valgrind: build with altivec only if it supported

(From OE-Core rev: 9992208ad7fdf27703e9470fa6b80ab94274b3f6)

Signed-off-by: Ting Liu <ting.liu@freescale.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>

Cherry-pick from branch dizzy.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kai Kang 2015-07-02 16:40:51 +08:00 committed by Richard Purdie
parent 5e032f1cca
commit ad11256f31
2 changed files with 69 additions and 0 deletions

View File

@ -0,0 +1,68 @@
Upstream-status: Backport
r14566 | florian | 2014-09-24 17:02:54 -0500 (Wed, 24 Sep 2014) | 4 lines
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
Index: none/tests/ppc32/Makefile.am
===================================================================
--- a/none/tests/ppc32/Makefile.am (revision 14565)
+++ b/none/tests/ppc32/Makefile.am (revision 14566)
@@ -72,8 +72,12 @@
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 @@
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)
Index: none/tests/ppc64/Makefile.am
===================================================================
--- a/none/tests/ppc64/Makefile.am (revision 14565)
+++ b/none/tests/ppc64/Makefile.am (revision 14566)
@@ -50,8 +50,10 @@
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_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)

View File

@ -23,6 +23,7 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
file://valgrind-remove-rpath.patch \
file://enable.building.on.4.x.kernel.patch \
file://add-ptest.patch \
file://pass-maltivec-only-if-it-supported.patch \
file://run-ptest \
"