diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch | 36 | ||||
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch | 30 | ||||
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch | 17 | ||||
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind/0002-fix-broken-inline-asm-in-tests-on-mips32-linux.patch | 47 | ||||
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch | 49 | ||||
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch | 27 | ||||
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind/mask-CPUID-support-in-HWCAP-on-aarch64.patch | 36 | ||||
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind/ppc-headers.patch | 87 | ||||
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind_3.14.0.bb (renamed from meta/recipes-devtools/valgrind/valgrind_3.13.0.bb) | 12 |
9 files changed, 77 insertions, 264 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch b/meta/recipes-devtools/valgrind/valgrind/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch new file mode 100644 index 0000000000..3efe65a940 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 1b5b6f827ac1153a41fc93e78bf34ccdf5720b9b Mon Sep 17 00:00:00 2001 | ||
2 | From: Randy MacLeod <Randy.MacLeod@windriver.com> | ||
3 | Date: Fri, 19 Oct 2018 10:31:12 -0400 | ||
4 | Subject: [PATCH] Guard against __GLIBC_PREREQ for musl libc | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> | ||
9 | --- | ||
10 | memcheck/tests/linux/sys-statx.c | 5 +++++ | ||
11 | 1 file changed, 5 insertions(+) | ||
12 | |||
13 | diff --git a/memcheck/tests/linux/sys-statx.c b/memcheck/tests/linux/sys-statx.c | ||
14 | index fe9f9ba45..473c2cd7f 100644 | ||
15 | --- a/memcheck/tests/linux/sys-statx.c | ||
16 | +++ b/memcheck/tests/linux/sys-statx.c | ||
17 | @@ -7,11 +7,16 @@ | ||
18 | #include <assert.h> | ||
19 | #include <string.h> | ||
20 | #include <sys/syscall.h> | ||
21 | + | ||
22 | +#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) | ||
23 | #if __GLIBC_PREREQ(2,28) | ||
24 | /* struct statx provided in sys/stat.h */ | ||
25 | #else | ||
26 | #include <linux/stat.h> | ||
27 | #endif | ||
28 | +#else | ||
29 | +#include <linux/stat.h> | ||
30 | +#endif | ||
31 | #include <errno.h> | ||
32 | |||
33 | int check_stat2; | ||
34 | -- | ||
35 | 2.17.0 | ||
36 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch deleted file mode 100644 index bf16a1adfe..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 629ac492b1d9bc709d17337eb9b1c28603eca250 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 28 Jun 2017 11:01:25 -0700 | ||
4 | Subject: [PATCH] memcheck/tests: Use ucontext_t instead of struct ucontext | ||
5 | |||
6 | glibc 2.26 does not expose struct ucontext anymore | ||
7 | |||
8 | Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=381769] | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | memcheck/tests/linux/stack_changes.c | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/memcheck/tests/linux/stack_changes.c b/memcheck/tests/linux/stack_changes.c | ||
16 | index ffb49c6..acc4109 100644 | ||
17 | --- a/memcheck/tests/linux/stack_changes.c | ||
18 | +++ b/memcheck/tests/linux/stack_changes.c | ||
19 | @@ -11,7 +11,7 @@ | ||
20 | // checks that Valgrind notices their stack changes properly. | ||
21 | |||
22 | #ifdef __GLIBC__ | ||
23 | -typedef struct ucontext mycontext; | ||
24 | +typedef ucontext_t mycontext; | ||
25 | |||
26 | mycontext ctx1, ctx2, oldc; | ||
27 | int count; | ||
28 | -- | ||
29 | 2.13.2 | ||
30 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch b/meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch index 3f9f33b487..480fe33247 100644 --- a/meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch | |||
@@ -1,17 +1,20 @@ | |||
1 | From 862b807076d57f2f58ed9d572ddac8bb402774a2 Mon Sep 17 00:00:00 2001 | 1 | From bd4e926e7e14747b3cd4d7b2a1bd5410b22f3ea2 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Randy MacLeod <Randy.MacLeod@windriver.com> |
3 | Date: Sat, 10 Jun 2017 01:01:10 -0700 | 3 | Date: Tue, 16 Oct 2018 21:27:46 -0400 |
4 | Subject: [PATCH 2/6] context APIs are not available on musl | 4 | Subject: [PATCH] context APIs are not available on musl |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
8 | Updated patch for valgrind-3.14 | ||
9 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
11 | Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> | ||
9 | --- | 12 | --- |
10 | memcheck/tests/linux/stack_changes.c | 7 ++++++- | 13 | memcheck/tests/linux/stack_changes.c | 7 ++++++- |
11 | 1 file changed, 6 insertions(+), 1 deletion(-) | 14 | 1 file changed, 6 insertions(+), 1 deletion(-) |
12 | 15 | ||
13 | diff --git a/memcheck/tests/linux/stack_changes.c b/memcheck/tests/linux/stack_changes.c | 16 | diff --git a/memcheck/tests/linux/stack_changes.c b/memcheck/tests/linux/stack_changes.c |
14 | index a978fc2..ffb49c6 100644 | 17 | index 7f97b90a5..a26cb4ae6 100644 |
15 | --- a/memcheck/tests/linux/stack_changes.c | 18 | --- a/memcheck/tests/linux/stack_changes.c |
16 | +++ b/memcheck/tests/linux/stack_changes.c | 19 | +++ b/memcheck/tests/linux/stack_changes.c |
17 | @@ -10,6 +10,7 @@ | 20 | @@ -10,6 +10,7 @@ |
@@ -19,7 +22,7 @@ index a978fc2..ffb49c6 100644 | |||
19 | // checks that Valgrind notices their stack changes properly. | 22 | // checks that Valgrind notices their stack changes properly. |
20 | 23 | ||
21 | +#ifdef __GLIBC__ | 24 | +#ifdef __GLIBC__ |
22 | typedef struct ucontext mycontext; | 25 | typedef ucontext_t mycontext; |
23 | 26 | ||
24 | mycontext ctx1, ctx2, oldc; | 27 | mycontext ctx1, ctx2, oldc; |
25 | @@ -51,9 +52,11 @@ int init_context(mycontext *uc) | 28 | @@ -51,9 +52,11 @@ int init_context(mycontext *uc) |
@@ -45,5 +48,5 @@ index a978fc2..ffb49c6 100644 | |||
45 | return 0; | 48 | return 0; |
46 | } | 49 | } |
47 | -- | 50 | -- |
48 | 2.13.1 | 51 | 2.17.0 |
49 | 52 | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-fix-broken-inline-asm-in-tests-on-mips32-linux.patch b/meta/recipes-devtools/valgrind/valgrind/0002-fix-broken-inline-asm-in-tests-on-mips32-linux.patch deleted file mode 100644 index 6df295f8a2..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0002-fix-broken-inline-asm-in-tests-on-mips32-linux.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 63ce36396348e7c4c021cffa652d2e3d20f7963a Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Fri, 27 Jul 2018 17:51:54 +0800 | ||
4 | Subject: [PATCH 2/2] fix broken inline asm in tests on mips32-linux | ||
5 | |||
6 | While build tests(`make check') with gcc 8.1.0 on mips32-linux, | ||
7 | there is a failure | ||
8 | [snip] | ||
9 | |mips-wrsmllib32-linux-gcc -meb -mabi=32 -mhard-float -march=mips32 | ||
10 | -c -o tc08_hbl2-tc08_hbl2.o `test -f 'tc08_hbl2.c' || echo '../../../ | ||
11 | valgrind-3.13.0/helgrind/tests/'`tc08_hbl2.c | ||
12 | |/tmp/cc37aJxQ.s: Assembler messages: | ||
13 | |/tmp/cc37aJxQ.s:275: Error: symbol `L1xyzzy1main' is already defined | ||
14 | |Makefile:1323: recipe for target 'tc08_hbl2-tc08_hbl2.o' failed | ||
15 | [snip] | ||
16 | |||
17 | Remove the duplicated L1xyzzy1main, and use local symbol to replace. | ||
18 | http://tigcc.ticalc.org/doc/gnuasm.html#SEC46 | ||
19 | |||
20 | Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=396906] | ||
21 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
22 | --- | ||
23 | helgrind/tests/tc08_hbl2.c | 4 ++-- | ||
24 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
25 | |||
26 | diff --git a/helgrind/tests/tc08_hbl2.c b/helgrind/tests/tc08_hbl2.c | ||
27 | index 2a757a008..f660d82dd 100644 | ||
28 | --- a/helgrind/tests/tc08_hbl2.c | ||
29 | +++ b/helgrind/tests/tc08_hbl2.c | ||
30 | @@ -121,12 +121,12 @@ | ||
31 | #elif defined(PLAT_mips32_linux) || defined(PLAT_mips64_linux) | ||
32 | # define INC(_lval,_lqual) \ | ||
33 | __asm__ __volatile__ ( \ | ||
34 | - "L1xyzzy1" _lqual":\n" \ | ||
35 | + "1:\n" \ | ||
36 | " move $t0, %0\n" \ | ||
37 | " ll $t1, 0($t0)\n" \ | ||
38 | " addiu $t1, $t1, 1\n" \ | ||
39 | " sc $t1, 0($t0)\n" \ | ||
40 | - " beqz $t1, L1xyzzy1" _lqual \ | ||
41 | + " beqz $t1, 1b\n" \ | ||
42 | : /*out*/ : /*in*/ "r"(&(_lval)) \ | ||
43 | : /*trash*/ "t0", "t1", "memory" \ | ||
44 | ) | ||
45 | -- | ||
46 | 2.17.1 | ||
47 | |||
diff --git a/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch b/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch index 39022d04ae..75bb0aa7cb 100644 --- a/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch +++ b/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 739421e253e6eba3eb6438651822f80fa9c0502a Mon Sep 17 00:00:00 2001 | 1 | From 8f916dcb395fe5a2429f2867ba4daf8ef3af073a Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Randy MacLeod <Randy.MacLeod@windriver.com> |
3 | Date: Tue, 15 Dec 2015 15:31:50 +0200 | 3 | Date: Tue, 16 Oct 2018 21:01:04 -0400 |
4 | Subject: [PATCH 1/2] Fix out of tree builds. | 4 | Subject: [PATCH] Fix out of tree builds. |
5 | 5 | ||
6 | The paths to these files need to be fully specified in | 6 | The paths to these files need to be fully specified in |
7 | the out of tree build case. glibc-2.X.supp is a generated file so the full path | 7 | the out of tree build case. glibc-2.X.supp is a generated file so the full path |
@@ -9,18 +9,21 @@ is deliberately not specified in that case. | |||
9 | 9 | ||
10 | RP 2013/03/23 | 10 | RP 2013/03/23 |
11 | 11 | ||
12 | Patch refreshed for valgrind-3.14.0. | ||
13 | |||
12 | Upstream-Status: Pending | 14 | Upstream-Status: Pending |
13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
14 | 15 | ||
16 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
17 | Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> | ||
15 | --- | 18 | --- |
16 | configure.ac | 68 ++++++++++++++++++++++++++++++------------------------------ | 19 | configure.ac | 68 ++++++++++++++++++++++++++-------------------------- |
17 | 1 file changed, 34 insertions(+), 34 deletions(-) | 20 | 1 file changed, 34 insertions(+), 34 deletions(-) |
18 | 21 | ||
19 | diff --git a/configure.ac b/configure.ac | 22 | diff --git a/configure.ac b/configure.ac |
20 | index 3874296fde0b..7a5ba2c8557e 100644 | 23 | index c18ae5f2a..99667ce57 100644 |
21 | --- a/configure.ac | 24 | --- a/configure.ac |
22 | +++ b/configure.ac | 25 | +++ b/configure.ac |
23 | @@ -373,50 +373,50 @@ case "${host_os}" in | 26 | @@ -392,50 +392,50 @@ case "${host_os}" in |
24 | 9.*) | 27 | 9.*) |
25 | AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard]) | 28 | AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard]) |
26 | AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version]) | 29 | AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version]) |
@@ -85,16 +88,18 @@ index 3874296fde0b..7a5ba2c8557e 100644 | |||
85 | + DEFAULT_SUPP="$srcdir/darwin16.supp ${DEFAULT_SUPP}" | 88 | + DEFAULT_SUPP="$srcdir/darwin16.supp ${DEFAULT_SUPP}" |
86 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" | 89 | + DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" |
87 | ;; | 90 | ;; |
88 | *) | 91 | 17.*) |
89 | AC_MSG_RESULT([unsupported (${kernel})]) | 92 | AC_MSG_RESULT([Darwin 17.x (${kernel}) / macOS 10.13 High Sierra]) |
90 | @@ -428,13 +428,13 @@ case "${host_os}" in | 93 | @@ -460,7 +460,7 @@ case "${host_os}" in |
91 | solaris2.11*) | 94 | DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}" |
92 | AC_MSG_RESULT([ok (${host_os})]) | 95 | ;; |
93 | VGCONF_OS="solaris" | 96 | *) |
94 | - DEFAULT_SUPP="solaris11.supp ${DEFAULT_SUPP}" | 97 | - DEFAULT_SUPP="solaris11.supp ${DEFAULT_SUPP}" |
95 | + DEFAULT_SUPP="$srcdir/solaris11.supp ${DEFAULT_SUPP}" | 98 | + DEFAULT_SUPP="$srcdir/solaris11.supp ${DEFAULT_SUPP}" |
99 | ;; | ||
100 | esac | ||
96 | ;; | 101 | ;; |
97 | 102 | @@ -468,7 +468,7 @@ case "${host_os}" in | |
98 | solaris2.12*) | 103 | solaris2.12*) |
99 | AC_MSG_RESULT([ok (${host_os})]) | 104 | AC_MSG_RESULT([ok (${host_os})]) |
100 | VGCONF_OS="solaris" | 105 | VGCONF_OS="solaris" |
@@ -103,7 +108,7 @@ index 3874296fde0b..7a5ba2c8557e 100644 | |||
103 | ;; | 108 | ;; |
104 | 109 | ||
105 | *) | 110 | *) |
106 | @@ -982,29 +982,29 @@ AC_MSG_CHECKING([the glibc version]) | 111 | @@ -1051,29 +1051,29 @@ AC_MSG_CHECKING([the glibc version]) |
107 | case "${GLIBC_VERSION}" in | 112 | case "${GLIBC_VERSION}" in |
108 | 2.2) | 113 | 2.2) |
109 | AC_MSG_RESULT(${GLIBC_VERSION} family) | 114 | AC_MSG_RESULT(${GLIBC_VERSION} family) |
@@ -143,7 +148,7 @@ index 3874296fde0b..7a5ba2c8557e 100644 | |||
143 | ;; | 148 | ;; |
144 | 2.*) | 149 | 2.*) |
145 | AC_MSG_RESULT(${GLIBC_VERSION} family) | 150 | AC_MSG_RESULT(${GLIBC_VERSION} family) |
146 | @@ -1013,8 +1013,8 @@ case "${GLIBC_VERSION}" in | 151 | @@ -1082,8 +1082,8 @@ case "${GLIBC_VERSION}" in |
147 | AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1, | 152 | AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1, |
148 | [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)]) | 153 | [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)]) |
149 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" | 154 | DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" |
@@ -154,7 +159,7 @@ index 3874296fde0b..7a5ba2c8557e 100644 | |||
154 | ;; | 159 | ;; |
155 | darwin) | 160 | darwin) |
156 | AC_MSG_RESULT(Darwin) | 161 | AC_MSG_RESULT(Darwin) |
157 | @@ -1024,7 +1024,7 @@ case "${GLIBC_VERSION}" in | 162 | @@ -1093,7 +1093,7 @@ case "${GLIBC_VERSION}" in |
158 | bionic) | 163 | bionic) |
159 | AC_MSG_RESULT(Bionic) | 164 | AC_MSG_RESULT(Bionic) |
160 | AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic]) | 165 | AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic]) |
@@ -163,7 +168,7 @@ index 3874296fde0b..7a5ba2c8557e 100644 | |||
163 | ;; | 168 | ;; |
164 | solaris) | 169 | solaris) |
165 | AC_MSG_RESULT(Solaris) | 170 | AC_MSG_RESULT(Solaris) |
166 | @@ -1051,11 +1051,11 @@ if test "$VGCONF_OS" != "solaris"; then | 171 | @@ -1120,11 +1120,11 @@ if test "$VGCONF_OS" != "solaris"; then |
167 | # attempt to detect whether such libraries are installed on the | 172 | # attempt to detect whether such libraries are installed on the |
168 | # build machine (or even if any X facilities are present); just | 173 | # build machine (or even if any X facilities are present); just |
169 | # add the suppressions antidisirregardless. | 174 | # add the suppressions antidisirregardless. |
@@ -179,5 +184,5 @@ index 3874296fde0b..7a5ba2c8557e 100644 | |||
179 | 184 | ||
180 | 185 | ||
181 | -- | 186 | -- |
182 | 2.13.2.3.g44cd85c14 | 187 | 2.17.0 |
183 | 188 | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch b/meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch deleted file mode 100644 index db322398c2..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | When checking if the compiler supports compressed debug sections we need to | ||
2 | actually link instead of just compile. Otherwise the compiler thinks that | ||
3 | they are supported, but gold does not support -gz=zlib. | ||
4 | |||
5 | Upstream-Status: Backport (r16459) | ||
6 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
7 | |||
8 | --- a/configure.ac~ 2017-07-11 11:53:16.000000000 +0100 | ||
9 | +++ b/configure.ac 2017-07-11 18:16:13.674130483 +0100 | ||
10 | @@ -2119,7 +2119,7 @@ | ||
11 | safe_CFLAGS=$CFLAGS | ||
12 | CFLAGS="-g -gz=zlib" | ||
13 | |||
14 | -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[ | ||
15 | +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ ]], [[ | ||
16 | return 0; | ||
17 | ]])], [ | ||
18 | ac_have_gz_zlib=yes | ||
19 | @@ -2139,7 +2139,7 @@ | ||
20 | safe_CFLAGS=$CFLAGS | ||
21 | CFLAGS="-g -gz=zlib-gnu" | ||
22 | |||
23 | -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[ | ||
24 | +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ ]], [[ | ||
25 | return 0; | ||
26 | ]])], [ | ||
27 | ac_have_gz_zlib_gnu=yes | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind/mask-CPUID-support-in-HWCAP-on-aarch64.patch b/meta/recipes-devtools/valgrind/valgrind/mask-CPUID-support-in-HWCAP-on-aarch64.patch deleted file mode 100644 index 89a95b82fe..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/mask-CPUID-support-in-HWCAP-on-aarch64.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | Fix runtime Valgrind failure | ||
2 | |||
3 | This patch is derived from | ||
4 | https://bugzilla.redhat.com/show_bug.cgi?id=1464211 | ||
5 | |||
6 | At runtime it will fails like this: | ||
7 | |||
8 | ARM64 front end: branch_etc | ||
9 | disInstr(arm64): unhandled instruction 0xD5380001 | ||
10 | disInstr(arm64): 1101'0101 0011'1000 0000'0000 0000'0001 ==2082== | ||
11 | valgrind: Unrecognised instruction at address 0x4014e64. | ||
12 | |||
13 | This patch is a workaround by masking all HWCAP | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | |||
17 | Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> | ||
18 | |||
19 | Index: valgrind-3.13.0/coregrind/m_initimg/initimg-linux.c | ||
20 | =================================================================== | ||
21 | |||
22 | --- valgrind-3.13.0.orig/coregrind/m_initimg/initimg-linux.c 2018-03-04 22:22:17.698572675 -0800 | ||
23 | +++ valgrind-3.13.0/coregrind/m_initimg/initimg-linux.c 2018-03-04 22:23:25.727815624 -0800 | ||
24 | @@ -703,6 +703,12 @@ | ||
25 | (and anything above) are not supported by Valgrind. */ | ||
26 | auxv->u.a_val &= VKI_HWCAP_S390_TE - 1; | ||
27 | } | ||
28 | +# elif defined(VGP_arm64_linux) | ||
29 | + { | ||
30 | + /* Linux 4.11 started populating this for arm64, but we | ||
31 | + currently don't support any. */ | ||
32 | + auxv->u.a_val = 0; | ||
33 | + } | ||
34 | # endif | ||
35 | break; | ||
36 | # if defined(VGP_ppc64be_linux) || defined(VGP_ppc64le_linux) | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind/ppc-headers.patch b/meta/recipes-devtools/valgrind/valgrind/ppc-headers.patch deleted file mode 100644 index 51259db001..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/ppc-headers.patch +++ /dev/null | |||
@@ -1,87 +0,0 @@ | |||
1 | Backport a patch from upstream to fix test compilation for PPC where | ||
2 | system headers don't get included. | ||
3 | |||
4 | Upstream-Status: Backport | ||
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
6 | |||
7 | r16450 | mjw | 2017-06-16 10:33:35 +0100 (Fri, 16 Jun 2017) | 7 lines | ||
8 | |||
9 | ppc64 doesn't compile test_isa_2_06_partx.c without VSX support | ||
10 | |||
11 | The #ifdef HAS_VSX guard is wrongly placed. It makes the standard | ||
12 | include headers not be used. Causing a build failure. Fix by moving | ||
13 | the #ifdef HAS_VSX after the standard includes. | ||
14 | |||
15 | Index: 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 | ||
41 | Index: 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__ | ||
62 | Index: 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.14.0.bb index 39ec6f5cc8..2fa529516b 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb | |||
@@ -12,7 +12,7 @@ DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d | |||
12 | ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'boost', '', d)} \ | 12 | ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'boost', '', d)} \ |
13 | " | 13 | " |
14 | 14 | ||
15 | SRC_URI = "ftp://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ | 15 | SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ |
16 | file://fixed-perl-path.patch \ | 16 | file://fixed-perl-path.patch \ |
17 | file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ | 17 | file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \ |
18 | file://run-ptest \ | 18 | file://run-ptest \ |
@@ -30,18 +30,14 @@ SRC_URI = "ftp://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ | |||
30 | file://0004-pth_atfork1.c-Define-error-API-for-musl.patch \ | 30 | file://0004-pth_atfork1.c-Define-error-API-for-musl.patch \ |
31 | file://0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch \ | 31 | file://0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch \ |
32 | file://0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch \ | 32 | file://0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch \ |
33 | file://0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch \ | ||
34 | file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \ | 33 | file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \ |
35 | file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ | 34 | file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ |
36 | file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ | 35 | file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ |
37 | file://link-gz-tests.patch \ | ||
38 | file://ppc-headers.patch \ | ||
39 | file://mask-CPUID-support-in-HWCAP-on-aarch64.patch \ | ||
40 | file://0001-fix-opcode-not-supported-on-mips32-linux.patch \ | 36 | file://0001-fix-opcode-not-supported-on-mips32-linux.patch \ |
41 | file://0002-fix-broken-inline-asm-in-tests-on-mips32-linux.patch \ | 37 | file://0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch \ |
42 | " | 38 | " |
43 | SRC_URI[md5sum] = "817dd08f1e8a66336b9ff206400a5369" | 39 | SRC_URI[md5sum] = "74175426afa280184b62591b58c671b3" |
44 | SRC_URI[sha256sum] = "d76680ef03f00cd5e970bbdcd4e57fb1f6df7d2e2c071635ef2be74790190c3b" | 40 | SRC_URI[sha256sum] = "037c11bfefd477cc6e9ebe8f193bb237fe397f7ce791b4a4ce3fa1c6a520baa5" |
45 | UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar" | 41 | UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar" |
46 | 42 | ||
47 | COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux' | 43 | COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux' |