summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2015-07-02 16:40:51 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-08 00:01:20 +0100
commitad11256f31c481457dfb71b8032a41a0d5e918e9 (patch)
tree544e863f48113583f439a63db54b496c66ef8379
parent5e032f1cca6ba22cd6c87d6105b1281620a42539 (diff)
downloadpoky-ad11256f31c481457dfb71b8032a41a0d5e918e9.tar.gz
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>
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/pass-maltivec-only-if-it-supported.patch68
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.10.1.bb1
2 files changed, 69 insertions, 0 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/pass-maltivec-only-if-it-supported.patch b/meta/recipes-devtools/valgrind/valgrind/pass-maltivec-only-if-it-supported.patch
new file mode 100644
index 0000000000..12ad4c3f90
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/pass-maltivec-only-if-it-supported.patch
@@ -0,0 +1,68 @@
1Upstream-status: Backport
2
3r14566 | florian | 2014-09-24 17:02:54 -0500 (Wed, 24 Sep 2014) | 4 lines
4
5The testbuckets none/tests/ppc{32,64} did not build in case the
6toolchain did not support -maltivec -mabi=altivec.
7This should work now. Fixes BZ #338731
8
9Index: none/tests/ppc32/Makefile.am
10===================================================================
11--- a/none/tests/ppc32/Makefile.am (revision 14565)
12+++ b/none/tests/ppc32/Makefile.am (revision 14566)
13@@ -72,8 +72,12 @@
14 allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@
15
16 if HAS_ALTIVEC
17+BUILD_FLAG_ALTIVEC = -maltivec
18+BUILD_FLAG_ABI_ALTIVEC = -mabi=altivec
19 ALTIVEC_FLAG = -DHAS_ALTIVEC
20 else
21+BUILD_FLAG_ALTIVEC =
22+BUILD_FLAG_ABI_ALTIVEC =
23 ALTIVEC_FLAG =
24 endif
25
26@@ -101,11 +105,12 @@
27 ISA_2_07_FLAG =
28 endif
29
30-jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames -maltivec \
31- @FLAG_M32@ $(ALTIVEC_FLAG)
32+jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames \
33+ @FLAG_M32@ $(ALTIVEC_FLAG) $(BUILD_FLAG_ALTIVEC)
34
35-testVMX_CFLAGS = $(AM_CFLAGS) -O -g -Wall -maltivec -mabi=altivec -DALTIVEC \
36- -DGCC_COMPILER @FLAG_M32@
37+testVMX_CFLAGS = $(AM_CFLAGS) -O -g -Wall -DALTIVEC \
38+ -DGCC_COMPILER @FLAG_M32@ $(BUILD_FLAG_ALTIVEC) \
39+ $(BUILD_FLAG_ABI_ALTIVEC)
40
41 test_isa_2_06_part1_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(VSX_FLAG) \
42 @FLAG_M32@ $(ALTIVEC_FLAG) $(BUILD_FLAG_VSX)
43Index: none/tests/ppc64/Makefile.am
44===================================================================
45--- a/none/tests/ppc64/Makefile.am (revision 14565)
46+++ b/none/tests/ppc64/Makefile.am (revision 14566)
47@@ -50,8 +50,10 @@
48 allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@
49
50 if HAS_ALTIVEC
51+BUILD_FLAG_ALTIVEC = -maltivec
52 ALTIVEC_FLAG = -DHAS_ALTIVEC
53 else
54+BUILD_FLAG_ALTIVEC =
55 ALTIVEC_FLAG =
56 endif
57
58@@ -88,8 +90,8 @@
59 test_isa_2_06_part3_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(VSX_FLAG) \
60 @FLAG_M64@ $(ALTIVEC_FLAG) $(BUILD_FLAG_VSX)
61
62-jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames -maltivec \
63- @FLAG_M64@ $(ALTIVEC_FLAG)
64+jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames \
65+ @FLAG_M64@ $(ALTIVEC_FLAG) $(BUILD_FLAG_ALTIVEC)
66
67 test_dfp1_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames $(DFP_FLAG) \
68 @FLAG_M64@ $(BUILD_FLAGS_DFP)
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb
index ac50d2ee7a..97d923d6f0 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb
@@ -23,6 +23,7 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
23 file://valgrind-remove-rpath.patch \ 23 file://valgrind-remove-rpath.patch \
24 file://enable.building.on.4.x.kernel.patch \ 24 file://enable.building.on.4.x.kernel.patch \
25 file://add-ptest.patch \ 25 file://add-ptest.patch \
26 file://pass-maltivec-only-if-it-supported.patch \
26 file://run-ptest \ 27 file://run-ptest \
27 " 28 "
28 29