Move ROUNDING_TESTS_* out of math-tests.h.

Continuing moving macros out of math-tests.h to smaller headers
following typo-proof conventions instead of using #ifndef, this patch
moves the ROUNDING_TESTS_* macros for individual types out to their
own sysdeps header.

In the soft-float case where FE_TONEAREST is the only rounding mode
macro defined, there is no need to define ROUNDING_TESTS_*; it is only
necessary when rounding modes macros are defined that may not be
supported at runtime.  Thus, the ROUNDING_TESTS_* definitions for some
configurations are just removed, not moved to new
math-tests-rounding.h headers; the only architectures needing
math-tests-rounding.h are those where the macros are defined in
bits/fenv.h because of the possibility of a soft-float compilation
using a hard-float glibc with the same ABI (i.e., ARM and RISC-V).

The test-*-vlen*.h headers, by using #undef, do not yet follow
typo-proof conventions (but they no longer implicitly rely on being
included before math-tests.h, and this area can always be cleaned up
further in future).

Tested with build-many-glibcs.py.

	* sysdeps/generic/math-tests-rounding.h: New file.
	* sysdeps/generic/math-tests.h: Include <math-tests-rounding.h>.
	(ROUNDING_TESTS_float): Do not define here.
	(ROUNDING_TESTS_double): Likewise.
	(ROUNDING_TESTS_long_double): Likewise.
	(ROUNDING_TESTS_float128): Likewise.
	* math/test-double-vlen2.h: Include <math-tests-rounding.h>.
	(ROUNDING_TESTS_double): Undefine before defining.
	* math/test-double-vlen4.h: Include <math-tests-rounding.h>.
	(ROUNDING_TESTS_double): Undefine before defining.
	* math/test-double-vlen8.h: Include <math-tests-rounding.h>.
	(ROUNDING_TESTS_double): Undefine before defining.
	* math/test-float-vlen16.h: Include <math-tests-rounding.h>.
	(ROUNDING_TESTS_float): Undefine before defining.
	* math/test-float-vlen4.h: Include <math-tests-rounding.h>.
	(ROUNDING_TESTS_float): Undefine before defining.
	* math/test-float-vlen8.h: Include <math-tests-rounding.h>.
	(ROUNDING_TESTS_float): Undefine before defining.
	* sysdeps/arm/nofpu/math-tests-rounding.h: New file.
	* sysdeps/arm/math-tests.h [__SOFTFP__] (ROUNDING_TESTS_float): Do
	not define here.
	[__SOFTFP__] (ROUNDING_TESTS_double): Likewise.
	[__SOFTFP__] (ROUNDING_TESTS_long_double): Likewise.
	* sysdeps/riscv/nofpu/math-tests-rounding.h: New file.
	* sysdeps/riscv/math-tests.h [!__riscv_flen]
	(ROUNDING_TESTS_float): Do not define here.
	[!__riscv_flen] (ROUNDING_TESTS_double): Likewise.
	[!__risv_flen] (ROUNDING_TESTS_long_double): Likewise.
	* sysdeps/m68k/coldfire/math-tests.h [!__mcffpu__]
	(ROUNDING_TESTS_float): Likewise.
	[!__mcffpu__] (ROUNDING_TESTS_double): Likewise.
	[!__mcffpu__] (ROUNDING_TESTS_long_double): Likewise.
	* sysdeps/mips/math-tests.h [__mips_soft_float]
	(ROUNDING_TESTS_float): Likewise.
	[__mips_soft_float] (ROUNDING_TESTS_double): Likewise.
	[__mips_soft_float] (ROUNDING_TESTS_long_double): Likewise.
	* sysdeps/nios2/math-tests.h (ROUNDING_TESTS_float): Likewise.
	(ROUNDING_TESTS_double): Likewise.
	(ROUNDING_TESTS_long_double): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 2d713d01152b3ce1e50a3661ccf3d5011abcfb8d..0f435dcae4128b691f5f0644b454169dacfb9888 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+2018-08-22  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/generic/math-tests-rounding.h: New file.
