From patchwork Thu Aug 23 23:42:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 961649 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-95479-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="oRjo6943"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41xLYQ3P32z9s47 for ; Fri, 24 Aug 2018 09:42:18 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=ntssszV3aXFnqAxWdraRLjm1StxyL mnEcDqgVASUo7ZuYJff9fSKJoaO0Majk/KXVis+e7Y6mrWLDWX2GvrMFygSwcsfJ gKdiV95HJp7VCro8MAP3q2kJr45auV9DRFvCrS+4iJ/hmXlHO0gT9Dxxxsr4IsuM lDHQVH5JecW+jA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=CQ6/kf9i7V4VAMepITHjdjQRl5I=; b=oRj o6943vR4jgtHmgitmojGKc/53+YAeSK1RZ6MCgfL5LRR+8aKPCYPudRdSTx66CnX M1uLJ4HEHA6ULFtb1S4KNaLadJ0mlNvF6FPX+Y9UtSDQgfftzxEpt9rd/q7p0ik0 Rt8UE9o/0alBaMs9qLal4wmlXzcRwGJ4MVMpHW3c= Received: (qmail 75627 invoked by alias); 23 Aug 2018 23:42:12 -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 75565 invoked by uid 89); 23 Aug 2018 23:42:11 -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=Lesser, lesser X-HELO: relay1.mentorg.com Date: Thu, 23 Aug 2018 23:42:02 +0000 From: Joseph Myers To: Subject: Move EXCEPTION_TESTS_* out of math-tests.h [committed] Message-ID: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 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. Committed. 2018-08-23 Joseph Myers * 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. diff --git a/sysdeps/arm/math-tests.h b/sysdeps/arm/math-tests.h index 9a34902b6a..6f5aed453d 100644 --- a/sysdeps/arm/math-tests.h +++ b/sysdeps/arm/math-tests.h @@ -16,16 +16,6 @@ License along with the GNU C Library; if not, see . */ -/* 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, and do not - support exceptions. */ -#ifdef __SOFTFP__ -# define EXCEPTION_TESTS_float 0 -# define EXCEPTION_TESTS_double 0 -# define EXCEPTION_TESTS_long_double 0 -#endif - /* Not all VFP implementations support trapping exceptions. */ #define EXCEPTION_ENABLE_SUPPORTED(EXCEPT) ((EXCEPT) == 0) diff --git a/sysdeps/arm/nofpu/math-tests-exceptions.h b/sysdeps/arm/nofpu/math-tests-exceptions.h new file mode 100644 index 0000000000..97bbcbc6ef --- /dev/null +++ b/sysdeps/arm/nofpu/math-tests-exceptions.h @@ -0,0 +1,29 @@ +/* Configuration for math tests: support for exceptions. 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 + . */ + +#ifndef ARM_NOFPU_MATH_TESTS_EXCEPTIONS_H +#define ARM_NOFPU_MATH_TESTS_EXCEPTIONS_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 exceptions. */ +#define EXCEPTION_TESTS_float 0 +#define EXCEPTION_TESTS_double 0 +#define EXCEPTION_TESTS_long_double 0 + +#endif /* math-tests-exceptions.h. */ 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 + . */ + +#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 #include #include #include diff --git a/sysdeps/m68k/coldfire/math-tests.h b/sysdeps/m68k/coldfire/math-tests.h deleted file mode 100644 index a386f6cb06..0000000000 --- a/sysdeps/m68k/coldfire/math-tests.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Configuration for math tests. ColdFire version. - Copyright (C) 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 - . */ - -/* ColdFire soft float does not support exceptions and rounding modes. */ -#ifndef __mcffpu__ -# define EXCEPTION_TESTS_float 0 -# define EXCEPTION_TESTS_double 0 -# define EXCEPTION_TESTS_long_double 0 -#endif - -#include_next diff --git a/sysdeps/mips/math-tests.h b/sysdeps/mips/math-tests.h deleted file mode 100644 index 79d7405be9..0000000000 --- a/sysdeps/mips/math-tests.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Configuration for math tests. MIPS 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 - . */ - -#include -#include - -/* MIPS soft float does not support exceptions and rounding modes. */ -#ifdef __mips_soft_float -# define EXCEPTION_TESTS_float 0 -# define EXCEPTION_TESTS_double 0 -# define EXCEPTION_TESTS_long_double 0 -#endif - -#include_next diff --git a/sysdeps/nios2/math-tests.h b/sysdeps/nios2/math-tests.h deleted file mode 100644 index b246827581..0000000000 --- a/sysdeps/nios2/math-tests.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Configuration for math tests. Nios II version. - Copyright (C) 2015-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 - . */ - -/* Current Nios II soft-float does not support exceptions or rounding - modes. */ -#define EXCEPTION_TESTS_float 0 -#define EXCEPTION_TESTS_double 0 -#define EXCEPTION_TESTS_long_double 0 - -#include_next diff --git a/sysdeps/riscv/math-tests.h b/sysdeps/riscv/math-tests.h index f4a8f9f5bc..6dd08c8757 100644 --- a/sysdeps/riscv/math-tests.h +++ b/sysdeps/riscv/math-tests.h @@ -20,13 +20,4 @@ /* Trapping exceptions are not supported on RISC-V. */ #define EXCEPTION_ENABLE_SUPPORTED(EXCEPT) ((EXCEPT) == 0) -/* Despite not supporting trapping exceptions, we support setting - floating-point exception flags on hard-float targets. These are not - supported on soft-float targets. */ -#ifndef __riscv_flen -# define EXCEPTION_TESTS_float 0 -# define EXCEPTION_TESTS_double 0 -# define EXCEPTION_TESTS_long_double 0 -#endif - #include_next diff --git a/sysdeps/riscv/nofpu/math-tests-exceptions.h b/sysdeps/riscv/nofpu/math-tests-exceptions.h new file mode 100644 index 0000000000..cf303666e5 --- /dev/null +++ b/sysdeps/riscv/nofpu/math-tests-exceptions.h @@ -0,0 +1,29 @@ +/* Configuration for math tests: support for exceptions. RISC-V + 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 + . */ + +#ifndef RISCV_NOFPU_MATH_TESTS_EXCEPTIONS_H +#define RISCV_NOFPU_MATH_TESTS_EXCEPTIONS_H 1 + +/* We support setting floating-point exception flags on hard-float + targets. These are not supported on soft-float targets. */ +#define EXCEPTION_TESTS_float 0 +#define EXCEPTION_TESTS_double 0 +#define EXCEPTION_TESTS_long_double 0 + +#endif /* math-tests-exceptions.h. */