diff options
author | Joseph Myers <joseph@codesourcery.com> | 2018-08-23 23:41:13 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2018-08-23 23:41:13 +0000 |
commit | 60bcac09c0be46f56583e260f5fef849a5845074 (patch) | |
tree | e1ae6a9f8d8475579dd4bc3046fcf557208bf55c /sysdeps/generic | |
parent | 3bded567a7f58cc8e372cfe7eb3bd32b116223fa (diff) | |
download | glibc-60bcac09c0be46f56583e260f5fef849a5845074.tar.gz glibc-60bcac09c0be46f56583e260f5fef849a5845074.tar.xz glibc-60bcac09c0be46f56583e260f5fef849a5845074.zip |
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 <math-tests-exceptions.h>. (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.
Diffstat (limited to 'sysdeps/generic')
-rw-r--r-- | sysdeps/generic/math-tests-exceptions.h | 30 | ||||
-rw-r--r-- | sysdeps/generic/math-tests.h | 17 |
2 files changed, 31 insertions, 16 deletions
diff --git a/sysdeps/generic/math-tests-exceptions.h b/sysdeps/generic/math-tests-exceptions.h new file mode 100644 index 0000000000..d93f525775 --- /dev/null +++ b/sysdeps/generic/math-tests-exceptions.h @@ -0,0 +1,30 @@ +/* Configuration for math tests: support for exceptions. 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_EXCEPTIONS_H +#define _MATH_TESTS_EXCEPTIONS_H 1 + +/* 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. */ +#define EXCEPTION_TESTS_float 1 +#define EXCEPTION_TESTS_double 1 +#define EXCEPTION_TESTS_long_double 1 +#define EXCEPTION_TESTS_float128 1 + +#endif /* math-tests-exceptions.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 <math-tests-exceptions.h> #include <math-tests-rounding.h> #include <math-tests-snan.h> #include <math-tests-snan-cast.h> |