From: Florian Krohm <florian@eich-krohm.de>
Date: Wed, 24 Sep 2014 22:02:54 +0000 (+0000)
Subject: The testbuckets none/tests/ppc{32,64} did not build in case the
X-Git-Tag: svn/VALGRIND_3_11_0~967
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=457f0b2d1aed26e5e8ef49838b125c03ac29b0c0;p=thirdparty%2Fvalgrind.git

The testbuckets none/tests/ppc{32,64} did not build in case the
toolchain did not support -maltivec -mabi=altivec.
This should work now. Fixes BZ #338731


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

diff --git a/NEWS b/NEWS
index 1079c24a12..8ee9be3027 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,7 @@ To see details of a given bug, visit
   https://bugs.kde.org/show_bug.cgi?id=XXXXXX
 where XXXXXX is the bug number as listed below.
 
+338731 ppc: Fix testuite build for toolchains not supporting -maltivec
 339020 ppc64: memcheck/tests/ppc64/power_ISA2_05 failing in nightly build
 339156 - gdbsrv not called for fatal signal
 n-i-bz Old STABS code is still being compiled, but never used. Remove it.
diff --git a/none/tests/ppc32/Makefile.am b/none/tests/ppc32/Makefile.am
index eb30c4240d..b38efd04fe 100644
--- a/none/tests/ppc32/Makefile.am
+++ b/none/tests/ppc32/Makefile.am
@@ -72,8 +72,12 @@ AM_CCASFLAGS += @FLAG_M32@
 allexec_CFLAGS		= $(AM_CFLAGS) @FLAG_W_NO_NONNULL@
 
 if HAS_ALTIVEC
+BUILD_FLAG_ALTIVEC = -maltivec
+BUILD_FLAG_ABI_ALTIVEC = -mabi=altivec
 ALTIVEC_FLAG = -DHAS_ALTIVEC
 else
+BUILD_FLAG_ALTIVEC =
+BUILD_FLAG_ABI_ALTIVEC =
 ALTIVEC_FLAG =
 endif
 
@@ -101,11 +105,12 @@ BUILD_FLAGS_ISA_2_07 =
 ISA_2_07_FLAG =
 endif
 
-jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames -maltivec \
-			@FLAG_M32@ $(ALTIVEC_FLAG)
+jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames \
+			@FLAG_M32@ $(ALTIVEC_FLAG) $(BUILD_FLAG_ALTIVEC)
 
-testVMX_CFLAGS  = $(AM_CFLAGS) -O -g -Wall -maltivec -mabi=altivec -DALTIVEC \
-			-DGCC_COMPILER @FLAG_M32@
+testVMX_CFLAGS  = $(AM_CFLAGS) -O -g -Wall -DALTIVEC \
+			-DGCC_COMPILER @FLAG_M32@  $(BUILD_FLAG_ALTIVEC) \
+			$(BUILD_FLAG_ABI_ALTIVEC)
 
 test_isa_2_06_part1_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(VSX_FLAG) \
 			@FLAG_M32@ $(ALTIVEC_FLAG) $(BUILD_FLAG_VSX)
diff --git a/none/tests/ppc64/Makefile.am b/none/tests/ppc64/Makefile.am
index bcd81efd5a..68baacf3f4 100644
--- a/none/tests/ppc64/Makefile.am
+++ b/none/tests/ppc64/Makefile.am
@@ -50,8 +50,10 @@ AM_CCASFLAGS += @FLAG_M64@
 allexec_CFLAGS		= $(AM_CFLAGS) @FLAG_W_NO_NONNULL@
 
 if HAS_ALTIVEC
+BUILD_FLAG_ALTIVEC = -maltivec
 ALTIVEC_FLAG = -DHAS_ALTIVEC
 else
+BUILD_FLAG_ALTIVEC =
 ALTIVEC_FLAG =
 endif
 
@@ -88,8 +90,8 @@ test_isa_2_06_part2_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(VSX_
 test_isa_2_06_part3_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(VSX_FLAG) \
 			@FLAG_M64@ $(ALTIVEC_FLAG) $(BUILD_FLAG_VSX)
 
-jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames -maltivec \
-			@FLAG_M64@ $(ALTIVEC_FLAG)
+jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames \
+			@FLAG_M64@ $(ALTIVEC_FLAG) $(BUILD_FLAG_ALTIVEC)
 
 test_dfp1_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(DFP_FLAG) \
 			@FLAG_M64@ $(BUILD_FLAGS_DFP)