This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] [powerpc] fpu_control.h: protect use of __builtin_cpu_supports()
- From: "Paul A. Clarke" <pc at us dot ibm dot com>
- To: libc-alpha at sourceware dot org
- Cc: tuliom at ascii dot art dot br, law at redhat dot com, carlos at redhat dot com
- Date: Mon, 8 Jul 2019 18:54:36 -0500
- Subject: [PATCH] [powerpc] fpu_control.h: protect use of __builtin_cpu_supports()
From: "Paul A. Clarke" <pc@us.ibm.com>
Using __builtin_cpu_supports() requires support in GCC and Glibc.
My recent patch to fpu_control.h added an unprotected use of
__builtin_cpu_supports(), and this is a user-visible file.
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]
Fixes 3db85a9814784a74536a1f0e7b7ddbfef7dc84bb.
2019-07-08 Paul A. Clarke <pc@us.ibm.com>
* sysdeps/powerpc/fpu/fpu_control.h (_FPU_GET_RC): Protect use of
__builtin_cpu_supports with __BUILTIN_CPU_SUPPORTS__.
---
sysdeps/powerpc/fpu/fenv_libc.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sysdeps/powerpc/fpu/fenv_libc.h b/sysdeps/powerpc/fpu/fenv_libc.h
index 55b1697..59a8c44 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. */
--
1.8.3.1