Fix ldbl-128ibm ceill, floorl inlining of ceil, floor [committed]

Message ID alpine.DEB.2.21.1809181324390.22179@digraph.polyomino.org.uk
State New
Headers show
Series
  • Fix ldbl-128ibm ceill, floorl inlining of ceil, floor [committed]
Related show

Commit Message

Joseph Myers Sept. 18, 2018, 1:24 p.m.
The ldbl-128ibm implementations of ceill and floorl call the
corresponding double functions.  This patch fixes those
implementations to call those functions as ceil and floor rather than
as __ceil and __floor, so that the proper inlining takes place when
possible, while including local asm redirections for when the
functions are not inlined since NO_MATH_REDIRECT applies to the double
functions as well as to the long double ones.

Tested with build-many-glibcs.py for all its powerpc configurations.  
Committed.

2018-09-18  Joseph Myers  <joseph@codesourcery.com>

	* sysdeps/ieee754/ldbl-128ibm/s_ceill.c (ceil): Redirect to
	__ceil.
	(__ceill): Call ceil instead of __ceil.
	* sysdeps/ieee754/ldbl-128ibm/s_floorl.c (floor): Redirect to
	__floor.
	(__floorl): Call floor instead of __floor.

Patch

diff --git a/sysdeps/ieee754/ldbl-128ibm/s_ceill.c b/sysdeps/ieee754/ldbl-128ibm/s_ceill.c
index 800835411a..6ca13766be 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_ceill.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_ceill.c
@@ -24,6 +24,8 @@ 
 #include <float.h>
 #include <ieee754.h>
 
+double ceil (double) asm ("__ceil");
+
 
 long double
 __ceill (long double x)
@@ -37,7 +39,7 @@  __ceill (long double x)
 			&& __builtin_isless (__builtin_fabs (xh),
 					     __builtin_inf ()), 1))
     {
-      hi = __ceil (xh);
+      hi = ceil (xh);
       if (hi != xh)
 	{
 	  /* The high part is not an integer; the low part does not
@@ -48,7 +50,7 @@  __ceill (long double x)
       else
 	{
 	  /* The high part is a nonzero integer.  */
-	  lo = __ceil (xl);
+	  lo = ceil (xl);
 	  xh = hi;
 	  xl = lo;
 	  ldbl_canonicalize_int (&xh, &xl);
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_floorl.c b/sysdeps/ieee754/ldbl-128ibm/s_floorl.c
index f33b6ad701..8767bac917 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_floorl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_floorl.c
@@ -24,6 +24,8 @@ 
 #include <float.h>
 #include <ieee754.h>
 
+double floor (double) asm ("__floor");
+
 
 long double
 __floorl (long double x)
@@ -37,7 +39,7 @@  __floorl (long double x)
 			&& __builtin_isless (__builtin_fabs (xh),
 					     __builtin_inf ()), 1))
     {
-      hi = __floor (xh);
+      hi = floor (xh);
       if (hi != xh)
 	{
 	  /* The high part is not an integer; the low part does not
@@ -48,7 +50,7 @@  __floorl (long double x)
       else
 	{
 	  /* The high part is a nonzero integer.  */
-	  lo = __floor (xl);
+	  lo = floor (xl);
 	  xh = hi;
 	  xl = lo;
 	  ldbl_canonicalize_int (&xh, &xl);