diff --git a/ChangeLog b/ChangeLog index bd52e877d7..735090ef57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2018-02-01 Joseph Myers + * sysdeps/m68k/coldfire/fpu/math_private.h: Move to .... + * sysdeps/m68k/coldfire/math_private.h: ... here. + * sysdeps/m68k/coldfire/nofpu/math_private.h: Remove file. + * sysdeps/tile/math_private.h: Likewise. + * sysdeps/microblaze/math_private.h (libc_feholdexcept_setround): + Remove macro. + * sysdeps/nios2/math_private.h (libc_feholdexcept_setround): + Likewise. + * sysdeps/m68k/coldfire/nofpu/math_private.h (libc_fesetround): Remove macro. (libc_fetestexcept): Likewise. diff --git a/sysdeps/m68k/coldfire/fpu/math_private.h b/sysdeps/m68k/coldfire/math_private.h similarity index 100% rename from sysdeps/m68k/coldfire/fpu/math_private.h rename to sysdeps/m68k/coldfire/math_private.h diff --git a/sysdeps/m68k/coldfire/nofpu/math_private.h b/sysdeps/m68k/coldfire/nofpu/math_private.h deleted file mode 100644 index 0694de971a..0000000000 --- a/sysdeps/m68k/coldfire/nofpu/math_private.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Disable use of exceptions and rounding modes for no-FPU ColdFire. - Copyright (C) 2012-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 COLDFIRE_NOFPU_MATH_PRIVATE_H -#define COLDFIRE_NOFPU_MATH_PRIVATE_H 1 - -/* Suppress use of exceptions and rounding modes here to avoid build - errors if the FE_* macros aren't defined. - - We intentionally ignore the "exception" arguments of functions that - take an exception, since we can't even evaluate the argument - without causing a build failure. The extra level of statement - expression wrapping avoids "statement with no effect" warnings. - Since the callers don't check for errors anyway, we just claim - success in every case. - - The overrides for libc_ functions must happen before we include - the generic math_private.h. */ - -#define libc_feholdexcept_setround(env, exc) ({ (void) (env); 0; }) - -/* Enable __finitel, __isinfl, and __isnanl for binary compatibility - when built without long double support. */ -#define LDBL_CLASSIFY_COMPAT 1 - -#include_next - -#endif diff --git a/sysdeps/microblaze/math_private.h b/sysdeps/microblaze/math_private.h index 1d70d05b81..64dc18133f 100644 --- a/sysdeps/microblaze/math_private.h +++ b/sysdeps/microblaze/math_private.h @@ -1,26 +1,6 @@ #ifndef MICROBLAZE_MATH_PRIVATE_H #define MICROBLAZE_MATH_PRIVATE_H 1 -/* Suppress use of exceptions here to avoid build errors if the FE_* - macros aren't definied. Only allow rounding modes implemented for - MicroBlaze. - - This does mean that some code will silently fail to report exceptions, - set rounding mode as expected, etc., but it allows math code to compile - that otherwise wouldn't (such as math/s_fma.c) and so is valuable. - - We intentionally ignore the "exception" arguments of functions that - take an exception, since we can't even evaluate the argument - without causing a build failure. The extra level of statement - expression wrapping avoids "statement with no effect" warnings. - Since the callers don't check for errors anyway, we just claim - success in every case. - - The overrides for libc_ functions must happen before we include - the generic math_private.h. */ - -#define libc_feholdexcept_setround(env, exc) ({ (void) (env); 0; }) - /* Enable __finitel, __isinfl, and __isnanl for binary compatibility when built without long double support. */ #define LDBL_CLASSIFY_COMPAT 1 diff --git a/sysdeps/nios2/math_private.h b/sysdeps/nios2/math_private.h index 9c734fab58..bc7f9c8e90 100644 --- a/sysdeps/nios2/math_private.h +++ b/sysdeps/nios2/math_private.h @@ -1,25 +1,6 @@ #ifndef NIO2_MATH_PRIVATE_H #define NIO2_MATH_PRIVATE_H 1 -/* Suppress use of exceptions here to avoid build errors if the FE_* - macros aren't defined. Only allow rounding modes implemented for Nios II. - - This does mean that some code will silently fail to report exceptions, - set rounding mode as expected, etc., but it allows math code to compile - that otherwise wouldn't (such as math/s_fma.c) and so is valuable. - - We intentionally ignore the "exception" arguments of functions that - take an exception, since we can't even evaluate the argument - without causing a build failure. The extra level of statement - expression wrapping avoids "statement with no effect" warnings. - Since the callers don't check for errors anyway, we just claim - success in every case. - - The overrides for libc_ functions must happen before we include - the generic math_private.h. */ - -#define libc_feholdexcept_setround(env, exc) ({ (void) (env); 0; }) - /* Enable __finitel, __isinfl, and __isnanl for binary compatibility when built without long double support. */ #define LDBL_CLASSIFY_COMPAT 1 diff --git a/sysdeps/tile/math_private.h b/sysdeps/tile/math_private.h deleted file mode 100644 index 09c720469e..0000000000 --- a/sysdeps/tile/math_private.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef TILE_MATH_PRIVATE_H -#define TILE_MATH_PRIVATE_H 1 - -/* Internally, we suppress any use of exception or rounding other - than what is supported by the hardware. This does mean that some - code will silently fail to report exceptions, set rounding mode - as expected, etc., but it allows math code to compile that otherwise - wouldn't (such as math/s_fma.c) and so is valuable. - - We intentionally ignore the "exception" arguments of functions that - take an exception, since we can't even evaluate the argument - without causing a build failure. The extra level of statement - expression wrapping avoids "statement with no effect" warnings. - Since the callers don't check for errors anyway, we just claim - success in every case. - - The overrides for libc_ functions must happen before we include - the generic math_private.h. */ - -#define libc_feholdexcept_setround(env, exc) ({ (void) (env); 0; }) - -#include_next - -#endif