[COMMITTED] Fix tst-audit10 build when -mavx512f is not supported.

Message ID 20160308203613.7A32D2C3C1B@topped-with-meat.com
State Committed
Headers

Commit Message

Roland McGrath March 8, 2016, 8:36 p.m. UTC
  This unbroke my local build with the same compiler the bot uses, and
so I expect it to unbreak the bot too.


Thanks,
Roland


2016-03-08  Roland McGrath  <roland@hack.frob.com>

	* sysdeps/x86_64/tst-audit10.c: #include <cpu-features.h>.
	* sysdeps/x86_64/tst-audit10-aux.c: Move audit_test extern decl ...
	(tst_audit10_aux) [__AVX512F__]: ... here.
  

Comments

Florian Weimer March 10, 2016, 11:16 a.m. UTC | #1
On 03/08/2016 09:36 PM, Roland McGrath wrote:
> This unbroke my local build with the same compiler the bot uses, and
> so I expect it to unbreak the bot too.

Sorry, and thanks for correcting this.  I verified that it fixes things
for GCC 4.7 as well.

Florian
  

Patch

diff --git a/sysdeps/x86_64/tst-audit10-aux.c b/sysdeps/x86_64/tst-audit10-aux.c
index 4398b8f..992a16c 100644
--- a/sysdeps/x86_64/tst-audit10-aux.c
+++ b/sysdeps/x86_64/tst-audit10-aux.c
@@ -20,13 +20,13 @@ 
 #include <stdlib.h>
 #include <string.h>
 
-extern __m512i audit_test (__m512i, __m512i, __m512i, __m512i,
-			   __m512i, __m512i, __m512i, __m512i);
-
 int
 tst_audit10_aux (void)
 {
 #ifdef __AVX512F__
+  extern __m512i audit_test (__m512i, __m512i, __m512i, __m512i,
+                             __m512i, __m512i, __m512i, __m512i);
+
   __m512i zmm = _mm512_setzero_si512 ();
   __m512i ret = audit_test (zmm, zmm, zmm, zmm, zmm, zmm, zmm, zmm);
 
diff --git a/sysdeps/x86_64/tst-audit10.c b/sysdeps/x86_64/tst-audit10.c
index 92e0cb4..a487b40 100644
--- a/sysdeps/x86_64/tst-audit10.c
+++ b/sysdeps/x86_64/tst-audit10.c
@@ -17,6 +17,7 @@ 
    <http://www.gnu.org/licenses/>.  */
 
 #include <cpuid.h>
+#include <cpu-features.h>
 
 int tst_audit10_aux (void);