aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog66
-rw-r--r--manual/arith.texi2
-rw-r--r--stdlib/strtod_nan.c2
-rw-r--r--stdlib/strtod_nan_main.c2
-rw-r--r--stdlib/strtof_nan.c2
-rw-r--r--stdlib/strtold_nan.c2
-rw-r--r--sysdeps/generic/math-nan-payload-double.h (renamed from stdlib/strtod_nan_double.h)5
-rw-r--r--sysdeps/generic/math-nan-payload-float.h (renamed from stdlib/strtod_nan_float.h)5
-rw-r--r--sysdeps/generic/math-type-macros-double.h3
-rw-r--r--sysdeps/generic/math-type-macros-float.h3
-rw-r--r--sysdeps/generic/math-type-macros-float128.h1
-rw-r--r--sysdeps/generic/math-type-macros-ldouble.h3
-rw-r--r--sysdeps/generic/math-type-macros.h9
-rw-r--r--sysdeps/ieee754/float128/math-nan-payload-float128.h (renamed from sysdeps/ieee754/float128/strtod_nan_float128.h)7
-rw-r--r--sysdeps/ieee754/float128/strtof128_nan.c4
-rw-r--r--sysdeps/ieee754/float128/wcstof128_nan.c3
-rw-r--r--sysdeps/ieee754/ldbl-128/math-nan-payload-ldouble.h (renamed from sysdeps/ieee754/ldbl-128/strtod_nan_ldouble.h)5
-rw-r--r--sysdeps/ieee754/ldbl-128ibm/math-nan-payload-ldouble.h (renamed from sysdeps/ieee754/ldbl-128ibm/strtod_nan_ldouble.h)5
-rw-r--r--sysdeps/ieee754/ldbl-96/math-nan-payload-ldouble.h (renamed from sysdeps/ieee754/ldbl-96/strtod_nan_ldouble.h)5
-rw-r--r--wcsmbs/wcstod_nan.c2
-rw-r--r--wcsmbs/wcstof_nan.c2
-rw-r--r--wcsmbs/wcstold_nan.c2
22 files changed, 105 insertions, 35 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e04684..88ffee6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,69 @@
+2018-05-16 Florian Weimer <fweimer@redhat.com>
+
+ * stdlib/strtod_nan.c: Include <math-type-macros-double.h> instead
+ of <strtod_nan_double.h>.
+ * stdlib/strtod_nan_main.c (STRTOD_NAN): Use SET_NAN_PAYLOAD
+ instead of SET_MANTISSA.
+ * stdlib/strtof_nan.c: Include <math-type-macros-float.h> instead
+ of include <strtod_nan_float.h>.
+ * stdlib/strtold_nan.c: Include <math-type-macros-ldouble.h>
+ instead of <strtod_nan_ldouble.h>.
+ * stdlib/strtod_nan_double.h: Move to ...
+ * sysdeps/generic/math-nan-payload-double.h: ... here.
+ (FLOAT): Remove definition.
+ (SET_MANTISSA): Rename to ...
+ (SET_NAN_PAYLOAD): ... this.
+ * stdlib/strtod_nan_float.h: Move to ...
+ * sysdeps/generic/math-nan-payload-float.h: ... here.
+ (FLOAT): Remove definition.
+ (SET_MANTISSA): Rename to ...
+ (SET_NAN_PAYLOAD): ... this.
+ * sysdeps/generic/math-type-macros-double.h: Include
+ <math-nan-payload-double.h>. Include <math/math-svid-compat.h>
+ instead of <math-svid-compat.h>.
+ * sysdeps/generic/math-type-macros-float.h: Include
+ <math-nan-payload-float.h>. Include <math/math-svid-compat.h>
+ instead of <math-svid-compat.h>.
+ * sysdeps/generic/math-type-macros-float128.h: Include
+ <math-nan-payload-float128.h>.
+ * sysdeps/generic/math-type-macros-ldouble.h: Include
+ <math-nan-payload-ldouble.h>. Include <math/math-svid-compat.h>
+ instead of <math-svid-compat.h>.
+ * sysdeps/generic/math-type-macros.h: Document SET_NAN_PAYLOAD and
+ check for definition.
+ * sysdeps/ieee754/float128/strtod_nan_float128.h: Move to ...
+ * sysdeps/ieee754/float128/math-nan-payload-float128.h: ... here.
+ Include <ieee754_float128.h>.
+ (FLOAT): Remove definition.
+ (SET_MANTISSA): Rename to ...
+ (SET_NAN_PAYLOAD): ... this.
+ * sysdeps/ieee754/float128/strtof128_nan.c: Include
+ <math-type-macros-float128.h> instead of <strtod_nan_float128.h>.
+ Do not include <float128_private.h>.
+ * sysdeps/ieee754/float128/wcstof128_nan.c: Likewise.
+ * sysdeps/ieee754/ldbl-128/strtod_nan_ldouble.h: Move to ...
+ * sysdeps/ieee754/ldbl-128/math-nan-payload-ldouble.h: ... here.
+ (FLOAT): Remove definition.
+ (SET_MANTISSA): Rename to ...
+ (SET_NAN_PAYLOAD): ... this.
+ * sysdeps/ieee754/ldbl-128ibm/strtod_nan_ldouble.h: Move to ...
+ * sysdeps/ieee754/ldbl-128ibm/math-nan-payload-ldouble.h: ... here.
+ (FLOAT): Remove definition.
+ (SET_MANTISSA): Rename to ...
+ (SET_NAN_PAYLOAD): ... this.
+ * sysdeps/ieee754/ldbl-96/strtod_nan_ldouble.h: Move to ...
+ * sysdeps/ieee754/ldbl-96/math-nan-payload-ldouble.h: ... here.
+ (FLOAT): Remove definition.
+ (SET_MANTISSA): Rename to ...
+ (SET_NAN_PAYLOAD): ... this.
+ * wcsmbs/wcstod_nan.c: Include <math-type-macros-double.h> instead
+ of "../stdlib/strtod_nan_double.h".
+ * wcsmbs/wcstof_nan.c: Include <math-type-macros-float.h> instead
+ of "../stdlib/strtod_nan_float.h".
+ * wcsmbs/wcstold_nan.c: Include <math-type-macros-ldouble.h>
+ instead of "../stdlib/strtod_nan_ldouble.h".
+ * manual/arith.texi (Parsing of Floats): Adjust comment.
+
2018-05-16 Joseph Myers <joseph@codesourcery.com>
* math/Makefile (libm-narrow-fns): Add mul.
diff --git a/manual/arith.texi b/manual/arith.texi
index 3c5b69b..2764f69 100644
--- a/manual/arith.texi
+++ b/manual/arith.texi
@@ -2784,7 +2784,7 @@ as well.
@c mpn_lshift_1 -> mpn_lshift ok
@c STRTOF_INTERNAL
@c MPN_VAR ok
-@c SET_MANTISSA ok
+@c SET_NAN_PAYLOAD ok
@c STRNCASECMP ok, wide and narrow
@c round_and_return ok
@c mpn_mul ok
diff --git a/stdlib/strtod_nan.c b/stdlib/strtod_nan.c
index f64fec1..c5876b5 100644
--- a/stdlib/strtod_nan.c
+++ b/stdlib/strtod_nan.c
@@ -18,7 +18,7 @@
<http://www.gnu.org/licenses/>. */
#include <strtod_nan_narrow.h>
-#include <strtod_nan_double.h>
+#include <math-type-macros-double.h>
#define STRTOD_NAN __strtod_nan
#include <strtod_nan_main.c>
diff --git a/stdlib/strtod_nan_main.c b/stdlib/strtod_nan_main.c
index 12f6e73..80ecb78 100644
--- a/stdlib/strtod_nan_main.c
+++ b/stdlib/strtod_nan_main.c
@@ -52,7 +52,7 @@ STRTOD_NAN (const STRING_TYPE *str, STRING_TYPE **endptr, STRING_TYPE endc)
mant = STRTOULL (str, &endp, 0);
if (endp == cp)
- SET_MANTISSA (retval, mant);
+ SET_NAN_PAYLOAD (retval, mant);
out:
if (endptr != NULL)
diff --git a/stdlib/strtof_nan.c b/stdlib/strtof_nan.c
index ea3decb..f085c5b 100644
--- a/stdlib/strtof_nan.c
+++ b/stdlib/strtof_nan.c
@@ -18,7 +18,7 @@
<http://www.gnu.org/licenses/>. */
#include <strtod_nan_narrow.h>
-#include <strtod_nan_float.h>
+#include <math-type-macros-float.h>
#define STRTOD_NAN __strtof_nan
#include <strtod_nan_main.c>
diff --git a/stdlib/strtold_nan.c b/stdlib/strtold_nan.c
index d4bbcc0..eadfe54 100644
--- a/stdlib/strtold_nan.c
+++ b/stdlib/strtold_nan.c
@@ -23,7 +23,7 @@
representation. */
#ifndef __NO_LONG_DOUBLE_MATH
# include <strtod_nan_narrow.h>
-# include <strtod_nan_ldouble.h>
+# include <math-type-macros-ldouble.h>
# define STRTOD_NAN __strtold_nan
# include <strtod_nan_main.c>
diff --git a/stdlib/strtod_nan_double.h b/sysdeps/generic/math-nan-payload-double.h
index d76a03b..cfcc53a 100644
--- a/stdlib/strtod_nan_double.h
+++ b/sysdeps/generic/math-nan-payload-double.h
@@ -1,4 +1,4 @@
-/* Convert string for NaN payload to corresponding NaN. For double.
+/* NaN payload handling for double.
Copyright (C) 1997-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -16,8 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#define FLOAT double
-#define SET_MANTISSA(flt, mant) \
+#define SET_NAN_PAYLOAD(flt, mant) \
do \
{ \
union ieee754_double u; \
diff --git a/stdlib/strtod_nan_float.h b/sysdeps/generic/math-nan-payload-float.h
index 80249d6..2a4ff8c 100644
--- a/stdlib/strtod_nan_float.h
+++ b/sysdeps/generic/math-nan-payload-float.h
@@ -1,4 +1,4 @@
-/* Convert string for NaN payload to corresponding NaN. For float.
+/* NaN payload handling for float.
Copyright (C) 1997-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -16,8 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#define FLOAT float
-#define SET_MANTISSA(flt, mant) \
+#define SET_NAN_PAYLOAD(flt, mant) \
do \
{ \
union ieee754_float u; \
diff --git a/sysdeps/generic/math-type-macros-double.h b/sysdeps/generic/math-type-macros-double.h
index 1af4c74..1564182 100644
--- a/sysdeps/generic/math-type-macros-double.h
+++ b/sysdeps/generic/math-type-macros-double.h
@@ -27,6 +27,7 @@
#define CFLOAT _Complex double
#define M_STRTO_NAN __strtod_nan
+#include <math-nan-payload-double.h>
#include <libm-alias-double.h>
#ifndef declare_mgen_alias
@@ -42,7 +43,7 @@
/* Do not use the type-generic wrapper templates if compatibility with
SVID error handling is needed. */
-#include <math-svid-compat.h>
+#include <math/math-svid-compat.h>
#define __USE_WRAPPER_TEMPLATE !LIBM_SVID_COMPAT
#endif
diff --git a/sysdeps/generic/math-type-macros-float.h b/sysdeps/generic/math-type-macros-float.h
index 9273bde..7dd0b74 100644
--- a/sysdeps/generic/math-type-macros-float.h
+++ b/sysdeps/generic/math-type-macros-float.h
@@ -30,6 +30,7 @@
the double macro constants. */
#define M_MLIT(c) c
+#include <math-nan-payload-float.h>
#include <libm-alias-float.h>
#ifndef declare_mgen_alias
@@ -45,7 +46,7 @@
/* Do not use the type-generic wrapper templates if compatibility with
SVID error handling is needed. */
-#include <math-svid-compat.h>
+#include <math/math-svid-compat.h>
#define __USE_WRAPPER_TEMPLATE !LIBM_SVID_COMPAT
#endif
diff --git a/sysdeps/generic/math-type-macros-float128.h b/sysdeps/generic/math-type-macros-float128.h
index 485c13b..6144bc0 100644
--- a/sysdeps/generic/math-type-macros-float128.h
+++ b/sysdeps/generic/math-type-macros-float128.h
@@ -29,6 +29,7 @@
#define M_MLIT(c) c ## f128
+#include <math-nan-payload-float128.h>
#include <libm-alias-float128.h>
#ifndef declare_mgen_alias
diff --git a/sysdeps/generic/math-type-macros-ldouble.h b/sysdeps/generic/math-type-macros-ldouble.h
index 5fe1600..db41199 100644
--- a/sysdeps/generic/math-type-macros-ldouble.h
+++ b/sysdeps/generic/math-type-macros-ldouble.h
@@ -27,6 +27,7 @@
#define CFLOAT _Complex long double
#define M_STRTO_NAN __strtold_nan
+#include <math-nan-payload-ldouble.h>
#include <libm-alias-ldouble.h>
#ifndef declare_mgen_alias
@@ -42,7 +43,7 @@
/* Do not use the type-generic wrapper templates if compatibility with
SVID error handling is needed. */
-#include <math-svid-compat.h>
+#include <math/math-svid-compat.h>
#define __USE_WRAPPER_TEMPLATE !LIBM_SVID_COMPAT
#endif
diff --git a/sysdeps/generic/math-type-macros.h b/sysdeps/generic/math-type-macros.h
index ffcf7b8..0e8ef16 100644
--- a/sysdeps/generic/math-type-macros.h
+++ b/sysdeps/generic/math-type-macros.h
@@ -40,7 +40,11 @@
declare_mgen_alias_r(from,to)
This exposes the appropriate symbol(s) for a
- function f_r of type FLOAT. */
+ function f_r of type FLOAT.
+
+ SET_NAN_PAYLOAD(flt, mant)
+ Set the NaN payload bits of the variable FLT of type FLOAT to
+ the mantissa MANT. */
#ifndef M_PFX
# error "M_PFX must be defined."
@@ -66,6 +70,9 @@
#ifndef declare_mgen_alias_r
# error "declare_mgen_alias_r must be defined."
#endif
+#ifndef SET_NAN_PAYLOAD
+# error "SET_NAN_PAYLOAD must be defined."
+#endif
#define __M_CONCAT(a,b) a ## b
#define __M_CONCATX(a,b) __M_CONCAT(a,b)
diff --git a/sysdeps/ieee754/float128/strtod_nan_float128.h b/sysdeps/ieee754/float128/math-nan-payload-float128.h
index c3eaca4..95ab953 100644
--- a/sysdeps/ieee754/float128/strtod_nan_float128.h
+++ b/sysdeps/ieee754/float128/math-nan-payload-float128.h
@@ -1,4 +1,4 @@
-/* Convert string for NaN payload to corresponding NaN. For _Float128.
+/* NaN payload handling for _Float128.
Copyright (C) 2017-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -16,8 +16,9 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#define FLOAT _Float128
-#define SET_MANTISSA(flt, mant) \
+#include <ieee754_float128.h>
+
+#define SET_NAN_PAYLOAD(flt, mant) \
do \
{ \
union ieee854_float128 u; \
diff --git a/sysdeps/ieee754/float128/strtof128_nan.c b/sysdeps/ieee754/float128/strtof128_nan.c
index 36a9bff..37a7f4e 100644
--- a/sysdeps/ieee754/float128/strtof128_nan.c
+++ b/sysdeps/ieee754/float128/strtof128_nan.c
@@ -19,10 +19,8 @@
#include <math.h>
-#include <float128_private.h>
-
#include <strtod_nan_narrow.h>
-#include <strtod_nan_float128.h>
+#include <math-type-macros-float128.h>
#define STRTOD_NAN __strtof128_nan
#include <stdlib/strtod_nan_main.c>
diff --git a/sysdeps/ieee754/float128/wcstof128_nan.c b/sysdeps/ieee754/float128/wcstof128_nan.c
index ffc72a0..f504809 100644
--- a/sysdeps/ieee754/float128/wcstof128_nan.c
+++ b/sysdeps/ieee754/float128/wcstof128_nan.c
@@ -18,7 +18,6 @@
<http://www.gnu.org/licenses/>. */
#include <stdlib/strtod_nan_wide.h>
-#include <float128_private.h>
-#include <strtod_nan_float128.h>
+#include <math-type-macros-float128.h>
#define STRTOD_NAN __wcstof128_nan
#include <stdlib/strtod_nan_main.c>
diff --git a/sysdeps/ieee754/ldbl-128/strtod_nan_ldouble.h b/sysdeps/ieee754/ldbl-128/math-nan-payload-ldouble.h
index 77d81ac..e2f092d 100644
--- a/sysdeps/ieee754/ldbl-128/strtod_nan_ldouble.h
+++ b/sysdeps/ieee754/ldbl-128/math-nan-payload-ldouble.h
@@ -1,4 +1,4 @@
-/* Convert string for NaN payload to corresponding NaN. For ldbl-128.
+/* NaN payload handling for ldbl-128.
Copyright (C) 1997-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -16,8 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#define FLOAT long double
-#define SET_MANTISSA(flt, mant) \
+#define SET_NAN_PAYLOAD(flt, mant) \
do \
{ \
union ieee854_long_double u; \
diff --git a/sysdeps/ieee754/ldbl-128ibm/strtod_nan_ldouble.h b/sysdeps/ieee754/ldbl-128ibm/math-nan-payload-ldouble.h
index cfa9c1e..6534075 100644
--- a/sysdeps/ieee754/ldbl-128ibm/strtod_nan_ldouble.h
+++ b/sysdeps/ieee754/ldbl-128ibm/math-nan-payload-ldouble.h
@@ -1,4 +1,4 @@
-/* Convert string for NaN payload to corresponding NaN. For ldbl-128ibm.
+/* NaN payload handling or ldbl-128ibm.
Copyright (C) 1997-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -16,8 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#define FLOAT long double
-#define SET_MANTISSA(flt, mant) \
+#define SET_NAN_PAYLOAD(flt, mant) \
do \
{ \
union ibm_extended_long_double u; \
diff --git a/sysdeps/ieee754/ldbl-96/strtod_nan_ldouble.h b/sysdeps/ieee754/ldbl-96/math-nan-payload-ldouble.h
index 08104b7..ab2542c 100644
--- a/sysdeps/ieee754/ldbl-96/strtod_nan_ldouble.h
+++ b/sysdeps/ieee754/ldbl-96/math-nan-payload-ldouble.h
@@ -1,4 +1,4 @@
-/* Convert string for NaN payload to corresponding NaN. For ldbl-96.
+/* NaN payload handling for ldbl-96.
Copyright (C) 1997-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -16,8 +16,7 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#define FLOAT long double
-#define SET_MANTISSA(flt, mant) \
+#define SET_NAN_PAYLOAD(flt, mant) \
do \
{ \
union ieee854_long_double u; \
diff --git a/wcsmbs/wcstod_nan.c b/wcsmbs/wcstod_nan.c
index 1aee82d..1423f3e 100644
--- a/wcsmbs/wcstod_nan.c
+++ b/wcsmbs/wcstod_nan.c
@@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/>. */
#include "../stdlib/strtod_nan_wide.h"
-#include "../stdlib/strtod_nan_double.h"
+#include <math-type-macros-double.h>
#define STRTOD_NAN __wcstod_nan
#include "../stdlib/strtod_nan_main.c"
diff --git a/wcsmbs/wcstof_nan.c b/wcsmbs/wcstof_nan.c
index 9c89e24..96f2198 100644
--- a/wcsmbs/wcstof_nan.c
+++ b/wcsmbs/wcstof_nan.c
@@ -17,7 +17,7 @@
<http://www.gnu.org/licenses/>. */
#include "../stdlib/strtod_nan_wide.h"
-#include "../stdlib/strtod_nan_float.h"
+#include <math-type-macros-float.h>
#define STRTOD_NAN __wcstof_nan
#include "../stdlib/strtod_nan_main.c"
diff --git a/wcsmbs/wcstold_nan.c b/wcsmbs/wcstold_nan.c
index a4d274f..66793ec 100644
--- a/wcsmbs/wcstold_nan.c
+++ b/wcsmbs/wcstold_nan.c
@@ -23,7 +23,7 @@
representation. */
#ifndef __NO_LONG_DOUBLE_MATH
# include "../stdlib/strtod_nan_wide.h"
-# include <strtod_nan_ldouble.h>
+# include <math-type-macros-ldouble.h>
# define STRTOD_NAN __wcstold_nan
# include "../stdlib/strtod_nan_main.c"