diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-11-20 23:46:23 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-11-20 23:46:23 +0000 |
| commit | 2d2c271aea8edd4147793ee6eea82b4ebe2143ae (patch) | |
| tree | 42d9eb83f9fd70cfff475252d5ab043631d28808 /sysdeps/hppa | |
| parent | d709042a6e5ab3c360280faad6f9538a34dc8eea (diff) | |
| download | glibc-2d2c271aea8edd4147793ee6eea82b4ebe2143ae.tar.gz glibc-2d2c271aea8edd4147793ee6eea82b4ebe2143ae.tar.xz glibc-2d2c271aea8edd4147793ee6eea82b4ebe2143ae.zip | |
Fix math_private.h multiple include guards.
Various math_private.h headers are guarded by "#ifndef _MATH_PRIVATE_H", but never define the macro. Nothing else defines the macro either (the generic math_private.h that they include defines a different macro, _MATH_PRIVATE_H_), so those guards are ineffective. With the recent inclusion of s_sin.c in s_sincos.c, this breaks the build for MIPS, since the build of s_sincos.c ends up including <math_private.h> twice and the MIPS version defines inline functions such as libc_feholdexcept_mips, without a separate fenv_private.h header with its own guards such as some architectures have. This patch fixes all the problem headers to use architecture-specific guard macro names, and to define those macros in the headers they guard, just as some architectures already do. Tested for x86 (testsuite, and that installed shared libraries are unchanged by the patch), and for mips64 (that it fixes the build). * sysdeps/arm/math_private.h [!_MATH_PRIVATE_H]: Change guard to [!ARM_MATH_PRIVATE_H]. [!ARM_MATH_PRIVATE_H] (ARM_MATH_PRIVATE_H): Define macro. * sysdeps/hppa/math_private.h [!_MATH_PRIVATE_H]: Change guard to [!HPPA_MATH_PRIVATE_H]. [!HPPA_MATH_PRIVATE_H] (HPPA_MATH_PRIVATE_H): Define macro. * sysdeps/i386/fpu/math_private.h [!_MATH_PRIVATE_H]: Change guard to [!I386_MATH_PRIVATE_H]. [!I386_MATH_PRIVATE_H] (I386_MATH_PRIVATE_H): Define macro. * sysdeps/m68k/m680x0/fpu/math_private.h [!_MATH_PRIVATE_H]: Change guard to [!M68K_MATH_PRIVATE_H]. [!M68K_MATH_PRIVATE_H] (M68K_MATH_PRIVATE_H): Define macro. * sysdeps/microblaze/math_private.h [!_MATH_PRIVATE_H]: Change guard to [!MICROBLAZE_MATH_PRIVATE_H]. [!MICROBLAZE_MATH_PRIVATE_H] (MICROBLAZE_MATH_PRIVATE_H): Define macro. * sysdeps/mips/math_private.h [!_MATH_PRIVATE_H]: Change guard to [!MIPS_MATH_PRIVATE_H]. [!MIPS_MATH_PRIVATE_H] (MIPS_MATH_PRIVATE_H): Define macro. * sysdeps/nios2/math_private.h [!_MATH_PRIVATE_H]: Change guard to [!NIO2_MATH_PRIVATE_H]. [!NIO2_MATH_PRIVATE_H] (NIO2_MATH_PRIVATE_H): Define macro. * sysdeps/tile/math_private.h [!_MATH_PRIVATE_H]: Change guard to [!TILE_MATH_PRIVATE_H]. [!TILE_MATH_PRIVATE_H] (TILE_MATH_PRIVATE_H): Define macro.
Diffstat (limited to 'sysdeps/hppa')
| -rw-r--r-- | sysdeps/hppa/math_private.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sysdeps/hppa/math_private.h b/sysdeps/hppa/math_private.h index fbcc8841b4..457495e786 100644 --- a/sysdeps/hppa/math_private.h +++ b/sysdeps/hppa/math_private.h @@ -16,7 +16,8 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef _MATH_PRIVATE_H +#ifndef HPPA_MATH_PRIVATE_H +#define HPPA_MATH_PRIVATE_H 1 /* One of the few architectures where the meaning of the quiet/signaling bit is inverse to IEEE 754-2008 (as well as common practice for IEEE 754-1985). */ |