+       * sysdeps/generic/math-tests.h: Include <math-tests-rounding.h>.
+       (ROUNDING_TESTS_float): Do not define here.
+       (ROUNDING_TESTS_double): Likewise.
+       (ROUNDING_TESTS_long_double): Likewise.
+       (ROUNDING_TESTS_float128): Likewise.
+       * math/test-double-vlen2.h: Include <math-tests-rounding.h>.
+       (ROUNDING_TESTS_double): Undefine before defining.
+       * math/test-double-vlen4.h: Include <math-tests-rounding.h>.
+       (ROUNDING_TESTS_double): Undefine before defining.
+       * math/test-double-vlen8.h: Include <math-tests-rounding.h>.
+       (ROUNDING_TESTS_double): Undefine before defining.
+       * math/test-float-vlen16.h: Include <math-tests-rounding.h>.
+       (ROUNDING_TESTS_float): Undefine before defining.
+       * math/test-float-vlen4.h: Include <math-tests-rounding.h>.
+       (ROUNDING_TESTS_float): Undefine before defining.
+       * math/test-float-vlen8.h: Include <math-tests-rounding.h>.
+       (ROUNDING_TESTS_float): Undefine before defining.
+       * sysdeps/arm/nofpu/math-tests-rounding.h: New file.
+       * sysdeps/arm/math-tests.h [__SOFTFP__] (ROUNDING_TESTS_float): Do
+       not define here.
+       [__SOFTFP__] (ROUNDING_TESTS_double): Likewise.
+       [__SOFTFP__] (ROUNDING_TESTS_long_double): Likewise.
+       * sysdeps/riscv/nofpu/math-tests-rounding.h: New file.
+       * sysdeps/riscv/math-tests.h [!__riscv_flen]
+       (ROUNDING_TESTS_float): Do not define here.
+       [!__riscv_flen] (ROUNDING_TESTS_double): Likewise.
+       [!__risv_flen] (ROUNDING_TESTS_long_double): Likewise.
+       * sysdeps/m68k/coldfire/math-tests.h [!__mcffpu__]
+       (ROUNDING_TESTS_float): Likewise.
+       [!__mcffpu__] (ROUNDING_TESTS_double): Likewise.
+       [!__mcffpu__] (ROUNDING_TESTS_long_double): Likewise.
+       * sysdeps/mips/math-tests.h [__mips_soft_float]
+       (ROUNDING_TESTS_float): Likewise.
+       [__mips_soft_float] (ROUNDING_TESTS_double): Likewise.
+       [__mips_soft_float] (ROUNDING_TESTS_long_double): Likewise.
+       * sysdeps/nios2/math-tests.h (ROUNDING_TESTS_float): Likewise.
+       (ROUNDING_TESTS_double): Likewise.
+       (ROUNDING_TESTS_long_double): Likewise.
+
 2018-08-21  Tobias Klauser  <tklauser@distanz.ch>
 
        * sysdeps/unix/sysv/linux/bits/socket.h (PF_MAX): Set to 45.

diff --git a/math/test-double-vlen2.h b/math/test-double-vlen2.h
index 5c2bfe036c5a132d8fb5ba027576611964ad4b2b..12f37bab8520b1f78d53c1c97ae2f9340d49fc13 100644 (file)
--- a/math/test-double-vlen2.h
+++ b/math/test-double-vlen2.h
@@ -19,7 +19,9 @@
 #include "test-double.h"
 #include "test-math-no-inline.h"
 #include "test-math-vector.h"
+#include <math-tests-rounding.h>
 
+#undef ROUNDING_TESTS_double
 #define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST)
 
 #define VEC_SUFF _vlen2

diff --git a/math/test-double-vlen4.h b/math/test-double-vlen4.h
index 8d9d326080fe6e0643a7f089759eb569efda4264..a28fef367cb2476e5042761de5648374e81e4939 100644 (file)
--- a/math/test-double-vlen4.h
+++ b/math/test-double-vlen4.h
@@ -19,7 +19,9 @@
 #include "test-double.h"
 #include "test-math-no-inline.h"
 #include "test-math-vector.h"
+#include <math-tests-rounding.h>
 
+#undef ROUNDING_TESTS_double
 #define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST)
 
 #define VEC_SUFF _vlen4

