about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2016-03-25 11:11:42 +0100
committerMike Frysinger <vapier@gentoo.org>2016-11-12 00:44:27 -0500
commit6a04ea1a9a8586c737a71b1a1b55e15c51a25c1f (patch)
tree81aa9a90f40da9c0683469f37c702049040b97f7
parent2af88e803f2084c17e55b835ef881b243a393fa9 (diff)
downloadglibc-6a04ea1a9a8586c737a71b1a1b55e15c51a25c1f.tar.gz
glibc-6a04ea1a9a8586c737a71b1a1b55e15c51a25c1f.tar.xz
glibc-6a04ea1a9a8586c737a71b1a1b55e15c51a25c1f.zip
tst-audit10: Fix compilation on compilers without bit_AVX512F [BZ #19860]
	[BZ# 19860]
	* sysdeps/x86_64/tst-audit10.c (avx512_enabled): Always return
	zero if the compiler does not provide the AVX512F bit.

(cherry picked from commit f327f5b47be57bc05a4077344b381016c1bb2c11)
(cherry picked from commit 4cf055a2a331b7361622dc9ac8993b59c6f0ef59)
-rw-r--r--sysdeps/x86_64/tst-audit10.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sysdeps/x86_64/tst-audit10.c b/sysdeps/x86_64/tst-audit10.c
index a487b408bb..0df2275f59 100644
--- a/sysdeps/x86_64/tst-audit10.c
+++ b/sysdeps/x86_64/tst-audit10.c
@@ -17,13 +17,13 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <cpuid.h>
-#include <cpu-features.h>
 
 int tst_audit10_aux (void);
 
 static int
 avx512_enabled (void)
 {
+#ifdef bit_AVX512F
   unsigned int eax, ebx, ecx, edx;
 
   if (__get_cpuid (1, &eax, &ebx, &ecx, &edx) == 0
@@ -38,6 +38,9 @@ avx512_enabled (void)
 
   /* Verify that ZMM, YMM and XMM states are enabled.  */
   return (eax & 0xe6) == 0xe6;
+#else
+  return 0;
+#endif
 }
 
 static int