Use trunc functions not __trunc 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 __trunc functions to call the
corresponding trunc names instead, with asm redirection to __trunc
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] (trunc): Redirect
	using MATH_REDIRECT.
	* sysdeps/aarch64/fpu/s_trunc.c: Define NO_MATH_REDIRECT before
	header inclusion.
	* sysdeps/aarch64/fpu/s_truncf.c: Likewise.
	* sysdeps/ieee754/dbl-64/wordsize-64/s_trunc.c: Likewise.
	* sysdeps/ieee754/float128/s_truncf128.c: Likewise.
	* sysdeps/ieee754/dbl-64/s_trunc.c: Likewise.
	* sysdeps/ieee754/flt-32/s_truncf.c: Likewise.
	* sysdeps/ieee754/ldbl-128/s_truncl.c: Likewise.
	* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_trunc.c: Likewise.
	* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_truncf.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc.c: Likewise.
	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf.c: Likewise.
	* sysdeps/riscv/rv64/rvd/s_trunc.c: Likewise.
	* sysdeps/riscv/rvf/s_truncf.c: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_trunc.c: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_truncf.c: Likewise.
	* sysdeps/x86_64/fpu/multiarch/s_trunc.c: Likewise.
	* sysdeps/x86_64/fpu/multiarch/s_truncf.c: Likewise.
	* sysdeps/m68k/m680x0/fpu/s_trunc_template.c: Likewise.
	* sysdeps/ieee754/ldbl-128ibm/s_truncl.c: Likewise.
	(ceil): Redirect to __ceil.
	(floor): Redirect to __floor.
	(trunc): Redirect to __trunc.
	(__truncl): Call trunc instead of __trunc.
	* sysdeps/powerpc/fpu/math_private.h [_ARCH_PWR5X] (__trunc):
	Remove macro.
	[_ARCH_PWR5X] (__truncf): Likewise.
	* sysdeps/ieee754/dbl-64/e_gamma_r.c (__ieee754_gamma_r): Use
	trunc functions instead of __trunc variants.
	* sysdeps/ieee754/flt-32/e_gammaf_r.c (__ieee754_gammaf_r):
	Likewise.
	* sysdeps/ieee754/ldbl-128/e_gammal_r.c (__ieee754_gammal_r):
	Likewise.
	* sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c (__ieee754_gammal_r):
	Likewise.
	* sysdeps/ieee754/ldbl-96/e_gammal_r.c (__ieee754_gammal_r):
	Likewise.

diff --git a/ChangeLog b/ChangeLog
index fc3fbffa231376019503c8271c3634bc955d70e2..dfb9dc156bb2958df6aab0ab65ffbdd3a006c2d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,46 @@
 2018-09-20  Joseph Myers  <joseph@codesourcery.com>
 
