diff options
author | Joseph Myers <joseph@codesourcery.com> | 2018-09-27 20:04:48 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2018-09-27 20:04:48 +0000 |
commit | 81dca813cc35f91414731fdd0ff6b756d5e1827f (patch) | |
tree | faaeb7f7118b0e45299fdfe00f9a248f27e70450 /sysdeps/ieee754 | |
parent | 9755bc4686d8cd6a0e9539040b903e9e9291c319 (diff) | |
download | glibc-81dca813cc35f91414731fdd0ff6b756d5e1827f.zip glibc-81dca813cc35f91414731fdd0ff6b756d5e1827f.tar.gz glibc-81dca813cc35f91414731fdd0ff6b756d5e1827f.tar.bz2 |
Use copysign functions not __copysign functions in glibc libm.
Continuing the move to use, within libm, public names for libm
functions that can be inlined as built-in functions on many
architectures, this patch moves calls to __copysign functions to call
the corresponding copysign names instead, with asm redirection to
__copysign when the calls are not inlined (all cases are inlined
except for IBM long double for powerpc soft-float / e500v1). This
eliminates the need for an inline function defining __copysign in
terms of __builtin_copysign.
Tested for x86_64, and with build-many-glibcs.py.
* include/math.h [!_ISOMAC && !(__FINITE_MATH_ONLY__ &&
__FINITE_MATH_ONLY__ > 0) && !NO_MATH_REDIRECT]
(MATH_REDIRECT_BINARY_ARGS): New macro.
[!_ISOMAC && !(__FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0)
&& !NO_MATH_REDIRECT] (copysign): Redirect using MATH_REDIRECT.
* sysdeps/alpha/fpu/s_copysign.c: Define NO_MATH_REDIRECT before
header inclusion.
* sysdeps/alpha/fpu/s_copysignf.c: Likewise.
* sysdeps/ieee754/dbl-64/s_copysign.c: Likewise.
* sysdeps/ieee754/float128/s_copysignf128.c: Likewise.
* sysdeps/ieee754/flt-32/s_copysignf.c: Likewise.
* sysdeps/ieee754/ldbl-128/s_copysignl.c: Likewise.
* sysdeps/ieee754/ldbl-128ibm/s_copysignl.c: Likewise.
* sysdeps/ieee754/ldbl-96/s_copysignl.c: Likewise.
* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_copysign.c:
Likewise.
* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_copysignf.c:
Likewise.
* sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c: Likewise.
* sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysignf.c: Likewise.
* sysdeps/riscv/rvd/s_copysign.c: Likewise.
* sysdeps/riscv/rvf/s_copysignf.c: Likewise.
* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysign.c:
Likewise.
* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf.c:
Likewise.
* sysdeps/generic/math_private_calls.h
[!__MATH_DECLARING_LONG_DOUBLE || !NO_LONG_DOUBLE] (__copysign):
Do not declare and define as an inline function.
* math/divtc3.c (__divtc3): Use copysign functions instead of
__copysign variants.
* math/multc3.c (__multc3): Likewise.
* sysdeps/generic/math-type-macros.h (M_COPYSIGN): Likewise.
* sysdeps/ieee754/dbl-64/e_atan2.c (signArctan2): Likewise.
* sysdeps/ieee754/dbl-64/e_atanh.c (__ieee754_atanh): Likewise.
* sysdeps/ieee754/dbl-64/e_gamma_r.c (__ieee754_gamma_r):
Likewise.
* sysdeps/ieee754/dbl-64/e_jn.c (__ieee754_jn): Likewise.
(__ieee754_yn): Likewise.
* sysdeps/ieee754/dbl-64/s_asinh.c (__asinh): Likewise.
* sysdeps/ieee754/dbl-64/s_atan.c (__signArctan): Likewise.
* sysdeps/ieee754/dbl-64/s_scalbln.c (__scalbln): Likewise.
* sysdeps/ieee754/dbl-64/s_scalbn.c (__scalbn): Likewise.
* sysdeps/ieee754/dbl-64/s_sin.c (do_sin): Likewise.
(__sin): Likewise.
* sysdeps/ieee754/dbl-64/s_sincos.c (__sincos): Likewise.
* sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c (__nearbyint):
Likewise.
* sysdeps/ieee754/dbl-64/wordsize-64/s_scalbln.c (__scalbln):
Likewise.
* sysdeps/ieee754/dbl-64/wordsize-64/s_scalbn.c (__scalbn):
Likewise.
* sysdeps/ieee754/flt-32/e_atanhf.c (__ieee754_atanhf): Likewise.
* sysdeps/ieee754/flt-32/e_gammaf_r.c (__ieee754_gammaf_r):
Likewise.
* sysdeps/ieee754/flt-32/e_jnf.c (__ieee754_jnf): Likewise.
(__ieee754_ynf): Likewise.
* sysdeps/ieee754/flt-32/s_asinhf.c (__asinhf): Likewise.
* sysdeps/ieee754/flt-32/s_scalbnf.c (__scalbnf): Likewise.
* sysdeps/ieee754/k_standard.c (__kernel_standard): Likewise.
* sysdeps/ieee754/ldbl-128/e_gammal_r.c (__ieee754_gammal_r):
Likewise.
* sysdeps/ieee754/ldbl-128/e_jnl.c (__ieee754_jnl): Likewise.
(__ieee754_ynl): Likewise.
* sysdeps/ieee754/ldbl-128/s_scalblnl.c (__scalblnl): Likewise.
* sysdeps/ieee754/ldbl-128/s_scalbnl.c (__scalbnl): Likewise.
* sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c (__ieee754_gammal_r):
Likewise.
* sysdeps/ieee754/ldbl-128ibm/e_jnl.c (__ieee754_jnl): Likewise.
(__ieee754_ynl): Likewise.
* sysdeps/ieee754/ldbl-128ibm/s_fmal.c (__fmal): Likewise.
* sysdeps/ieee754/ldbl-128ibm/s_scalblnl.c (__scalblnl): Likewise.
* sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c (__scalbnl): Likewise.
* sysdeps/ieee754/ldbl-96/e_gammal_r.c (__ieee754_gammal_r):
Likewise.
* sysdeps/ieee754/ldbl-96/e_jnl.c (__ieee754_jnl): Likewise.
(__ieee754_ynl)
* sysdeps/ieee754/ldbl-96/s_asinhl.c (__asinhl): Likewise.
* sysdeps/ieee754/ldbl-96/s_scalblnl.c (__scalblnl): Likewise.
* sysdeps/ieee754/ldbl-opt/nldbl-copysign.c (copysignl): Likewise.
* sysdeps/powerpc/power5+/fpu/s_modf.c (__modf): Likewise.
* sysdeps/powerpc/power5+/fpu/s_modff.c (__modff): Likewise.
Diffstat (limited to 'sysdeps/ieee754')
39 files changed, 82 insertions, 76 deletions
diff --git a/sysdeps/ieee754/dbl-64/e_atan2.c b/sysdeps/ieee754/dbl-64/e_atan2.c index c3e1b22..741ba9b 100644 --- a/sysdeps/ieee754/dbl-64/e_atan2.c +++ b/sysdeps/ieee754/dbl-64/e_atan2.c @@ -64,7 +64,7 @@ static double atan2Mp (double, double, const int[]); static double signArctan2 (double y, double z) { - return __copysign (z, y); + return copysign (z, y); } static double normalized (double, double, double, double); diff --git a/sysdeps/ieee754/dbl-64/e_atanh.c b/sysdeps/ieee754/dbl-64/e_atanh.c index da4da82..d145b2b 100644 --- a/sysdeps/ieee754/dbl-64/e_atanh.c +++ b/sysdeps/ieee754/dbl-64/e_atanh.c @@ -71,6 +71,6 @@ __ieee754_atanh (double x) return x / 0.0; } - return __copysign (t, x); + return copysign (t, x); } strong_alias (__ieee754_atanh, __atanh_finite) diff --git a/sysdeps/ieee754/dbl-64/e_gamma_r.c b/sysdeps/ieee754/dbl-64/e_gamma_r.c index 7707c06..9692b73 100644 --- a/sysdeps/ieee754/dbl-64/e_gamma_r.c +++ b/sysdeps/ieee754/dbl-64/e_gamma_r.c @@ -199,22 +199,22 @@ __ieee754_gamma_r (double x, int *signgamp) { if (*signgamp < 0) { - ret = math_narrow_eval (-__copysign (DBL_MAX, ret) * DBL_MAX); + ret = math_narrow_eval (-copysign (DBL_MAX, ret) * DBL_MAX); ret = -ret; } else - ret = math_narrow_eval (__copysign (DBL_MAX, ret) * DBL_MAX); + ret = math_narrow_eval (copysign (DBL_MAX, ret) * DBL_MAX); return ret; } else if (ret == 0) { if (*signgamp < 0) { - ret = math_narrow_eval (-__copysign (DBL_MIN, ret) * DBL_MIN); + ret = math_narrow_eval (-copysign (DBL_MIN, ret) * DBL_MIN); ret = -ret; } else - ret = math_narrow_eval (__copysign (DBL_MIN, ret) * DBL_MIN); + ret = math_narrow_eval (copysign (DBL_MIN, ret) * DBL_MIN); return ret; } else diff --git a/sysdeps/ieee754/dbl-64/e_jn.c b/sysdeps/ieee754/dbl-64/e_jn.c index cb7c6cf..aff06ea 100644 --- a/sysdeps/ieee754/dbl-64/e_jn.c +++ b/sysdeps/ieee754/dbl-64/e_jn.c @@ -250,7 +250,7 @@ __ieee754_jn (int n, double x) } if (ret == 0) { - ret = math_narrow_eval (__copysign (DBL_MIN, ret) * DBL_MIN); + ret = math_narrow_eval (copysign (DBL_MIN, ret) * DBL_MIN); __set_errno (ERANGE); } else @@ -344,7 +344,7 @@ __ieee754_yn (int n, double x) } out: if (isinf (ret)) - ret = __copysign (DBL_MAX, ret) * DBL_MAX; + ret = copysign (DBL_MAX, ret) * DBL_MAX; return ret; } strong_alias (__ieee754_yn, __yn_finite) diff --git a/sysdeps/ieee754/dbl-64/s_asinh.c b/sysdeps/ieee754/dbl-64/s_asinh.c index 192ff85..7fd281d 100644 --- a/sysdeps/ieee754/dbl-64/s_asinh.c +++ b/sysdeps/ieee754/dbl-64/s_asinh.c @@ -65,6 +65,6 @@ __asinh (double x) w = __log1p (xa + t / (one + sqrt (one + t))); } } - return __copysign (w, x); + return copysign (w, x); } libm_alias_double (__asinh, asinh) diff --git a/sysdeps/ieee754/dbl-64/s_atan.c b/sysdeps/ieee754/dbl-64/s_atan.c index 311c28f..e346581 100644 --- a/sysdeps/ieee754/dbl-64/s_atan.c +++ b/sysdeps/ieee754/dbl-64/s_atan.c @@ -57,7 +57,7 @@ static double atanMp (double, const int[]); static double __signArctan (double x, double y) { - return __copysign (y, x); + return copysign (y, x); } diff --git a/sysdeps/ieee754/dbl-64/s_copysign.c b/sysdeps/ieee754/dbl-64/s_copysign.c index ab81d73..589b088 100644 --- a/sysdeps/ieee754/dbl-64/s_copysign.c +++ b/sysdeps/ieee754/dbl-64/s_copysign.c @@ -20,6 +20,7 @@ static char rcsid[] = "$NetBSD: s_copysign.c,v 1.8 1995/05/10 20:46:57 jtc Exp $ * with the sign bit of y. */ +#define NO_MATH_REDIRECT #include <math.h> #include <math_private.h> #include <libm-alias-double.h> diff --git a/sysdeps/ieee754/dbl-64/s_scalbln.c b/sysdeps/ieee754/dbl-64/s_scalbln.c index 32cd12e..0e3d732 100644 --- a/sysdeps/ieee754/dbl-64/s_scalbln.c +++ b/sysdeps/ieee754/dbl-64/s_scalbln.c @@ -42,9 +42,9 @@ __scalbln (double x, long int n) if (__glibc_unlikely (k == 0x7ff)) return x + x; /* NaN or Inf */ if (__glibc_unlikely (n < -50000)) - return tiny * __copysign (tiny, x); /*underflow*/ + return tiny * copysign (tiny, x); /*underflow*/ if (__glibc_unlikely (n > 50000 || k + n > 0x7fe)) - return huge * __copysign (huge, x); /* overflow */ + return huge * copysign (huge, x); /* overflow */ /* Now k and n are bounded we know that k = k+n does not overflow. */ k = k + n; @@ -53,7 +53,7 @@ __scalbln (double x, long int n) SET_HIGH_WORD (x, (hx & 0x800fffff) | (k << 20)); return x; } if (k <= -54) - return tiny * __copysign (tiny, x); /*underflow*/ + return tiny * copysign (tiny, x); /*underflow*/ k += 54; /* subnormal result */ SET_HIGH_WORD (x, (hx & 0x800fffff) | (k << 20)); return x * twom54; diff --git a/sysdeps/ieee754/dbl-64/s_scalbn.c b/sysdeps/ieee754/dbl-64/s_scalbn.c index 58c7e1b..cf4d684 100644 --- a/sysdeps/ieee754/dbl-64/s_scalbn.c +++ b/sysdeps/ieee754/dbl-64/s_scalbn.c @@ -42,9 +42,9 @@ __scalbn (double x, int n) if (__glibc_unlikely (k == 0x7ff)) return x + x; /* NaN or Inf */ if (__glibc_unlikely (n < -50000)) - return tiny * __copysign (tiny, x); /*underflow*/ + return tiny * copysign (tiny, x); /*underflow*/ if (__glibc_unlikely (n > 50000 || k + n > 0x7fe)) - return huge * __copysign (huge, x); /* overflow */ + return huge * copysign (huge, x); /* overflow */ /* Now k and n are bounded we know that k = k+n does not overflow. */ k = k + n; @@ -53,7 +53,7 @@ __scalbn (double x, int n) SET_HIGH_WORD (x, (hx & 0x800fffff) | (k << 20)); return x; } if (k <= -54) - return tiny * __copysign (tiny, x); /*underflow*/ + return tiny * copysign (tiny, x); /*underflow*/ k += 54; /* subnormal result */ SET_HIGH_WORD (x, (hx & 0x800fffff) | (k << 20)); return x * twom54; diff --git a/sysdeps/ieee754/dbl-64/s_sin.c b/sysdeps/ieee754/dbl-64/s_sin.c index db1687e..212f83c 100644 --- a/sysdeps/ieee754/dbl-64/s_sin.c +++ b/sysdeps/ieee754/dbl-64/s_sin.c @@ -144,7 +144,7 @@ do_sin (double x, double dx) c = x * dx + xx * (cs2 + xx * (cs4 + xx * cs6)); SINCOS_TABLE_LOOKUP (u, sn, ssn, cs, ccs); cor = (ssn + s * ccs - sn * c) + cs * s; - return __copysign (sn + cor, xold); + return copysign (sn + cor, xold); } /* Reduce range of x to within PI/2 with abs (x) < 105414350. The high part @@ -231,7 +231,7 @@ __sin (double x) { t = hp0 - fabs (x); /* Max ULP is 0.51. */ - retval = __copysign (do_cos (t, hp1), x); + retval = copysign (do_cos (t, hp1), x); } /* else if (k < 0x400368fd) */ /*-------------------------- 2.426265<|x|< 105414350 ----------------------*/ diff --git a/sysdeps/ieee754/dbl-64/s_sincos.c b/sysdeps/ieee754/dbl-64/s_sincos.c index 6dc1609..41664c1 100644 --- a/sysdeps/ieee754/dbl-64/s_sincos.c +++ b/sysdeps/ieee754/dbl-64/s_sincos.c @@ -63,7 +63,7 @@ __sincos (double x, double *sinx, double *cosx) y = hp0 - fabs (x); a = y + hp1; da = (y - a) + hp1; - *sinx = __copysign (do_cos (a, da), x); + *sinx = copysign (do_cos (a, da), x); *cosx = do_sin (a, da); return; } diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c index 2bb59de..92fa72a 100644 --- a/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c +++ b/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c @@ -49,7 +49,7 @@ __nearbyint(double x) double t = w-TWO52[sx]; math_force_eval (t); libc_fesetenv (&env); - return __copysign (t, x); + return copysign (t, x); } } else { if(j0==0x400) return x+x; /* inf or NaN */ diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_scalbln.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_scalbln.c index 8dce51e..071c9d7 100644 --- a/sysdeps/ieee754/dbl-64/wordsize-64/s_scalbln.c +++ b/sysdeps/ieee754/dbl-64/wordsize-64/s_scalbln.c @@ -40,9 +40,9 @@ __scalbln (double x, long int n) } if (__builtin_expect(k==0x7ff, 0)) return x+x; /* NaN or Inf */ if (__builtin_expect(n< -50000, 0)) - return tiny*__copysign(tiny,x); /*underflow*/ + return tiny*copysign(tiny,x); /*underflow*/ if (__builtin_expect(n> 50000 || k+n > 0x7fe, 0)) - return huge*__copysign(huge,x); /* overflow */ + return huge*copysign(huge,x); /* overflow */ /* Now k and n are bounded we know that k = k+n does not overflow. */ k = k+n; @@ -50,7 +50,7 @@ __scalbln (double x, long int n) {INSERT_WORDS64(x,(ix&UINT64_C(0x800fffffffffffff))|(k<<52)); return x;} if (k <= -54) - return tiny*__copysign(tiny,x); /*underflow*/ + return tiny*copysign(tiny,x); /*underflow*/ k += 54; /* subnormal result */ INSERT_WORDS64(x,(ix&INT64_C(0x800fffffffffffff))|(k<<52)); return x*twom54; diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_scalbn.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_scalbn.c index d517a91..4491227 100644 --- a/sysdeps/ieee754/dbl-64/wordsize-64/s_scalbn.c +++ b/sysdeps/ieee754/dbl-64/wordsize-64/s_scalbn.c @@ -40,9 +40,9 @@ __scalbn (double x, int n) } if (__builtin_expect(k==0x7ff, 0)) return x+x; /* NaN or Inf */ if (__builtin_expect(n< -50000, 0)) - return tiny*__copysign(tiny,x); /*underflow*/ + return tiny*copysign(tiny,x); /*underflow*/ if (__builtin_expect(n> 50000 || k+n > 0x7fe, 0)) - return huge*__copysign(huge,x); /* overflow */ + return huge*copysign(huge,x); /* overflow */ /* Now k and n are bounded we know that k = k+n does not overflow. */ k = k+n; @@ -50,7 +50,7 @@ __scalbn (double x, int n) {INSERT_WORDS64(x,(ix&UINT64_C(0x800fffffffffffff))|(k<<52)); return x;} if (k <= -54) - return tiny*__copysign(tiny,x); /*underflow*/ + return tiny*copysign(tiny,x); /*underflow*/ k += 54; /* subnormal result */ INSERT_WORDS64(x,(ix&INT64_C(0x800fffffffffffff))|(k<<52)); return x*twom54; diff --git a/sysdeps/ieee754/float128/s_copysignf128.c b/sysdeps/ieee754/float128/s_copysignf128.c index 808f7ab..fcb5162 100644 --- a/sysdeps/ieee754/float128/s_copysignf128.c +++ b/sysdeps/ieee754/float128/s_copysignf128.c @@ -1,2 +1,3 @@ +#define NO_MATH_REDIRECT #include <float128_private.h> #include "../ldbl-128/s_copysignl.c" diff --git a/sysdeps/ieee754/flt-32/e_atanhf.c b/sysdeps/ieee754/flt-32/e_atanhf.c index 207d759..db2462e 100644 --- a/sysdeps/ieee754/flt-32/e_atanhf.c +++ b/sysdeps/ieee754/flt-32/e_atanhf.c @@ -71,6 +71,6 @@ __ieee754_atanhf (float x) return x / 0.0f; } - return __copysignf (t, x); + return copysignf (t, x); } strong_alias (__ieee754_atanhf, __atanhf_finite) diff --git a/sysdeps/ieee754/flt-32/e_gammaf_r.c b/sysdeps/ieee754/flt-32/e_gammaf_r.c index 6a9e28a..af37abb 100644 --- a/sysdeps/ieee754/flt-32/e_gammaf_r.c +++ b/sysdeps/ieee754/flt-32/e_gammaf_r.c @@ -191,22 +191,22 @@ __ieee754_gammaf_r (float x, int *signgamp) { if (*signgamp < 0) { - ret = math_narrow_eval (-__copysignf (FLT_MAX, ret) * FLT_MAX); + ret = math_narrow_eval (-copysignf (FLT_MAX, ret) * FLT_MAX); ret = -ret; } else - ret = math_narrow_eval (__copysignf (FLT_MAX, ret) * FLT_MAX); + ret = math_narrow_eval (copysignf (FLT_MAX, ret) * FLT_MAX); return ret; } else if (ret == 0) { if (*signgamp < 0) { - ret = math_narrow_eval (-__copysignf (FLT_MIN, ret) * FLT_MIN); + ret = math_narrow_eval (-copysignf (FLT_MIN, ret) * FLT_MIN); ret = -ret; } else - ret = math_narrow_eval (__copysignf (FLT_MIN, ret) * FLT_MIN); + ret = math_narrow_eval (copysignf (FLT_MIN, ret) * FLT_MIN); return ret; } else diff --git a/sysdeps/ieee754/flt-32/e_jnf.c b/sysdeps/ieee754/flt-32/e_jnf.c index e8b9425..ae29015 100644 --- a/sysdeps/ieee754/flt-32/e_jnf.c +++ b/sysdeps/ieee754/flt-32/e_jnf.c @@ -174,7 +174,7 @@ __ieee754_jnf(int n, float x) } if (ret == 0) { - ret = math_narrow_eval (__copysignf (FLT_MIN, ret) * FLT_MIN); + ret = math_narrow_eval (copysignf (FLT_MIN, ret) * FLT_MIN); __set_errno (ERANGE); } else @@ -230,7 +230,7 @@ __ieee754_ynf(int n, float x) } out: if (isinf (ret)) - ret = __copysignf (FLT_MAX, ret) * FLT_MAX; + ret = copysignf (FLT_MAX, ret) * FLT_MAX; return ret; } strong_alias (__ieee754_ynf, __ynf_finite) diff --git a/sysdeps/ieee754/flt-32/s_asinhf.c b/sysdeps/ieee754/flt-32/s_asinhf.c index 0812b54..13af5db 100644 --- a/sysdeps/ieee754/flt-32/s_asinhf.c +++ b/sysdeps/ieee754/flt-32/s_asinhf.c @@ -47,6 +47,6 @@ __asinhf(float x) w =__log1pf(xa+t/(one+sqrtf(one+t))); } } - return __copysignf(w, x); + return copysignf(w, x); } libm_alias_float (__asinh, asinh) diff --git a/sysdeps/ieee754/flt-32/s_copysignf.c b/sysdeps/ieee754/flt-32/s_copysignf.c index 3c4ac7c..77d1d90 100644 --- a/sysdeps/ieee754/flt-32/s_copysignf.c +++ b/sysdeps/ieee754/flt-32/s_copysignf.c @@ -23,6 +23,7 @@ static char rcsid[] = "$NetBSD: s_copysignf.c,v 1.4 1995/05/10 20:46:59 jtc Exp * with the sign bit of y. */ +#define NO_MATH_REDIRECT #include <math.h> #include <math_private.h> #include <libm-alias-float.h> diff --git a/sysdeps/ieee754/flt-32/s_scalbnf.c b/sysdeps/ieee754/flt-32/s_scalbnf.c index f36ae24..1a760f7 100644 --- a/sysdeps/ieee754/flt-32/s_scalbnf.c +++ b/sysdeps/ieee754/flt-32/s_scalbnf.c @@ -36,16 +36,16 @@ __scalbnf (float x, int n) } if (__builtin_expect(k==0xff, 0)) return x+x; /* NaN or Inf */ if (__builtin_expect(n< -50000, 0)) - return tiny*__copysignf(tiny,x); /*underflow*/ + return tiny*copysignf(tiny,x); /*underflow*/ if (__builtin_expect(n> 50000 || k+n > 0xfe, 0)) - return huge*__copysignf(huge,x); /* overflow */ + return huge*copysignf(huge,x); /* overflow */ /* Now k and n are bounded we know that k = k+n does not overflow. */ k = k+n; if (__builtin_expect(k > 0, 1)) /* normal result */ {SET_FLOAT_WORD(x,(ix&0x807fffff)|(k<<23)); return x;} if (k <= -25) - return tiny*__copysignf(tiny,x); /*underflow*/ + return tiny*copysignf(tiny,x); /*underflow*/ k += 25; /* subnormal result */ SET_FLOAT_WORD(x,(ix&0x807fffff)|(k<<23)); return x*twom25; diff --git a/sysdeps/ieee754/k_standard.c b/sysdeps/ieee754/k_standard.c index f71a837..826f197 100644 --- a/sysdeps/ieee754/k_standard.c +++ b/sysdeps/ieee754/k_standard.c @@ -693,7 +693,7 @@ __kernel_standard(double x, double y, int type) /* scalb underflow */ exc.type = UNDERFLOW; exc.name = CSTR ("scalb"); - exc.retval = __copysign(zero,x); + exc.retval = copysign(zero,x); if (_LIB_VERSION == _POSIX_) __set_errno (ERANGE); else if (!matherr(&exc)) { @@ -808,7 +808,7 @@ __kernel_standard(double x, double y, int type) /* tgamma(finite) overflow */ exc.type = OVERFLOW; exc.name = CSTR ("tgamma"); - exc.retval = __copysign (HUGE_VAL, x); + exc.retval = copysign (HUGE_VAL, x); if (_LIB_VERSION == _POSIX_) __set_errno (ERANGE); else if (!matherr(&exc)) { @@ -930,7 +930,7 @@ __kernel_standard(double x, double y, int type) /* tgamma(+-0) */ exc.type = SING; exc.name = CSTR ("tgamma"); - exc.retval = __copysign (HUGE_VAL, x); + exc.retval = copysign (HUGE_VAL, x); if (_LIB_VERSION == _POSIX_) __set_errno (ERANGE); else if (!matherr(&exc)) { diff --git a/sysdeps/ieee754/ldbl-128/e_gammal_r.c b/sysdeps/ieee754/ldbl-128/e_gammal_r.c index 837395e..b8690b0 100644 --- a/sysdeps/ieee754/ldbl-128/e_gammal_r.c +++ b/sysdeps/ieee754/ldbl-128/e_gammal_r.c @@ -203,16 +203,16 @@ __ieee754_gammal_r (_Float128 x, int *signgamp) if (isinf (ret) && x != 0) { if (*signgamp < 0) - return -(-__copysignl (LDBL_MAX, ret) * LDBL_MAX); + return -(-copysignl (LDBL_MAX, ret) * LDBL_MAX); else - return __copysignl (LDBL_MAX, ret) * LDBL_MAX; + return copysignl (LDBL_MAX, ret) * LDBL_MAX; } else if (ret == 0) { if (*signgamp < 0) - return -(-__copysignl (LDBL_MIN, ret) * LDBL_MIN); + return -(-copysignl (LDBL_MIN, ret) * LDBL_MIN); else - return __copysignl (LDBL_MIN, ret) * LDBL_MIN; + return copysignl (LDBL_MIN, ret) * LDBL_MIN; } else return ret; diff --git a/sysdeps/ieee754/ldbl-128/e_jnl.c b/sysdeps/ieee754/ldbl-128/e_jnl.c index 540b95c..7610d18 100644 --- a/sysdeps/ieee754/ldbl-128/e_jnl.c +++ b/sysdeps/ieee754/ldbl-128/e_jnl.c @@ -299,7 +299,7 @@ __ieee754_jnl (int n, _Float128 x) } if (ret == 0) { - ret = __copysignl (LDBL_MIN, ret) * LDBL_MIN; + ret = copysignl (LDBL_MIN, ret) * LDBL_MIN; __set_errno (ERANGE); } else @@ -415,7 +415,7 @@ __ieee754_ynl (int n, _Float128 x) } out: if (isinf (ret)) - ret = __copysignl (LDBL_MAX, ret) * LDBL_MAX; + ret = copysignl (LDBL_MAX, ret) * LDBL_MAX; return ret; } strong_alias (__ieee754_ynl, __ynl_finite) diff --git a/sysdeps/ieee754/ldbl-128/s_copysignl.c b/sysdeps/ieee754/ldbl-128/s_copysignl.c index d23e0f7..a501139 100644 --- a/sysdeps/ieee754/ldbl-128/s_copysignl.c +++ b/sysdeps/ieee754/ldbl-128/s_copysignl.c @@ -23,6 +23,7 @@ static char rcsid[] = "$NetBSD: $"; * with the sign bit of y. */ +#define NO_MATH_REDIRECT #include <math.h> #include <math_private.h> #include <libm-alias-ldouble.h> diff --git a/sysdeps/ieee754/ldbl-128/s_scalblnl.c b/sysdeps/ieee754/ldbl-128/s_scalblnl.c index 5864eaf..590b2ca 100644 --- a/sysdeps/ieee754/ldbl-128/s_scalblnl.c +++ b/sysdeps/ieee754/ldbl-128/s_scalblnl.c @@ -46,16 +46,16 @@ _Float128 __scalblnl (_Float128 x, long int n) k = ((hx>>48)&0x7fff) - 114; } if (k==0x7fff) return x+x; /* NaN or Inf */ - if (n< -50000) return tiny*__copysignl(tiny,x); /*underflow*/ + if (n< -50000) return tiny*copysignl(tiny,x); /*underflow*/ if (n> 50000 || k+n > 0x7ffe) - return huge*__copysignl(huge,x); /* overflow */ + return huge*copysignl(huge,x); /* overflow */ /* Now k and n are bounded we know that k = k+n does not overflow. */ k = k+n; if (k > 0) /* normal result */ {SET_LDOUBLE_MSW64(x,(hx&0x8000ffffffffffffULL)|(k<<48)); return x;} if (k <= -114) - return tiny*__copysignl(tiny,x); /*underflow*/ + return tiny*copysignl(tiny,x); /*underflow*/ k += 114; /* subnormal result */ SET_LDOUBLE_MSW64(x,(hx&0x8000ffffffffffffULL)|(k<<48)); return x*twom114; diff --git a/sysdeps/ieee754/ldbl-128/s_scalbnl.c b/sysdeps/ieee754/ldbl-128/s_scalbnl.c index e6fe796..ad9a0b1 100644 --- a/sysdeps/ieee754/ldbl-128/s_scalbnl.c +++ b/sysdeps/ieee754/ldbl-128/s_scalbnl.c @@ -46,16 +46,16 @@ _Float128 __scalbnl (_Float128 x, int n) k = ((hx>>48)&0x7fff) - 114; } if (k==0x7fff) return x+x; /* NaN or Inf */ - if (n< -50000) return tiny*__copysignl(tiny,x); /*underflow*/ + if (n< -50000) return tiny*copysignl(tiny,x); /*underflow*/ if (n> 50000 || k+n > 0x7ffe) - return huge*__copysignl(huge,x); /* overflow */ + return huge*copysignl(huge,x); /* overflow */ /* Now k and n are bounded we know that k = k+n does not overflow. */ k = k+n; if (k > 0) /* normal result */ {SET_LDOUBLE_MSW64(x,(hx&0x8000ffffffffffffULL)|(k<<48)); return x;} if (k <= -114) - return tiny*__copysignl(tiny,x); /*underflow*/ + return tiny*copysignl(tiny,x); /*underflow*/ k += 114; /* subnormal result */ SET_LDOUBLE_MSW64(x,(hx&0x8000ffffffffffffULL)|(k<<48)); return x*twom114; diff --git a/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c b/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c index 6361d35..e648ca1 100644 --- a/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c +++ b/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c @@ -203,16 +203,16 @@ __ieee754_gammal_r (long double x, int *signgamp) if (isinf (ret) && x != 0) { if (*signgamp < 0) - return -(-__copysignl (LDBL_MAX, ret) * LDBL_MAX); + return -(-copysignl (LDBL_MAX, ret) * LDBL_MAX); else - return __copysignl (LDBL_MAX, ret) * LDBL_MAX; + return copysignl (LDBL_MAX, ret) * LDBL_MAX; } else if (ret == 0) { if (*signgamp < 0) - return -(-__copysignl (LDBL_MIN, ret) * LDBL_MIN); + return -(-copysignl (LDBL_MIN, ret) * LDBL_MIN); else - return __copysignl (LDBL_MIN, ret) * LDBL_MIN; + return copysignl (LDBL_MIN, ret) * LDBL_MIN; } else return ret; diff --git a/sysdeps/ieee754/ldbl-128ibm/e_jnl.c b/sysdeps/ieee754/ldbl-128ibm/e_jnl.c index 208def0..50b4558 100644 --- a/sysdeps/ieee754/ldbl-128ibm/e_jnl.c +++ b/sysdeps/ieee754/ldbl-128ibm/e_jnl.c @@ -299,7 +299,7 @@ __ieee754_jnl (int n, long double x) } if (ret == 0) { - ret = __copysignl (LDBL_MIN, ret) * LDBL_MIN; + ret = copysignl (LDBL_MIN, ret) * LDBL_MIN; __set_errno (ERANGE); } else @@ -417,7 +417,7 @@ __ieee754_ynl (int n, long double x) } out: if (isinf (ret)) - ret = __copysignl (LDBL_MAX, ret) * LDBL_MAX; + ret = copysignl (LDBL_MAX, ret) * LDBL_MAX; return ret; } strong_alias (__ieee754_ynl, __ynl_finite) diff --git a/sysdeps/ieee754/ldbl-128ibm/s_copysignl.c b/sysdeps/ieee754/ldbl-128ibm/s_copysignl.c index 3b8ec1a..4214853 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_copysignl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_copysignl.c @@ -23,6 +23,7 @@ static char rcsid[] = "$NetBSD: $"; * with the sign bit of y. */ +#define NO_MATH_REDIRECT #include <math.h> #include <math_private.h> #include <math_ldbl_opt.h> diff --git a/sysdeps/ieee754/ldbl-128ibm/s_fmal.c b/sysdeps/ieee754/ldbl-128ibm/s_fmal.c index bc61e90..5b55268 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_fmal.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_fmal.c @@ -244,7 +244,7 @@ __fmal (long double x, long double y, long double z) scale_val = math_opt_barrier (scale_val); scale_val = __scalbn (scale_val, scale_exp); if (fabs (scale_val) == DBL_MAX) - return __copysignl (LDBL_MAX, scale_val); + return copysignl (LDBL_MAX, scale_val); math_check_force_underflow (scale_val); return scale_val; diff --git a/sysdeps/ieee754/ldbl-128ibm/s_scalblnl.c b/sysdeps/ieee754/ldbl-128ibm/s_scalblnl.c index 0316352..b6a2d30 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_scalblnl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_scalblnl.c @@ -56,9 +56,9 @@ long double __scalblnl (long double x, long int n) k = ((hx>>52)&0x7ff) - 54; } else if (k==0x7ff) return x+x; /* NaN or Inf */ - if (n< -50000) return tiny*__copysignl(tiny,x); /*underflow */ + if (n< -50000) return tiny*copysignl(tiny,x); /*underflow */ if (n> 50000 || k+n > 0x7fe) - return huge*__copysignl(huge,x); /* overflow */ + return huge*copysignl(huge,x); /* overflow */ /* Now k and n are bounded we know that k = k+n does not overflow. */ k = k+n; @@ -93,7 +93,7 @@ long double __scalblnl (long double x, long int n) return x; } if (k <= -54) - return tiny*__copysignl(tiny,x); /*underflow*/ + return tiny*copysignl(tiny,x); /*underflow*/ k += 54; /* subnormal result */ lx &= 0x8000000000000000ULL; hx &= 0x800fffffffffffffULL; diff --git a/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c b/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c index 0c45088..bbefa86 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c @@ -56,9 +56,9 @@ long double __scalbnl (long double x, int n) k = ((hx>>52)&0x7ff) - 54; } else if (k==0x7ff) return x+x; /* NaN or Inf */ - if (n< -50000) return tiny*__copysignl(tiny,x); /*underflow */ + if (n< -50000) return tiny*copysignl(tiny,x); /*underflow */ if (n> 50000 || k+n > 0x7fe) - return huge*__copysignl(huge,x); /* overflow */ + return huge*copysignl(huge,x); /* overflow */ /* Now k and n are bounded we know that k = k+n does not overflow. */ k = k+n; @@ -93,7 +93,7 @@ long double __scalbnl (long double x, int n) return x; } if (k <= -54) - return tiny*__copysignl(tiny,x); /*underflow*/ + return tiny*copysignl(tiny,x); /*underflow*/ k += 54; /* subnormal result */ lx &= 0x8000000000000000ULL; hx &= 0x800fffffffffffffULL; diff --git a/sysdeps/ieee754/ldbl-96/e_gammal_r.c b/sysdeps/ieee754/ldbl-96/e_gammal_r.c index 49428eb..c4a166d 100644 --- a/sysdeps/ieee754/ldbl-96/e_gammal_r.c +++ b/sysdeps/ieee754/ldbl-96/e_gammal_r.c @@ -195,16 +195,16 @@ __ieee754_gammal_r (long double x, int *signgamp) if (isinf (ret) && x != 0) { if (*signgamp < 0) - return -(-__copysignl (LDBL_MAX, ret) * LDBL_MAX); + return -(-copysignl (LDBL_MAX, ret) * LDBL_MAX); else - return __copysignl (LDBL_MAX, ret) * LDBL_MAX; + return copysignl (LDBL_MAX, ret) * LDBL_MAX; } else if (ret == 0) { if (*signgamp < 0) - return -(-__copysignl (LDBL_MIN, ret) * LDBL_MIN); + return -(-copysignl (LDBL_MIN, ret) * LDBL_MIN); else - return __copysignl (LDBL_MIN, ret) * LDBL_MIN; + return copysignl (LDBL_MIN, ret) * LDBL_MIN; } else return ret; diff --git a/sysdeps/ieee754/ldbl-96/e_jnl.c b/sysdeps/ieee754/ldbl-96/e_jnl.c index fd28f6a..8551908 100644 --- a/sysdeps/ieee754/ldbl-96/e_jnl.c +++ b/sysdeps/ieee754/ldbl-96/e_jnl.c @@ -292,7 +292,7 @@ __ieee754_jnl (int n, long double x) } if (ret == 0) { - ret = __copysignl (LDBL_MIN, ret) * LDBL_MIN; + ret = copysignl (LDBL_MIN, ret) * LDBL_MIN; __set_errno (ERANGE); } else @@ -400,7 +400,7 @@ __ieee754_ynl (int n, long double x) } out: if (isinf (ret)) - ret = __copysignl (LDBL_MAX, ret) * LDBL_MAX; + ret = copysignl (LDBL_MAX, ret) * LDBL_MAX; return ret; } strong_alias (__ieee754_ynl, __ynl_finite) diff --git a/sysdeps/ieee754/ldbl-96/s_asinhl.c b/sysdeps/ieee754/ldbl-96/s_asinhl.c index 2b9ae1f..0edd332 100644 --- a/sysdeps/ieee754/ldbl-96/s_asinhl.c +++ b/sysdeps/ieee754/ldbl-96/s_asinhl.c @@ -62,6 +62,6 @@ long double __asinhl(long double x) w =__log1pl(xa+t/(one+sqrtl(one+t))); } } - return __copysignl(w, x); + return copysignl(w, x); } libm_alias_ldouble (__asinh, asinh) diff --git a/sysdeps/ieee754/ldbl-96/s_copysignl.c b/sysdeps/ieee754/ldbl-96/s_copysignl.c index 3c16d54..d0a6dc1 100644 --- a/sysdeps/ieee754/ldbl-96/s_copysignl.c +++ b/sysdeps/ieee754/ldbl-96/s_copysignl.c @@ -24,6 +24,7 @@ static char rcsid[] = "$NetBSD: $"; * with the sign bit of y. */ +#define NO_MATH_REDIRECT #include <math.h> #include <math_private.h> #include <libm-alias-ldouble.h> diff --git a/sysdeps/ieee754/ldbl-96/s_scalblnl.c b/sysdeps/ieee754/ldbl-96/s_scalblnl.c index 457e999..d752248 100644 --- a/sysdeps/ieee754/ldbl-96/s_scalblnl.c +++ b/sysdeps/ieee754/ldbl-96/s_scalblnl.c @@ -44,16 +44,16 @@ __scalblnl (long double x, long int n) } if (__builtin_expect(k==0x7fff, 0)) return x+x; /* NaN or Inf */ if (__builtin_expect(n< -50000, 0)) - return tiny*__copysignl(tiny,x); + return tiny*copysignl(tiny,x); if (__builtin_expect(n> 50000 || k+n > 0x7ffe, 0)) - return huge*__copysignl(huge,x); /* overflow */ + return huge*copysignl(huge,x); /* overflow */ /* Now k and n are bounded we know that k = k+n does not overflow. */ k = k+n; if (__builtin_expect(k > 0, 1)) /* normal result */ {SET_LDOUBLE_EXP(x,(es&0x8000)|k); return x;} if (k <= -64) - return tiny*__copysignl(tiny,x); /*underflow*/ + return tiny*copysignl(tiny,x); /*underflow*/ k += 64; /* subnormal result */ SET_LDOUBLE_EXP(x,(es&0x8000)|k); return x*twom64; diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-copysign.c b/sysdeps/ieee754/ldbl-opt/nldbl-copysign.c index 045f00d..ef23bad 100644 --- a/sysdeps/ieee754/ldbl-opt/nldbl-copysign.c +++ b/sysdeps/ieee754/ldbl-opt/nldbl-copysign.c @@ -4,5 +4,5 @@ double attribute_hidden copysignl (double x, double y) { - return __copysign (x, y); + return copysign (x, y); } |