diff --git a/math/test-double-vlen8.h b/math/test-double-vlen8.h
index 602fd6eb59a981acaa70b9fc956cf82d7cf42b88..93e4daba2ad023c6d02ee834b197b1974d28ea5e 100644 (file)
--- a/math/test-double-vlen8.h
+++ b/math/test-double-vlen8.h
@@ -19,7 +19,9 @@
 #include "test-double.h"
 #include "test-math-no-inline.h"
 #include "test-math-vector.h"
+#include <math-tests-rounding.h>
 
+#undef ROUNDING_TESTS_double
 #define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST)
 
 #define VEC_SUFF _vlen8

diff --git a/math/test-float-vlen16.h b/math/test-float-vlen16.h
index 268c8e67c01a548bdf61f803f57e13bcbd8d7857..3cdd97dabfbf688b138ae27a87ca3bca9bd2e686 100644 (file)
--- a/math/test-float-vlen16.h
+++ b/math/test-float-vlen16.h
@@ -19,7 +19,9 @@
 #include "test-float.h"
 #include "test-math-no-inline.h"
 #include "test-math-vector.h"
+#include <math-tests-rounding.h>
 
+#undef ROUNDING_TESTS_float
 #define ROUNDING_TESTS_float(MODE) ((MODE) == FE_TONEAREST)
 
 #define VEC_SUFF _vlen16

diff --git a/math/test-float-vlen4.h b/math/test-float-vlen4.h
index 1da9f66c4d6ded3958f855e0d7ade09373a3917a..76374b98fe4f95d555d0b4ec3abdd9bb24f0214f 100644 (file)
--- a/math/test-float-vlen4.h
+++ b/math/test-float-vlen4.h
@@ -19,7 +19,9 @@
 #include "test-float.h"
 #include "test-math-no-inline.h"
 #include "test-math-vector.h"
+#include <math-tests-rounding.h>
 
+#undef ROUNDING_TESTS_float
 #define ROUNDING_TESTS_float(MODE) ((MODE) == FE_TONEAREST)
 
 #define VEC_SUFF _vlen4

diff --git a/math/test-float-vlen8.h b/math/test-float-vlen8.h
index b44ed1c5b34f3d9c52fa14805b53157852622a30..b44d00e0ac684e4722f47f2a788225941794c055 100644 (file)
--- a/math/test-float-vlen8.h
+++ b/math/test-float-vlen8.h
@@ -19,7 +19,9 @@
 #include "test-float.h"
 #include "test-math-no-inline.h"
 #include "test-math-vector.h"
+#include <math-tests-rounding.h>
 
+#undef ROUNDING_TESTS_float
 #define ROUNDING_TESTS_float(MODE) ((MODE) == FE_TONEAREST)
 
 #define VEC_SUFF _vlen8

diff --git a/sysdeps/arm/math-tests.h b/sysdeps/arm/math-tests.h
index d4d68f39c9e6f54cd4a5b3e7f20faa3964f0bdf4..9a34902b6a2df7c4b8d3e5952775f01046debaba 100644 (file)
--- a/sysdeps/arm/math-tests.h
+++ b/sysdeps/arm/math-tests.h
@@ -21,9 +21,6 @@
    support rounding modes, although fesetround succeeds, and do not
    support exceptions.  */
 #ifdef __SOFTFP__
-# define ROUNDING_TESTS_float(MODE)    ((MODE) == FE_TONEAREST)
-# define ROUNDING_TESTS_double(MODE)   ((MODE) == FE_TONEAREST)
-# define ROUNDING_TESTS_long_double(MODE)      ((MODE) == FE_TONEAREST)
 # define EXCEPTION_TESTS_float 0
 # define EXCEPTION_TESTS_double        0
 # define EXCEPTION_TESTS_long_double   0

