Changeset 3887

Timestamp:

Jun 28, 2014, 5:38:35 PM (11 years ago)

Author:

bird

Message:

watcom build hacks.

Location:

trunk/libc/src/glibc/sysdeps

Files:

• Makefile.kmk (modified) (2 diffs)
• generic/cargf.c (deleted)
• generic/w_lgammal.c (modified) (1 diff)
• os2/__spawni.c (modified) (1 diff)

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

@@ -46 +46 @@
 
 libc_glibc_sysdeps_SOURCES.x86 = \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/generic/cargf.c \
         $(PATH_LIBC_SRC)/glibc/sysdeps/generic/fpu_control.c \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/generic/s_erfl.c \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/generic/w_lgammal.c \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/generic/w_tgammaf.c \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/generic/w_tgammal.c \
+        \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/ieee754/ldbl-96/e_acoshl.c \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/ieee754/ldbl-96/e_gammal_r.c \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/ieee754/ldbl-96/e_j0l.c \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/ieee754/ldbl-96/e_j1l.c \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/ieee754/ldbl-96/e_jnl.c \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/ieee754/ldbl-96/e_lgammal_r.c \
+
+if !defined(CFG_LIBC_USE_WATCOM) && !defined(CFG_LIBC_USE_MSVC) ## @todo when hell freezes over...
+libc_glibc_sysdeps_SOURCES.x86 = \
         $(PATH_LIBC_SRC)/glibc/sysdeps/generic/s_cacos.c \
         $(PATH_LIBC_SRC)/glibc/sysdeps/generic/s_cacosf.c \
@@ -100 +113 @@
         $(PATH_LIBC_SRC)/glibc/sysdeps/generic/s_ctanhf.c \
         $(PATH_LIBC_SRC)/glibc/sysdeps/generic/s_ctanhl.c \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/generic/s_ctanl.c \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/generic/s_erfl.c \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/generic/w_lgammal.c \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/generic/w_tgammaf.c \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/generic/w_tgammal.c \
-        \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/ieee754/ldbl-96/e_acoshl.c \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/ieee754/ldbl-96/e_gammal_r.c \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/ieee754/ldbl-96/e_j0l.c \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/ieee754/ldbl-96/e_j1l.c \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/ieee754/ldbl-96/e_jnl.c \
-        $(PATH_LIBC_SRC)/glibc/sysdeps/ieee754/ldbl-96/e_lgammal_r.c \
+        $(PATH_LIBC_SRC)/glibc/sysdeps/generic/s_ctanl.c
+endif
 
 if !defined(CFG_LIBC_USE_WATCOM) && !defined(CFG_LIBC_USE_MSVC) ## @todo later

trunk/libc/src/glibc/sysdeps/generic/w_lgammal.c

@@ -56 +56 @@
 }
 /* w e a k _alias (__lgammal, lgammal) */
-strong_alias (_std_lgammal, _std_gammal)
+/* s t r o n g _alias (_std_lgammal, _std_gammal)*/
 /* w e a k _alias (__gammal, gammal) */

trunk/libc/src/glibc/sysdeps/os2/__spawni.c

@@ -42 +42 @@
 #endif
 #include "../../posix/spawn_int.h"
+#include "klibc/backend.h"
 
 /*******************************************************************************