diff options
| author | Paul A. Clarke <pc@us.ibm.com> | 2019-07-08 17:06:19 -0500 |
|---|---|---|
| committer | Paul A. Clarke <pc@us.ibm.com> | 2019-07-09 13:09:35 -0500 |
| commit | b5232c9f9e6048b8f780d3cbfadbc8e59bb90ce4 (patch) | |
| tree | 2a5bc5198738f29083351ee68ad20c274cc75ff1 | |
| parent | 6ba205b2c35e3e024c8c12d2ee1b73363e84da87 (diff) | |
| download | glibc-b5232c9f9e6048b8f780d3cbfadbc8e59bb90ce4.tar.gz | |
[powerpc] fenv_libc.h: protect use of __builtin_cpu_supports
Using __builtin_cpu_supports() requires support in GCC and Glibc.
My recent patch to fenv_libc.h added an unprotected use of
__builtin_cpu_supports(). Compilation of Glibc itself will fail
with a sufficiently new GCC and sufficiently old Glibc:
../sysdeps/powerpc/fpu/fegetexcept.c: In function ‘__fegetexcept’:
../sysdeps/powerpc/fpu/fenv_libc.h:52:20: error: builtin ‘__builtin_cpu_supports’ needs GLIBC (2.23 and newer) that exports hardware capability bits [-Werror]
Reviewed-by: Florian Weimer <fweimer@redhat.com>
Fixes 3db85a9814784a74536a1f0e7b7ddbfef7dc84bb.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/powerpc/fpu/fenv_libc.h | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2019-07-09 Paul A. Clarke <pc@us.ibm.com> + + * sysdeps/powerpc/fpu/fenv_libc.h (_FPU_GET_RC): Protect use of + __builtin_cpu_supports with __BUILTIN_CPU_SUPPORTS__. + 2019-07-08 DJ Delorie <dj@redhat.com> [BZ #23501] diff --git a/sysdeps/powerpc/fpu/fenv_libc.h b/sysdeps/powerpc/fpu/fenv_libc.h index 55b1697c03..9861f18efd 100644 --- a/sysdeps/powerpc/fpu/fenv_libc.h +++ b/sysdeps/powerpc/fpu/fenv_libc.h @@ -47,12 +47,14 @@ extern const fenv_t *__fe_mask_env (void) attribute_hidden; #ifdef _ARCH_PWR9 # define fegetenv_status() fegetenv_status_ISA300() -#else +#elif defined __BUILTIN_CPU_SUPPORTS__ # define fegetenv_status() \ (__glibc_likely (__builtin_cpu_supports ("arch_3_00")) \ ? fegetenv_status_ISA300() \ : fegetenv_register() \ ) +#else +# define fegetenv_status() fegetenv_register () #endif /* Equivalent to fesetenv, but takes a fenv_t instead of a pointer. */ |