about summary refs log tree commit diff
path: root/sysdeps/powerpc
diff options
context:
space:
mode:
authorPaul A. Clarke <pc@us.ibm.com>2019-07-08 17:06:19 -0500
committerPaul A. Clarke <pc@us.ibm.com>2019-07-09 13:09:35 -0500
commitb5232c9f9e6048b8f780d3cbfadbc8e59bb90ce4 (patch)
tree2a5bc5198738f29083351ee68ad20c274cc75ff1 /sysdeps/powerpc
parent6ba205b2c35e3e024c8c12d2ee1b73363e84da87 (diff)
downloadglibc-b5232c9f9e6048b8f780d3cbfadbc8e59bb90ce4.tar.gz
glibc-b5232c9f9e6048b8f780d3cbfadbc8e59bb90ce4.tar.xz
glibc-b5232c9f9e6048b8f780d3cbfadbc8e59bb90ce4.zip
[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.
Diffstat (limited to 'sysdeps/powerpc')
-rw-r--r--sysdeps/powerpc/fpu/fenv_libc.h4
1 files changed, 3 insertions, 1 deletions
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.  */