Changeset 3833

Timestamp:

Mar 2, 2014, 2:17:46 AM (11 years ago)

Author:

bird

Message:

More watcom hacking.

Location:

trunk/libc

Files:

• include/fenv.h (modified) (1 diff)
• include/spawn.h (modified) (2 diffs)
• include/sys/cdefs.h (modified) (1 diff)
• src/glibc/include/libc-alias-glibc.h (modified) (1 diff)
• src/glibc/intl/dcigettext.c (modified) (1 diff)
• src/glibc/intl/loadinfo.h (modified) (1 diff)
• src/glibc/intl/localecharset.c (modified) (2 diffs)
• src/glibc/misc/error.c (modified) (4 diffs)
• src/glibc/posix/regcomp.c (modified) (1 diff)
• src/glibc/posix/regex_internal.c (modified) (1 diff)
• src/glibc/posix/regex_internal.h (modified) (2 diffs)
• src/glibc/posix/regexec.c (modified) (3 diffs)
• src/glibc/posix/spawn_faction_addclose.c (modified) (1 diff)
• src/glibc/posix/spawn_faction_adddup2.c (modified) (1 diff)
• src/glibc/posix/spawn_faction_addopen.c (modified) (1 diff)
• src/glibc/string/argz-addsep.c (modified) (1 diff)
• src/glibc/string/argz-append.c (modified) (1 diff)
• src/glibc/string/argz-count.c (modified) (1 diff)
• src/glibc/string/argz-create.c (modified) (1 diff)
• src/glibc/string/argz-ctsep.c (modified) (1 diff)
• src/glibc/string/argz-delete.c (modified) (1 diff)
• src/glibc/string/argz-extract.c (modified) (1 diff)
• src/glibc/string/argz-insert.c (modified) (1 diff)
• src/glibc/string/argz-next.c (modified) (1 diff)
• src/glibc/string/argz-replace.c (modified) (1 diff)
• src/glibc/string/argz-stringify.c (modified) (1 diff)
• src/glibc/string/strndup.c (modified) (1 diff)
• src/glibc/sysdeps/Makefile.kmk (modified) (2 diffs)
• src/glibc/sysdeps/i386/sysdep.h (modified) (1 diff)
• src/glibc/sysdeps/ieee754/ldbl-96/e_j0l.c (modified) (1 diff)
• src/glibc/sysdeps/ieee754/ldbl-96/e_j1l.c (modified) (2 diffs)
• src/glibc/sysdeps/os2/sysdep.h (modified) (1 diff)

trunk/libc/include/fenv.h

@@ -98 +98 @@
 #define FE_DFL_ENV      (&__fe_dfl_env)
 
