about summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog35
-rw-r--r--stdlib/strtold.c14
-rw-r--r--sysdeps/ieee754/float128/strtof128.c17
-rw-r--r--sysdeps/ieee754/float128/strtof128_l.c15
-rw-r--r--sysdeps/ieee754/ldbl-128/strtold_l.c15
-rw-r--r--sysdeps/ieee754/ldbl-64-128/strtold_l.c15
-rw-r--r--sysdeps/ieee754/ldbl-96/strtold_l.c15
7 files changed, 126 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 145080e995..b58c4e21ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,40 @@
 2017-11-24  Joseph Myers  <joseph@codesourcery.com>
 
+	* stdlib/strtold.c [__HAVE_FLOAT64X_LONG_DOUBLE] (strtof64x):
+	Define and later undefine as macro.  Define as weak alias if
+	[!USE_WIDE_CHAR].
+	[__HAVE_FLOAT64X_LONG_DOUBLE] (wcstof64x): Define and later
+	undefine as macro.  Define as weak alias if [USE_WIDE_CHAR].
+	* sysdeps/ieee754/float128/strtof128.c: Include <bits/floatn.h>.
+	[__HAVE_FLOAT64X && !__HAVE_FLOAT64X_LONG_DOUBLE] (strtof64x):
+	Define and later undefine as macro.  Define as weak alias if
+	[!USE_WIDE_CHAR].
+	[__HAVE_FLOAT64X && !__HAVE_FLOAT64X_LONG_DOUBLE] (wcstof64x):
+	Define and later undefine as macro.  Define as weak alias if
+	[USE_WIDE_CHAR].
+	* sysdeps/ieee754/float128/strtof128_l.c
+	[__HAVE_FLOAT64X && !__HAVE_FLOAT64X_LONG_DOUBLE] (strtof64x_l):
+	Define and later undefine as macro.  Define as weak alias if
+	[!USE_WIDE_CHAR].
+	[__HAVE_FLOAT64X && !__HAVE_FLOAT64X_LONG_DOUBLE] (wcstof64x_l):
+	Define and later undefine as macro.  Define as weak alias if
+	[USE_WIDE_CHAR].
+	* sysdeps/ieee754/ldbl-128/strtold_l.c
+	[__HAVE_FLOAT64X_LONG_DOUBLE] (strtof64x_l): Define and later
+	undefine as macro.  Define as weak alias if [!USE_WIDE_CHAR].
+	[__HAVE_FLOAT64X_LONG_DOUBLE] (wcstof64x_l): Define and later
+	undefine as macro.  Define as weak alias if [USE_WIDE_CHAR].
+	* sysdeps/ieee754/ldbl-64-128/strtold_l.c
+	[__HAVE_FLOAT64X_LONG_DOUBLE] (strtof64x_l): Define and later
+	undefine as macro.  Define as weak alias if [!USE_WIDE_CHAR].
+	[__HAVE_FLOAT64X_LONG_DOUBLE] (wcstof64x_l): Define and later
+	undefine as macro.  Define as weak alias if [USE_WIDE_CHAR].
+	* sysdeps/ieee754/ldbl-96/strtold_l.c
+	[__HAVE_FLOAT64X_LONG_DOUBLE] (strtof64x_l): Define and later
+	undefine as macro.  Define as weak alias if [!USE_WIDE_CHAR].
+	[__HAVE_FLOAT64X_LONG_DOUBLE] (wcstof64x_l): Define and later
+	undefine as macro.  Define as weak alias if [USE_WIDE_CHAR].
+
 	* math/test-float64x.h: New file.
 	* math/Makefile (type-float64x-yes): New variable.
 	(test-types): Add $(type-float64x-$(float64x-alias-fcts)).
diff --git a/stdlib/strtold.c b/stdlib/strtold.c
index 4e683b44b6..167a727798 100644
--- a/stdlib/strtold.c
+++ b/stdlib/strtold.c
@@ -27,6 +27,10 @@
 # define strtof128 __hide_strtof128
 # define wcstof128 __hide_wcstof128
 #endif
+#if __HAVE_FLOAT64X_LONG_DOUBLE
+# define strtof64x __hide_strtof64x
+# define wcstof64x __hide_wcstof64x
+#endif
 
 #ifdef __LONG_DOUBLE_MATH_OPTIONAL
 # include <wchar.h>
@@ -78,3 +82,13 @@ weak_alias (NEW (wcstold), wcstof128)
 weak_alias (NEW (strtold), strtof128)
 # endif
 #endif
+
+#if __HAVE_FLOAT64X_LONG_DOUBLE
+# undef strtof64x
+# undef wcstof64x
+# ifdef USE_WIDE_CHAR
+weak_alias (NEW (wcstold), wcstof64x)
+# else
+weak_alias (NEW (strtold), strtof64x)
+# endif
+#endif
diff --git a/sysdeps/ieee754/float128/strtof128.c b/sysdeps/ieee754/float128/strtof128.c
index 63cc80d58d..e82bff6b62 100644
--- a/sysdeps/ieee754/float128/strtof128.c
+++ b/sysdeps/ieee754/float128/strtof128.c
@@ -19,6 +19,13 @@
 /* The actual implementation for all floating point sizes is in strtod.c.
    These macros tell it to produce the `_Float128' version, `strtof128'.  */
 
+#include <bits/floatn.h>
+
+#if __HAVE_FLOAT64X && !__HAVE_FLOAT64X_LONG_DOUBLE
+# define strtof64x __hide_strtof64x
+# define wcstof64x __hide_wcstof64x
+#endif
+
 #define FLOAT		_Float128
 #define FLT		FLT128
 #ifdef USE_WIDE_CHAR
