Remove some math_private.h libc_feholdexcept_setround overrides.

math_private.h headers for configurations lacking support for
floating-point exceptions and rounding modes define
libc_feholdexcept_setround to override the default version with one
that discards its rounding mode argument.

Unlike other such libc_fe* macros that I removed, this one is actually
used for such configurations (in dbl-64/e_sqrt.c).  However, this does
not make the macro required.  It's only used for such configurations
with FE_TONEAREST as the rounding mode (anything needing another mode
should not be used when that mode is unavailable), and the default
definition just calls __feholdexcept and __fesetround.  Since we now
have suitable inline do-nothing definitions of __feholdexcept and
__fesetround for the cases of no exceptions and rounding modes, we can
just rely on those inlines to achieve the same optimization as this
macro definition.  Thus, this patch removes those macro definitions
(and the math_private.h headers containing them, when no longer needed
after that removal).

Tested with build-many-glibcs.py that installed stripped shared
libraries are unchanged by the patch.

	* 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.
This commit is contained in:
Joseph Myers 2018-02-01 20:58:57 +00:00
parent 8a6bb1d086
commit eb65a3d545
6 changed files with 9 additions and 106 deletions

View File

@ -1,5 +1,14 @@
2018-02-01 Joseph Myers <joseph@codesourcery.com> 2018-02-01 Joseph Myers <joseph@codesourcery.com>
* 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): * sysdeps/m68k/coldfire/nofpu/math_private.h (libc_fesetround):
Remove macro. Remove macro.
(libc_fetestexcept): Likewise. (libc_fetestexcept): Likewise.

View File

@ -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
<http://www.gnu.org/licenses/>. */
#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 <math_private.h>
#endif

View File

@ -1,26 +1,6 @@
#ifndef MICROBLAZE_MATH_PRIVATE_H #ifndef MICROBLAZE_MATH_PRIVATE_H
#define MICROBLAZE_MATH_PRIVATE_H 1 #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 /* Enable __finitel, __isinfl, and __isnanl for binary compatibility
when built without long double support. */ when built without long double support. */
#define LDBL_CLASSIFY_COMPAT 1 #define LDBL_CLASSIFY_COMPAT 1

View File

@ -1,25 +1,6 @@
#ifndef NIO2_MATH_PRIVATE_H #ifndef NIO2_MATH_PRIVATE_H
#define NIO2_MATH_PRIVATE_H 1 #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 /* Enable __finitel, __isinfl, and __isnanl for binary compatibility
when built without long double support. */ when built without long double support. */
#define LDBL_CLASSIFY_COMPAT 1 #define LDBL_CLASSIFY_COMPAT 1

View File

@ -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 <math_private.h>
#endif