+       * include/math.h [!_ISOMAC && !(__FINITE_MATH_ONLY__ &&
+       __FINITE_MATH_ONLY__ > 0) && !NO_MATH_REDIRECT] (trunc): Redirect
+       using MATH_REDIRECT.
+       * sysdeps/aarch64/fpu/s_trunc.c: Define NO_MATH_REDIRECT before
+       header inclusion.
+       * sysdeps/aarch64/fpu/s_truncf.c: Likewise.
+       * sysdeps/ieee754/dbl-64/wordsize-64/s_trunc.c: Likewise.
+       * sysdeps/ieee754/float128/s_truncf128.c: Likewise.
+       * sysdeps/ieee754/dbl-64/s_trunc.c: Likewise.
+       * sysdeps/ieee754/flt-32/s_truncf.c: Likewise.
+       * sysdeps/ieee754/ldbl-128/s_truncl.c: Likewise.
+       * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_trunc.c: Likewise.
+       * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_truncf.c: Likewise.
+       * sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc.c: Likewise.
+       * sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf.c: Likewise.
+       * sysdeps/riscv/rv64/rvd/s_trunc.c: Likewise.
+       * sysdeps/riscv/rvf/s_truncf.c: Likewise.
+       * sysdeps/sparc/sparc64/fpu/multiarch/s_trunc.c: Likewise.
+       * sysdeps/sparc/sparc64/fpu/multiarch/s_truncf.c: Likewise.
+       * sysdeps/x86_64/fpu/multiarch/s_trunc.c: Likewise.
+       * sysdeps/x86_64/fpu/multiarch/s_truncf.c: Likewise.
+       * sysdeps/m68k/m680x0/fpu/s_trunc_template.c: Likewise.
+       * sysdeps/ieee754/ldbl-128ibm/s_truncl.c: Likewise.
+       (ceil): Redirect to __ceil.
+       (floor): Redirect to __floor.
+       (trunc): Redirect to __trunc.
+       (__truncl): Call trunc instead of __trunc.
+       * sysdeps/powerpc/fpu/math_private.h [_ARCH_PWR5X] (__trunc):
+       Remove macro.
+       [_ARCH_PWR5X] (__truncf): Likewise.
+       * sysdeps/ieee754/dbl-64/e_gamma_r.c (__ieee754_gamma_r): Use
+       trunc functions instead of __trunc variants.
+       * sysdeps/ieee754/flt-32/e_gammaf_r.c (__ieee754_gammaf_r):
+       Likewise.
+       * sysdeps/ieee754/ldbl-128/e_gammal_r.c (__ieee754_gammal_r):
+       Likewise.
+       * sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c (__ieee754_gammal_r):
+       Likewise.
+       * sysdeps/ieee754/ldbl-96/e_gammal_r.c (__ieee754_gammal_r):
+       Likewise.
+
        * sysdeps/x86/cpu-features.h [__geode__ || __k6__]: Handle like
        [__i586__ || __pentium__].
        [__i486__]: Handle explicitly.

diff --git a/include/math.h b/include/math.h
index e96f9712575d289a3ff62696b34860c7e3e7ae6e..f8482afc4449ee55b0b10210394eedba1f8e1b77 100644 (file)
--- a/include/math.h
+++ b/include/math.h
@@ -104,6 +104,7 @@ MATH_REDIRECT (sqrt, "__ieee754_", MATH_REDIRECT_UNARY_ARGS)
 MATH_REDIRECT (ceil, "__", MATH_REDIRECT_UNARY_ARGS)
 MATH_REDIRECT (floor, "__", MATH_REDIRECT_UNARY_ARGS)
 MATH_REDIRECT (rint, "__", MATH_REDIRECT_UNARY_ARGS)
+MATH_REDIRECT (trunc, "__", MATH_REDIRECT_UNARY_ARGS)
 #  endif
 # endif
 

diff --git a/sysdeps/aarch64/fpu/s_trunc.c b/sysdeps/aarch64/fpu/s_trunc.c
index 22f44f1e04e0aec56395baf6253d767db73ef4f7..929448edd0ccd83939143559532bc697498090ba 100644 (file)
--- a/sysdeps/aarch64/fpu/s_trunc.c
+++ b/sysdeps/aarch64/fpu/s_trunc.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_truncf.c b/sysdeps/aarch64/fpu/s_truncf.c
index 3771b6d6bfa6a7740a3926a4f46d375d432519cd..242ea773d17675c1f58945d5534b31013972a336 100644 (file)
--- a/sysdeps/aarch64/fpu/s_truncf.c
+++ b/sysdeps/aarch64/fpu/s_truncf.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-float.h>
 

