summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-07-14 19:53:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-17 14:01:38 +0100
commit27e5534f13cf9d1965c91c9724c2839e7a37270f (patch)
tree87c59d670cd8ecad679a276988dd009d69dc757e /meta
parent6b490be5d119f932996ee8d0755ec331510da3b2 (diff)
downloadpoky-27e5534f13cf9d1965c91c9724c2839e7a37270f.tar.gz
valgrind: fix ptest compilation for PowerPC
(From OE-Core rev: cd1a123bd07016abcff218d4274161cd794a190b) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/ppc-headers.patch87
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.13.0.bb1
2 files changed, 88 insertions, 0 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/ppc-headers.patch b/meta/recipes-devtools/valgrind/valgrind/ppc-headers.patch
new file mode 100644
index 0000000000..51259db001
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/ppc-headers.patch
@@ -0,0 +1,87 @@
1Backport a patch from upstream to fix test compilation for PPC where
2system headers don't get included.
3
4Upstream-Status: Backport
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7r16450 | mjw | 2017-06-16 10:33:35 +0100 (Fri, 16 Jun 2017) | 7 lines
8
9ppc64 doesn't compile test_isa_2_06_partx.c without VSX support
10
11The #ifdef HAS_VSX guard is wrongly placed. It makes the standard
12include headers not be used. Causing a build failure. Fix by moving
13the #ifdef HAS_VSX after the standard includes.
14
15Index: none/tests/ppc32/test_isa_2_06_part3.c
16===================================================================
17--- a/none/tests/ppc32/test_isa_2_06_part3.c (revision 16449)
18+++ b/none/tests/ppc32/test_isa_2_06_part3.c (revision 16450)
19@@ -20,17 +20,18 @@
20 The GNU General Public License is contained in the file COPYING.
21 */
22
23-#ifdef HAS_VSX
24-
25 #include <stdio.h>
26 #include <stdint.h>
27 #include <stdlib.h>
28 #include <string.h>
29 #include <malloc.h>
30-#include <altivec.h>
31 #include <math.h>
32 #include <unistd.h> // getopt
33
34+#ifdef HAS_VSX
35+
36+#include <altivec.h>
37+
38 #ifndef __powerpc64__
39 typedef uint32_t HWord_t;
40 #else
41Index: none/tests/ppc32/test_isa_2_06_part1.c
42===================================================================
43--- a/none/tests/ppc32/test_isa_2_06_part1.c (revision 16449)
44+++ b/none/tests/ppc32/test_isa_2_06_part1.c (revision 16450)
45@@ -20,13 +20,14 @@
46 The GNU General Public License is contained in the file COPYING.
47 */
48
49-#ifdef HAS_VSX
50-
51 #include <stdio.h>
52 #include <stdint.h>
53 #include <stdlib.h>
54 #include <string.h>
55 #include <malloc.h>
56+
57+#ifdef HAS_VSX
58+
59 #include <altivec.h>
60
61 #ifndef __powerpc64__
62Index: none/tests/ppc32/test_isa_2_06_part2.c
63===================================================================
64--- a/none/tests/ppc32/test_isa_2_06_part2.c (revision 16449)
65+++ b/none/tests/ppc32/test_isa_2_06_part2.c (revision 16450)
66@@ -20,17 +20,18 @@
67 The GNU General Public License is contained in the file COPYING.
68 */
69
70-#ifdef HAS_VSX
71-
72 #include <stdio.h>
73 #include <stdint.h>
74 #include <stdlib.h>
75 #include <string.h>
76 #include <malloc.h>
77-#include <altivec.h>
78 #include <math.h>
79 #include <unistd.h> // getopt
80
81+#ifdef HAS_VSX
82+
83+#include <altivec.h>
84+
85 #ifndef __powerpc64__
86 typedef uint32_t HWord_t;
87 #else
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
index 2ec9b9b6fc..feab5fc1a1 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
@@ -36,6 +36,7 @@ SRC_URI = "ftp://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
36 file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ 36 file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \
37 file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ 37 file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \
38 file://link-gz-tests.patch \ 38 file://link-gz-tests.patch \
39 file://ppc-headers.patch \
39 " 40 "
40SRC_URI[md5sum] = "817dd08f1e8a66336b9ff206400a5369" 41SRC_URI[md5sum] = "817dd08f1e8a66336b9ff206400a5369"
41SRC_URI[sha256sum] = "d76680ef03f00cd5e970bbdcd4e57fb1f6df7d2e2c071635ef2be74790190c3b" 42SRC_URI[sha256sum] = "d76680ef03f00cd5e970bbdcd4e57fb1f6df7d2e2c071635ef2be74790190c3b"