This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Move SNAN_TESTS_* out of math-tests.h [committed]
- From: Joseph Myers <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Fri, 10 Aug 2018 19:22:59 +0000
- Subject: Move SNAN_TESTS_* out of math-tests.h [committed]
Continuing moving macros out of math-tests.h to smaller headers
following typo-proof conventions instead of using #ifndef, this patch
moves the SNAN_TESTS_* macros for individual types out to their own
sysdeps header (while the type-generic SNAN_TESTS wrapper for those
macros remains in math-tests.h).
Tested for x86_64 and x86, and with build-many-glibcs.py. Committed.
2018-08-10 Joseph Myers <joseph@codesourcery.com>
* sysdeps/generic/math-tests-snan.h: New file.
* sysdeps/generic/math-tests.h: Include <math-tests-snan.h>.
(SNAN_TESTS_float): Do not define here.
(SNAN_TESTS_double): Likewise.
(SNAN_TESTS_long_double): Likewise.
(SNAN_TESTS_float128): Likewise.
* sysdeps/i386/fpu/math-tests-snan.h: New file.
* sysdeps/i386/fpu/math-tests.h: Remove file.
* sysdeps/ia64/math-tests-snan.h: New file.
* sysdeps/ia64/math-tests.h: Remove file.
* sysdeps/x86/math-tests.h: Likewise.
* sysdeps/x86_64/fpu/math-tests-snan.h: New file.
diff --git a/sysdeps/generic/math-tests-snan.h b/sysdeps/generic/math-tests-snan.h
new file mode 100644
index 0000000..a7f33cf
--- /dev/null
+++ b/sysdeps/generic/math-tests-snan.h
@@ -0,0 +1,30 @@
+/* Configuration for math tests: sNaN support. Generic version.
+ Copyright (C) 2013-2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _MATH_TESTS_SNAN_H
+#define _MATH_TESTS_SNAN_H 1
+
+/* Indicate whether to run tests involving sNaN values for the float,
+ double, long double and _Float128 C data types, respectively. All
+ are run unless overridden. */
+#define SNAN_TESTS_float 1
+#define SNAN_TESTS_double 1
+#define SNAN_TESTS_long_double 1
+#define SNAN_TESTS_float128 1
+
+#endif /* math-tests-snan.h. */
diff --git a/sysdeps/generic/math-tests.h b/sysdeps/generic/math-tests.h
index a768ab8..f59a225 100644
--- a/sysdeps/generic/math-tests.h
+++ b/sysdeps/generic/math-tests.h
@@ -33,22 +33,6 @@
: PREFIX ## long_double ARGS)
#endif
-/* Indicate whether to run tests involving sNaN values for the float, double,
- and long double C data types, respectively. All are run unless
- overridden. */
-#ifndef SNAN_TESTS_float
-# define SNAN_TESTS_float 1
-#endif
-#ifndef SNAN_TESTS_double
-# define SNAN_TESTS_double 1
-#endif
-#ifndef SNAN_TESTS_long_double
-# define SNAN_TESTS_long_double 1
-#endif
-#ifndef SNAN_TESTS_float128
-# define SNAN_TESTS_float128 1
-#endif
-
/* Return nonzero value if to run tests involving sNaN values for X. */
#define SNAN_TESTS(x) MATH_TESTS_TG (SNAN_TESTS_, , x)
@@ -109,5 +93,6 @@
# define EXCEPTION_SET_FORCES_TRAP 0
#endif
+#include <math-tests-snan.h>
#include <math-tests-snan-cast.h>
#include <math-tests-snan-payload.h>
diff --git a/sysdeps/i386/fpu/math-tests-snan.h b/sysdeps/i386/fpu/math-tests-snan.h
new file mode 100644
index 0000000..9d30f69
--- /dev/null
+++ b/sysdeps/i386/fpu/math-tests-snan.h
@@ -0,0 +1,39 @@
+/* Configuration for math tests: sNaN support. 32-bit x86 version.
+ Copyright (C) 2013-2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef I386_MATH_TESTS_SNAN_H
+#define I386_MATH_TESTS_SNAN_H 1
+
+/* On 32-bit x86, versions of GCC up to at least 4.8 are happy to use
+ FPU load instructions for sNaN values, and loading a float or
+ double sNaN value will already raise an INVALID exception as well
+ as turn the sNaN into a qNaN, rendering certain tests infeasible in
+ this scenario. <https://gcc.gnu.org/PR56831>. */
+#define SNAN_TESTS_float 0
+#define SNAN_TESTS_double 0
+#define SNAN_TESTS_long_double 1
+
+/* Before GCC 7, there is no built-in function to provide a __float128
+ sNaN, so most sNaN tests for this type cannot work. */
+#if __GNUC_PREREQ (7, 0)
+# define SNAN_TESTS_float128 1
+#else
+# define SNAN_TESTS_float128 0
+#endif
+
+#endif /* math-tests-snan.h. */
diff --git a/sysdeps/i386/fpu/math-tests.h b/sysdeps/i386/fpu/math-tests.h
deleted file mode 100644
index 6aba841..0000000
--- a/sysdeps/i386/fpu/math-tests.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Configuration for math tests. 32-bit x86 version.
- Copyright (C) 2013-2018 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-/* On 32-bit x86, versions of GCC up to at least 4.8 are happy to use FPU load
- instructions for sNaN values, and loading a float or double sNaN value will
- already raise an INVALID exception as well as turn the sNaN into a qNaN,
- rendering certain tests infeasible in this scenario.
- <http://gcc.gnu.org/PR56831>. */
-#define SNAN_TESTS_float 0
-#define SNAN_TESTS_double 0
-
-#include_next <math-tests.h>
diff --git a/sysdeps/ia64/math-tests-snan.h b/sysdeps/ia64/math-tests-snan.h
new file mode 100644
index 0000000..854a5d5
--- /dev/null
+++ b/sysdeps/ia64/math-tests-snan.h
@@ -0,0 +1,34 @@
+/* Configuration for math tests: sNaN support. ia64 version.
+ Copyright (C) 2013-2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef IA64_MATH_TESTS_SNAN_H
+#define IA64_MATH_TESTS_SNAN_H 1
+
+#define SNAN_TESTS_float 1
+#define SNAN_TESTS_double 1
+#define SNAN_TESTS_long_double 1
+
+/* Before GCC 7, there is no built-in function to provide a __float128
+ sNaN, so most sNaN tests for this type cannot work. */
+#if __GNUC_PREREQ (7, 0)
+# define SNAN_TESTS_float128 1
+#else
+# define SNAN_TESTS_float128 0
+#endif
+
+#endif /* math-tests-snan.h. */
diff --git a/sysdeps/ia64/math-tests.h b/sysdeps/ia64/math-tests.h
deleted file mode 100644
index 81e29f5..0000000
--- a/sysdeps/ia64/math-tests.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Configuration for math tests. ia64 version.
- Copyright (C) 2017-2018 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-/* Before GCC 7, there is no built-in function to provide a __float128
- sNaN, so most sNaN tests for this type cannot work. */
-#if !__GNUC_PREREQ (7, 0)
-# define SNAN_TESTS_float128 0
-#endif
-
-#include_next <math-tests.h>
diff --git a/sysdeps/x86/math-tests.h b/sysdeps/x86/math-tests.h
deleted file mode 100644
index 43c7ebe..0000000
--- a/sysdeps/x86/math-tests.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Configuration for math tests. x86 version.
- Copyright (C) 2017-2018 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-/* Before GCC 7, there is no built-in function to provide a __float128
- sNaN, so most sNaN tests for this type cannot work. */
-#if !__GNUC_PREREQ (7, 0)
-# define SNAN_TESTS_float128 0
-#endif
-
-#include_next <math-tests.h>
diff --git a/sysdeps/x86_64/fpu/math-tests-snan.h b/sysdeps/x86_64/fpu/math-tests-snan.h
new file mode 100644
index 0000000..13e772f
--- /dev/null
+++ b/sysdeps/x86_64/fpu/math-tests-snan.h
@@ -0,0 +1,34 @@
+/* Configuration for math tests: sNaN support. x86_64 version.
+ Copyright (C) 2013-2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef X86_64_MATH_TESTS_SNAN_H
+#define X86_64_MATH_TESTS_SNAN_H 1
+
+#define SNAN_TESTS_float 1
+#define SNAN_TESTS_double 1
+#define SNAN_TESTS_long_double 1
+
+/* Before GCC 7, there is no built-in function to provide a __float128
+ sNaN, so most sNaN tests for this type cannot work. */
+#if __GNUC_PREREQ (7, 0)
+# define SNAN_TESTS_float128 1
+#else
+# define SNAN_TESTS_float128 0
+#endif
+
+#endif /* math-tests-snan.h. */
--
Joseph S. Myers
joseph@codesourcery.com