Remove __nan{f,,l} macros

Use the GCC builtin instead.  With the exception of the
files built from a template, they are unused.  This
is preparation for making the s_nanF objects generated.

diff --git a/ChangeLog b/ChangeLog
index d68dfed061365b5a1cd86994621b0efe5e487d79..8423f60979798dc2facd3735eb7016002fa198d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2016-09-20  Paul E. Murphy  <murphyp@linux.vnet.ibm.com>
+
+       * math/s_nanf.c: Remove __nanf undef.
+       * math/s_nan.c: Remove __nan undef.
+       * math/s_nanl.c: Remove __nanl undef.
+
+       * sysdeps/generic/math_private.h (__nan): Remove macro
+       override.
+       (__nanf): Likewise.
+       (__nanl): Likewise.
+
 2016-09-20  Paul E. Murphy  <murphyp@linux.vnet.ibm.com>
 
        * math/Makefile (gen-all-calls): New variable.

diff --git a/math/s_nan.c b/math/s_nan.c
index d9af7752ce397a9207209d9b5d517ac4a1cd6fc6..03e95f56ad781a123402c2cd2c304bd393522ec9 100644 (file)
--- a/math/s_nan.c
+++ b/math/s_nan.c
@@ -24,7 +24,6 @@
 #include <ieee754.h>
 
 
-#undef __nan
 double
 __nan (const char *tagp)
 {

diff --git a/math/s_nanf.c b/math/s_nanf.c
index 0dd6778f67df61f032c978260c9f3f33d9c40fcd..3046720a11bac1cf5af529852b22859650863590 100644 (file)
--- a/math/s_nanf.c
+++ b/math/s_nanf.c
@@ -24,7 +24,6 @@
 #include <ieee754.h>
 
 
-#undef __nanf
 float
 __nanf (const char *tagp)
 {

diff --git a/math/s_nanl.c b/math/s_nanl.c
index e6149bc0c7a9c01f84c1bc4b06d1cbc14e0e8ff4..4b7b3d563c70a89e5dd596d17cd224cfeb8b0964 100644 (file)
--- a/math/s_nanl.c
+++ b/math/s_nanl.c
@@ -24,7 +24,6 @@
 #include <ieee754.h>
 
 
-#undef __nanl
 long double
 __nanl (const char *tagp)
 {

diff --git a/sysdeps/generic/math-type-macros.h b/sysdeps/generic/math-type-macros.h
index bd9e25a8164339d484df3ec562b68b67af61e2a0..78b883c8777a4b12a03d0a4653dfca28d393eb73 100644 (file)
--- a/sysdeps/generic/math-type-macros.h
+++ b/sysdeps/generic/math-type-macros.h
@@ -74,7 +74,7 @@
 #define __M_CONCAT(a,b) a ## b
 #define __M_CONCATX(a,b) __M_CONCAT(a,b)
 
-#define M_NAN M_SUF (__nan) ("")
+#define M_NAN M_SUF (__builtin_nan) ("")
 #define M_MAX_EXP __M_CONCATX (M_PFX, _MAX_EXP)
 #define M_MIN __M_CONCATX (M_PFX, _MIN)
 #define M_MAX __M_CONCATX (M_PFX, _MAX)

diff --git a/sysdeps/generic/math_private.h b/sysdeps/generic/math_private.h
index 24adcfb4335850aa37ddbad16c8ddca7768a4973..28e5df0a240e314837243f36da7cb9b37745cf3c 100644 (file)
--- a/sysdeps/generic/math_private.h
+++ b/sysdeps/generic/math_private.h
@@ -775,11 +775,4 @@ libc_feresetround_noex_ctx (struct rm_ctx *ctx)
   SET_RESTORE_ROUND_GENERIC (RM, libc_feholdsetround_53bit,          \
                             libc_feresetround_53bit)
 
-#define __nan(str) \
-  (__builtin_constant_p (str) && str[0] == '\0' ? NAN : __nan (str))
-#define __nanf(str) \
-  (__builtin_constant_p (str) && str[0] == '\0' ? NAN : __nan (str))
-#define __nanl(str) \
-  (__builtin_constant_p (str) && str[0] == '\0' ? NAN : __nan (str))
-
 #endif /* _MATH_PRIVATE_H_ */