-#define __fldcw(__cw)           __asm __volatile("fldcw %0" : : "m" (__cw))
-#define __fldenv(__env)         __asm __volatile("fldenv %0" : : "m" (__env))
-#define __fnclex()              __asm __volatile("fnclex")
-#define __fnstenv(__env)        __asm __volatile("fnstenv %0" : "=m" (*(__env)))
-#define __fnstcw(__cw)          __asm __volatile("fnstcw %0" : "=m" (*(__cw)))
-#define __fnstsw(__sw)          __asm __volatile("fnstsw %0" : "=am" (*(__sw)))
-#define __fwait()               __asm __volatile("fwait")
-#define __ldmxcsr(__csr)        __asm __volatile("ldmxcsr %0" : : "m" (__csr))
-#define __stmxcsr(__csr)        __asm __volatile("stmxcsr %0" : "=m" (*(__csr)))
+#if defined(__GNUC__)
+# define __fldcw(__cw)          __asm __volatile("fldcw %0" : : "m" (__cw))
+# define __fldenv(__env)        __asm __volatile("fldenv %0" : : "m" (__env))
+# define __fnclex()             __asm __volatile("fnclex")
+# define __fnstenv(__env)       __asm __volatile("fnstenv %0" : "=m" (*(__env)))
+# define __fnstcw(__cw)         __asm __volatile("fnstcw %0" : "=m" (*(__cw)))
+# define __fnstsw(__sw)         __asm __volatile("fnstsw %0" : "=am" (*(__sw)))
+# define __fwait()              __asm __volatile("fwait")
+# define __ldmxcsr(__csr)       __asm __volatile("ldmxcsr %0" : : "m" (__csr))
+# define __stmxcsr(__csr)       __asm __volatile("stmxcsr %0" : "=m" (*(__csr)))
+
+#elif defined(__WATCOMC__)
+# define __fldcw(__cw)          __fldcw_(&(__cw))
+void __fldcw_(unsigned short *);
+# pragma aux __fldcw = "fldcw [ecx]" parm [ecx];
+# define __fldenv(__env)        __fldenv_(&(__env))
+void __fldenv_(fenv_t const *);
+# pragma aux __fldenv_ = "fldenv [edx]" parm [edx] modify;  /** @todo how to tell it we've modified memory? */
+void __fnclex(void);
+# pragma aux __fnclex = "fnclex"
+void __fnstenv(fenv_t *);
+# pragma aux __fstenv = "fstenv [edx]" parm [edx];
+
+void __fnstcw(unsigned short *);
+# pragma aux __fnstcw = "fnstcw [ecx]" parm [ecx] modify; /** @todo how to tell it we've modified memory? */
+
+void __fnstsw(unsigned short *);
+# pragma aux __fnstsw = "fnstsw [eax]" parm [eax] modify;/** @todo how to tell it we've modified memory? */
+void __fwait(void);
+# pragma aux __fwait = "fwait"
+# define __ldmxcsr(__csr)       __ldmxcsr_(&(__csr))
+void __ldmxcsr_(int *);
+# pragma aux __ldmxcsr_ = "ldmxcsr [eax]" parm [eax];
+void __stmxcsr(int *);
+# pragma aux __stmxcsr = "stmxcsr [eax]" parm [eax] modify;  /** @todo how to tell it we've modified memory? */
+#else
+# error "Port me"
+#endif
 
 static __inline int

trunk/libc/include/spawn.h

@@ -27 +27 @@
 
 #include <features.h>
-#ifndef __EMX__                         /* bird */
+#ifndef __KLIBC__                       /* bird */
 #include <sched.h>
 #endif                                  /* bird */
@@ -34 +34 @@
 
 /* bird - start */
-#ifdef __EMX__
+#ifdef __KLIBC__
 #undef __used /* BSD defines this in sys/cdefs.h since 5.3 */
 #ifndef __THROW

trunk/libc/include/sys/cdefs.h

@@ -140 +140 @@
 # endif
 
+# ifdef __WATCOMC__ /* The foo(type __param[restrict]) isn't supported. */
+#  undef __restrict_arr
+#  define __restrict_arr
+# endif
+
 /** @def __KLIBC_CC_NO_COMPLEX
  * Indicates that the compiles does not implement _Complex.

trunk/libc/src/glibc/include/libc-alias-glibc.h

@@ -44 +44 @@
 #ifndef _LIBC_SYMBOLS_H /* hackityhack */
 # undef weak_alias
