Mark Wielaard ae1b1f3
commit 326d53c8378984c50f29bd124d3f2b4a1242306c
Mark Wielaard ae1b1f3
Author: mjw <mjw@a5019735-40e9-0310-863c-91ae7b9d1cf9>
Mark Wielaard ae1b1f3
Date:   Fri Jun 16 09:33:35 2017 +0000
Mark Wielaard ae1b1f3
Mark Wielaard ae1b1f3
    ppc64 doesn't compile test_isa_2_06_partx.c without VSX support
Mark Wielaard ae1b1f3
    
Mark Wielaard ae1b1f3
    The #ifdef HAS_VSX guard is wrongly placed. It makes the standard
Mark Wielaard ae1b1f3
    include headers not be used. Causing a build failure. Fix by moving
Mark Wielaard ae1b1f3
    the #ifdef HAS_VSX after the standard includes.
Mark Wielaard ae1b1f3
    
Mark Wielaard ae1b1f3
    https://bugs.kde.org/show_bug.cgi?id=381272
Mark Wielaard ae1b1f3
    
Mark Wielaard ae1b1f3
    git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16450 a5019735-40e9-0310-863c-91ae7b9d1cf9
Mark Wielaard ae1b1f3
Mark Wielaard ae1b1f3
diff --git a/none/tests/ppc32/test_isa_2_06_part1.c b/none/tests/ppc32/test_isa_2_06_part1.c
Mark Wielaard ae1b1f3
index 7cd4930..7a14c6d 100644
Mark Wielaard ae1b1f3
--- a/none/tests/ppc32/test_isa_2_06_part1.c
Mark Wielaard ae1b1f3
+++ b/none/tests/ppc32/test_isa_2_06_part1.c
Mark Wielaard ae1b1f3
@@ -20,13 +20,14 @@
Mark Wielaard ae1b1f3
  The GNU General Public License is contained in the file COPYING.
Mark Wielaard ae1b1f3
  */
Mark Wielaard ae1b1f3
 
Mark Wielaard ae1b1f3
-#ifdef HAS_VSX
Mark Wielaard ae1b1f3
-
Mark Wielaard ae1b1f3
 #include <stdio.h>
Mark Wielaard ae1b1f3
 #include <stdint.h>
Mark Wielaard ae1b1f3
 #include <stdlib.h>
Mark Wielaard ae1b1f3
 #include <string.h>
Mark Wielaard ae1b1f3
 #include <malloc.h>
Mark Wielaard ae1b1f3
+
Mark Wielaard ae1b1f3
+#ifdef HAS_VSX
Mark Wielaard ae1b1f3
+
Mark Wielaard ae1b1f3
 #include <altivec.h>
Mark Wielaard ae1b1f3
 
Mark Wielaard ae1b1f3
 #ifndef __powerpc64__
Mark Wielaard ae1b1f3
diff --git a/none/tests/ppc32/test_isa_2_06_part2.c b/none/tests/ppc32/test_isa_2_06_part2.c
Mark Wielaard ae1b1f3
index c7bf4fe..2ee7b53 100644
Mark Wielaard ae1b1f3
--- a/none/tests/ppc32/test_isa_2_06_part2.c
Mark Wielaard ae1b1f3
+++ b/none/tests/ppc32/test_isa_2_06_part2.c
Mark Wielaard ae1b1f3
@@ -20,17 +20,18 @@
Mark Wielaard ae1b1f3
  The GNU General Public License is contained in the file COPYING.
Mark Wielaard ae1b1f3
  */
Mark Wielaard ae1b1f3
 
Mark Wielaard ae1b1f3
-#ifdef HAS_VSX
Mark Wielaard ae1b1f3
-
Mark Wielaard ae1b1f3
 #include <stdio.h>
Mark Wielaard ae1b1f3
 #include <stdint.h>
Mark Wielaard ae1b1f3
 #include <stdlib.h>
Mark Wielaard ae1b1f3
 #include <string.h>
Mark Wielaard ae1b1f3
 #include <malloc.h>
Mark Wielaard ae1b1f3
-#include <altivec.h>
Mark Wielaard ae1b1f3
 #include <math.h>
Mark Wielaard ae1b1f3
 #include <unistd.h>    // getopt
Mark Wielaard ae1b1f3
 
Mark Wielaard ae1b1f3
+#ifdef HAS_VSX
Mark Wielaard ae1b1f3
+
Mark Wielaard ae1b1f3
+#include <altivec.h>
Mark Wielaard ae1b1f3
+
Mark Wielaard ae1b1f3
 #ifndef __powerpc64__
Mark Wielaard ae1b1f3
 typedef uint32_t HWord_t;
Mark Wielaard ae1b1f3
 #else
Mark Wielaard ae1b1f3
diff --git a/none/tests/ppc32/test_isa_2_06_part3.c b/none/tests/ppc32/test_isa_2_06_part3.c
Mark Wielaard ae1b1f3
index 8c74c09..5ebc1a5 100644
Mark Wielaard ae1b1f3
--- a/none/tests/ppc32/test_isa_2_06_part3.c
Mark Wielaard ae1b1f3
+++ b/none/tests/ppc32/test_isa_2_06_part3.c
Mark Wielaard ae1b1f3
@@ -20,17 +20,18 @@
Mark Wielaard ae1b1f3
  The GNU General Public License is contained in the file COPYING.
Mark Wielaard ae1b1f3
  */
Mark Wielaard ae1b1f3
 
Mark Wielaard ae1b1f3
-#ifdef HAS_VSX
Mark Wielaard ae1b1f3
-
Mark Wielaard ae1b1f3
 #include <stdio.h>
Mark Wielaard ae1b1f3
 #include <stdint.h>
