[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 3db85a9814.
This commit is contained in:
Paul A. Clarke 2019-07-08 17:06:19 -05:00
parent 6ba205b2c3
commit b5232c9f9e
2 changed files with 8 additions and 1 deletions

View File

@ -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]

View File

@ -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. */