-# ifdef __WANT_WEAK__
+# if defined(__WANT_WEAK__) && defined(__GNUC__)
 #  define weak_alias(name, aliasname) \
     extern __typeof(name) aliasname  __attribute__((weak, alias(#name)));

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

@@ -180 +180 @@
    IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
  */
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __OS2__ || defined __DJGPP__
   /* Win32, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')

trunk/libc/src/glibc/intl/loadinfo.h

@@ -52 +52 @@
 
 /* Separator in PATH like lists of pathnames.  */
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __OS2__ || defined __DJGPP__
   /* Win32, OS/2, DOS */
 # define PATH_SEPARATOR ';'

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

@@ -63 +63 @@
 # include <windows.h>
 #endif
-#if defined OS2
+#if defined(OS2) || defined(__OS2__)
 # define INCL_DOS
 # include <os2.h>
@@ -74 +74 @@
 #endif
 
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
+#if defined _WIN32 || defined __WIN32__ || defined __EMX_ || defined __OS2__ || defined __DJGPP__
   /* Win32, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')

trunk/libc/src/glibc/misc/error.c

@@ -26 +26 @@
 
 #include <stdio.h>
-#ifndef __EMX__                         /* bird */
+#ifndef __KLIBC__                       /* bird */
 #include <libintl.h>
 #endif                                  /* bird */
@@ -103 +103 @@
 # endif
 
-#ifndef __EMX__ /* bird */
+#ifndef __KLIBC__ /* bird */
 /* The calling program should define program_name and set it to the
    name of the executing program.  */
 extern char *program_name;
-#else /* __EMX__ */                     /* bird */
+#else /* __KLIBC__ */                    /* bird */
 /* Use the BSD _getprogname() which the Innotek LIBC also implements.
    Using this save the time used to maintain the two program_* vars
@@ -124 +124 @@
 # define error __error
 # define error_at_line __error_at_line
-#endif /* __EMX__ */                     /* bird */
-
-
-#ifndef __EMX__ /* bird */
+#endif /* __KLIBC__ */                    /* bird */
+
+
+#ifndef __KLIBC__ /* bird */
 # if HAVE_STRERROR_R || defined strerror_r
 #  define __strerror_r strerror_r
@@ -152 +152 @@
 #  endif /* HAVE_STRERROR */
 # endif /* HAVE_STRERROR_R || defined strerror_r */
-#endif /* !__EMX__ */ /* bird */
+#endif /* !__KLIBC__ */ /* bird */
 #endif  /* not _LIBC */
 

trunk/libc/src/glibc/posix/regcomp.c

@@ -562 +562 @@
 {
   /* Set the first 128 bits.  */
+# if defined(_MSC_VER) || defined(__WATCOMC__) /* bird */
+  BITSET_WORD_MAX, BITSET_WORD_MAX,
+#  if ULONG_MAX > INT_MAX
+  BITSET_WORD_MAX, BITSET_WORD_MAX,
+  0, 0,
+#  endif
+  0, 0,
+# else  /* bird */
   [0 ... 0x80 / BITSET_WORD_BITS - 1] = BITSET_WORD_MAX
+# endif /* bird */
 };
 #endif

trunk/libc/src/glibc/posix/regex_internal.c

@@ -30 +30 @@
                                           unsigned int context,
                                           unsigned int hash) internal_function;
+
 
 

trunk/libc/src/glibc/posix/regex_internal.h

@@ -395 +395 @@
 #ifdef RE_ENABLE_I18N
 static void build_wcs_buffer (re_string_t *pstr) internal_function;
-static int build_wcs_upper_buffer (re_string_t *pstr) internal_function;
+/*static int build_wcs_upper_buffer (re_string_t *pstr) internal_function;*/       /* bird */
+static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr) internal_function; /* bird */
 #endif /* RE_ENABLE_I18N */
 static void build_upper_buffer (re_string_t *pstr) internal_function;
@@ -566 +567 @@
   /* The string object corresponding to the input string.  */
   re_string_t input;
-#if defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
+#if defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L && !defined(__WATCOMC__))
   const re_dfa_t *const dfa;
 #else

trunk/libc/src/glibc/posix/regexec.c

@@ -635 +635 @@
   int extra_nmatch;
   int sb, ch;
-#if defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
+#if defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L && !defined(__WATCOMC__))
   re_match_context_t mctx = { .dfa = dfa };
 #else
@@ -644 +644 @@
   RE_TRANSLATE_TYPE t = preg->translate;
 
-#if !(defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L))
+#if !(defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L && !defined(__WATCOMC__)))
   memset (&mctx, '\0', sizeof (re_match_context_t));
   mctx.dfa = dfa;
@@ -2899 +2899 @@
     }
 
+#ifdef __GNUC__
   str_idx = path->next_idx ?: top_str;
+#else
+  str_idx = path->next_idx ? path->next_idx : top_str;
+#endif
 
   /* Temporary modify MCTX.  */