@@ -32,3 +39,13 @@
 #include <float128_private.h>
 
 #include <stdlib/strtod.c>
+
+#if __HAVE_FLOAT64X && !__HAVE_FLOAT64X_LONG_DOUBLE
+# undef strtof64x
+# undef wcstof64x
+# ifdef USE_WIDE_CHAR
+weak_alias (wcstof128, wcstof64x)
+# else
+weak_alias (strtof128, strtof64x)
+# endif
+#endif
diff --git a/sysdeps/ieee754/float128/strtof128_l.c b/sysdeps/ieee754/float128/strtof128_l.c
index a541d60ef3..833a1360d0 100644
--- a/sysdeps/ieee754/float128/strtof128_l.c
+++ b/sysdeps/ieee754/float128/strtof128_l.c
@@ -21,6 +21,11 @@
 /* Bring in potential typedef for _Float128 early for declaration below.  */
 #include <bits/floatn.h>
 
+#if __HAVE_FLOAT64X && !__HAVE_FLOAT64X_LONG_DOUBLE
+# define strtof64x_l __hide_strtof64x_l
+# define wcstof64x_l __hide_wcstof64x_l
+#endif
+
 extern _Float128 ____strtof128_l_internal (const char *, char **,
 					   int, locale_t);
 
@@ -41,3 +46,13 @@ extern _Float128 ____strtof128_l_internal (const char *, char **,
 #include <float128_private.h>
 
 #include <stdlib/strtod_l.c>
+
+#if __HAVE_FLOAT64X && !__HAVE_FLOAT64X_LONG_DOUBLE
+# undef strtof64x_l
+# undef wcstof64x_l
+# ifdef USE_WIDE_CHAR
+weak_alias (wcstof128_l, wcstof64x_l)
+# else
+weak_alias (strtof128_l, strtof64x_l)
+# endif
+#endif
diff --git a/sysdeps/ieee754/ldbl-128/strtold_l.c b/sysdeps/ieee754/ldbl-128/strtold_l.c
index ea5c91919a..c0d6b73367 100644
--- a/sysdeps/ieee754/ldbl-128/strtold_l.c
+++ b/sysdeps/ieee754/ldbl-128/strtold_l.c
@@ -39,6 +39,11 @@
 # define wcstof128_l __hide_wcstof128_l
 #endif
 
+#if __HAVE_FLOAT64X_LONG_DOUBLE
+# define strtof64x_l __hide_strtof64x_l
+# define wcstof64x_l __hide_wcstof64x_l
+#endif
+
 #include <strtod_l.c>
 
 #if __HAVE_FLOAT128 && !__HAVE_DISTINCT_FLOAT128
@@ -50,3 +55,13 @@ weak_alias (wcstold_l, wcstof128_l)
 weak_alias (strtold_l, strtof128_l)
 # endif
 #endif
+
+#if __HAVE_FLOAT64X_LONG_DOUBLE
+# undef strtof64x_l
+# undef wcstof64x_l
+# ifdef USE_WIDE_CHAR
+weak_alias (wcstold_l, wcstof64x_l)
+# else
+weak_alias (strtold_l, strtof64x_l)
+# endif
+#endif
diff --git a/sysdeps/ieee754/ldbl-64-128/strtold_l.c b/sysdeps/ieee754/ldbl-64-128/strtold_l.c
index f6f717172c..bca493a9ff 100644
--- a/sysdeps/ieee754/ldbl-64-128/strtold_l.c
+++ b/sysdeps/ieee754/ldbl-64-128/strtold_l.c
@@ -22,6 +22,11 @@
 # define wcstof128_l __hide_wcstof128_l
 #endif
 
+#if __HAVE_FLOAT64X_LONG_DOUBLE
+# define strtof64x_l __hide_strtof64x_l
+# define wcstof64x_l __hide_wcstof64x_l
+#endif
+
 #include <math.h>
 #include <stdlib.h>
 #include <wchar.h>
@@ -74,3 +79,13 @@ weak_alias (____new_wcstold_l, wcstof128_l)
 weak_alias (____new_strtold_l, strtof128_l)
 # endif
 #endif
+
+#if __HAVE_FLOAT64X_LONG_DOUBLE
+# undef strtof64x_l
+# undef wcstof64x_l
+# ifdef USE_WIDE_CHAR
+weak_alias (____new_wcstold_l, wcstof64x_l)
+# else
+weak_alias (____new_strtold_l, strtof64x_l)
+# endif
+#endif
diff --git a/sysdeps/ieee754/ldbl-96/strtold_l.c b/sysdeps/ieee754/ldbl-96/strtold_l.c
index 251f91ba9d..946bca8932 100644
--- a/sysdeps/ieee754/ldbl-96/strtold_l.c
+++ b/sysdeps/ieee754/ldbl-96/strtold_l.c
@@ -34,4 +34,19 @@
 #define MPN2FLOAT	__mpn_construct_long_double
 #define FLOAT_HUGE_VAL	HUGE_VALL
 
+#if __HAVE_FLOAT64X_LONG_DOUBLE
+# define strtof64x_l __hide_strtof64x_l
+# define wcstof64x_l __hide_wcstof64x_l
+#endif
+
 #include <stdlib/strtod_l.c>
+
+#if __HAVE_FLOAT64X_LONG_DOUBLE
+# undef strtof64x_l
+# undef wcstof64x_l
+# ifdef USE_WIDE_CHAR
+weak_alias (wcstold_l, wcstof64x_l)
+# else
+weak_alias (strtold_l, strtof64x_l)
+# endif
+#endif
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-08-05 15:21:00 +0000