Changeset 3826

Timestamp:

Feb 28, 2014, 1:00:25 AM (11 years ago)

Author:

bird

Message:

More watcom build hacking.

Location:

trunk/libc

Files:

• Config.kmk (modified) (2 diffs)
• include/alloca.h (modified) (1 diff)
• src/glibc/argp/argp-help.c (modified) (2 diffs)
• src/glibc/argp/argp-parse.c (modified) (1 diff)
• src/glibc/intl/loadmsgcat.c (modified) (1 diff)

trunk/libc/Config.kmk

@@ -89 +89 @@
 if defined(CFG_LIBC_USE_WATCOM)
  TEMPLATE_libc_TOOL = OPENWATCOM
- TEMPLATE_libc_CFLAGS = $(TEMPLATE_lib_CFLAGS) -za99
+ TEMPLATE_libc_CFLAGS = $(TEMPLATE_lib_CFLAGS) -za99 -aa
  TEMPLATE_libc_CFLAGS.os2 = $(TEMPLATE_lib_CFLAGS.os2)
  TEMPLATE_libc_CFLAGS.release = $(TEMPLATE_lib_CFLAGS.release)
@@ -173 +173 @@
  TEMPLATE_bldprog_INCS = $(TOOL_OPENWATCOM_CXXINCS) $(PATH_LIBC_ROOT)
  TEMPLATE_bldprog_BLD_TRG_ARCH = x86
- TEMPLATE_bldprog_CFLAGS = -za99
+ TEMPLATE_bldprog_CFLAGS = -za99 -aa
 else
  TEMPLATE_bldprog_TOOL = GCC3

trunk/libc/include/alloca.h

@@ -12 +12 @@
 __BEGIN_DECLS
 #if __GNUC__ >= 2 || defined(__INTEL_COMPILER)
-#undef  alloca  /* some GNU bits try to get cute and define this on their own */
-#define alloca(sz) __builtin_alloca(sz)
+# undef  alloca /* some GNU bits try to get cute and define this on their own */
+# define alloca(sz) __builtin_alloca(sz)
+
+#elif defined(__WATCOMC__)
+# undef  alloca /* ditto above */
+# ifdef _M_IX86
+#  define alloca(a_cb) __builtin_alloca( ((a_cb) + sizeof(void *) - 1) & ~(sizeof(void *) - 1) )
+extern void *__builtin_alloca(size_t cb);
+#  pragma aux __builtin_alloca = "sub esp, edx" parm [eax] value [esp] modify exact nomemory [esp]
+# else
+#  error "Unsupported arch."
+# endif
+
 #elif defined(lint)
 void    *alloca(size_t);

trunk/libc/src/glibc/argp/argp-help.c

@@ -28 +28 @@
 
 /* AIX requires this to be the first thing in the file.  */
+#ifdef __IN_KLIBC__
+# include <alloca.h>
+#else /* !__IN_KLIBC__ */
 #ifndef __GNUC__
 # if HAVE_ALLOCA_H || defined _LIBC
@@ -41 +44 @@
 # endif
 #endif
+#endif /* !__IN_KLIBC__ */
 
 #include <stddef.h>

trunk/libc/src/glibc/argp/argp-parse.c

@@ -65 +65 @@
 #endif
 #ifndef N_
+# if 0 /* bird: OpenWatcom doesn't like this */
 # define N_(msgid) (msgid)
+# else
+#  define N_(msgid) msgid
+# endif
 #endif
 

trunk/libc/src/glibc/intl/loadmsgcat.c

@@ -1002 +1002 @@
       do
         {
+#ifndef __IN_KLIBC__
           long int nb = (long int) TEMP_FAILURE_RETRY (read (fd, read_ptr,
                                                              to_read));
+#else
+          long int nb;
+          do nb = read (fd, read_ptr, to_read); while (nb == -1 && errno == EINTR);
+#endif
           if (nb <= 0)
             goto out;