From: Mark Wielaard <mark@klomp.org>
Date: Fri, 16 Jun 2017 09:33:35 +0000 (+0000)
Subject: ppc64 doesn't compile test_isa_2_06_partx.c without VSX support
X-Git-Tag: VALGRIND_3_14_0~321
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9160ea1ad5d5c34004966141ee1db340065b44ec;p=thirdparty%2Fvalgrind.git

ppc64 doesn't compile test_isa_2_06_partx.c without VSX support

The #ifdef HAS_VSX guard is wrongly placed. It makes the standard
include headers not be used. Causing a build failure. Fix by moving
the #ifdef HAS_VSX after the standard includes.

https://bugs.kde.org/show_bug.cgi?id=381272

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16450
---

diff --git a/NEWS b/NEWS
index 01eb0defbe..722910729d 100644
--- a/NEWS
+++ b/NEWS
@@ -37,6 +37,7 @@ where XXXXXX is the bug number as listed below.
 
 380397  s390x: __GI_strcspn() replacemenet needed
 381162  possible array overrun in VEX register allocator
+381272  ppc64 doesn't compile test_isa_2_06_partx.c without VSX support
 
 
 Release 3.13.0 (15 June 2017)
diff --git a/none/tests/ppc32/test_isa_2_06_part1.c b/none/tests/ppc32/test_isa_2_06_part1.c
index 7cd49301f8..7a14c6df31 100644
--- a/none/tests/ppc32/test_isa_2_06_part1.c
+++ b/none/tests/ppc32/test_isa_2_06_part1.c
@@ -20,13 +20,14 @@
  The GNU General Public License is contained in the file COPYING.
  */
 
-#ifdef HAS_VSX
-
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <malloc.h>
+
+#ifdef HAS_VSX
+
 #include <altivec.h>
 
 #ifndef __powerpc64__
diff --git a/none/tests/ppc32/test_isa_2_06_part2.c b/none/tests/ppc32/test_isa_2_06_part2.c
index c7bf4fe697..2ee7b53ced 100644
--- a/none/tests/ppc32/test_isa_2_06_part2.c
+++ b/none/tests/ppc32/test_isa_2_06_part2.c
@@ -20,17 +20,18 @@
  The GNU General Public License is contained in the file COPYING.
  */
 
-#ifdef HAS_VSX
-
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <malloc.h>
-#include <altivec.h>
 #include <math.h>
 #include <unistd.h>    // getopt
 
+#ifdef HAS_VSX
+
+#include <altivec.h>
+
 #ifndef __powerpc64__
 typedef uint32_t HWord_t;
 #else
diff --git a/none/tests/ppc32/test_isa_2_06_part3.c b/none/tests/ppc32/test_isa_2_06_part3.c
index 8c74c09d4e..5ebc1a5e7f 100644
--- a/none/tests/ppc32/test_isa_2_06_part3.c
+++ b/none/tests/ppc32/test_isa_2_06_part3.c
@@ -20,17 +20,18 @@
  The GNU General Public License is contained in the file COPYING.
  */
 
-#ifdef HAS_VSX
-
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <malloc.h>
-#include <altivec.h>
 #include <math.h>
 #include <unistd.h>    // getopt
 
+#ifdef HAS_VSX
+
+#include <altivec.h>
+
 #ifndef __powerpc64__
 typedef uint32_t HWord_t;
 #else