diff options
51 files changed, 160 insertions, 96 deletions
@@ -1,3 +1,79 @@ +2018-09-14 Joseph Myers <joseph@codesourcery.com> + + * include/math.h [!_ISOMAC && !(__FINITE_MATH_ONLY__ && + __FINITE_MATH_ONLY__ > 0) && !NO_MATH_REDIRECT] (MATH_REDIRECT): + New macro. + [!_ISOMAC && !(__FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0) + && !NO_MATH_REDIRECT] (MATH_REDIRECT_LDBL): Likewise. + [!_ISOMAC && !(__FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0) + && !NO_MATH_REDIRECT] (MATH_REDIRECT_F128): Likewise. + [!_ISOMAC && !(__FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0) + && !NO_MATH_REDIRECT] (MATH_REDIRECT_UNARY_ARGS): Likewise. + [!_ISOMAC && !(__FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0) + && !NO_MATH_REDIRECT] (sqrt): Redirect using MATH_REDIRECT. + [!_ISOMAC && !(__FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0) + && !NO_MATH_REDIRECT] (floor): Likewise. + * sysdeps/aarch64/fpu/s_floor.c: Define NO_MATH_REDIRECT before + header inclusion. + * sysdeps/aarch64/fpu/s_floorf.c: Likewise. + * sysdeps/ieee754/dbl-64/s_floor.c: Likewise. + * sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c: Likewise. + * sysdeps/ieee754/float128/s_floorf128.c: Likewise. + * sysdeps/ieee754/flt-32/s_floorf.c: Likewise. + * sysdeps/ieee754/ldbl-128/s_floorl.c: Likewise. + * sysdeps/ieee754/ldbl-128ibm/s_floorl.c: Likewise. + * sysdeps/m68k/m680x0/fpu/s_floor_template.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_floor.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_floorf.c: Likewise. + * sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor.c: Likewise. + * sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf.c: Likewise. + * sysdeps/riscv/rv64/rvd/s_floor.c: Likewise. + * sysdeps/riscv/rvf/s_floorf.c: Likewise. + * sysdeps/sparc/sparc64/fpu/multiarch/s_floor.c: Likewise. + * sysdeps/sparc/sparc64/fpu/multiarch/s_floorf.c: Likewise. + * sysdeps/x86_64/fpu/multiarch/s_floor.c: Likewise. + * sysdeps/x86_64/fpu/multiarch/s_floorf.c: Likewise. + * sysdeps/powerpc/fpu/math_private.h [_ARCH_PWR5X] (__floor): + Remove macro. + [_ARCH_PWR5X] (__floorf): Likewise. + * sysdeps/x86_64/fpu/math_private.h [__SSE4_1__] (__floor): Remove + inline function. + [__SSE4_1__] (__floorf): Likewise. + * math/w_lgamma_main.c (LGFUNC (__lgamma)): Use floor functions + instead of __floor variants. + * math/w_lgamma_r_compat.c (__lgamma_r): Likewise. + * math/w_lgammaf_main.c (LGFUNC (__lgammaf)): Likewise. + * math/w_lgammaf_r_compat.c (__lgammaf_r): Likewise. + * math/w_lgammal_main.c (LGFUNC (__lgammal)): Likewise. + * math/w_lgammal_r_compat.c (__lgammal_r): Likewise. + * math/w_tgamma_compat.c (__tgamma): Likewise. + * math/w_tgamma_template.c (M_DECL_FUNC (__tgamma)): Likewise. + * math/w_tgammaf_compat.c (__tgammaf): Likewise. + * math/w_tgammal_compat.c (__tgammal): Likewise. + * sysdeps/ieee754/dbl-64/e_lgamma_r.c (sin_pi): Likewise. + * sysdeps/ieee754/dbl-64/k_rem_pio2.c (__kernel_rem_pio2): + Likewise. + * sysdeps/ieee754/dbl-64/lgamma_neg.c (__lgamma_neg): Likewise. + * sysdeps/ieee754/flt-32/e_lgammaf_r.c (sin_pif): Likewise. + * sysdeps/ieee754/flt-32/lgamma_negf.c (__lgamma_negf): Likewise. + * sysdeps/ieee754/ldbl-128/e_lgammal_r.c (__ieee754_lgammal_r): + Likewise. + * sysdeps/ieee754/ldbl-128/e_powl.c (__ieee754_powl): Likewise. + * sysdeps/ieee754/ldbl-128/lgamma_negl.c (__lgamma_negl): + Likewise. + * sysdeps/ieee754/ldbl-128/s_expm1l.c (__expm1l): Likewise. + * sysdeps/ieee754/ldbl-128ibm/e_lgammal_r.c (__ieee754_lgammal_r): + Likewise. + * sysdeps/ieee754/ldbl-128ibm/e_powl.c (__ieee754_powl): Likewise. + * sysdeps/ieee754/ldbl-128ibm/lgamma_negl.c (__lgamma_negl): + Likewise. + * sysdeps/ieee754/ldbl-128ibm/s_expm1l.c (__expm1l): Likewise. + * sysdeps/ieee754/ldbl-128ibm/s_truncl.c (__truncl): Likewise. + * sysdeps/ieee754/ldbl-96/e_lgammal_r.c (sin_pi): Likewise. + * sysdeps/ieee754/ldbl-96/lgamma_negl.c (__lgamma_negl): Likewise. + * sysdeps/powerpc/power5+/fpu/s_modf.c (__modf): Likewise. + * sysdeps/powerpc/power5+/fpu/s_modff.c (__modff): Likewise. + 2018-09-12 Joseph Myers <joseph@codesourcery.com> * elf/Makefile (modules-names-tests): New variable. diff --git a/include/math.h b/include/math.h index 9ab7aa4403..eed953072b 100644 --- a/include/math.h +++ b/include/math.h @@ -79,16 +79,29 @@ fabsf128 (_Float128 x) # if !(defined __FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0) # ifndef NO_MATH_REDIRECT -/* Declare sqrt for use within GLIBC. Compilers typically inline sqrt as a - single instruction. Use an asm to avoid use of PLTs if it doesn't. */ -float (sqrtf) (float) asm ("__ieee754_sqrtf"); -double (sqrt) (double) asm ("__ieee754_sqrt"); -# ifndef __NO_LONG_DOUBLE_MATH -long double (sqrtl) (long double) asm ("__ieee754_sqrtl"); +/* Declare some functions for use within GLIBC. Compilers typically + inline those functions as a single instruction. Use an asm to + avoid use of PLTs if it doesn't. */ +# define MATH_REDIRECT(FUNC, PREFIX, ARGS) \ + float (FUNC ## f) (ARGS (float)) asm (PREFIX #FUNC "f"); \ + double (FUNC) (ARGS (double)) asm (PREFIX #FUNC ); \ + MATH_REDIRECT_LDBL (FUNC, PREFIX, ARGS) \ + MATH_REDIRECT_F128 (FUNC, PREFIX, ARGS) +# ifdef __NO_LONG_DOUBLE_MATH +# define MATH_REDIRECT_LDBL(FUNC, PREFIX, ARGS) +# else +# define MATH_REDIRECT_LDBL(FUNC, PREFIX, ARGS) \ + long double (FUNC ## l) (ARGS (long double)) asm (PREFIX #FUNC "l"); # endif -# if __HAVE_DISTINCT_FLOAT128 > 0 -_Float128 (sqrtf128) (_Float128) asm ("__ieee754_sqrtf128"); +# if __HAVE_DISTINCT_FLOAT128 +# define MATH_REDIRECT_F128(FUNC, PREFIX, ARGS) \ + _Float128 (FUNC ## f128) (ARGS (_Float128)) asm (PREFIX #FUNC "f128"); +# else +# define MATH_REDIRECT_F128(FUNC, PREFIX, ARGS) # endif +# define MATH_REDIRECT_UNARY_ARGS(TYPE) TYPE +MATH_REDIRECT (sqrt, "__ieee754_", MATH_REDIRECT_UNARY_ARGS) +MATH_REDIRECT (floor, "__", MATH_REDIRECT_UNARY_ARGS) # endif # endif diff --git a/math/w_lgamma_main.c b/math/w_lgamma_main.c index ac91b9d9e6..573bcb88fb 100644 --- a/math/w_lgamma_main.c +++ b/math/w_lgamma_main.c @@ -31,7 +31,7 @@ LGFUNC (__lgamma) (double x) if(__builtin_expect(!isfinite(y), 0) && isfinite(x) && _LIB_VERSION != _IEEE_) return __kernel_standard(x, x, - __floor(x)==x&&x<=0.0 + floor(x)==x&&x<=0.0 ? 15 /* lgamma pole */ : 14); /* lgamma overflow */ diff --git a/math/w_lgamma_r_compat.c b/math/w_lgamma_r_compat.c index 5b3ceaa2ea..c68ce67174 100644 --- a/math/w_lgamma_r_compat.c +++ b/math/w_lgamma_r_compat.c @@ -28,7 +28,7 @@ __lgamma_r(double x, int *signgamp) if(__builtin_expect(!isfinite(y), 0) && isfinite(x) && _LIB_VERSION != _IEEE_) return __kernel_standard(x, x, - __floor(x)==x&&x<=0.0 + floor(x)==x&&x<=0.0 ? 15 /* lgamma pole */ : 14); /* lgamma overflow */ diff --git a/math/w_lgammaf_main.c b/math/w_lgammaf_main.c index ef6065994f..2a85e3cadf 100644 --- a/math/w_lgammaf_main.c +++ b/math/w_lgammaf_main.c @@ -28,7 +28,7 @@ LGFUNC (__lgammaf) (float x) if(__builtin_expect(!isfinite(y), 0) && isfinite(x) && _LIB_VERSION != _IEEE_) return __kernel_standard_f(x, x, - __floorf(x)==x&&x<=0.0f + floorf(x)==x&&x<=0.0f ? 115 /* lgamma pole */ : 114); /* lgamma overflow */ diff --git a/math/w_lgammaf_r_compat.c b/math/w_lgammaf_r_compat.c index c7751f13f5..78fc4fcb23 100644 --- a/math/w_lgammaf_r_compat.c +++ b/math/w_lgammaf_r_compat.c @@ -31,7 +31,7 @@ __lgammaf_r(float x, int *signgamp) if(__builtin_expect(!isfinite(y), 0) && isfinite(x) && _LIB_VERSION != _IEEE_) return __kernel_standard_f(x, x, - __floorf(x)==x&&x<=0.0f + floorf(x)==x&&x<=0.0f ? 115 /* lgamma pole */ : 114); /* lgamma overflow */ diff --git a/math/w_lgammal_main.c b/math/w_lgammal_main.c index f269cef6ab..04440cd29f 100644 --- a/math/w_lgammal_main.c +++ b/math/w_lgammal_main.c @@ -35,7 +35,7 @@ LGFUNC (__lgammal) (long double x) if(__builtin_expect(!isfinite(y), 0) && isfinite(x) && _LIB_VERSION != _IEEE_) return __kernel_standard_l(x, x, - __floorl(x)==x&&x<=0.0L + floorl(x)==x&&x<=0.0L ? 215 /* lgamma pole */ : 214); /* lgamma overflow */ diff --git a/math/w_lgammal_r_compat.c b/math/w_lgammal_r_compat.c index 09a8070b46..6ebfa41333 100644 --- a/math/w_lgammal_r_compat.c +++ b/math/w_lgammal_r_compat.c @@ -32,7 +32,7 @@ __lgammal_r(long double x, int *signgamp) if(__builtin_expect(!isfinite(y), 0) && isfinite(x) && _LIB_VERSION != _IEEE_) return __kernel_standard(x, x, - __floorl(x)==x&&x<=0.0 + floorl(x)==x&&x<=0.0 ? 215 /* lgamma pole */ : 214); /* lgamma overflow */ diff --git a/math/w_tgamma_compat.c b/math/w_tgamma_compat.c index 219aa10862..910d2fe490 100644 --- a/math/w_tgamma_compat.c +++ b/math/w_tgamma_compat.c @@ -33,7 +33,7 @@ __tgamma(double x) && _LIB_VERSION != _IEEE_) { if (x == 0.0) return __kernel_standard(x,x,50); /* tgamma pole */ - else if(__floor(x)==x&&x<0.0) + else if(floor(x)==x&&x<0.0) return __kernel_standard(x,x,41); /* tgamma domain */ else if (y == 0) __set_errno (ERANGE); /* tgamma underflow */ diff --git a/math/w_tgamma_template.c b/math/w_tgamma_template.c index 032f27a3f7..f570615d7b 100644 --- a/math/w_tgamma_template.c +++ b/math/w_tgamma_template.c @@ -41,7 +41,7 @@ M_DECL_FUNC (__tgamma) (FLOAT x) if (x == 0) /* Pole error: tgamma(x=0). */ __set_errno (ERANGE); - else if (M_SUF (__floor) (x) == x && x < 0) + else if (M_SUF (floor) (x) == x && x < 0) /* Domain error: tgamma(integer x<0). */ __set_errno (EDOM); else diff --git a/math/w_tgammaf_compat.c b/math/w_tgammaf_compat.c index e9ffddb796..ed509885ae 100644 --- a/math/w_tgammaf_compat.c +++ b/math/w_tgammaf_compat.c @@ -32,7 +32,7 @@ __tgammaf(float x) if (x == (float)0.0) /* tgammaf pole */ return __kernel_standard_f(x, x, 150); - else if(__floorf(x)==x&&x<0.0f) + else if(floorf(x)==x&&x<0.0f) /* tgammaf domain */ return __kernel_standard_f(x, x, 141); else if (y == 0) diff --git a/math/w_tgammal_compat.c b/math/w_tgammal_compat.c index 3695b7fbb3..d79c788dfc 100644 --- a/math/w_tgammal_compat.c +++ b/math/w_tgammal_compat.c @@ -36,7 +36,7 @@ __tgammal(long double x) && _LIB_VERSION != _IEEE_) { if(x==0.0) return __kernel_standard_l(x,x,250); /* tgamma pole */ - else if(__floorl(x)==x&&x<0.0L) + else if(floorl(x)==x&&x<0.0L) return __kernel_standard_l(x,x,241); /* tgamma domain */ else if (y == 0) __set_errno (ERANGE); /* tgamma underflow */ diff --git a/sysdeps/aarch64/fpu/s_floor.c b/sysdeps/aarch64/fpu/s_floor.c index 7258246896..9580a5313d 100644 --- a/sysdeps/aarch64/fpu/s_floor.c +++ b/sysdeps/aarch64/fpu/s_floor.c @@ -16,6 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +#define NO_MATH_REDIRECT #include <math.h> #include <libm-alias-double.h> diff --git a/sysdeps/aarch64/fpu/s_floorf.c b/sysdeps/aarch64/fpu/s_floorf.c index bd197013ad..a874aaedaf 100644 --- a/ |