5 files changed, 78 insertions, 33 deletions
diff --git a/sysdeps/i386/fpu/math-tests.h b/sysdeps/generic/math-tests-snan.h
index 6aba8414d4..a7f33cf427 100644
--- a/sysdeps/i386/fpu/math-tests.h
+++ b/sysdeps/generic/math-tests-snan.h
@@ -1,4 +1,4 @@
-/* Configuration for math tests.  32-bit x86 version.
+/* 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.
 
@@ -16,12 +16,15 @@
    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
+#ifndef _MATH_TESTS_SNAN_H
+#define _MATH_TESTS_SNAN_H 1
 
-#include_next <math-tests.h>
+/* 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 a768ab82e0..f59a2251ed 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 0000000000..9d30f69db0
--- /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/ia64/math-tests.h b/sysdeps/ia64/math-tests-snan.h
index 81e29f5c03..854a5d5897 100644
--- a/sysdeps/ia64/math-tests.h
+++ b/sysdeps/ia64/math-tests-snan.h
@@ -1,5 +1,5 @@
-/* Configuration for math tests.  ia64 version.
-   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+/* 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
@@ -16,10 +16,19 @@
    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)
+#if __GNUC_PREREQ (7, 0)
+# define SNAN_TESTS_float128	1
+#else
 # define SNAN_TESTS_float128	0
 #endif
 
-#include_next <math-tests.h>
+#endif /* math-tests-snan.h.  */
diff --git a/sysdeps/x86/math-tests.h b/sysdeps/x86_64/fpu/math-tests-snan.h
index 43c7ebe337..13e772f8b6 100644
--- a/sysdeps/x86/math-tests.h
+++ b/sysdeps/x86_64/fpu/math-tests-snan.h
@@ -1,5 +1,5 @@
-/* Configuration for math tests.  x86 version.
-   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+/* 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
@@ -16,10 +16,19 @@
    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)
+#if __GNUC_PREREQ (7, 0)
+# define SNAN_TESTS_float128	1
+#else
 # define SNAN_TESTS_float128	0
 #endif
 
-#include_next <math-tests.h>
+#endif /* math-tests-snan.h.  */