ldbl-128: Use mathx_hidden_def inplace of hidden_def

This provides a extra macro expansion before invoking
the hidden_def macro.  This is necessary to build the
ldbl-128 files as float128 correctly.

	* sysdeps/generic/math_private.h:
	(mathx_hidden_def): New macro.
	* sysdeps/ieee754/ldbl-128/s_finitel.c: Replace hidden_def with
	the above.
	* sysdeps/ieee754/ldbl-128/s_isinfl.c: Likewise.
	* sysdeps/ieee754/ldbl-128/s_isnanl.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 7d023fc8674f16d71803db50d28e1fc42e148d80..c0bb010f5fe61b79edc492b71c3eed627608e57b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-05-04  Paul E. Murphy  <murphyp@linux.vnet.ibm.com>
+
+       * sysdeps/generic/math_private.h (mathx_hidden_def): New macro.
+       * sysdeps/ieee754/ldbl-128/s_finitel.c: Replace hidden_def with
+       the above.
+       * sysdeps/ieee754/ldbl-128/s_isinfl.c: Likewise.
+       * sysdeps/ieee754/ldbl-128/s_isnanl.c: Likewise.
+
 2017-05-04  Joseph Myers  <joseph@codesourcery.com>
 
        [BZ #21445]

diff --git a/sysdeps/generic/math_private.h b/sysdeps/generic/math_private.h
index aba1cb9cbcfbf5bdf48713ff7c86b7430145968f..4d8a35ff87863565242db5ae5bf44495aa878437 100644 (file)
--- a/sysdeps/generic/math_private.h
+++ b/sysdeps/generic/math_private.h
@@ -181,6 +181,10 @@ do {                                                               \
 } while (0)
 #endif
 
+/* We need to guarantee an expansion of name when building
+   ldbl-128 files as another type (e.g _Float128).  */
+#define mathx_hidden_def(name) hidden_def(name)
+
 /* Get long double macros from a separate header.  */
 #include <math_ldbl.h>
 

diff --git a/sysdeps/ieee754/ldbl-128/s_finitel.c b/sysdeps/ieee754/ldbl-128/s_finitel.c
index feb459092499249afbb0932dd96badb209cb2816..7c699688fe2cf75f20981db714569123c89dc784 100644 (file)
--- a/sysdeps/ieee754/ldbl-128/s_finitel.c
+++ b/sysdeps/ieee754/ldbl-128/s_finitel.c
@@ -32,5 +32,5 @@ int __finitel(_Float128 x)
        return (int)((u_int64_t)((hx&0x7fff000000000000LL)
                                 -0x7fff000000000000LL)>>63);
 }
-hidden_def (__finitel)
+mathx_hidden_def (__finitel)
 weak_alias (__finitel, finitel)

diff --git a/sysdeps/ieee754/ldbl-128/s_isinfl.c b/sysdeps/ieee754/ldbl-128/s_isinfl.c
index dce8fc0b5de7dfa5c0ec18626741022c72c28133..a41e8cf44bddeb7fa4439be6f560f2a1ae20d0ea 100644 (file)
--- a/sysdeps/ieee754/ldbl-128/s_isinfl.c
+++ b/sysdeps/ieee754/ldbl-128/s_isinfl.c
@@ -25,5 +25,5 @@ __isinfl (_Float128 x)
        lx |= -lx;
        return ~(lx >> 63) & (hx >> 62);
 }
-hidden_def (__isinfl)
+mathx_hidden_def (__isinfl)
 weak_alias (__isinfl, isinfl)

diff --git a/sysdeps/ieee754/ldbl-128/s_isnanl.c b/sysdeps/ieee754/ldbl-128/s_isnanl.c
index 1dee642512d74792dafae55def9e2d3eec4d7c8d..80f97fea4c34cb5ba8d6564ca5275789549ae6e5 100644 (file)
--- a/sysdeps/ieee754/ldbl-128/s_isnanl.c
+++ b/sysdeps/ieee754/ldbl-128/s_isnanl.c
@@ -34,5 +34,5 @@ int __isnanl(_Float128 x)
        hx = 0x7fff000000000000LL - hx;
        return (int)((u_int64_t)hx>>63);
 }
-hidden_def (__isnanl)
+mathx_hidden_def (__isnanl)
 weak_alias (__isnanl, isnanl)