From c0e7e2c127cf6d90c4ba86be11b09f45530bf8be Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 1 Aug 2018 11:18:57 +0000 Subject: [PATCH] Move SNAN_TESTS_TYPE_CAST out of math-tests.h. The math-tests.h header has many different macros and groups of macros, defined using #ifndef in the generic version which is included by architecture versions with #include_next after possibly defining non-default versions of some of those macros. This use of #ifndef is contrary to our normal typo-proof conventions for macro definitions. This patch moves one of the macros, SNAN_TESTS_TYPE_CAST, out to its own sysdeps header, to follow those typo-proof conventions more closely. Tested with build-many-glibcs.py. 2018-08-01 Joseph Myers * sysdeps/generic/math-tests-snan-cast.h: New file. * sysdeps/powerpc/math-tests-snan-cast.h: Likewise. * sysdeps/generic/math-tests.h: Include . (SNAN_TESTS_TYPE_CAST): Do not define macro here. * sysdeps/powerpc/math-tests.h (SNAN_TESTS_TYPE_CAST): Likewise. --- ChangeLog | 8 +++++++ sysdeps/generic/math-tests-snan-cast.h | 26 ++++++++++++++++++++++ sysdeps/generic/math-tests.h | 8 ++----- sysdeps/powerpc/math-tests-snan-cast.h | 30 ++++++++++++++++++++++++++ sysdeps/powerpc/math-tests.h | 8 ------- 5 files changed, 66 insertions(+), 14 deletions(-) create mode 100644 sysdeps/generic/math-tests-snan-cast.h create mode 100644 sysdeps/powerpc/math-tests-snan-cast.h diff --git a/ChangeLog b/ChangeLog index f9e8b7ed87..d0ac705919 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2018-08-01 Joseph Myers + + * sysdeps/generic/math-tests-snan-cast.h: New file. + * sysdeps/powerpc/math-tests-snan-cast.h: Likewise. + * sysdeps/generic/math-tests.h: Include . + (SNAN_TESTS_TYPE_CAST): Do not define macro here. + * sysdeps/powerpc/math-tests.h (SNAN_TESTS_TYPE_CAST): Likewise. + 2018-08-01 Carlos O'Donel * version.h (RELEASE): Set to "development". diff --git a/sysdeps/generic/math-tests-snan-cast.h b/sysdeps/generic/math-tests-snan-cast.h new file mode 100644 index 0000000000..ff64c1cd9a --- /dev/null +++ b/sysdeps/generic/math-tests-snan-cast.h @@ -0,0 +1,26 @@ +/* Configuration for math tests: casts of sNaN values. 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 + . */ + +#ifndef _MATH_TESTS_SNAN_CAST_H +#define _MATH_TESTS_SNAN_CAST_H 1 + +/* Indicate whether to run tests involving type casts of sNaN values. + These are run unless overridden. */ +#define SNAN_TESTS_TYPE_CAST 1 + +#endif /* math-tests-snan-cast.h. */ diff --git a/sysdeps/generic/math-tests.h b/sysdeps/generic/math-tests.h index cf9eff4691..8f5f80635b 100644 --- a/sysdeps/generic/math-tests.h +++ b/sysdeps/generic/math-tests.h @@ -52,12 +52,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 type casts of sNaN values. These - are run unless overridden. */ -#ifndef SNAN_TESTS_TYPE_CAST -# define SNAN_TESTS_TYPE_CAST 1 -#endif - /* Indicate whether operations on signaling NaNs preserve the payload (if possible; it is not possible with a zero payload if the high bit is set for signaling NaNs) when generating a quiet NaN, and @@ -122,3 +116,5 @@ #ifndef EXCEPTION_SET_FORCES_TRAP # define EXCEPTION_SET_FORCES_TRAP 0 #endif + +#include diff --git a/sysdeps/powerpc/math-tests-snan-cast.h b/sysdeps/powerpc/math-tests-snan-cast.h new file mode 100644 index 0000000000..13e941d0f6 --- /dev/null +++ b/sysdeps/powerpc/math-tests-snan-cast.h @@ -0,0 +1,30 @@ +/* Configuration for math tests: casts of sNaN values. PowerPC 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 + . */ + +#ifndef POWERPC_MATH_TESTS_SNAN_CAST_H +#define POWERPC_MATH_TESTS_SNAN_CAST_H 1 + +/* On PowerPC, in versions of GCC up to at least 4.7.2, a type cast -- + which is a IEEE 754-2008 general-computational convertFormat + operation (IEEE 754-2008, 5.4.2) -- does not turn a sNaN into a + qNaN (whilst raising an INVALID exception), which is contrary to + IEEE 754-2008 5.1 and 7.2. This renders certain tests infeasible + in this scenario. . */ +#define SNAN_TESTS_TYPE_CAST 0 + +#endif /* math-tests-snan-cast.h. */ diff --git a/sysdeps/powerpc/math-tests.h b/sysdeps/powerpc/math-tests.h index cf8adccefd..f95428a2d1 100644 --- a/sysdeps/powerpc/math-tests.h +++ b/sysdeps/powerpc/math-tests.h @@ -16,14 +16,6 @@ License along with the GNU C Library; if not, see . */ -/* On PowerPC, in versions of GCC up to at least 4.7.2, a type cast -- which is - a IEEE 754-2008 general-computational convertFormat operation (IEEE - 754-2008, 5.4.2) -- does not turn a sNaN into a qNaN (whilst raising an - INVALID exception), which is contrary to IEEE 754-2008 5.1 and 7.2. This - renders certain tests infeasible in this scenario. - . */ -#define SNAN_TESTS_TYPE_CAST 0 - #ifndef __NO_FPRS__ /* Setting exception flags in FPSCR results in enabled traps for those exceptions being taken. */