From 60bcac09c0be46f56583e260f5fef849a5845074 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 23 Aug 2018 23:41:13 +0000 Subject: Move EXCEPTION_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 EXCEPTION_TESTS_* macros for individual types out to their own sysdeps header. As with ROUNDING_TESTS_*, there is no need to define these macros if FE_ALL_EXCEPT == 0 and the individual exception macros are undefined; thus, math-tests-exceptions.h headers are only needed for soft-float ARM and RISC-V, while the other cases that defined these macros do not need to do so (and the associated math-tests.h headers are thus removed without needing replacement by math-tests-exceptions.h headers). Tested with build-many-glibcs.py. * sysdeps/generic/math-tests-exceptions.h: New file. * sysdeps/generic/math-tests.h: Include . (EXCEPTION_TESTS_float): Do not define here. (EXCEPTION_TESTS_double): Likewise. (EXCEPTION_TESTS_long_double): Likewise. (EXCEPTION_TESTS_float128): Likewise. * sysdeps/arm/math-tests.h [__SOFTFP__] (EXCEPTION_TESTS_float): Likewise. [__SOFTFP__] (EXCEPTION_TESTS_double): Likewise. [__SOFTFP__] (EXCEPTION_TESTS_long_double): Likewise. * sysdeps/arm/nofpu/math-tests-exceptions.h: New file. * sysdeps/m68k/coldfire/math-tests.h: Remove file. * sysdeps/mips/math-tests.h: Likewise. * sysdeps/nios2/math-tests.h: Likewise. * sysdeps/riscv/math-tests.h [!__riscv_flen] (EXCEPTION_TESTS_float): Do not define here. [!__riscv_flen] (EXCEPTION_TESTS_double): Likewise. [!__riscv_flen] (EXCEPTION_TESTS_long_double): Likewise. * sysdeps/riscv/nofpu/math-tests-exceptions.h: New file. --- sysdeps/generic/math-tests.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'sysdeps/generic/math-tests.h') diff --git a/sysdeps/generic/math-tests.h b/sysdeps/generic/math-tests.h index 2ad83dfc43..bbcecd2819 100644 --- a/sysdeps/generic/math-tests.h +++ b/sysdeps/generic/math-tests.h @@ -39,22 +39,6 @@ #define ROUNDING_TESTS(TYPE, MODE) \ MATH_TESTS_TG (ROUNDING_TESTS_, (MODE), TYPE) -/* Indicate whether to run tests of floating-point exceptions for a - given floating-point type, given that the exception macros are - defined. All are run unless overridden. */ -#ifndef EXCEPTION_TESTS_float -# define EXCEPTION_TESTS_float 1 -#endif -#ifndef EXCEPTION_TESTS_double -# define EXCEPTION_TESTS_double 1 -#endif -#ifndef EXCEPTION_TESTS_long_double -# define EXCEPTION_TESTS_long_double 1 -#endif -#ifndef EXCEPTION_TESTS_float128 -# define EXCEPTION_TESTS_float128 1 -#endif - #define EXCEPTION_TESTS(TYPE) MATH_TESTS_TG (EXCEPTION_TESTS_, , TYPE) /* Indicate whether the given exception trap(s) can be enabled @@ -77,6 +61,7 @@ # define EXCEPTION_SET_FORCES_TRAP 0 #endif +#include #include #include #include -- cgit 1.4.1