Changeset 3830

Timestamp:

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

Author:

bird

Message:

Redid cabsl, carg and cargl from scratch so watcom can grok and compile them

Location:

trunk/libc

Files:

• include/complex.h (modified) (2 diffs)
• src/glibc/math (deleted)
• src/libc/math/Makefile.kmk (modified) (1 diff, 1 prop)
• src/libc/math/cabsl.c (added)
• src/libc/math/carg.c (added)
• src/libc/math/cargl.c (added)
• src/libc/math/nan.c (modified) (1 prop)
• src/libc/math/nanf.c (modified) (1 prop)
• src/libc/math/nanl.c (modified) (1 prop)

trunk/libc/include/complex.h

@@ -41 +41 @@
 #endif
 
-#define complex         _Complex
-#define I               _Complex_I
+#if defined(_MSC_VER) || defined(__WATCOMC__) /* While watcom has _Complex, it causes compiler crashes. */
+typedef struct __float_complex       { float       __m_Real, __m_Imag; } __float_complex;
+typedef struct __double_complex      { double      __m_Real, __m_Imag; } __double_complex;
+typedef struct __long_double_complex { long double __m_Real, __m_Imag; } __long_double_complex;
+#else
+# define __float_complex        __float_complex
+# define __double_complex       __double_complex
+# define __long_double_complex  __long_double_complex
+
+# define complex                _Complex
+# define I                      _Complex_I
+#endif
+
 
 #include <sys/cdefs.h>
@@ -48 +59 @@
 __BEGIN_DECLS
 
-double          cabs(double complex);
-float           cabsf(float complex);
-double          cimag(double complex);
-float           cimagf(float complex);
-long double     cimagl(long double complex);
-double complex  conj(double complex);
-float complex   conjf(float complex);
-long double complex
-                conjl(long double complex);
-double          creal(double complex);
-float           crealf(float complex);
-long double     creall(long double complex);
+double          cabs(__double_complex);
+float           cabsf(__float_complex);
+double          cimag(__double_complex);
+float           cimagf(__float_complex);
+long double     cimagl(__long_double_complex);
+__double_complex        conj(__double_complex);
+__float_complex conjf(__float_complex);
+__long_double_complex
+                conjl(__long_double_complex);
+double          creal(__double_complex);
+float           crealf(__float_complex);
+long double     creall(__long_double_complex);
 
 /* bird:  */