Mark Wielaard ae1b1f3
 #include <stdlib.h>
Mark Wielaard ae1b1f3
 #include <string.h>
Mark Wielaard ae1b1f3
 #include <malloc.h>
Mark Wielaard ae1b1f3
-#include <altivec.h>
Mark Wielaard ae1b1f3
 #include <math.h>
Mark Wielaard ae1b1f3
 #include <unistd.h>    // getopt
Mark Wielaard ae1b1f3
 
Mark Wielaard ae1b1f3
+#ifdef HAS_VSX
Mark Wielaard ae1b1f3
+
Mark Wielaard ae1b1f3
+#include <altivec.h>
Mark Wielaard ae1b1f3
+
Mark Wielaard ae1b1f3
 #ifndef __powerpc64__
Mark Wielaard ae1b1f3
 typedef uint32_t HWord_t;
Mark Wielaard ae1b1f3
 #else
Mark Wielaard 345398b
Mark Wielaard 345398b
diff --git a/none/tests/ppc64/test_isa_2_06_part1.c b/none/tests/ppc64/test_isa_2_06_part1.c
Mark Wielaard 345398b
index 7cd4930..7a14c6d 100644
Mark Wielaard 345398b
--- a/none/tests/ppc64/test_isa_2_06_part1.c
Mark Wielaard 345398b
+++ b/none/tests/ppc64/test_isa_2_06_part1.c
Mark Wielaard 345398b
@@ -20,13 +20,14 @@
Mark Wielaard 345398b
  The GNU General Public License is contained in the file COPYING.
Mark Wielaard 345398b
  */
Mark Wielaard 345398b
 
Mark Wielaard 345398b
-#ifdef HAS_VSX
Mark Wielaard 345398b
-
Mark Wielaard 345398b
 #include <stdio.h>
Mark Wielaard 345398b
 #include <stdint.h>
Mark Wielaard 345398b
 #include <stdlib.h>
Mark Wielaard 345398b
 #include <string.h>
Mark Wielaard 345398b
 #include <malloc.h>
Mark Wielaard 345398b
+
Mark Wielaard 345398b
+#ifdef HAS_VSX
Mark Wielaard 345398b
+
Mark Wielaard 345398b
 #include <altivec.h>
Mark Wielaard 345398b
 
Mark Wielaard 345398b
 #ifndef __powerpc64__
Mark Wielaard 345398b
diff --git a/none/tests/ppc64/test_isa_2_06_part2.c b/none/tests/ppc64/test_isa_2_06_part2.c
Mark Wielaard 345398b
index c7bf4fe..2ee7b53 100644
Mark Wielaard 345398b
--- a/none/tests/ppc64/test_isa_2_06_part2.c
Mark Wielaard 345398b
+++ b/none/tests/ppc64/test_isa_2_06_part2.c
Mark Wielaard 345398b
@@ -20,17 +20,18 @@
Mark Wielaard 345398b
  The GNU General Public License is contained in the file COPYING.
Mark Wielaard 345398b
  */
Mark Wielaard 345398b
 
Mark Wielaard 345398b
-#ifdef HAS_VSX
Mark Wielaard 345398b
-
Mark Wielaard 345398b
 #include <stdio.h>
Mark Wielaard 345398b
 #include <stdint.h>
Mark Wielaard 345398b
 #include <stdlib.h>
Mark Wielaard 345398b
 #include <string.h>
Mark Wielaard 345398b
 #include <malloc.h>
Mark Wielaard 345398b
-#include <altivec.h>
Mark Wielaard 345398b
 #include <math.h>
Mark Wielaard 345398b
 #include <unistd.h>    // getopt
Mark Wielaard 345398b
 
Mark Wielaard 345398b
+#ifdef HAS_VSX
Mark Wielaard 345398b
+
Mark Wielaard 345398b
+#include <altivec.h>
Mark Wielaard 345398b
+
Mark Wielaard 345398b
 #ifndef __powerpc64__
Mark Wielaard 345398b
 typedef uint32_t HWord_t;
Mark Wielaard 345398b
 #else
Mark Wielaard 345398b
diff --git a/none/tests/ppc64/test_isa_2_06_part3.c b/none/tests/ppc64/test_isa_2_06_part3.c
Mark Wielaard 345398b
index 8c74c09..5ebc1a5 100644
Mark Wielaard 345398b
--- a/none/tests/ppc64/test_isa_2_06_part3.c
Mark Wielaard 345398b
+++ b/none/tests/ppc64/test_isa_2_06_part3.c
Mark Wielaard 345398b
@@ -20,17 +20,18 @@
Mark Wielaard 345398b
  The GNU General Public License is contained in the file COPYING.
Mark Wielaard 345398b
  */
Mark Wielaard 345398b
 
Mark Wielaard 345398b
-#ifdef HAS_VSX
Mark Wielaard 345398b
-
Mark Wielaard 345398b
 #include <stdio.h>
Mark Wielaard 345398b
 #include <stdint.h>
Mark Wielaard 345398b
 #include <stdlib.h>
Mark Wielaard 345398b
 #include <string.h>
Mark Wielaard 345398b
 #include <malloc.h>
Mark Wielaard 345398b
-#include <altivec.h>
Mark Wielaard 345398b
 #include <math.h>
Mark Wielaard 345398b
 #include <unistd.h>    // getopt
Mark Wielaard 345398b
 
Mark Wielaard 345398b
+#ifdef HAS_VSX
Mark Wielaard 345398b
+
Mark Wielaard 345398b
+#include <altivec.h>
Mark Wielaard 345398b
+
Mark Wielaard 345398b
 #ifndef __powerpc64__
Mark Wielaard 345398b
 typedef uint32_t HWord_t;
Mark Wielaard 345398b
 #else