diff --git a/sysdeps/ieee754/dbl-64/e_gamma_r.c b/sysdeps/ieee754/dbl-64/e_gamma_r.c
index 823ffdbced5215af54562d92eb88108206e182bf..2cfe6d640ed2cabb018d0a926f64687bbbc8eaf7 100644 (file)
--- a/sysdeps/ieee754/dbl-64/e_gamma_r.c
+++ b/sysdeps/ieee754/dbl-64/e_gamma_r.c
@@ -173,8 +173,8 @@ __ieee754_gamma_r (double x, int *signgamp)
        }
       else
        {
-         double tx = __trunc (x);
-         *signgamp = (tx == 2.0 * __trunc (tx / 2.0)) ? -1 : 1;
+         double tx = trunc (x);
+         *signgamp = (tx == 2.0 * trunc (tx / 2.0)) ? -1 : 1;
          if (x <= -184.0)
            /* Underflow.  */
            ret = DBL_MIN * DBL_MIN;

diff --git a/sysdeps/ieee754/dbl-64/s_trunc.c b/sysdeps/ieee754/dbl-64/s_trunc.c
index 6ffabb410adc8574e88734ed37dec224aed9bda6..d9894b2beb78a25a7f076fd52b51c08ff4c31085 100644 (file)
--- a/sysdeps/ieee754/dbl-64/s_trunc.c
+++ b/sysdeps/ieee754/dbl-64/s_trunc.c
@@ -17,6 +17,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_private.h>

diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_trunc.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_trunc.c
index 19a09b894e22a68635660d17fd36271c816070fb..f7e22552b3957bd84cc780aafc8b454a1607a26b 100644 (file)
--- a/sysdeps/ieee754/dbl-64/wordsize-64/s_trunc.c
+++ b/sysdeps/ieee754/dbl-64/wordsize-64/s_trunc.c
@@ -17,6 +17,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_private.h>

diff --git a/sysdeps/ieee754/float128/s_truncf128.c b/sysdeps/ieee754/float128/s_truncf128.c
index 474d9dc77ee8e4455156c8588ae3f2de09011009..5786cfe4c0ecaee4eb2fc0916b0cbd299f936c72 100644 (file)
--- a/sysdeps/ieee754/float128/s_truncf128.c
+++ b/sysdeps/ieee754/float128/s_truncf128.c
@@ -1,2 +1,3 @@
+#define NO_MATH_REDIRECT
 #include <float128_private.h>
 #include "../ldbl-128/s_truncl.c"

diff --git a/sysdeps/ieee754/flt-32/e_gammaf_r.c b/sysdeps/ieee754/flt-32/e_gammaf_r.c
index 68f8f44c6533f8338d03e47a2090e9b294a1811d..7d9a6cbac466540f93ef1080af40d64803f66aaf 100644 (file)
--- a/sysdeps/ieee754/flt-32/e_gammaf_r.c
+++ b/sysdeps/ieee754/flt-32/e_gammaf_r.c
@@ -165,8 +165,8 @@ __ieee754_gammaf_r (float x, int *signgamp)
        }
       else
        {
-         float tx = __truncf (x);
-         *signgamp = (tx == 2.0f * __truncf (tx / 2.0f)) ? -1 : 1;
+         float tx = truncf (x);
+         *signgamp = (tx == 2.0f * truncf (tx / 2.0f)) ? -1 : 1;
          if (x <= -42.0f)
            /* Underflow.  */
            ret = FLT_MIN * FLT_MIN;

diff --git a/sysdeps/ieee754/flt-32/s_truncf.c b/sysdeps/ieee754/flt-32/s_truncf.c
index 2e1464aeac500b8da90d399ff9b3304f90020907..7ef067e0b5cc51c1f1c101d1bece9bc53a919c31 100644 (file)
--- a/sysdeps/ieee754/flt-32/s_truncf.c
+++ b/sysdeps/ieee754/flt-32/s_truncf.c
@@ -17,6 +17,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_private.h>

diff --git a/sysdeps/ieee754/ldbl-128/e_gammal_r.c b/sysdeps/ieee754/ldbl-128/e_gammal_r.c
index f620463ef99f375378eea52e59557cd746fe6a4e..184798fb54eb9bed5de02f6cdf90bb327311a8f9 100644 (file)
--- a/sysdeps/ieee754/ldbl-128/e_gammal_r.c
+++ b/sysdeps/ieee754/ldbl-128/e_gammal_r.c
@@ -179,8 +179,8 @@ __ieee754_gammal_r (_Float128 x, int *signgamp)
        }
       else
        {
-         _Float128 tx = __truncl (x);
-         *signgamp = (tx == 2 * __truncl (tx / 2)) ? -1 : 1;
+         _Float128 tx = truncl (x);
+         *signgamp = (tx == 2 * truncl (tx / 2)) ? -1 : 1;
          if (x <= -1775)
            /* Underflow.  */
            ret = LDBL_MIN * LDBL_MIN;

diff --git a/sysdeps/ieee754/ldbl-128/s_truncl.c b/sysdeps/ieee754/ldbl-128/s_truncl.c
index f858ede3d259b758f273c3bc21327dc5a2101547..2dc01e70fd6dceb15ec416747164d7a9bbe18701 100644 (file)
--- a/sysdeps/ieee754/ldbl-128/s_truncl.c
+++ b/sysdeps/ieee754/ldbl-128/s_truncl.c
@@ -18,6 +18,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_private.h>

diff --git a/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c b/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c
index c1e0efa5e12df352d933fb570dffe59fffb3fd60..36801213d402cd13e4e7ff01f228b10f8055525d 100644 (file)
--- a/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c
+++ b/sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c
@@ -179,8 +179,8 @@ __ieee754_gammal_r (long double x, int *signgamp)
        }
       else
        {
-         long double tx = __truncl (x);
-         *signgamp = (tx == 2.0L * __truncl (tx / 2.0L)) ? -1 : 1;
+         long double tx = truncl (x);
+         *signgamp = (tx == 2.0L * truncl (tx / 2.0L)) ? -1 : 1;
          if (x <= -191.0L)
            /* Underflow.  */
            ret = LDBL_MIN * LDBL_MIN;

diff --git a/sysdeps/ieee754/ldbl-128ibm/s_truncl.c b/sysdeps/ieee754/ldbl-128ibm/s_truncl.c
index 96465678838b3d00687a8f000cf9bb769d222194..3d658d32feea164c7f8cf78c4488c955e650c188 100644 (file)
--- a/sysdeps/ieee754/ldbl-128ibm/s_truncl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_truncl.c
@@ -17,12 +17,17 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_private.h>
 #include <math_ldbl_opt.h>
 #include <float.h>
 #include <ieee754.h>
 
+double ceil (double) asm ("__ceil");
+double floor (double) asm ("__floor");
+double trunc (double) asm ("__trunc");
+
 
 long double
 __truncl (long double x)
@@ -36,7 +41,7 @@ __truncl (long double x)
                        && __builtin_isless (__builtin_fabs (xh),
                                             __builtin_inf ()), 1))
     {
-      hi = __trunc (xh);
+      hi = trunc (xh);
       if (hi != xh)
        {
          /* The high part is not an integer; the low part does not

diff --git a/sysdeps/ieee754/ldbl-96/e_gammal_r.c b/sysdeps/ieee754/ldbl-96/e_gammal_r.c
index addb60d748fd7ed0d2850b3ddaa2d74b3520c183..b0970335b9c8b3242c317b5b189fa08ac452377f 100644 (file)
--- a/sysdeps/ieee754/ldbl-96/e_gammal_r.c
+++ b/sysdeps/ieee754/ldbl-96/e_gammal_r.c
@@ -171,8 +171,8 @@ __ieee754_gammal_r (long double x, int *signgamp)
        }
       else
        {
-         long double tx = __truncl (x);
-         *signgamp = (tx == 2.0L * __truncl (tx / 2.0L)) ? -1 : 1;
+         long double tx = truncl (x);
+         *signgamp = (tx == 2.0L * truncl (tx / 2.0L)) ? -1 : 1;
          if (x <= -1766.0L)
            /* Underflow.  */
            ret = LDBL_MIN * LDBL_MIN;

diff --git a/sysdeps/m68k/m680x0/fpu/s_trunc_template.c b/sysdeps/m68k/m680x0/fpu/s_trunc_template.c
index 39a6822cfb3f400314b41e7561e36adca4ccef2b..7dc534f9c2ce1bb3ea28fd6825a72bb5d6bf785b 100644 (file)
--- a/sysdeps/m68k/m680x0/fpu/s_trunc_template.c
+++ b/sysdeps/m68k/m680x0/fpu/s_trunc_template.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>
 
 FLOAT

diff --git a/sysdeps/powerpc/fpu/math_private.h b/sysdeps/powerpc/fpu/math_private.h
index b71278ade46cd43bc72dd26170feac80e0279a4b..7f2acbb83305a85a2c2080fa64ce22f5c5447f02 100644 (file)
--- a/sysdeps/powerpc/fpu/math_private.h
+++ b/sysdeps/powerpc/fpu/math_private.h
@@ -57,26 +57,6 @@ __ieee754_sqrtf128 (_Float128 __x)
      __z; })
 # endif
 
