summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--stdlib/strfromd.c25
2 files changed, 31 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ed099d037..bcc49a1dc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2017-12-05 Joseph Myers <joseph@codesourcery.com>
+ * stdlib/strfromd.c: Include <bits/floatn.h>.
+ [__HAVE_FLOAT64 && !__HAVE_DISTINCT_FLOAT64] (strfromf64): Define
+ and later undefine as macro and define as weak alias.
+ [__HAVE_FLOAT32X && !__HAVE_DISTINCT_FLOAT32X] (strfromf32x):
+ Likewise.
+
* math/test-float32x.h: New file.
* math/test-float64.h: Likewise.
diff --git a/stdlib/strfromd.c b/stdlib/strfromd.c
index 5342059008..85c555540d 100644
--- a/stdlib/strfromd.c
+++ b/stdlib/strfromd.c
@@ -16,7 +16,32 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+#include <bits/floatn.h>
+
#define FLOAT double
#define STRFROM strfromd
+#if __HAVE_FLOAT64 && !__HAVE_DISTINCT_FLOAT64
+# define strfromf64 __hide_strfromf64
+#endif
+#if __HAVE_FLOAT32X && !__HAVE_DISTINCT_FLOAT32X
+# define strfromf32x __hide_strfromf32x
+#endif
+
+#include <stdlib.h>
+
+#if __HAVE_FLOAT64 && !__HAVE_DISTINCT_FLOAT64
+# undef strfromf64
+#endif
+#if __HAVE_FLOAT32X && !__HAVE_DISTINCT_FLOAT32X
+# undef strfromf32x
+#endif
+
#include "strfrom-skeleton.c"
+
+#if __HAVE_FLOAT64 && !__HAVE_DISTINCT_FLOAT64
+weak_alias (strfromd, strfromf64)
+#endif
+#if __HAVE_FLOAT32X && !__HAVE_DISTINCT_FLOAT32X
+weak_alias (strfromd, strfromf32x)
+#endif