diff --git a/sysdeps/arm/nofpu/math-tests-rounding.h b/sysdeps/arm/nofpu/math-tests-rounding.h
new file mode 100644 (file)
index 0000000..9a3b58c
--- /dev/null
+++ b/sysdeps/arm/nofpu/math-tests-rounding.h
@@ -0,0 +1,29 @@
+/* Configuration for math tests: rounding mode support.  ARM no-FPU 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 ARM_NOFPU_MATH_TESTS_ROUNDING_H
+#define ARM_NOFPU_MATH_TESTS_ROUNDING_H 1
+
+/* On systems with VFP support, but where glibc is built for
+   soft-float, the libgcc functions used in libc and libm do not
+   support rounding modes, although fesetround succeeds.  */
+#define ROUNDING_TESTS_float(MODE)     ((MODE) == FE_TONEAREST)
+#define ROUNDING_TESTS_double(MODE)    ((MODE) == FE_TONEAREST)
+#define ROUNDING_TESTS_long_double(MODE)       ((MODE) == FE_TONEAREST)
+
+#endif /* math-tests-rounding.h.  */

diff --git a/sysdeps/generic/math-tests-rounding.h b/sysdeps/generic/math-tests-rounding.h
new file mode 100644 (file)
index 0000000..ccc38bd
--- /dev/null
+++ b/sysdeps/generic/math-tests-rounding.h
@@ -0,0 +1,30 @@
+/* Configuration for math tests: rounding mode 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_ROUNDING_H
+#define _MATH_TESTS_ROUNDING_H 1
+
+/* Indicate whether to run tests involving a given rounding mode for a
+   given floating-point type, given that fesetround succeeds for that
+   mode.  All are run if fesetround succeeds unless overridden.  */
+#define ROUNDING_TESTS_float(MODE)     1
+#define ROUNDING_TESTS_double(MODE)    1
+#define ROUNDING_TESTS_long_double(MODE)       1
+#define ROUNDING_TESTS_float128(MODE)  1
+
+#endif /* math-tests-rounding.h.  */

diff --git a/sysdeps/generic/math-tests.h b/sysdeps/generic/math-tests.h
index f59a2251ed37de3f7bc7ad33dfab3400b7bbc070..2ad83dfc43351eb6e313916b4d2f2d4fbbc20154 100644 (file)
--- a/sysdeps/generic/math-tests.h
+++ b/sysdeps/generic/math-tests.h
@@ -36,22 +36,6 @@
 /* Return nonzero value if to run tests involving sNaN values for X.  */
 #define SNAN_TESTS(x) MATH_TESTS_TG (SNAN_TESTS_, , x)
 
-/* Indicate whether to run tests involving a given rounding mode for a
-   given floating-point type, given that fesetround succeeds for that
-   mode.  All are run if fesetround succeeds unless overridden.  */
-#ifndef ROUNDING_TESTS_float
-# define ROUNDING_TESTS_float(MODE)    1
-#endif
-#ifndef ROUNDING_TESTS_double
-# define ROUNDING_TESTS_double(MODE)   1
-#endif
-#ifndef ROUNDING_TESTS_long_double
-# define ROUNDING_TESTS_long_double(MODE)      1
-#endif
-#ifndef ROUNDING_TESTS_float128
-# define ROUNDING_TESTS_float128(MODE) 1
-#endif
-
 #define ROUNDING_TESTS(TYPE, MODE)             \
   MATH_TESTS_TG (ROUNDING_TESTS_, (MODE), TYPE)
 
@@ -93,6 +77,7 @@
 # define EXCEPTION_SET_FORCES_TRAP 0
 #endif
 
+#include <math-tests-rounding.h>
 #include <math-tests-snan.h>
 #include <math-tests-snan-cast.h>
 #include <math-tests-snan-payload.h>

diff --git a/sysdeps/m68k/coldfire/math-tests.h b/sysdeps/m68k/coldfire/math-tests.h
index b05609d45d533f8d3a5126240c7c09c811243dcd..a386f6cb06c47121dbb0086c3f8cb9c5ab328dbe 100644 (file)
--- a/sysdeps/m68k/coldfire/math-tests.h
+++ b/sysdeps/m68k/coldfire/math-tests.h
@@ -18,9 +18,6 @@
 
 /* ColdFire soft float does not support exceptions and rounding modes.  */
 #ifndef __mcffpu__
-# define ROUNDING_TESTS_float(MODE)    ((MODE) == FE_TONEAREST)
-# define ROUNDING_TESTS_double(MODE)   ((MODE) == FE_TONEAREST)
-# define ROUNDING_TESTS_long_double(MODE)      ((MODE) == FE_TONEAREST)
 # define EXCEPTION_TESTS_float 0
 # define EXCEPTION_TESTS_double        0
 # define EXCEPTION_TESTS_long_double   0