-# ifndef __trunc
-#  define __trunc(x)                   \
-    ({ double __z;                     \
-     __asm __volatile (                        \
-       "       friz %0,%1\n"           \
-               : "=f" (__z)            \
-               : "f" (x));             \
-     __z; })
-# endif
-# ifndef __truncf
-#  define __truncf(x)                  \
-    ({ float __z;                      \
-     __asm __volatile (                        \
-       "       friz %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/powerpc32/power4/fpu/multiarch/s_trunc.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_trunc.c
index 5712d6a3b2f329b976b30bbbd4eb62b71743ad73..eef0db6c2b4072296079d0df4d9f4a0ad60feabf 100644 (file)
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_trunc.c
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_trunc.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_truncf.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_truncf.c
index d5d72b52fe62e9718155b821b965a97d50309e1e..4943b2d23dfcc509186de5aaf7366d20c1500f25 100644 (file)
--- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_truncf.c
+++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_truncf.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_trunc.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc.c
index 989ffc9cf4ca55531270f9654e523441b609f7fc..5a720d8fcbb140b080f514691de5357912108a8d 100644 (file)
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc.c
+++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc.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_truncf.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf.c
index fc5351b0ca4f51c097ce2114ebd91ea21a00a622..3869c42fe02706f6aa59d998bf293607f6f992e3 100644 (file)
--- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf.c
+++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf.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/riscv/rv64/rvd/s_trunc.c b/sysdeps/riscv/rv64/rvd/s_trunc.c
index ec28090ca0033bfd0a14485015a853d51f08768e..ab755b7679287843acafe458415ef0d3b6e1de30 100644 (file)
--- a/sysdeps/riscv/rv64/rvd/s_trunc.c
+++ b/sysdeps/riscv/rv64/rvd/s_trunc.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_private.h>
 #include <fenv_private.h>

diff --git a/sysdeps/riscv/rvf/s_truncf.c b/sysdeps/riscv/rvf/s_truncf.c
index ad5c2e217cfe6c9ec6b9dbdaf4ed9fc110e03953..0c90092a4a68b48bba184326260f8e4232158051 100644 (file)
--- a/sysdeps/riscv/rvf/s_truncf.c
+++ b/sysdeps/riscv/rvf/s_truncf.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_private.h>
 #include <fenv_private.h>

diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_trunc.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_trunc.c
index 82ad6ffccac8428b79b950a592f0ddb52cbfcba4..73b0b559a9973d59b4a58f6d79c9a4fdc26a670c 100644 (file)
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_trunc.c
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_trunc.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 <sparc-ifunc.h>
 #include <math.h>
 #include <libm-alias-double.h>

diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_truncf.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_truncf.c
index 1c7a4a038fd3c5e0b69d71fd2f23d9758724dcf0..8098f569e604992f42e994867cd9dc07424177e3 100644 (file)
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_truncf.c
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_truncf.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 <sparc-ifunc.h>
 #include <math.h>
 #include <libm-alias-float.h>

diff --git a/sysdeps/x86_64/fpu/multiarch/s_trunc.c b/sysdeps/x86_64/fpu/multiarch/s_trunc.c
index a1b0c606303a0cdbd7e03812ca357f4f27b110b7..e606e040d5ddd9b07d81b925454646ff0a16bc7e 100644 (file)
--- a/sysdeps/x86_64/fpu/multiarch/s_trunc.c
+++ b/sysdeps/x86_64/fpu/multiarch/s_trunc.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 <libm-alias-double.h>
 
 #define trunc __redirect_trunc

diff --git a/sysdeps/x86_64/fpu/multiarch/s_truncf.c b/sysdeps/x86_64/fpu/multiarch/s_truncf.c
index a7e220bd0c0a2f5cc458f68180326b812a1fac43..69ebd010ba2f0286b75b4d8b344ae4acb531ce23 100644 (file)
--- a/sysdeps/x86_64/fpu/multiarch/s_truncf.c
+++ b/sysdeps/x86_64/fpu/multiarch/s_truncf.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 <libm-alias-float.h>
 
 #define truncf __redirect_truncf