trunk/libc/src/glibc/posix/spawn_faction_addclose.c

@@ -29 +29 @@
                                    int fd)
 {
-#ifndef __EMX__
+#ifndef __KLIBC__ /** @todo fix this*/
   int maxfd = __sysconf (_SC_OPEN_MAX);
 #else

trunk/libc/src/glibc/posix/spawn_faction_adddup2.c

@@ -29 +29 @@
                                   int fd, int newfd)
 {
-#ifndef __EMX__
+#ifndef __KLIBC__ /** @todo fix this*/
   int maxfd = __sysconf (_SC_OPEN_MAX);
 #else

trunk/libc/src/glibc/posix/spawn_faction_addopen.c

@@ -30 +30 @@
                                   mode_t mode)
 {
-#ifndef __EMX__
+#ifndef __KLIBC__ /** @todo fix this*/
   int maxfd = __sysconf (_SC_OPEN_MAX);
 #else

trunk/libc/src/glibc/string/argz-addsep.c

@@ -18 +18 @@
    02111-1307 USA.  */
 
-#ifdef __EMX__
 #include "libc-alias-glibc.h"
-#endif
 #include <argz.h>
 #include <errno.h>

trunk/libc/src/glibc/string/argz-append.c

@@ -19 +19 @@
    02111-1307 USA.  */
 
-#ifdef __EMX__
 #include "libc-alias-glibc.h"
-#endif
 #include <argz.h>
 #include <string.h>

trunk/libc/src/glibc/string/argz-count.c

@@ -19 +19 @@
    02111-1307 USA.  */
 
-#ifdef __EMX__
 #include "libc-alias-glibc.h"
-#endif
 #include <argz.h>
 #include <string.h>

trunk/libc/src/glibc/string/argz-create.c

@@ -19 +19 @@
    02111-1307 USA.  */
 
-#ifdef __EMX__
 #include "libc-alias-glibc.h"
-#endif
 
 #include <argz.h>

trunk/libc/src/glibc/string/argz-ctsep.c

@@ -18 +18 @@
    02111-1307 USA.  */
 
-#ifdef __EMX__
 #include "libc-alias-glibc.h"
-#endif
 #include <argz.h>
 #include <errno.h>

trunk/libc/src/glibc/string/argz-delete.c

@@ -19 +19 @@
    02111-1307 USA.  */
 
-#ifdef __EMX__
 #include "libc-alias-glibc.h"
-#endif
 #include <argz.h>
 #include <string.h>

trunk/libc/src/glibc/string/argz-extract.c

@@ -19 +19 @@
    02111-1307 USA.  */
 
-#ifdef __EMX__
 #include "libc-alias-glibc.h"
-#endif
 #include <argz.h>
 

trunk/libc/src/glibc/string/argz-insert.c

@@ -19 +19 @@
    02111-1307 USA.  */
 
-#ifdef __EMX__
 #include "libc-alias-glibc.h"
-#endif
 #include <argz.h>
 #include <string.h>

trunk/libc/src/glibc/string/argz-next.c

@@ -19 +19 @@
    02111-1307 USA.  */
 
-#ifdef __EMX__
 #include "libc-alias-glibc.h"
-#endif
 #include <argz.h>
 #include <string.h>

trunk/libc/src/glibc/string/argz-replace.c

@@ -19 +19 @@
    02111-1307 USA.  */
 
-#ifdef __EMX__
 #include "libc-alias-glibc.h"
-#endif
 #include <stdlib.h>
 #include <string.h>

trunk/libc/src/glibc/string/argz-stringify.c

@@ -19 +19 @@
    02111-1307 USA.  */
 
-#ifdef __EMX__
 #include "libc-alias-glibc.h"
-#endif
 #include <argz.h>
 #include <string.h>

trunk/libc/src/glibc/string/strndup.c

@@ -17 +17 @@
    02111-1307 USA.  */
 
-#ifdef __EMX__
 #include "libc-alias-glibc.h"
-#endif
 #ifdef HAVE_CONFIG_H
 # include "config.h"

trunk/libc/src/glibc/sysdeps/Makefile.kmk

@@ -46 +46 @@
 
 libc_glibc_sysdeps_SOURCES.x86 = \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/rawmemchr.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/stpncpy.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/strchrnul.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_atan2l.c \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_atanhl.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_exp2l.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_exp10.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_exp10f.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_exp10l.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_fmodl.c \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_log2.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_log2f.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_log2l.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_log10l.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_logl.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_powl.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_remainderl.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_scalbl.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_sqrtl.c \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_asinhl.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_atanl.c \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_cexp.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_expm1l.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_llrintl.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_log1pl.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_logbl.c \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_lrintl.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_nearbyintl.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_remquol.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_rintl.c \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_significandl.c \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_sincos.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_sincosf.S \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_sincosl.S \
-        \
         $(PATH_LIBC_SRC)/glibc/sysdeps/generic/cargf.c \
         $(PATH_LIBC_SRC)/glibc/sysdeps/generic/fpu_control.c \
@@ -148 +113 @@
         $(PATH_LIBC_SRC)/glibc/sysdeps/ieee754/ldbl-96/e_lgammal_r.c \
 
+if !defined(CFG_LIBC_USE_WATCOM) && !defined(CFG_LIBC_USE_MSVC) ## @todo later
+libc_glibc_sysdeps_SOURCES.x86 = \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/rawmemchr.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/stpncpy.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/strchrnul.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_atan2l.c \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_atanhl.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_exp2l.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_exp10.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_exp10f.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_exp10l.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_fmodl.c \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_log2.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_log2f.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_log2l.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_log10l.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_logl.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_powl.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_remainderl.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_scalbl.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/e_sqrtl.c \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_asinhl.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_atanl.c \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_cexp.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_expm1l.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_llrintl.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_log1pl.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_logbl.c \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_lrintl.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_nearbyintl.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_remquol.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_rintl.c \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_significandl.c \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_sincos.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_sincosf.S \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/i386/fpu/s_sincosl.S
+endif
+
 # configure the variants. */
 $(call LIBC_CONFIG_VARIANT_LIBS,libc_glibc_sysdeps)

trunk/libc/src/glibc/sysdeps/i386/sysdep.h

@@ -111 +111 @@
 #define mcount          _mcount
 #endif
-#ifdef __EMX__
+#if defined(__KLIBC__) && (defined(_WIN32) || defined(__OS2__))
 #define mcount __mcount
 #endif

trunk/libc/src/glibc/sysdeps/ieee754/ldbl-96/e_j0l.c

@@ -75 +75 @@
 #include "math.h"
 #include "math_private.h"
+#ifdef __WATCOMC__
+# undef huge
+#endif
 
 #ifdef __STDC__

trunk/libc/src/glibc/sysdeps/ieee754/ldbl-96/e_j1l.c

@@ -75 +75 @@
 #include "math.h"
 #include "math_private.h"
+#ifdef __WATCOMC__
+#undef huge
+#endif
 
 #ifdef __STDC__
@@ -87 +90 @@
 static long double
 #endif
-  huge = 1e4930L,
+ huge = 1e4930L,
  one = 1.0L,
  invsqrtpi = 5.6418958354775628694807945156077258584405e-1L,

trunk/libc/src/glibc/sysdeps/os2/sysdep.h

@@ -22 +22 @@
 /* config.h candidates? */
 #undef NO_UNDERSCORES
-#define HAVE_CPP_ASM_DEBUGINFO
-#define HAVE_ASM_SET_DIRECTIVE
-#define HAVE_ASM_WEAKEXT_DIRECTIVE
+#ifdef __GNUC__
+# define HAVE_CPP_ASM_DEBUGINFO
+# define HAVE_ASM_SET_DIRECTIVE
+# define HAVE_ASM_WEAKEXT_DIRECTIVE
+#endif
 #ifndef __BOUNDED_POINTERS__
-#define __BOUNDED_POINTERS__ 0
+# define __BOUNDED_POINTERS__ 0
 #endif