From patchwork Mon Aug 27 18:53:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 29078 Received: (qmail 49793 invoked by alias); 27 Aug 2018 18:53:53 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 49776 invoked by uid 89); 27 Aug 2018 18:53:53 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy= X-HELO: relay1.mentorg.com Date: Mon, 27 Aug 2018 18:53:44 +0000 From: Joseph Myers To: Subject: Move EXCEPTION_SET_FORCES_TRAP out of math-tests.h [committed] Message-ID: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 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. Committed. 2018-08-27 Joseph Myers * sysdeps/generic/math-tests-trap-force.h: New file. * sysdeps/generic/math-tests.h: Include . (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. 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 + . */ + +#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 #include #include #include #include #include +#include diff --git a/sysdeps/powerpc/fpu/math-tests-trap-force.h b/sysdeps/powerpc/fpu/math-tests-trap-force.h new file mode 100644 index 0000000000..e9d40019ee --- /dev/null +++ b/sysdeps/powerpc/fpu/math-tests-trap-force.h @@ -0,0 +1,27 @@ +/* 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 + 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_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 /* math-tests-trap-force.h. */ diff --git a/sysdeps/powerpc/math-tests.h b/sysdeps/powerpc/math-tests.h deleted file mode 100644 index f95428a2d1..0000000000 --- a/sysdeps/powerpc/math-tests.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Configuration for math tests. 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 __NO_FPRS__ -/* Setting exception flags in FPSCR results in enabled traps for those - exceptions being taken. */ -# define EXCEPTION_SET_FORCES_TRAP 1 -#endif - -#include_next