diff --git a/sysdeps/mips/math-tests.h b/sysdeps/mips/math-tests.h
index 8e0b98bfefe422a52f86ffee71f690df6b4a8a44..79d7405be96b0c77f4bbcde7439be9a13bc01d4d 100644 (file)
--- a/sysdeps/mips/math-tests.h
+++ b/sysdeps/mips/math-tests.h
@@ -21,9 +21,6 @@
 
 /* MIPS soft float does not support exceptions and rounding modes.  */
 #ifdef __mips_soft_float
-# define ROUNDING_TESTS_float(MODE)    ((MODE) == FE_TONEAREST)
-# define ROUNDING_TESTS_double(MODE)   ((MODE) == FE_TONEAREST)
-# define ROUNDING_TESTS_long_double(MODE)      ((MODE) == FE_TONEAREST)
 # define EXCEPTION_TESTS_float 0
 # define EXCEPTION_TESTS_double        0
 # define EXCEPTION_TESTS_long_double   0

diff --git a/sysdeps/nios2/math-tests.h b/sysdeps/nios2/math-tests.h
index a1c2762786e73b68d91bd372c6d5e0ffd3646fa2..b246827581df08db8048d596f007930734a586a0 100644 (file)
--- a/sysdeps/nios2/math-tests.h
+++ b/sysdeps/nios2/math-tests.h
@@ -18,9 +18,6 @@
 
 /* Current Nios II soft-float does not support exceptions or rounding
    modes.  */
-#define ROUNDING_TESTS_float(MODE)     ((MODE) == FE_TONEAREST)
-#define ROUNDING_TESTS_double(MODE)    ((MODE) == FE_TONEAREST)
-#define ROUNDING_TESTS_long_double(MODE)       ((MODE) == FE_TONEAREST)
 #define EXCEPTION_TESTS_float  0
 #define EXCEPTION_TESTS_double 0
 #define EXCEPTION_TESTS_long_double    0

diff --git a/sysdeps/riscv/math-tests.h b/sysdeps/riscv/math-tests.h
index 3db33b0e9a6e72858ac6026a91d40d14cbe59b27..f4a8f9f5bcb27a9e6cc1ce862997ba62b58b258a 100644 (file)
--- a/sysdeps/riscv/math-tests.h
+++ b/sysdeps/riscv/math-tests.h
@@ -29,11 +29,4 @@
 # define EXCEPTION_TESTS_long_double   0
 #endif
 
-/* On soft-float targets we only support the "to nearest" rounding mode.  */
-#ifndef __riscv_flen
-# define ROUNDING_TESTS_float(MODE)            ((MODE) == FE_TONEAREST)
-# define ROUNDING_TESTS_double(MODE)           ((MODE) == FE_TONEAREST)
-# define ROUNDING_TESTS_long_double(MODE)      ((MODE) == FE_TONEAREST)
-#endif
-
 #include_next <math-tests.h>

diff --git a/sysdeps/riscv/nofpu/math-tests-rounding.h b/sysdeps/riscv/nofpu/math-tests-rounding.h
new file mode 100644 (file)
index 0000000..97842ce
--- /dev/null
+++ b/sysdeps/riscv/nofpu/math-tests-rounding.h
@@ -0,0 +1,27 @@
+/* Configuration for math tests: rounding mode support.  RISC-V no-FPU version.
+   Copyright (C) 2014-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 RISCV_NOFPU_MATH_TESTS_ROUNDING_H
+#define RISCV_NOFPU_MATH_TESTS_ROUNDING_H 1
+
+/* On soft-float targets we only support the "to nearest" rounding mode.  */
+#define ROUNDING_TESTS_float(MODE)             ((MODE) == FE_TONEAREST)
+#define ROUNDING_TESTS_double(MODE)            ((MODE) == FE_TONEAREST)
+#define ROUNDING_TESTS_long_double(MODE)       ((MODE) == FE_TONEAREST)
+
+#endif /* math-tests-rounding.h.  */