summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-12-22 11:31:12 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-12-22 11:31:12 +0000
commita0ebeb988d63d94da086b72daf0691f67584724a (patch)
tree9f02c52ab3ca4863834e14ccffc8335c371eec7f
parent42256be88ff6114cce268616cfd47a0b10ddc575 (diff)
- fix fpclassify, signbit, isfinite, isnan, isinf macros for long double math support
- add rule to create preprocessor output for float- and long double math wrapper
-rw-r--r--Makerules6
-rw-r--r--include/math.h31
-rw-r--r--libc/sysdeps/linux/common/bits/mathcalls.h194
-rw-r--r--libm/Makefile.in39
-rw-r--r--libm/e_scalb.c2
-rw-r--r--libm/float_wrappers.c10
-rw-r--r--libm/ldouble_wrappers.c56
-rw-r--r--libm/s_finite.c2
-rw-r--r--libm/s_finitef.c2
-rw-r--r--libm/s_fma.c6
-rw-r--r--libm/s_fpclassify.c2
-rw-r--r--libm/s_fpclassifyf.c6
-rw-r--r--libm/s_isinf.c2
-rw-r--r--libm/s_isinff.c2
-rw-r--r--libm/s_isnan.c9
-rw-r--r--libm/s_isnanf.c4
-rw-r--r--libm/s_ldexp.c4
-rw-r--r--libm/s_signbitf.c1
-rw-r--r--libm/s_significand.c1
-rw-r--r--libm/w_drem.c1
-rw-r--r--libm/w_exp.c2
-rw-r--r--libm/w_gamma.c3
-rw-r--r--libm/w_gamma_r.c2
-rw-r--r--libm/w_hypot.c2
-rw-r--r--libm/w_j0.c2
-rw-r--r--libm/w_j1.c2
-rw-r--r--libm/w_jn.c2
-rw-r--r--libm/w_lgamma.c2
-rw-r--r--libm/w_lgamma_r.c3
-rw-r--r--libm/w_log2.c1
-rw-r--r--libm/w_pow.c8
-rw-r--r--libm/w_scalb.c5
-rw-r--r--libm/w_sinh.c2
-rw-r--r--libm/w_tgamma.c2
34 files changed, 202 insertions, 216 deletions
diff --git a/Makerules b/Makerules
index 24d48c77b..9067867b7 100644
--- a/Makerules
+++ b/Makerules
@@ -80,6 +80,7 @@ pur_disp_compile.s = echo " "CC-S $(show_objs)
pur_disp_compile.u = echo " "CC $(show_objs)
pur_disp_compile.S = echo " "AS $(show_objs)
pur_disp_compile.m = $(pur_disp_compile.c)
+pur_disp_compile.mi= echo " "CPP-m $(show_objs)
pur_disp_compile-m = echo " "CC-m $(show_objs)
pur_disp_hcompile.u= echo " "HOSTCC $(show_objs)
pur_disp_hcompile.o= echo " "HOSTCC-o $(show_objs)
@@ -99,6 +100,7 @@ sil_disp_compile.s = true
sil_disp_compile.u = true
sil_disp_compile.S = true
sil_disp_compile.m = true
+sil_disp_compile.mi= true
sil_disp_compile-m = true
sil_disp_hcompile.u= true
sil_disp_hcompile.o= true
@@ -118,6 +120,7 @@ ver_disp_compile.s = echo $(cmd_compile.s)
ver_disp_compile.u = echo $(cmd_compile.u)
ver_disp_compile.S = echo $(cmd_compile.S)
ver_disp_compile.m = echo $(cmd_compile.m)
+ver_disp_compile.mi= echo $(cmd_compile.mi)
ver_disp_compile-m = echo $(cmd_compile-m)
ver_disp_hcompile.u= echo $(cmd_hcompile.u)
ver_disp_hcompile.o= echo $(cmd_hcompile.o)
@@ -137,6 +140,7 @@ disp_compile.s = $($(DISP)_disp_compile.s)
disp_compile.u = $($(DISP)_disp_compile.u)
disp_compile.S = $($(DISP)_disp_compile.S)
disp_compile.m = $($(DISP)_disp_compile.m)
+disp_compile.mi= $($(DISP)_disp_compile.mi)
disp_compile-m = $($(DISP)_disp_compile-m)
disp_hcompile.u= $($(DISP)_disp_hcompile.u)
disp_hcompile.o= $($(DISP)_disp_hcompile.o)
@@ -189,6 +193,7 @@ cmd_compile.s = $(cmd_compile.c:-c=-S)
cmd_compile.u = $(CC) $^ $(DEPS-$(notdir $@)) -o $@ $(CFLAGS) $(CFLAGS-$(notdir $(^D))) $(CFLAGS-$(notdir $@)) $(CFLAGS_gen.dep)
cmd_compile.S = $(filter-out -std=gnu99, $(cmd_compile.c)) -D__ASSEMBLER__ $(ASFLAGS) $(ARCH_ASFLAGS) $(ASFLAGS-$(suffix $@)) $(ASFLAGS-$(notdir $<)) $(ASFLAGS-$(notdir $@))
cmd_compile.m = $(cmd_compile.c) -DL_$(patsubst %$(suffix $(notdir $@)),%,$(notdir $@))
+cmd_compile.mi= $(cmd_compile.m:-c=-E -dD $(EXTRA_CPPFLAGS))
cmd_compile-m = $(CC) $^ -c -o $@ $(CFLAGS) $(ARCH_CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(notdir $(@D))) $(CFLAGS-$(notdir $@))
cmd_strip = $(STRIPTOOL) $(STRIP_FLAGS) $^
@@ -216,6 +221,7 @@ compile.i = $(call maybe_exec,compile.i)
compile.s = $(call maybe_exec,compile.s)
compile.S = @$(call maybe_exec,compile.S)
compile.m = @$(call maybe_exec,compile.m)
+compile.mi= $(call maybe_exec,compile.mi)
compile-m = @$(disp_compile-m) ; $(cmd_compile-m) && $(cmd_t_strip)
do_strip = @$(disp_strip) ; $(cmd_strip)
do_t_strip= @$(disp_t_strip) ; $(cmd_t_strip)
diff --git a/include/math.h b/include/math.h
index ae5d6ec70..15bc9ccc6 100644
--- a/include/math.h
+++ b/include/math.h
@@ -46,6 +46,10 @@ __BEGIN_DECLS
/* Get general and ISO C99 specific information. */
#include <bits/mathdef.h>
+#if !(defined _LIBC && (defined NOT_IN_libc && defined IS_IN_libm))
+# define libm_hidden_proto(name, attrs...)
+#endif
+
/* The file <bits/mathcalls.h> contains the prototypes for all the
actual math functions. These macros are used for those prototypes,
so we can easily declare each function as both `name' and `__name',
@@ -55,15 +59,32 @@ __BEGIN_DECLS
__MATHDECL (_Mdouble_,function,suffix, args)
#define __MATHDECL(type, function,suffix, args) \
__MATHDECL_1(type, function,suffix, args); \
- __MATHDECL_1(type, __CONCAT(__,function),suffix, args)
+
#define __MATHCALLX(function,suffix, args, attrib) \
__MATHDECLX (_Mdouble_,function,suffix, args, attrib)
#define __MATHDECLX(type, function,suffix, args, attrib) \
__MATHDECL_1(type, function,suffix, args) __attribute__ (attrib); \
- __MATHDECL_1(type, __CONCAT(__,function),suffix, args) __attribute__ (attrib)
+ __MATHDECLI_MAINVARIANT(function)
+
+
#define __MATHDECL_1(type, function,suffix, args) \
extern type __MATH_PRECNAME(function,suffix) args __THROW
-
+/* Decls which are also used internally in libm.
+ Only the main variant is used internally, no need to try to avoid relocs
+ for the {l,f} variants. */
+#define __MATHCALLI(function,suffix, args) \
+ __MATHDECLI (_Mdouble_,function,suffix, args)
+#define __MATHDECLI(type, function,suffix, args) \
+ __MATHDECL_1(type, function,suffix, args); \
+ __MATHDECLI_MAINVARIANT(function)
+/* Private helpers for purely macro impls below.
+ Only make __foo{,f,l} visible but not (the macro-only) foo. */
+#define __MATHDECL_PRIV(type, function,suffix, args, attrib) \
+ __MATHDECL_1(type, __CONCAT(__,function),suffix, args) \
+ __attribute__ (attrib); \
+ libm_hidden_proto(__MATH_PRECNAME(__##function,suffix))
+
+#define __MATHDECLI_MAINVARIANT libm_hidden_proto
#define _Mdouble_ double
#define __MATH_PRECNAME(name,r) __CONCAT(name,r)
# define _Mdouble_BEGIN_NAMESPACE __BEGIN_NAMESPACE_STD
@@ -72,7 +93,9 @@ __BEGIN_DECLS
#undef _Mdouble_
#undef _Mdouble_BEGIN_NAMESPACE
#undef _Mdouble_END_NAMESPACE
-#undef __MATH_PRECNAME
+#undef __MATH_PRECNAME
+#undef __MATHDECLI_MAINVARIANT
+#define __MATHDECLI_MAINVARIANT(x)
#if defined __USE_MISC || defined __USE_ISOC99
diff --git a/libc/sysdeps/linux/common/bits/mathcalls.h b/libc/sysdeps/linux/common/bits/mathcalls.h
index e30b04aed..9241dd26d 100644
--- a/libc/sysdeps/linux/common/bits/mathcalls.h
+++ b/libc/sysdeps/linux/common/bits/mathcalls.h
@@ -52,59 +52,45 @@
_Mdouble_BEGIN_NAMESPACE
/* Arc cosine of X. */
-__MATHCALL (acos,, (_Mdouble_ __x));
-libm_hidden_proto(acos)
+__MATHCALLI (acos,, (_Mdouble_ __x));
/* Arc sine of X. */
-__MATHCALL (asin,, (_Mdouble_ __x));
-libm_hidden_proto(asin)
+__MATHCALLI (asin,, (_Mdouble_ __x));
/* Arc tangent of X. */
-__MATHCALL (atan,, (_Mdouble_ __x));
-libm_hidden_proto(atan)
+__MATHCALLI (atan,, (_Mdouble_ __x));
/* Arc tangent of Y/X. */
-__MATHCALL (atan2,, (_Mdouble_ __y, _Mdouble_ __x));
-libm_hidden_proto(atan2)
+__MATHCALLI (atan2,, (_Mdouble_ __y, _Mdouble_ __x));
/* Cosine of X. */
-__MATHCALL (cos,, (_Mdouble_ __x));
-libm_hidden_proto(cos)
+__MATHCALLI (cos,, (_Mdouble_ __x));
/* Sine of X. */
-__MATHCALL (sin,, (_Mdouble_ __x));
-libm_hidden_proto(sin)
+__MATHCALLI (sin,, (_Mdouble_ __x));
/* Tangent of X. */
-__MATHCALL (tan,, (_Mdouble_ __x));
-libm_hidden_proto(tan)
+__MATHCALLI (tan,, (_Mdouble_ __x));
/* Hyperbolic functions. */
/* Hyperbolic cosine of X. */
-__MATHCALL (cosh,, (_Mdouble_ __x));
-libm_hidden_proto(cosh)
+__MATHCALLI (cosh,, (_Mdouble_ __x));
/* Hyperbolic sine of X. */
-__MATHCALL (sinh,, (_Mdouble_ __x));
-libm_hidden_proto(sinh)
+__MATHCALLI (sinh,, (_Mdouble_ __x));
/* Hyperbolic tangent of X. */
-__MATHCALL (tanh,, (_Mdouble_ __x));
-libm_hidden_proto(tanh)
+__MATHCALLI (tanh,, (_Mdouble_ __x));
_Mdouble_END_NAMESPACE
#if 0 /*def __USE_GNU*/
/* Cosine and sine of X. */
__MATHDECL (void,sincos,,
(_Mdouble_ __x, _Mdouble_ *__sinx, _Mdouble_ *__cosx));
-libm_hidden_proto(sincos)
#endif
#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
__BEGIN_NAMESPACE_C99
/* Hyperbolic arc cosine of X. */
-__MATHCALL (acosh,, (_Mdouble_ __x));
-libm_hidden_proto(acosh)
+__MATHCALLI (acosh,, (_Mdouble_ __x));
/* Hyperbolic arc sine of X. */
-__MATHCALL (asinh,, (_Mdouble_ __x));
-libm_hidden_proto(asinh)
+__MATHCALLI (asinh,, (_Mdouble_ __x));
/* Hyperbolic arc tangent of X. */
-__MATHCALL (atanh,, (_Mdouble_ __x));
-libm_hidden_proto(atanh)
+__MATHCALLI (atanh,, (_Mdouble_ __x));
__END_NAMESPACE_C99
#endif
@@ -112,64 +98,51 @@ __END_NAMESPACE_C99
_Mdouble_BEGIN_NAMESPACE
/* Exponential function of X. */
-__MATHCALL (exp,, (_Mdouble_ __x));
-libm_hidden_proto(exp)
+__MATHCALLI (exp,, (_Mdouble_ __x));
/* Break VALUE into a normalized fraction and an integral power of 2. */
-__MATHCALL (frexp,, (_Mdouble_ __x, int *__exponent));
-libm_hidden_proto(frexp)
+__MATHCALLI (frexp,, (_Mdouble_ __x, int *__exponent));
/* X times (two to the EXP power). */
-__MATHCALL (ldexp,, (_Mdouble_ __x, int __exponent));
-libm_hidden_proto(ldexp)
+__MATHCALLI (ldexp,, (_Mdouble_ __x, int __exponent));
/* Natural logarithm of X. */
-__MATHCALL (log,, (_Mdouble_ __x));
-libm_hidden_proto(log)
+__MATHCALLI (log,, (_Mdouble_ __x));
/* Base-ten logarithm of X. */
-__MATHCALL (log10,, (_Mdouble_ __x));
-libm_hidden_proto(log10)
+__MATHCALLI (log10,, (_Mdouble_ __x));
/* Break VALUE into integral and fractional parts. */
-__MATHCALL (modf,, (_Mdouble_ __x, _Mdouble_ *__iptr));
-libm_hidden_proto(modf)
+__MATHCALLI (modf,, (_Mdouble_ __x, _Mdouble_ *__iptr));
_Mdouble_END_NAMESPACE
#if 0 /*def __USE_GNU*/
/* A function missing in all standards: compute exponent to base ten. */
__MATHCALL (exp10,, (_Mdouble_ __x));
-libm_hidden_proto(exp10)
/* Another name occasionally used. */
__MATHCALL (pow10,, (_Mdouble_ __x));
-libm_hidden_proto(pow10)
#endif
#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
__BEGIN_NAMESPACE_C99
/* Return exp(X) - 1. */
-__MATHCALL (expm1,, (_Mdouble_ __x));
-libm_hidden_proto(expm1)
+__MATHCALLI (expm1,, (_Mdouble_ __x));
/* Return log(1 + X). */
-__MATHCALL (log1p,, (_Mdouble_ __x));
-libm_hidden_proto(log1p)
+__MATHCALLI (log1p,, (_Mdouble_ __x));
/* Return the base 2 signed integral exponent of X. */
-__MATHCALL (logb,, (_Mdouble_ __x));
-libm_hidden_proto(logb)
+__MATHCALLI (logb,, (_Mdouble_ __x));
__END_NAMESPACE_C99
#endif
#ifdef __USE_ISOC99
__BEGIN_NAMESPACE_C99
/* Compute base-2 exponential of X. */
-__MATHCALL (exp2,, (_Mdouble_ __x));
-libm_hidden_proto(exp2)
+__MATHCALLI (exp2,, (_Mdouble_ __x));
/* Compute base-2 logarithm of X. */
__MATHCALL (log2,, (_Mdouble_ __x));
-libm_hidden_proto(log2)
__END_NAMESPACE_C99
#endif
@@ -178,27 +151,23 @@ __END_NAMESPACE_C99
_Mdouble_BEGIN_NAMESPACE
/* Return X to the Y power. */
-__MATHCALL (pow,, (_Mdouble_ __x, _Mdouble_ __y));
-libm_hidden_proto(pow)
+__MATHCALLI (pow,, (_Mdouble_ __x, _Mdouble_ __y));
/* Return the square root of X. */
-__MATHCALL (sqrt,, (_Mdouble_ __x));
-libm_hidden_proto(sqrt)
+__MATHCALLI (sqrt,, (_Mdouble_ __x));
_Mdouble_END_NAMESPACE
#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_ISOC99
__BEGIN_NAMESPACE_C99
/* Return `sqrt(X*X + Y*Y)'. */
-__MATHCALL (hypot,, (_Mdouble_ __x, _Mdouble_ __y));
-libm_hidden_proto(hypot)
+__MATHCALLI (hypot,, (_Mdouble_ __x, _Mdouble_ __y));
__END_NAMESPACE_C99
#endif
#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
__BEGIN_NAMESPACE_C99
/* Return the cube root of X. */
-__MATHCALL (cbrt,, (_Mdouble_ __x));
-libm_hidden_proto(cbrt)
+__MATHCALLI (cbrt,, (_Mdouble_ __x));
__END_NAMESPACE_C99
#endif
@@ -208,56 +177,46 @@ __END_NAMESPACE_C99
_Mdouble_BEGIN_NAMESPACE
/* Smallest integral value not less than X. */
__MATHCALLX (ceil,, (_Mdouble_ __x), (__const__));
-libm_hidden_proto(ceil)
/* Absolute value of X. */
__MATHCALLX (fabs,, (_Mdouble_ __x), (__const__));
-libm_hidden_proto(fabs)
/* Largest integer not greater than X. */
__MATHCALLX (floor,, (_Mdouble_ __x), (__const__));
-libm_hidden_proto(floor)
/* Floating-point modulo remainder of X/Y. */
-__MATHCALL (fmod,, (_Mdouble_ __x, _Mdouble_ __y));
-libm_hidden_proto(fmod)
+__MATHCALLI (fmod,, (_Mdouble_ __x, _Mdouble_ __y));
/* Return 0 if VALUE is finite or NaN, +1 if it
is +Infinity, -1 if it is -Infinity. */
-__MATHDECL_1 (int,__isinf,, (_Mdouble_ __value)) __attribute__ ((__const__));
-libm_hidden_proto(__isinf)
+__MATHDECL_PRIV (int,isinf,, (_Mdouble_ __value), (__const__));
/* Return nonzero if VALUE is finite and not NaN. */
-__MATHDECL_1 (int,__finite,, (_Mdouble_ __value)) __attribute__ ((__const__));
-libm_hidden_proto(__finite)
+__MATHDECL_PRIV (int,finite,, (_Mdouble_ __value), (__const__));
_Mdouble_END_NAMESPACE
#ifdef __USE_MISC
+#if 0
/* Return 0 if VALUE is finite or NaN, +1 if it
is +Infinity, -1 if it is -Infinity. */
-__MATHDECL_1 (int,isinf,, (_Mdouble_ __value)) __attribute__ ((__const__));
-libm_hidden_proto(isinf)
+__MATHDECL_PRIV (int,isinf,, (_Mdouble_ __value), (__const__));
/* Return nonzero if VALUE is finite and not NaN. */
-__MATHDECL_1 (int,finite,, (_Mdouble_ __value)) __attribute__ ((__const__));
-libm_hidden_proto(finite)
-
+__MATHDECL_PRIV (int,finite,, (_Mdouble_ __value), (__const__));
+#endif
/* Return the remainder of X/Y. */
__MATHCALL (drem,, (_Mdouble_ __x, _Mdouble_ __y));
-libm_hidden_proto(drem)
/* Return the fractional part of X after dividing out `ilogb (X)'. */
__MATHCALL (significand,, (_Mdouble_ __x));
-libm_hidden_proto(significand)
#endif /* Use misc. */
#if defined __USE_MISC || defined __USE_ISOC99
__BEGIN_NAMESPACE_C99
/* Return X with its signed changed to Y's. */
__MATHCALLX (copysign,, (_Mdouble_ __x, _Mdouble_ __y), (__const__));
-libm_hidden_proto(copysign)
__END_NAMESPACE_C99
#endif
@@ -265,60 +224,46 @@ __END_NAMESPACE_C99
__BEGIN_NAMESPACE_C99
/* Return representation of NaN for double type. */
__MATHCALLX (nan,, (__const char *__tagb), (__const__));
-libm_hidden_proto(nan)
__END_NAMESPACE_C99
#endif
/* Return nonzero if VALUE is not a number. */
-__MATHDECL_1 (int,__isnan,, (_Mdouble_ __value)) __attribute__ ((__const__));
-libm_hidden_proto(__isnan)
+__MATHDECL_PRIV (int,__isnan,, (_Mdouble_ __value), (__const__));
#if defined __USE_MISC || defined __USE_XOPEN
/* Return nonzero if VALUE is not a number. */
-__MATHDECL_1 (int,isnan,, (_Mdouble_ __value)) __attribute__ ((__const__));
-libm_hidden_proto(isnan)
+__MATHDECL_PRIV (int,isnan,, (_Mdouble_ __value), (__const__));
/* Bessel functions. */
__MATHCALL (j0,, (_Mdouble_));
-libm_hidden_proto(j0)
__MATHCALL (j1,, (_Mdouble_));
-libm_hidden_proto(j1)
__MATHCALL (jn,, (int, _Mdouble_));
-libm_hidden_proto(jn)
__MATHCALL (y0,, (_Mdouble_));
-libm_hidden_proto(y0)
__MATHCALL (y1,, (_Mdouble_));
-libm_hidden_proto(y1)
__MATHCALL (yn,, (int, _Mdouble_));
-libm_hidden_proto(yn)
#endif
#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_ISOC99
__BEGIN_NAMESPACE_C99
/* Error and gamma functions. */
-__MATHCALL (erf,, (_Mdouble_));
-libm_hidden_proto(erf)
-__MATHCALL (erfc,, (_Mdouble_));
-libm_hidden_proto(erfc)
-__MATHCALL (lgamma,, (_Mdouble_));
-libm_hidden_proto(lgamma)
+__MATHCALLI (erf,, (_Mdouble_));
+__MATHCALLI (erfc,, (_Mdouble_));
+__MATHCALLI (lgamma,, (_Mdouble_));
__END_NAMESPACE_C99
#endif
#ifdef __USE_ISOC99
__BEGIN_NAMESPACE_C99
/* True gamma function. */
-__MATHCALL (tgamma,, (_Mdouble_));
-libm_hidden_proto(tgamma)
+__MATHCALLI (tgamma,, (_Mdouble_));
__END_NAMESPACE_C99
#endif
#if defined __USE_MISC || defined __USE_XOPEN
/* Obsolete alias for `lgamma'. */
__MATHCALL (gamma,, (_Mdouble_));
-libm_hidden_proto(gamma)
#endif
#ifdef __USE_MISC
@@ -326,7 +271,6 @@ libm_hidden_proto(gamma)
`signgam'. The reentrant version instead takes a pointer and stores
the value through it. */
__MATHCALL (lgamma,_r, (_Mdouble_, int *__signgamp));
-libm_hidden_proto(lgamma_r)
#endif
@@ -334,103 +278,80 @@ libm_hidden_proto(lgamma_r)
__BEGIN_NAMESPACE_C99
/* Return the integer nearest X in the direction of the
prevailing rounding mode. */
-__MATHCALL (rint,, (_Mdouble_ __x));
-libm_hidden_proto(rint)
+__MATHCALLI (rint,, (_Mdouble_ __x));
/* Return X + epsilon if X < Y, X - epsilon if X > Y. */
__MATHCALLX (nextafter,, (_Mdouble_ __x, _Mdouble_ __y), (__const__));
-libm_hidden_proto(nextafter)
# if defined __USE_ISOC99 && !defined __LDBL_COMPAT
__MATHCALLX (nexttoward,, (_Mdouble_ __x, long double __y), (__const__));
-libm_hidden_proto(nexttoward)
# endif
/* Return the remainder of integer divison X / Y with infinite precision. */
-__MATHCALL (remainder,, (_Mdouble_ __x, _Mdouble_ __y));
-libm_hidden_proto(remainder)
+__MATHCALLI (remainder,, (_Mdouble_ __x, _Mdouble_ __y));
# if defined __USE_MISC || defined __USE_ISOC99
/* Return X times (2 to the Nth power). */
-__MATHCALL (scalbn,, (_Mdouble_ __x, int __n));
-libm_hidden_proto(scalbn)
+__MATHCALLI (scalbn,, (_Mdouble_ __x, int __n));
# endif
/* Return the binary exponent of X, which must be nonzero. */
-__MATHDECL (int,ilogb,, (_Mdouble_ __x));
-libm_hidden_proto(ilogb)
+__MATHDECLI (int,ilogb,, (_Mdouble_ __x));
#endif
#ifdef __USE_ISOC99
/* Return X times (2 to the Nth power). */
-__MATHCALL (scalbln,, (_Mdouble_ __x, long int __n));
-libm_hidden_proto(scalbln)
+__MATHCALLI (scalbln,, (_Mdouble_ __x, long int __n));
/* Round X to integral value in floating-point format using current
rounding direction, but do not raise inexact exception. */
-__MATHCALL (nearbyint,, (_Mdouble_ __x));
-libm_hidden_proto(nearbyint)
+__MATHCALLI (nearbyint,, (_Mdouble_ __x));
/* Round X to nearest integral value, rounding halfway cases away from
zero. */
__MATHCALLX (round,, (_Mdouble_ __x), (__const__));
-libm_hidden_proto(round)
/* Round X to the integral value in floating-point format nearest but
not larger in magnitude. */
__MATHCALLX (trunc,, (_Mdouble_ __x), (__const__));
-libm_hidden_proto(trunc)
/* Compute remainder of X and Y and put in *QUO a value with sign of x/y
and magnitude congruent `mod 2^n' to the magnitude of the integral
quotient x/y, with n >= 3. */
-__MATHCALL (remquo,, (_Mdouble_ __x, _Mdouble_ __y, int *__quo));
-libm_hidden_proto(remquo)
+__MATHCALLI (remquo,, (_Mdouble_ __x, _Mdouble_ __y, int *__quo));
/* Conversion functions. */
/* Round X to nearest integral value according to current rounding
direction. */
-__MATHDECL (long int,lrint,, (_Mdouble_ __x));
-libm_hidden_proto(lrint)
-__MATHDECL (long long int,llrint,, (_Mdouble_ __x));
-libm_hidden_proto(llrint)
+__MATHDECLI (long int,lrint,, (_Mdouble_ __x));
+__MATHDECLI (long long int,llrint,, (_Mdouble_ __x));
/* Round X to nearest integral value, rounding halfway cases away from
zero. */
-__MATHDECL (long int,lround,, (_Mdouble_ __x));
-libm_hidden_proto(lround)
-__MATHDECL (long long int,llround,, (_Mdouble_ __x));
-libm_hidden_proto(llround)
+__MATHDECLI (long int,lround,, (_Mdouble_ __x));
+__MATHDECLI (long long int,llround,, (_Mdouble_ __x));
/* Return positive difference between X and Y. */
-__MATHCALL (fdim,, (_Mdouble_ __x, _Mdouble_ __y));
-libm_hidden_proto(fdim)
+__MATHCALLI (fdim,, (_Mdouble_ __x, _Mdouble_ __y));
/* Return maximum numeric value from X and Y. */
-__MATHCALL (fmax,, (_Mdouble_ __x, _Mdouble_ __y));
-libm_hidden_proto(fmax)
+__MATHCALLI (fmax,, (_Mdouble_ __x, _Mdouble_ __y));
/* Return minimum numeric value from X and Y. */
-__MATHCALL (fmin,, (_Mdouble_ __x, _Mdouble_ __y));
-libm_hidden_proto(fmin)
+__MATHCALLI (fmin,, (_Mdouble_ __x, _Mdouble_ __y));
/* Classify given number. */
-__MATHDECL_1 (int, __fpclassify,, (_Mdouble_ __value))
- __attribute__ ((__const__));
-libm_hidden_proto(__fpclassify)
+__MATHDECL_PRIV (int, fpclassify,, (_Mdouble_ __value), (__const__));
/* Test for negative number. */
-__MATHDECL_1 (int, __signbit,, (_Mdouble_ __value))
- __attribute__ ((__const__));
-libm_hidden_proto(__signbit)
+__MATHDECL_PRIV (int, signbit,, (_Mdouble_ __value), (__const__));
/* Multiply-add function computed as a ternary operation. */
-__MATHCALL (fma,, (_Mdouble_ __x, _Mdouble_ __y, _Mdouble_ __z));
-libm_hidden_proto(fma)
+__MATHCALLI (fma,, (_Mdouble_ __x, _Mdouble_ __y, _Mdouble_ __z));
#endif /* Use ISO C99. */
#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC99
@@ -440,5 +361,4 @@ __END_NAMESPACE_C99
#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
/* Return X times (2 to the Nth power). */
__MATHCALL (scalb,, (_Mdouble_ __x, _Mdouble_ __n));
-libm_hidden_proto(scalb)
#endif
diff --git a/libm/Makefile.in b/libm/Makefile.in
index 9ddd8c8a5..b490ec8bf 100644
--- a/libm/Makefile.in
+++ b/libm/Makefile.in
@@ -86,13 +86,13 @@ FL_MOBJ := \
scalblnf.o scalbnf.o sinf.o sinhf.o sqrtf.o tanf.o tanhf.o \
tgammaf.o truncf.o cargf.o llrintf.o
-LD_MOBJ := acoshl.o acosl.o asinhl.o asinl.o atan2l.o atanhl.o atanl.o cbrtl.o \
+LD_MOBJ := acoshl.o acosl.o asinhl.o asinl.o atan2l.o atanhl.o atanl.o cargl.o cbrtl.o \
ceill.o copysignl.o coshl.o cosl.o erfcl.o erfl.o exp2l.o expl.o \
- expm1l.o fabsl.o fdiml.o floorl.o fmal.o fmaxl.o fminl.o fmodl.o \
- frexpl.o gammal.o hypotl.o ilogbl.o ldexpl.o lgammal.o llrintl.o \
+ expm1l.o fabsl.o finitel.o fdiml.o floorl.o fmal.o fmaxl.o fminl.o fmodl.o fpclassifyl.o \
+ frexpl.o gammal.o hypotl.o ilogbl.o isinfl.o isnanl.o ldexpl.o lgammal.o llrintl.o \
llroundl.o log10l.o log1pl.o XXXlog2l.o logbl.o logl.o lrintl.o lroundl.o \
modfl.o nearbyintl.o nextafterl.o XXXnexttowardl.o powl.o remainderl.o \
- remquol.o rintl.o roundl.o scalblnl.o scalbnl.o sinhl.o sinl.o sqrtl.o \
+ remquol.o rintl.o roundl.o scalblnl.o scalbnl.o signbitl.o sinhl.o sinl.o sqrtl.o \
tanhl.o tanl.o tgammal.o truncl.o
else
# This list of math functions was taken from POSIX/IEEE 1003.1b-1993
@@ -139,21 +139,21 @@ libm_SRC := $(patsubst %.c,$(libm_DIR)/%.c,$(libm_CSRC))
libm_OBJ := $(patsubst $(libm_DIR)/%.c,$(libm_OUT)/%.o,$(libm_SRC))
ifeq ($(strip $(UCLIBC_HAS_LONG_DOUBLE_MATH)),y)
-libm_MSRC2 := $(libm_DIR)/$(LD_MSRC)
-libm_MOBJ2 := $(patsubst %.o,$(libm_OUT)/%.o,$(LD_MOBJ))
+libm_MSRC_LD := $(libm_DIR)/$(LD_MSRC)
+libm_MOBJ_LD := $(patsubst %.o,$(libm_OUT)/%.o,$(LD_MOBJ))
endif
-libm_MSRC := $(libm_DIR)/$(FL_MSRC)
-libm_MOBJ := $(patsubst %.o,$(libm_OUT)/%.o,$(FL_MOBJ))
+libm_MSRC_FL := $(libm_DIR)/$(FL_MSRC)
+libm_MOBJ_FL := $(patsubst %.o,$(libm_OUT)/%.o,$(FL_MOBJ))
ifneq ($(DOMULTI),n)
-CFLAGS-libm += $(patsubst %,-DL_%,$(subst .o,,$(notdir $(libm_MOBJ))))
+CFLAGS-libm += $(patsubst %,-DL_%,$(subst .o,,$(notdir $(libm_MOBJ_FL))))
ifeq ($(strip $(UCLIBC_HAS_LONG_DOUBLE_MATH)),y)
-CFLAGS-libm += $(patsubst %,-DL_%,$(subst .o,,$(notdir $(libm_MOBJ2))))
+CFLAGS-libm += $(patsubst %,-DL_%,$(subst .o,,$(notdir $(libm_MOBJ_LD))))
endif
endif
-libm_OBJS := $(libm_OBJ) $(libm_MOBJ) $(libm_MOBJ2)
+libm_OBJS := $(libm_OBJ) $(libm_MOBJ_FL) $(libm_MOBJ_LD)
ifeq ($(DOPIC),y)
libm-a-y += $(libm_OBJS:.o=.os)
@@ -182,7 +182,7 @@ $(libm_OUT)/libm_so.a: $(libm-so-y)
$(Q)$(RM) $@
$(do_ar)
-$(libm_OUT)/libm.oS: $(libm_SRC) $(libm_MSRC) $(libm_MSRC2) $(libm_ARCH_SRC)
+$(libm_OUT)/libm.oS: $(libm_SRC) $(libm_MSRC_FL) $(libm_MSRC_LD) $(libm_ARCH_SRC)
$(Q)$(RM) $@
$(compile-m)
@@ -191,17 +191,24 @@ $(top_builddir)lib/libm.a: $(libm-a-y)
$(Q)$(RM) $@
$(do_ar)
-$(libm_MOBJ): $(libm_MSRC)
+$(libm_MOBJ_FL): $(libm_MSRC_FL)
$(compile.m)
-$(libm_MOBJ2): $(libm_MSRC2)
+$(libm_MOBJ_LD): $(libm_MSRC_LD)
$(compile.m)
-$(libm_MOBJ:.o=.os): $(libm_MSRC)
+$(libm_MOBJ_FL:.o=.os): $(libm_MSRC_FL)
$(compile.m)
-$(libm_MOBJ2:.o=.os): $(libm_MSRC2)
+$(libm_MOBJ_LD:.o=.os): $(libm_MSRC_LD)
$(compile.m)
+# spare us from adding a gazillion dummy two-liner files
+$(libm_MOBJ_FL:.o=.i): $(libm_MSRC_FL)
+ $(compile.mi)
+
+$(libm_MOBJ_LD:.o=.i): $(libm_MSRC_LD)
+ $(compile.mi)
+
libm_clean:
$(do_rm) $(addprefix $(libm_OUT)/,$(foreach e, o os oS a,$(foreach d, *. */*. */*/*.,$(d)$(e))))
diff --git a/libm/e_scalb.c b/libm/e_scalb.c
index 2f0dba14a..33eaeeac6 100644
--- a/libm/e_scalb.c
+++ b/libm/e_scalb.c
@@ -44,7 +44,7 @@ static char rcsid[] = "$NetBSD: e_scalb.c,v 1.6 1995/05/10 20:46:09 jtc Exp $";
return scalbn(x,fn);
#else
if (isnan(x)||isnan(fn)) return x*fn;
- if (!finite(fn)) {
+ if (!isfinite(fn)) {
if(fn>0.0) return x*fn;
else return x/(-fn);
}
diff --git a/libm/float_wrappers.c b/libm/float_wrappers.c
index 26041d088..36efcfbea 100644
--- a/libm/float_wrappers.c
+++ b/libm/float_wrappers.c
@@ -39,6 +39,7 @@ float asinhf(float);
float atan2f(float, float);
float atanf(float);
float atanhf(float);
+float cargf(float complex);
float cbrtf(float);
float ceilf(float);
float copysignf(float, float);
@@ -136,7 +137,7 @@ float atanhf (float x)
#ifdef L_cargf
float cargf (float complex x)
{
- return (float) carg( (double)x );
+ return (float) carg( (double complex)x );
}
#endif
@@ -535,3 +536,10 @@ float truncf (float x)
return (float) trunc( (double)x );
}
#endif
+
+#ifdef L_fmaf
+float fmaf (float x, float y, float z)
+{
+ return (float) fma( (double)x, (double)y, (double)z );
+}
+#endif
diff --git a/libm/ldouble_wrappers.c b/libm/ldouble_wrappers.c
index 62732bae9..a4f13f429 100644
--- a/libm/ldouble_wrappers.c
+++ b/libm/ldouble_wrappers.c
@@ -14,6 +14,8 @@
/* Prevent math.h from defining colliding inlines */
#undef __USE_EXTERN_INLINES
#include "math.h"
+#include <complex.h>
+
/* Implement the following, as defined by SuSv3 */
#if 0
@@ -24,6 +26,7 @@ long double asinl(long double);
long double atan2l(long double, long double);
long double atanhl(long double);
long double atanl(long double);
+long double cargl(long double complex);
long double cbrtl(long double);
long double ceill(long double);
long double copysignl(long double, long double);
@@ -131,6 +134,14 @@ long double atanl (long double x)
#endif
+#ifdef L_cargl
+long double cargl (long double complex x)
+{
+ return (long double) carg( (double complex)x );
+}
+#endif
+
+
#ifdef L_cbrtl
long double cbrtl (long double x)
{
@@ -524,3 +535,48 @@ long double truncl (long double x)
return (long double) trunc( (double)x );
}
#endif
+
+
+#ifdef __DO_C99_MATH__
+
+#ifdef L_fpclassifyl
+int __fpclassifyl (long double x)
+{
+ return __fpclassify ( (double) x );
+}
+libm_hidden_def(__fpclassifyl)
+#endif
+
+#ifdef L_finitel
+int __finitel (long double x)
+{
+ return __finite ( (double)x );
+}
+libm_hidden_def(__finitel)
+#endif
+
+#ifdef L_signbitl
+int __signbitl (long double x)
+{
+ return __signbitl ( (double)x );
+}
+libm_hidden_def(__signbitl)
+#endif
+
+#ifdef L_isnanl
+int __isnanl (long double x)
+{
+ return __isnan ( (double)x );
+}
+libm_hidden_def(__isnanl)
+#endif
+
+#ifdef L_isinfl
+int __isinfl (long double x)
+{
+ return __isinf ( (double)x );
+}
+libm_hidden_def(__isinfl)
+#endif
+
+#endif
diff --git a/libm/s_finite.c b/libm/s_finite.c
index 2235d0a42..357c3d4af 100644
--- a/libm/s_finite.c
+++ b/libm/s_finite.c
@@ -28,5 +28,3 @@ int __finite(double x)
return (int)((u_int32_t)((hx&0x7fffffff)-0x7ff00000)>>31);
}
libm_hidden_def(__finite)
-weak_alias(__finite,finite)
-libm_hidden_weak(finite)
diff --git a/libm/s_finitef.c b/libm/s_finitef.c
index 66eba8f98..b7c853d4a 100644
--- a/libm/s_finitef.c
+++ b/libm/s_finitef.c
@@ -21,7 +21,6 @@
#include "math.h"
#include "math_private.h"
-libm_hidden_proto(__finitef)
int __finitef(float x)
{
int32_t ix;
@@ -29,4 +28,3 @@ int __finitef(float x)
return (int)((u_int32_t)((ix&0x7fffffff)-0x7f800000)>>31);
}
libm_hidden_def(__finitef)
-strong_alias(__finitef,finitef)
diff --git a/libm/s_fma.c b/libm/s_fma.c
index f9e8cf974..7a87fbdd3 100644
--- a/libm/s_fma.c
+++ b/libm/s_fma.c
@@ -20,11 +20,9 @@
#include <math.h>
-libm_hidden_proto(__fma)
double
-__fma (double x, double y, double z)
+fma (double x, double y, double z)
{
return (x * y) + z;
}
-libm_hidden_def(__fma)
-strong_alias (__fma, fma)
+libm_hidden_def(fma)
diff --git a/libm/s_fpclassify.c b/libm/s_fpclassify.c
index d2c4c8232..f2d6736e3 100644
--- a/libm/s_fpclassify.c
+++ b/libm/s_fpclassify.c
@@ -40,4 +40,4 @@ __fpclassify (double x)
return retval;
}
-libm_hidden_def (__fpclassify)
+libm_hidden_def(__fpclassify)
diff --git a/libm/s_fpclassifyf.c b/libm/s_fpclassifyf.c
index edc0db635..23ae59f18 100644
--- a/libm/s_fpclassifyf.c
+++ b/libm/s_fpclassifyf.c
@@ -21,9 +21,7 @@
#include <math.h>
#include "math_private.h"
-libm_hidden_proto(__fpclassifyf)
-int
-__fpclassifyf (float x)
+int __fpclassifyf (float x)
{
u_int32_t wx;
int retval = FP_NORMAL;
@@ -39,4 +37,4 @@ __fpclassifyf (float x)
return retval;
}
-libm_hidden_def (__fpclassifyf)
+libm_hidden_def(__fpclassifyf)
diff --git a/libm/s_isinf.c b/libm/s_isinf.c
index 99a1cdf18..b73aa6696 100644
--- a/libm/s_isinf.c
+++ b/libm/s_isinf.c
@@ -22,5 +22,3 @@ __isinf (double x)
return ~(lx >> 31) & (hx >> 30);
}
libm_hidden_def(__isinf)
-weak_alias (__isinf, isinf)
-libm_hidden_weak(isinf)
diff --git a/libm/s_isinff.c b/libm/s_isinff.c
index 6827024af..e25912834 100644
--- a/libm/s_isinff.c
+++ b/libm/s_isinff.c
@@ -11,7 +11,6 @@
#include "math.h"
#include "math_private.h"
-libm_hidden_proto(__isinff)
int
__isinff (float x)
{
@@ -23,4 +22,3 @@ __isinff (float x)
return ~(t >> 31) & (ix >> 30);
}
libm_hidden_def(__isinff)
-strong_alias (__isinff, isinff)
diff --git a/libm/s_isnan.c b/libm/s_isnan.c
index 671c5cb2e..51ed94e04 100644
--- a/libm/s_isnan.c
+++ b/libm/s_isnan.c
@@ -18,12 +18,7 @@
#include "math.h"
#include "math_private.h"
-#ifdef __STDC__
- int __isnan(double x)
-#else
- int __isnan(x)
- double x;
-#endif
+int __isnan(double x)
{
int32_t hx,lx;
EXTRACT_WORDS(hx,lx,x);
@@ -33,5 +28,3 @@
return (int)(((u_int32_t)hx)>>31);
}
libm_hidden_def(__isnan)
-weak_alias(__isnan,isnan)
-libm_hidden_weak(isnan)
diff --git a/libm/s_isnanf.c b/libm/s_isnanf.c
index 6afa5df06..d868264f7 100644
--- a/libm/s_isnanf.c
+++ b/libm/s_isnanf.c
@@ -21,7 +21,6 @@
#include "math.h"
#include "math_private.h"
-libm_hidden_proto(__isnanf)
int __isnanf(float x)
{
int32_t ix;
@@ -30,5 +29,4 @@ int __isnanf(float x)
ix = 0x7f800000 - ix;
return (int)(((u_int32_t)(ix))>>31);
}
-libm_hidden_def (__isnanf)
-weak_alias (__isnanf, isnanf)
+libm_hidden_def(__isnanf)
diff --git a/libm/s_ldexp.c b/libm/s_ldexp.c
index a065f5ada..02dae6fcf 100644
--- a/libm/s_ldexp.c
+++ b/libm/s_ldexp.c
@@ -26,9 +26,9 @@ static char rcsid[] = "$NetBSD: s_ldexp.c,v 1.6 1995/05/10 20:47:40 jtc Exp $";
double value; int exp;
#endif
{
- if(!finite(value)||value==0.0) return value;
+ if(!isfinite(value)||value==0.0) return value;
value = scalbn(value,exp);
- if(!finite(value)||value==0.0) errno = ERANGE;
+ if(!isfinite(value)||value==0.0) errno = ERANGE;
return value;
}
libm_hidden_def(ldexp)
diff --git a/libm/s_signbitf.c b/libm/s_signbitf.c
index 3a5cf0c2a..a15e26a09 100644
--- a/libm/s_signbitf.c
+++ b/libm/s_signbitf.c
@@ -24,7 +24,6 @@
#include <math.h>
#include "math_private.h"
-libm_hidden_proto(__signbitf)
int
__signbitf (float x)
{
diff --git a/libm/s_significand.c b/libm/s_significand.c
index 2a7980a44..100ac0889 100644
--- a/libm/s_significand.c
+++ b/libm/s_significand.c
@@ -33,4 +33,3 @@ static char rcsid[] = "$NetBSD: s_significand.c,v 1.6 1995/05/10 20:48:11 jtc Ex
{
return __ieee754_scalb(x,(double) -ilogb(x));
}
-libm_hidden_def(significand)
diff --git a/libm/w_drem.c b/libm/w_drem.c
index 6b3dd3937..4f9127b1e 100644
--- a/libm/w_drem.c
+++ b/libm/w_drem.c
@@ -12,4 +12,3 @@ double drem(double x, double y)
{
return remainder(x, y);
}
-libm_hidden_def(drem)
diff --git a/libm/w_exp.c b/libm/w_exp.c
index e11222499..067279664 100644
--- a/libm/w_exp.c
+++ b/libm/w_exp.c
@@ -42,7 +42,7 @@ u_threshold= -7.45133219101941108420e+02; /* 0xc0874910, 0xD52D3051 */
double z;
z = __ieee754_exp(x);
if(_LIB_VERSION == _IEEE_) return z;
- if(finite(x)) {
+ if(isfinite(x)) {
if(x>o_threshold)
return __kernel_standard(x,x,6); /* exp overflow */
else if(x<u_threshold)
diff --git a/libm/w_gamma.c b/libm/w_gamma.c
index 0b286e190..5d8bca0ee 100644
--- a/libm/w_gamma.c
+++ b/libm/w_gamma.c
@@ -37,7 +37,7 @@ libm_hidden_proto(signgam)
double y;
y = __ieee754_lgamma_r(x,&signgam);
if(_LIB_VERSION == _IEEE_) return y;
- if(!finite(y)&&finite(x)) {
+ if(!isfinite(y)&&isfinite(x)) {
if(floor(x)==x&&x<=0.0)
return __kernel_standard(x,x,41); /* gamma pole */
else
@@ -46,4 +46,3 @@ libm_hidden_proto(signgam)
return y;
#endif
}
-libm_hidden_def(gamma)
diff --git a/libm/w_gamma_r.c b/libm/w_gamma_r.c
index b9f14fb48..a8eb2994d 100644
--- a/libm/w_gamma_r.c
+++ b/libm/w_gamma_r.c
@@ -37,7 +37,7 @@ libm_hidden_proto(gamma_r)
double y;
y = __ieee754_lgamma_r(x,signgamp);
if(_LIB_VERSION == _IEEE_) return y;
- if(!finite(y)&&finite(x)) {
+ if(!isfinite(y)&&isfinite(x)) {
if(floor(x)==x&&x<=0.0)
return __kernel_standard(x,x,41); /* gamma pole */
else
diff --git a/libm/w_hypot.c b/libm/w_hypot.c
index 9ed348e3e..a6abb8032 100644
--- a/libm/w_hypot.c
+++ b/libm/w_hypot.c
@@ -34,7 +34,7 @@ static char rcsid[] = "$NetBSD: w_hypot.c,v 1.6 1995/05/10 20:49:07 jtc Exp $";
double z;
z = __ieee754_hypot(x,y);
if(_LIB_VERSION == _IEEE_) return z;
- if((!finite(z))&&finite(x)&&finite(y))
+ if((!isfinite(z))&&isfinite(x)&&isfinite(y))
return __kernel_standard(x,y,4); /* hypot overflow */
else
return z;
diff --git a/libm/w_j0.c b/libm/w_j0.c
index 27290c858..61f4f20fc 100644
--- a/libm/w_j0.c
+++ b/libm/w_j0.c
@@ -39,7 +39,6 @@ static char rcsid[] = "$NetBSD: w_j0.c,v 1.6 1995/05/10 20:49:11 jtc Exp $";
return z;
#endif
}
-libm_hidden_def(j0)
#ifdef __STDC__
double y0(double x) /* wrapper y0 */
@@ -68,4 +67,3 @@ libm_hidden_def(j0)
return z;
#endif
}
-libm_hidden_def(y0)
diff --git a/libm/w_j1.c b/libm/w_j1.c
index 9ce34cca3..389dc156c 100644
--- a/libm/w_j1.c
+++ b/libm/w_j1.c
@@ -40,7 +40,6 @@ static char rcsid[] = "$NetBSD: w_j1.c,v 1.6 1995/05/10 20:49:15 jtc Exp $";
return z;
#endif
}
-libm_hidden_def(j1)
#ifdef __STDC__
double y1(double x) /* wrapper y1 */
@@ -69,4 +68,3 @@ libm_hidden_def(j1)
return z;
#endif
}
-libm_hidden_def(y1)
diff --git a/libm/w_jn.c b/libm/w_jn.c
index 2ba74d812..173f6aa9e 100644
--- a/libm/w_jn.c
+++ b/libm/w_jn.c
@@ -62,7 +62,6 @@ static char rcsid[] = "$NetBSD: w_jn.c,v 1.6 1995/05/10 20:49:19 jtc Exp $";
return z;
#endif
}
-libm_hidden_def(jn)
#ifdef __STDC__
double yn(int n, double x) /* wrapper yn */
@@ -91,4 +90,3 @@ libm_hidden_def(jn)
return z;
#endif
}
-libm_hidden_def(yn)
diff --git a/libm/w_lgamma.c b/libm/w_lgamma.c
index 24b8b02b4..20a237488 100644
--- a/libm/w_lgamma.c
+++ b/libm/w_lgamma.c
@@ -37,7 +37,7 @@ libm_hidden_proto(signgam)
double y;
y = __ieee754_lgamma_r(x,&signgam);
if(_LIB_VERSION == _IEEE_) return y;
- if(!finite(y)&&finite(x)) {
+ if(!isfinite(y)&&isfinite(x)) {
if(floor(x)==x&&x<=0.0)
return __kernel_standard(x,x,15); /* lgamma pole */
else
diff --git a/libm/w_lgamma_r.c b/libm/w_lgamma_r.c
index 20b002608..f3d0b847b 100644
--- a/libm/w_lgamma_r.c
+++ b/libm/w_lgamma_r.c
@@ -34,7 +34,7 @@ static char rcsid[] = "$NetBSD: w_lgamma_r.c,v 1.6 1995/05/10 20:49:27 jtc Exp $
double y;
y = __ieee754_lgamma_r(x,signgamp);
if(_LIB_VERSION == _IEEE_) return y;
- if(!finite(y)&&finite(x)) {
+ if(!isfinite(y)&&isfinite(x)) {
if(floor(x)==x&&x<=0.0)
return __kernel_standard(x,x,15); /* lgamma pole */
else
@@ -43,4 +43,3 @@ static char rcsid[] = "$NetBSD: w_lgamma_r.c,v 1.6 1995/05/10 20:49:27 jtc Exp $
return y;
#endif
}
-libm_hidden_def(lgamma_r)
diff --git a/libm/w_log2.c b/libm/w_log2.c
index ec274f761..7b1a1b18d 100644
--- a/libm/w_log2.c
+++ b/libm/w_log2.c
@@ -11,4 +11,3 @@ double log2 (double d)
{
return __ieee754_log2 (d);
}
-libm_hidden_def(log2)
diff --git a/libm/w_pow.c b/libm/w_pow.c
index 94d30bcec..09e0b5c2c 100644
--- a/libm/w_pow.c
+++ b/libm/w_pow.c
@@ -41,19 +41,19 @@
if(x==0.0){
if(y==0.0)
return __kernel_standard(x,y,20); /* pow(0.0,0.0) */
- if(finite(y)&&y<0.0)
+ if(isfinite(y)&&y<0.0)
return __kernel_standard(x,y,23); /* pow(0.0,negative) */
return z;
}
- if(!finite(z)) {
- if(finite(x)&&finite(y)) {
+ if(!isfinite(z)) {
+ if(isfinite(x)&&isfinite(y)) {
if(isnan(z))
return __kernel_standard(x,y,24); /* pow neg**non-int */
else
return __kernel_standard(x,y,21); /* pow overflow */
}
}
- if(z==0.0&&finite(x)&&finite(y))
+ if(z==0.0&&isfinite(x)&&isfinite(y))
return __kernel_standard(x,y,22); /* pow underflow */
return z;
#endif
diff --git a/libm/w_scalb.c b/libm/w_scalb.c
index a770877ea..2ad6c6ed1 100644
--- a/libm/w_scalb.c
+++ b/libm/w_scalb.c
@@ -46,16 +46,15 @@ static char rcsid[] = "$NetBSD: w_scalb.c,v 1.6 1995/05/10 20:49:48 jtc Exp $";
double z;
z = __ieee754_scalb(x,fn);
if(_LIB_VERSION == _IEEE_) return z;
- if(!(finite(z)||isnan(z))&&finite(x)) {
+ if(!(isfinite(z)||isnan(z))&&isfinite(x)) {
return __kernel_standard(x,(double)fn,32); /* scalb overflow */
}
if(z==0.0&&z!=x) {
return __kernel_standard(x,(double)fn,33); /* scalb underflow */
}
#ifndef _SCALB_INT
- if(!finite(fn)) errno = ERANGE;
+ if(!isfinite(fn)) errno = ERANGE;
#endif
return z;
#endif
}
-libm_hidden_def(scalb)
diff --git a/libm/w_sinh.c b/libm/w_sinh.c
index dabfdd918..5d1903fbf 100644
--- a/libm/w_sinh.c
+++ b/libm/w_sinh.c
@@ -34,7 +34,7 @@ static char rcsid[] = "$NetBSD: w_sinh.c,v 1.6 1995/05/10 20:49:51 jtc Exp $";
double z;
z = __ieee754_sinh(x);
if(_LIB_VERSION == _IEEE_) return z;
- if(!finite(z)&&finite(x)) {
+ if(!isfinite(z)&&isfinite(x)) {
return __kernel_standard(x,x,25); /* sinh overflow */
} else
return z;
diff --git a/libm/w_tgamma.c b/libm/w_tgamma.c
index 0449e16d8..abfb119bd 100644
--- a/libm/w_tgamma.c
+++ b/libm/w_tgamma.c
@@ -35,7 +35,7 @@ libm_hidden_proto(signgam)
#else
if(_LIB_VERSION == _IEEE_) return y;
- if(!finite(y)&&finite(x)) {
+ if(!isfinite(y)&&isfinite(x)) {
if(floor(x)==x&&x<=0.0)
return __kernel_standard(x,x,41); /* tgamma pole */
else