-long double          cabsl(long double complex);
-double complex       cacos(double complex);
-float complex        cacosf(float complex);
-double complex       cacosh(double complex);
-float complex        cacoshf(float complex);
-long double complex  cacoshl(long double complex);
-long double complex  cacosl(long double complex);
-double               carg(double complex);
-float                cargf(float complex);
-long double          cargl(long double complex);
-double complex       casin(double complex);
-float complex        casinf(float complex);
-double complex       casinh(double complex);
-float complex        casinhf(float complex);
-long double complex  casinhl(long double complex);
-long double complex  casinl(long double complex);
-double complex       catan(double complex);
-float complex        catanf(float complex);
-double complex       catanh(double complex);
-float complex        catanhf(float complex);
-long double complex  catanhl(long double complex);
-long double complex  catanl(long double complex);
-double complex       ccos(double complex);
-float complex        ccosf(float complex);
-double complex       ccosh(double complex);
-float complex        ccoshf(float complex);
-long double complex  ccoshl(long double complex);
-long double complex  ccosl(long double complex);
-double complex       cexp(double complex);
-float complex        cexpf(float complex);
-long double complex  cexpl(long double complex);
-double complex       clog(double complex);
-float complex        clogf(float complex);
-long double complex  clogl(long double complex);
-double complex       cpow(double complex, double complex);
-float complex        cpowf(float complex, float complex);
-long double complex  cpowl(long double complex, long double complex);
-double complex       cproj(double complex);
-float complex        cprojf(float complex);
-long double complex  cprojl(long double complex);
-double complex       csin(double complex);
-float complex        csinf(float complex);
-double complex       csinh(double complex);
-float complex        csinhf(float complex);
-long double complex  csinhl(long double complex);
-long double complex  csinl(long double complex);
-double complex       csqrt(double complex);
-float complex        csqrtf(float complex);
-long double complex  csqrtl(long double complex);
-double complex       ctan(double complex);
-float complex        ctanf(float complex);
-double complex       ctanh(double complex);
-float complex        ctanhf(float complex);
-long double complex  ctanhl(long double complex);
-long double complex  ctanl(long double complex);
+long double          cabsl(__long_double_complex);
+__double_complex       cacos(__double_complex);
+__float_complex        cacosf(__float_complex);
+__double_complex       cacosh(__double_complex);
+__float_complex        cacoshf(__float_complex);
+__long_double_complex  cacoshl(__long_double_complex);
+__long_double_complex  cacosl(__long_double_complex);
+double               carg(__double_complex);
+float                cargf(__float_complex);
+long double          cargl(__long_double_complex);
+__double_complex       casin(__double_complex);
+__float_complex        casinf(__float_complex);
+__double_complex       casinh(__double_complex);
+__float_complex        casinhf(__float_complex);
+__long_double_complex  casinhl(__long_double_complex);
+__long_double_complex  casinl(__long_double_complex);
+__double_complex       catan(__double_complex);
+__float_complex        catanf(__float_complex);
+__double_complex       catanh(__double_complex);
+__float_complex        catanhf(__float_complex);
+__long_double_complex  catanhl(__long_double_complex);
+__long_double_complex  catanl(__long_double_complex);
+__double_complex       ccos(__double_complex);
+__float_complex        ccosf(__float_complex);
+__double_complex       ccosh(__double_complex);
+__float_complex        ccoshf(__float_complex);
+__long_double_complex  ccoshl(__long_double_complex);
+__long_double_complex  ccosl(__long_double_complex);
+__double_complex       cexp(__double_complex);
+__float_complex        cexpf(__float_complex);
+__long_double_complex  cexpl(__long_double_complex);
+__double_complex       clog(__double_complex);
+__float_complex        clogf(__float_complex);
+__long_double_complex  clogl(__long_double_complex);
+__double_complex       cpow(__double_complex, __double_complex);
+__float_complex        cpowf(__float_complex, __float_complex);
+__long_double_complex  cpowl(__long_double_complex, __long_double_complex);
+__double_complex       cproj(__double_complex);
+__float_complex        cprojf(__float_complex);
+__long_double_complex  cprojl(__long_double_complex);
+__double_complex       csin(__double_complex);
+__float_complex        csinf(__float_complex);
+__double_complex       csinh(__double_complex);
+__float_complex        csinhf(__float_complex);
+__long_double_complex  csinhl(__long_double_complex);
+__long_double_complex  csinl(__long_double_complex);
+__double_complex       csqrt(__double_complex);
+__float_complex        csqrtf(__float_complex);
+__long_double_complex  csqrtl(__long_double_complex);
+__double_complex       ctan(__double_complex);
+__float_complex        ctanf(__float_complex);
+__double_complex       ctanh(__double_complex);
+__float_complex        ctanhf(__float_complex);
+__long_double_complex  ctanhl(__long_double_complex);
+__long_double_complex  ctanl(__long_double_complex);
 
 /* gnu extensions? */
-double complex       clog10(double complex);
-float complex        clog10f(float complex);
-long double complex  clog10l(long double complex);
+__double_complex       clog10(__double_complex);
+__float_complex        clog10f(__float_complex);
+__long_double_complex  clog10l(__long_double_complex);
 __END_DECLS
 

trunk/libc/src/libc/math/Makefile.kmk

@@ -35 +35 @@
 libc_libc_math_SOURCES = \
     $(PATH_LIBC_SRC)/libc/math/cbrtl.c \
+    $(PATH_LIBC_SRC)/libc/math/cabsl.c \
+    $(PATH_LIBC_SRC)/libc/math/carg.c \
+    $(PATH_LIBC_SRC)/libc/math/cargl.c \
     $(PATH_LIBC_SRC)/libc/math/nan.c \
     $(PATH_LIBC_SRC)/libc/math/nanf.c \