From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 99218 invoked by alias); 1 Feb 2018 20:53:48 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 99086 invoked by uid 89); 1 Feb 2018 20:53:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No 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,RCVD_IN_DNSWL_NONE,SPF_PASS,URIBL_RED autolearn=ham version=3.3.2 spammy=duly X-HELO: relay1.mentorg.com Date: Thu, 01 Feb 2018 20:53:00 -0000 From: Joseph Myers To: Subject: Move some fenv.h override macros to generic math_private.h Message-ID: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-SW-Source: 2018-02/txt/msg00044.txt.bz2 Various configurations lacking support for floating-point exceptions and rounding modes have a math_private.h that overrides certain functions and macros, internal and external, to avoid references to FE_* constants that are undefined in those configurations. For example, there are unconditional feraiseexcept (FE_INVALID) calls in generic libm code, and these macro definitions duly define feraiseexcept to ignore its argument to avoid an error from FE_INVALID being undefined. In fact it is easy to tell in an architecture-independent way whether this is needed, by testing whether FE_ALL_EXCEPT == 0. Thus, this patch puts such a test, and feraiseexcept and __feraiseexcept macros, in the generic math_private.h, so reducing the duplication between architecture versions of this header. The feclearexcept macro present in several versions of this header, and fetestexcept in the tile version, are not needed; they would have been needed before there were proper soft-fp fma implementations (when generic versions, that depend on FE_TOWARDZERO and FE_INEXACT, were being used for configurations not supporting those features), but aren't needed any more, and so are removed. The tile version of this header has several inline functions for fenv.h functions to optimize calls to them away in such configurations where they do nothing useful, and all these header versions also have definitions of some of the libc_fe* internal macros. I intend to make those generic in subsequent patches. Tested with build-many-glibcs.py that installed stripped shared libraries are unchanged by this patch. Committed. 2018-02-01 Joseph Myers * sysdeps/generic/math_private.h [FE_ALL_EXCEPT == 0] (feraiseexcept): New macro. [FE_ALL_EXCEPT == 0] (__feraiseexcept): Likewise. * sysdeps/m68k/coldfire/nofpu/math_private.h (feraiseexcept): Remove macro. (__feraiseexcept): Likewise. (feclearexcept): Likewise. * sysdeps/microblaze/math_private.h (feraiseexcept): Likewise. (__feraiseexcept): Likewise. (feclearexcept): Likewise. * sysdeps/nios2/math_private.h (feraiseexcept): Likewise. (__feraiseexcept): Likewise. (feclearexcept): Likewise. * sysdeps/tile/math_private.h (feraiseexcept): Likewise. (__feraiseexcept): Likewise. (feclearexcept): Likewise. (fetestexcept): Likewise. diff --git a/sysdeps/generic/math_private.h b/sysdeps/generic/math_private.h index e4b9d86..acfbd9b 100644 --- a/sysdeps/generic/math_private.h +++ b/sysdeps/generic/math_private.h @@ -644,4 +644,14 @@ libc_feresetround_noex_ctx (struct rm_ctx *ctx) SET_RESTORE_ROUND_GENERIC (RM, libc_feholdsetround_53bit, \ libc_feresetround_53bit) +/* When no floating-point exceptions are defined in , make + feraiseexcept ignore its argument so that unconditional + feraiseexcept calls do not cause errors for undefined exceptions. + Define it to expand to a void expression so that any calls testing + the result of feraiseexcept do produce errors. */ +#if FE_ALL_EXCEPT == 0 +# define feraiseexcept(excepts) ((void) 0) +# define __feraiseexcept(excepts) ((void) 0) +#endif + #endif /* _MATH_PRIVATE_H_ */ diff --git a/sysdeps/m68k/coldfire/nofpu/math_private.h b/sysdeps/m68k/coldfire/nofpu/math_private.h index 879577b..951f026 100644 --- a/sysdeps/m68k/coldfire/nofpu/math_private.h +++ b/sysdeps/m68k/coldfire/nofpu/math_private.h @@ -30,9 +30,7 @@ success in every case. The overrides for libc_ functions must happen before we include - the generic math_private.h, and the overrides for regular - functions must happen afterwards, to avoid clashing with - the declarations of those functions. */ + the generic math_private.h. */ #define libc_fesetround(rnd) ({ 0; }) #define libc_fetestexcept(exc) ({ 0; }) @@ -45,8 +43,4 @@ #include_next -#define feraiseexcept(excepts) ({ 0; }) -#define __feraiseexcept(excepts) ({ 0; }) -#define feclearexcept(exc) ({ 0; }) - #endif diff --git a/sysdeps/microblaze/math_private.h b/sysdeps/microblaze/math_private.h index d82e8bf..1a2c521 100644 --- a/sysdeps/microblaze/math_private.h +++ b/sysdeps/microblaze/math_private.h @@ -17,9 +17,7 @@ success in every case. The overrides for libc_ functions must happen before we include - the generic math_private.h, and the overrides for regular - functions must happen afterwards, to avoid clashing with - the declarations of those functions. */ + the generic math_private.h. */ #define libc_fesetround(rnd) ({ 0; }) #define libc_fetestexcept(exc) ({ 0; }) @@ -32,8 +30,4 @@ #include_next -#define feraiseexcept(excepts) ({ 0; }) -#define __feraiseexcept(excepts) ({ 0; }) -#define feclearexcept(exc) ({ 0; }) - #endif diff --git a/sysdeps/nios2/math_private.h b/sysdeps/nios2/math_private.h index 373da2a..2514041 100644 --- a/sysdeps/nios2/math_private.h +++ b/sysdeps/nios2/math_private.h @@ -16,9 +16,7 @@ success in every case. The overrides for libc_ functions must happen before we include - the generic math_private.h, and the overrides for regular - functions must happen afterwards, to avoid clashing with - the declarations of those functions. */ + the generic math_private.h. */ #define libc_fesetround(rnd) ({ 0; }) #define libc_fetestexcept(exc) ({ 0; }) @@ -31,8 +29,4 @@ #include_next -#define feraiseexcept(excepts) ({ 0; }) -#define __feraiseexcept(excepts) ({ 0; }) -#define feclearexcept(exc) ({ 0; }) - #endif diff --git a/sysdeps/tile/math_private.h b/sysdeps/tile/math_private.h index 99daec4..6dc43f4 100644 --- a/sysdeps/tile/math_private.h +++ b/sysdeps/tile/math_private.h @@ -26,10 +26,6 @@ #include_next -#define feraiseexcept(excepts) ({ 0; }) -#define __feraiseexcept(excepts) ({ 0; }) -#define feclearexcept(exc) ({ 0; }) -#define fetestexcept(exc) ({ 0; }) extern inline int fegetenv (fenv_t *__e) { return 0; } extern inline int __fegetenv (fenv_t *__e) { return 0; } extern inline int fesetenv (const fenv_t *__e) { return 0; } -- Joseph S. Myers joseph@codesourcery.com