Move EXCEPTION_SET_FORCES_TRAP out of math-tests.h.

Completing the move of macros out of math-tests.h to smaller headers
following typo-proof conventions instead of using #ifndef, this patch
moves the EXCEPTION_SET_FORCES_TRAP macro out to its own
math-tests-trap-force.h header.

Tested with build-many-glibcs.py.

	* sysdeps/generic/math-tests-trap-force.h: New file.
	* sysdeps/generic/math-tests.h: Include <math-tests-trap-force.h>.
	(EXCEPTION_SET_FORCES_TRAP): Do not define here.
	* sysdeps/powerpc/math-tests.h: Remove file.
	* sysdeps/powerpc/fpu/math-tests-trap-force.h: New file.

4 files changed, 47 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 9fc0060be2..157689fe45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-08-27  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/generic/math-tests-trap-force.h: New file.
+	* sysdeps/generic/math-tests.h: Include <math-tests-trap-force.h>.
+	(EXCEPTION_SET_FORCES_TRAP): Do not define here.
+	* sysdeps/powerpc/math-tests.h: Remove file.
+	* sysdeps/powerpc/fpu/math-tests-trap-force.h: New file.
+
 2018-08-27 Martin Kuchta  <martin.kuchta@netapp.com>
 	   Torvald Riegel  <triegel@redhat.com>
 
diff --git a/sysdeps/generic/math-tests-trap-force.h b/sysdeps/generic/math-tests-trap-force.h
new file mode 100644
index 0000000000..5a9f36cc7c
--- /dev/null
+++ b/sysdeps/generic/math-tests-trap-force.h
@@ -0,0 +1,30 @@
+/* Configuration for math tests: support for setting exception flags
+   without causing enabled traps.  Generic version.
+   Copyright (C) 2016-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_TRAP_FORCE_H
+#define _MATH_TESTS_TRAP_FORCE_H 1
+
+/* Indicate whether exception traps, if enabled, occur whenever an
+   exception flag is set explicitly, so it is not possible to set flag
+   bits with traps enabled without causing traps to be taken.  If
+   traps cannot be enabled, the value of this macro does not
+   matter.  */
+#define EXCEPTION_SET_FORCES_TRAP 0
+
+#endif /* math-tests-trap-force.h.  */
diff --git a/sysdeps/generic/math-tests.h b/sysdeps/generic/math-tests.h
index 53502fff2a..ce348c95a2 100644
--- a/sysdeps/generic/math-tests.h
+++ b/sysdeps/generic/math-tests.h
@@ -41,18 +41,10 @@
 
 #define EXCEPTION_TESTS(TYPE) MATH_TESTS_TG (EXCEPTION_TESTS_, , TYPE)
 
-/* Indicate whether exception traps, if enabled, occur whenever an
-   exception flag is set explicitly, so it is not possible to set flag
-   bits with traps enabled without causing traps to be taken.  If
-   traps cannot be enabled, the value of this macro does not
-   matter.  */
-#ifndef EXCEPTION_SET_FORCES_TRAP
-# define EXCEPTION_SET_FORCES_TRAP 0
-#endif
-
 #include <math-tests-exceptions.h>
 #include <math-tests-rounding.h>
 #include <math-tests-snan.h>
 #include <math-tests-snan-cast.h>
 #include <math-tests-snan-payload.h>
 #include <math-tests-trap.h>
+#include <math-tests-trap-force.h>
diff --git a/sysdeps/powerpc/math-tests.h b/sysdeps/powerpc/fpu/math-tests-trap-force.h
index f95428a2d1..e9d40019ee 100644
--- a/sysdeps/powerpc/math-tests.h
+++ b/sysdeps/powerpc/fpu/math-tests-trap-force.h
@@ -1,5 +1,6 @@
-/* Configuration for math tests.  PowerPC version.
-   Copyright (C) 2013-2018 Free Software Foundation, Inc.
+/* Configuration for math tests: support for setting exception flags
+   without causing enabled traps.  PowerPC version.
+   Copyright (C) 2016-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 +17,11 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef __NO_FPRS__
+#ifndef POWERPC_FPU_MATH_TESTS_TRAP_FORCE_H
+#define POWERPC_FPU_MATH_TESTS_TRAP_FORCE_H 1
+
 /* Setting exception flags in FPSCR results in enabled traps for those
    exceptions being taken.  */
-# define EXCEPTION_SET_FORCES_TRAP 1
-#endif
+#define EXCEPTION_SET_FORCES_TRAP 1
 
-#include_next <math-tests.h>
+#endif /* math-tests-trap-force.h.  */