diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:46:31 -0800 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:51:37 -0800 |
| commit | f757db2d319ccc5f7034165046fb2bb58901afb1 (patch) | |
| tree | 7dc465febb3a802d3f0e8856fcda856b13b04c0a /libm | |
| parent | 76c0c0ed99f74b8a5965be6e1c6a0c0e7a72513c (diff) | |
| parent | b71274eebd68b7c68ab95c856f8075bdf4524cd7 (diff) | |
Merge remote branch 'origin/master' into nptl_merge
Conflicts:
Rules.mak
libc/misc/sysvipc/msgq.c
test/Rules.mak
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libm')
| -rw-r--r-- | libm/Makefile.in | 8 | ||||
| -rw-r--r-- | libm/ldouble_wrappers.c | 15 |
2 files changed, 11 insertions, 12 deletions
diff --git a/libm/Makefile.in b/libm/Makefile.in index d17d64fae..56b2d76c3 100644 --- a/libm/Makefile.in +++ b/libm/Makefile.in @@ -56,8 +56,8 @@ LD_MSRC := ldouble_wrappers.c ifeq ($(DO_C99_MATH),y) libm_CSRC := \ e_acos.c e_acosh.c e_asin.c e_atan2.c e_atanh.c e_cosh.c \ - e_exp.c e_fmod.c e_hypot.c e_j0.c \ - e_j1.c e_jn.c e_lgamma_r.c e_log.c e_log2.c e_log10.c \ + e_exp.c e_fmod.c e_hypot.c \ + e_lgamma_r.c e_log.c e_log2.c e_log10.c \ e_pow.c e_remainder.c e_rem_pio2.c e_scalb.c e_sinh.c \ e_sqrt.c k_cos.c k_rem_pio2.c k_sin.c k_standard.c k_tan.c \ s_asinh.c s_atan.c s_cbrt.c s_ceil.c s_copysign.c s_cos.c \ @@ -209,6 +209,10 @@ libm_CSRC := \ FL_MOBJ := sqrtf.o endif +ifeq ($(DO_XSI_MATH),y) +libm_CSRC += e_j0.c e_j1.c e_jn.c +endif + # assume that arch specific versions are provided as single sources/objects ifeq ($(UCLIBC_HAS_FPU),y) ifeq ($(DO_C99_MATH),y) diff --git a/libm/ldouble_wrappers.c b/libm/ldouble_wrappers.c index c53b99773..34f06722e 100644 --- a/libm/ldouble_wrappers.c +++ b/libm/ldouble_wrappers.c @@ -505,28 +505,23 @@ long double significandl(long double x) #ifdef __DO_C99_MATH__ #ifdef L___fpclassifyl -int_WRAPPER1(__fpclassify) -libm_hidden_def(__fpclassifyl) +int_WRAPPER_C99(__fpclassify) #endif #ifdef L___finitel -int_WRAPPER1(__finite) -libm_hidden_def(__finitel) +int_WRAPPER_C99(__finite) #endif #ifdef L___signbitl -int_WRAPPER1(__signbit) -libm_hidden_def(__signbitl) +int_WRAPPER_C99(__signbit) #endif #ifdef L___isnanl -int_WRAPPER1(__isnan) -libm_hidden_def(__isnanl) +int_WRAPPER_C99(__isnan) #endif #ifdef L___isinfl -int_WRAPPER1(__isinf) -libm_hidden_def(__isinfl) +int_WRAPPER_C99(__isinf) #endif #endif |