diff options
author | Joseph Myers <joseph@codesourcery.com> | 2018-09-17 20:42:06 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2018-09-17 20:42:06 +0000 |
commit | 71223ef90946a5089b38cd60eb0eb9e50a8f3e4c (patch) | |
tree | 1546f604cd7040f8d6a073c4af53760a63c35e73 /sysdeps/powerpc | |
parent | 89983cb37c9319806a551e8fe9f3a11ff8f973e1 (diff) | |
download | glibc-71223ef90946a5089b38cd60eb0eb9e50a8f3e4c.tar.gz glibc-71223ef90946a5089b38cd60eb0eb9e50a8f3e4c.tar.xz glibc-71223ef90946a5089b38cd60eb0eb9e50a8f3e4c.zip |
Use ceil functions not __ceil 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 __ceil functions to call the corresponding ceil names instead, with asm redirection to __ceil when the calls are not inlined. Tested for x86_64, and with build-many-glibcs.py. * include/math.h [!_ISOMAC && !(__FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0) && !NO_MATH_REDIRECT] (ceil): Redirect using MATH_REDIRECT. * sysdeps/aarch64/fpu/s_ceil.c: Define NO_MATH_REDIRECT before header inclusion. * sysdeps/aarch64/fpu/s_ceilf.c: Likewise. * sysdeps/ieee754/dbl-64/s_ceil.c: Likewise. * sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c: Likewise. * sysdeps/ieee754/float128/s_ceilf128.c: Likewise. * sysdeps/ieee754/flt-32/s_ceilf.c: Likewise. * sysdeps/ieee754/ldbl-128/s_ceill.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_ceill.c: Likewise. * sysdeps/m68k/m680x0/fpu/s_ceil_template.c: Likewise. * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceil.c: Likewise. * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceilf.c: Likewise. * sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil.c: Likewise. * sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf.c: Likewise. * sysdeps/riscv/rv64/rvd/s_ceil.c: Likewise. * sysdeps/riscv/rvf/s_ceilf.c: Likewise. * sysdeps/sparc/sparc64/fpu/multiarch/s_ceil.c: Likewise. * sysdeps/sparc/sparc64/fpu/multiarch/s_ceilf.c: Likewise. * sysdeps/x86_64/fpu/multiarch/s_ceil.c: Likewise. * sysdeps/x86_64/fpu/multiarch/s_ceilf.c: Likewise. * sysdeps/powerpc/fpu/math_private.h [_ARCH_PWR5X] (__ceil): Remove macro. * sysdeps/ieee754/dbl-64/e_gamma_r.c (gamma_positive): Use ceil functions instead of __ceil variants. * sysdeps/ieee754/flt-32/e_gammaf_r.c (gammaf_positive): Likewise. * sysdeps/ieee754/ldbl-128/e_gammal_r.c (gammal_positive): Likewise. * sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c (gammal_positive): Likewise. * sysdeps/ieee754/ldbl-128ibm/s_truncl.c (__truncl): Likewise. * sysdeps/ieee754/ldbl-96/e_gammal_r.c (gammal_positive): Likewise. * sysdeps/powerpc/power5+/fpu/s_modf.c (__modf): Likewise. * sysdeps/powerpc/power5+/fpu/s_modff.c (__modff): Likewise.
Diffstat (limited to 'sysdeps/powerpc')
-rw-r--r-- | sysdeps/powerpc/fpu/math_private.h | 20 | ||||
-rw-r--r-- | sysdeps/powerpc/power5+/fpu/s_modf.c | 2 | ||||
-rw-r--r-- | sysdeps/powerpc/power5+/fpu/s_modff.c | 2 | ||||
-rw-r--r-- | sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceil.c | 1 | ||||
-rw-r--r-- | sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceilf.c | 1 | ||||
-rw-r--r-- | sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil.c | 1 | ||||
-rw-r--r-- | sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf.c | 1 |
7 files changed, 6 insertions, 22 deletions
diff --git a/sysdeps/powerpc/fpu/math_private.h b/sysdeps/powerpc/fpu/math_private.h index dc6dbfa474..b71278ade4 100644 --- a/sysdeps/powerpc/fpu/math_private.h +++ b/sysdeps/powerpc/fpu/math_private.h @@ -77,26 +77,6 @@ __ieee754_sqrtf128 (_Float128 __x) __z; }) # endif -# ifndef __ceil -# define __ceil(x) \ - ({ double __z; \ - __asm __volatile ( \ - " frip %0,%1\n" \ - : "=f" (__z) \ - : "f" (x)); \ - __z; }) -# endif -# ifndef __ceilf -# define __ceilf(x) \ - ({ float __z; \ - __asm __volatile ( \ - " frip %0,%1\n" \ - " frsp %0,%0\n" \ - : "=f" (__z) \ - : "f" (x)); \ - __z; }) -# endif - #endif /* defined _ARCH_PWR5X */ #endif /* _PPC_MATH_PRIVATE_H_ */ diff --git a/sysdeps/powerpc/power5+/fpu/s_modf.c b/sysdeps/powerpc/power5+/fpu/s_modf.c index 3d3b3e7866..20c828c778 100644 --- a/sysdeps/powerpc/power5+/fpu/s_modf.c +++ b/sysdeps/powerpc/power5+/fpu/s_modf.c @@ -41,7 +41,7 @@ __modf (double x, double *iptr) } else { - *iptr = __ceil (x); + *iptr = ceil (x); return __copysign (x - *iptr, x); } } diff --git a/sysdeps/powerpc/power5+/fpu/s_modff.c b/sysdeps/powerpc/power5+/fpu/s_modff.c index de44218982..807bfe1e03 100644 --- a/sysdeps/powerpc/power5+/fpu/s_modff.c +++ b/sysdeps/powerpc/power5+/fpu/s_modff.c @@ -40,7 +40,7 @@ __modff (float x, float *iptr) } else { - *iptr = __ceilf (x); + *iptr = ceilf (x); return __copysignf (x - *iptr, x); } } diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceil.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceil.c index 5f3c0713fb..ae0f628759 100644 --- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceil.c +++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceil.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 <math_ldbl_opt.h> #include <shlib-compat.h> diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceilf.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceilf.c index 1f10ed6585..4dcf2b0dfe 100644 --- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceilf.c +++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_ceilf.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 <math_ldbl_opt.h> #include <shlib-compat.h> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil.c index 5cde4eb46f..2ea9bb878e 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil.c +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil.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 <math_ldbl_opt.h> #include <shlib-compat.h> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf.c index 18697e52b3..b7a7a0afda 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf.c +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf.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 <math_ldbl_opt.h> #include <shlib-compat.h> |