summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/valgrind
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-04-27 10:40:04 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-28 11:51:42 +0100
commitd88d5c978d5b0d293dd879ee59a17524c68f5966 (patch)
treed01267aac71c5935825273a2e4e3297714444ad3 /meta/recipes-devtools/valgrind
parentc9067501519cd9878b61365d09b4924ee80427ea (diff)
downloadpoky-d88d5c978d5b0d293dd879ee59a17524c68f5966.tar.gz
valgrind: update 3.18.1 -> 3.19.0
Dropped patches are either backports, were merged upstream, or upstream fixed the issue differently. (From OE-Core rev: 4c9b619eb7cd91e7ffc8db0f5571a4dbe6966ccc) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/valgrind')
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-Fix-drd-tests-shared_timed_mutex.cpp.patch26
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch36
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-Implement-linux-rseq-syscall-as-ENOSYS.patch198
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-str_tester.c-Limit-rawmemchr-test-to-glibc.patch35
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch176
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch28
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.19.0.bb (renamed from meta/recipes-devtools/valgrind/valgrind_3.18.1.bb)14
7 files changed, 33 insertions, 480 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-Fix-drd-tests-shared_timed_mutex.cpp.patch b/meta/recipes-devtools/valgrind/valgrind/0001-Fix-drd-tests-shared_timed_mutex.cpp.patch
new file mode 100644
index 0000000000..738bf87c92
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-Fix-drd-tests-shared_timed_mutex.cpp.patch
@@ -0,0 +1,26 @@
1From 900b3f9b0765488f0e1f457ff5d5d1e3efe897de Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Wed, 27 Apr 2022 10:01:22 +0200
4Subject: [PATCH] Fix drd/tests/shared_timed_mutex.cpp
5
6Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=453055]
7Signed-off-by: Alexander Kanavin <alex@linutronix.de>
8---
9 drd/tests/shared_timed_mutex.cpp | 1 +
10 1 file changed, 1 insertion(+)
11
12diff --git a/drd/tests/shared_timed_mutex.cpp b/drd/tests/shared_timed_mutex.cpp
13index 9741169..dfd97a4 100644
14--- a/drd/tests/shared_timed_mutex.cpp
15+++ b/drd/tests/shared_timed_mutex.cpp
16@@ -43,6 +43,7 @@ void g()
17 if (test_mutex.try_lock_shared_until(then))
18 {
19 test_mutex.unlock_shared();
20+ break;
21 }
22 }
23 if (i == 3)
24--
252.30.2
26
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
deleted file mode 100644
index 81ab29f3be..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 1b5b6f827ac1153a41fc93e78bf34ccdf5720b9b Mon Sep 17 00:00:00 2001
2From: Randy MacLeod <Randy.MacLeod@windriver.com>
3Date: Fri, 19 Oct 2018 10:31:12 -0400
4Subject: [PATCH] Guard against __GLIBC_PREREQ for musl libc
5
6Upstream-Status: Submitted https://bugs.kde.org/show_bug.cgi?id=400162
7
8Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
9---
10 memcheck/tests/linux/sys-statx.c | 5 +++++
11 1 file changed, 5 insertions(+)
12
13diff --git a/memcheck/tests/linux/sys-statx.c b/memcheck/tests/linux/sys-statx.c
14index 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--
352.17.0
36
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-Implement-linux-rseq-syscall-as-ENOSYS.patch b/meta/recipes-devtools/valgrind/valgrind/0001-Implement-linux-rseq-syscall-as-ENOSYS.patch
deleted file mode 100644
index be1536980c..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-Implement-linux-rseq-syscall-as-ENOSYS.patch
+++ /dev/null
@@ -1,198 +0,0 @@
1From 1024237358f01009fe233cb1294f3b8211304eaa Mon Sep 17 00:00:00 2001
2From: Mark Wielaard <mark@klomp.org>
3Date: Fri, 10 Dec 2021 17:41:59 +0100
4Subject: [PATCH] Implement linux rseq syscall as ENOSYS
5
6This implements rseq for amd64, arm, arm64, ppc32, ppc64,
7s390x and x86 linux as ENOSYS (without warning).
8
9glibc will start using rseq to accelerate sched_getcpu, if
10available. This would cause a warning from valgrind every
11time a new thread is started.
12
13Real rseq (restartable sequences) support is pretty hard, so
14for now just explicitly return ENOSYS (just like we do for clone3).
15
16Upstream-Status: Backport [ 1024237358f01009fe233cb1294f3b8211304eaa ]
17
18https://sourceware.org/pipermail/libc-alpha/2021-December/133656.html
19---
20 coregrind/m_syswrap/syswrap-amd64-linux.c | 2 ++
21 coregrind/m_syswrap/syswrap-arm-linux.c | 1 +
22 coregrind/m_syswrap/syswrap-arm64-linux.c | 3 ++-
23 coregrind/m_syswrap/syswrap-ppc32-linux.c | 2 ++
24 coregrind/m_syswrap/syswrap-ppc64-linux.c | 2 ++
25 coregrind/m_syswrap/syswrap-s390x-linux.c | 2 ++
26 coregrind/m_syswrap/syswrap-x86-linux.c | 2 ++
27 include/vki/vki-scnums-arm-linux.h | 1 +
28 include/vki/vki-scnums-arm64-linux.h | 4 +++-
29 include/vki/vki-scnums-ppc32-linux.h | 1 +
30 include/vki/vki-scnums-ppc64-linux.h | 1 +
31 include/vki/vki-scnums-s390x-linux.h | 5 ++++-
32 12 files changed, 23 insertions(+), 3 deletions(-)
33
34diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c
35index 5062324a1..18b25f80a 100644
36--- a/coregrind/m_syswrap/syswrap-amd64-linux.c
37+++ b/coregrind/m_syswrap/syswrap-amd64-linux.c
38@@ -862,6 +862,8 @@ static SyscallTableEntry syscall_table[] = {
39
40 LINXY(__NR_statx, sys_statx), // 332
41
42+ GENX_(__NR_rseq, sys_ni_syscall), // 334
43+
44 LINX_(__NR_membarrier, sys_membarrier), // 324
45
46 LINX_(__NR_copy_file_range, sys_copy_file_range), // 326
47diff --git a/coregrind/m_syswrap/syswrap-arm-linux.c b/coregrind/m_syswrap/syswrap-arm-linux.c
48index 556dd844b..d583cef0c 100644
49--- a/coregrind/m_syswrap/syswrap-arm-linux.c
50+++ b/coregrind/m_syswrap/syswrap-arm-linux.c
51@@ -1024,6 +1024,7 @@ static SyscallTableEntry syscall_main_table[] = {
52 LINX_(__NR_pwritev2, sys_pwritev2), // 393
53
54 LINXY(__NR_statx, sys_statx), // 397
55+ GENX_(__NR_rseq, sys_ni_syscall), // 398
56
57 LINXY(__NR_clock_gettime64, sys_clock_gettime64), // 403
58 LINX_(__NR_clock_settime64, sys_clock_settime64), // 404
59diff --git a/coregrind/m_syswrap/syswrap-arm64-linux.c b/coregrind/m_syswrap/syswrap-arm64-linux.c
60index b87107727..2066a38ea 100644
61--- a/coregrind/m_syswrap/syswrap-arm64-linux.c
62+++ b/coregrind/m_syswrap/syswrap-arm64-linux.c
63@@ -823,8 +823,9 @@ static SyscallTableEntry syscall_main_table[] = {
64 // (__NR_pkey_mprotect, sys_ni_syscall), // 288
65 // (__NR_pkey_alloc, sys_ni_syscall), // 289
66 // (__NR_pkey_free, sys_ni_syscall), // 290
67+ LINXY(__NR_statx, sys_statx), // 291
68
69- LINXY(__NR_statx, sys_statx), // 397
70+ GENX_(__NR_rseq, sys_ni_syscall), // 293
71
72 LINXY(__NR_io_uring_setup, sys_io_uring_setup), // 425
73 LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426
74diff --git a/coregrind/m_syswrap/syswrap-ppc32-linux.c b/coregrind/m_syswrap/syswrap-ppc32-linux.c
75index 6263ab845..637b2504e 100644
76--- a/coregrind/m_syswrap/syswrap-ppc32-linux.c
77+++ b/coregrind/m_syswrap/syswrap-ppc32-linux.c
78@@ -1028,6 +1028,8 @@ static SyscallTableEntry syscall_table[] = {
79
80 LINXY(__NR_statx, sys_statx), // 383
81
82+ GENX_(__NR_rseq, sys_ni_syscall), // 387
83+
84 LINXY(__NR_clock_gettime64, sys_clock_gettime64), // 403
85 LINX_(__NR_clock_settime64, sys_clock_settime64), // 404
86
87diff --git a/coregrind/m_syswrap/syswrap-ppc64-linux.c b/coregrind/m_syswrap/syswrap-ppc64-linux.c
88index a26b41c32..93956d3cc 100644
89--- a/coregrind/m_syswrap/syswrap-ppc64-linux.c
90+++ b/coregrind/m_syswrap/syswrap-ppc64-linux.c
91@@ -1019,6 +1019,8 @@ static SyscallTableEntry syscall_table[] = {
92
93 LINXY(__NR_statx, sys_statx), // 383
94
95+ GENX_(__NR_rseq, sys_ni_syscall), // 387
96+
97 LINXY(__NR_io_uring_setup, sys_io_uring_setup), // 425
98 LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426
99 LINXY(__NR_io_uring_register, sys_io_uring_register), // 427
100diff --git a/coregrind/m_syswrap/syswrap-s390x-linux.c b/coregrind/m_syswrap/syswrap-s390x-linux.c
101index 5c9209859..73f9684c4 100644
102--- a/coregrind/m_syswrap/syswrap-s390x-linux.c
103+++ b/coregrind/m_syswrap/syswrap-s390x-linux.c
104@@ -860,6 +860,8 @@ static SyscallTableEntry syscall_table[] = {
105
106 LINXY(__NR_statx, sys_statx), // 379
107
108+ GENX_(__NR_rseq, sys_ni_syscall), // 381
109+
110 LINXY(__NR_io_uring_setup, sys_io_uring_setup), // 425
111 LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426
112 LINXY(__NR_io_uring_register, sys_io_uring_register), // 427
113diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c
114index 1d8f45d33..8662ff501 100644
115--- a/coregrind/m_syswrap/syswrap-x86-linux.c
116+++ b/coregrind/m_syswrap/syswrap-x86-linux.c
117@@ -1619,6 +1619,8 @@ static SyscallTableEntry syscall_table[] = {
118 /* Explicitly not supported on i386 yet. */
119 GENX_(__NR_arch_prctl, sys_ni_syscall), // 384
120
121+ GENX_(__NR_rseq, sys_ni_syscall), // 386
122+
123 LINXY(__NR_clock_gettime64, sys_clock_gettime64), // 403
124 LINX_(__NR_clock_settime64, sys_clock_settime64), // 404
125
126diff --git a/include/vki/vki-scnums-arm-linux.h b/include/vki/vki-scnums-arm-linux.h
127index ff560e19d..485db8b26 100644
128--- a/include/vki/vki-scnums-arm-linux.h
129+++ b/include/vki/vki-scnums-arm-linux.h
130@@ -432,6 +432,7 @@
131 #define __NR_pkey_alloc 395
132 #define __NR_pkey_free 396
133 #define __NR_statx 397
134+#define __NR_rseq 398
135
136
137
138diff --git a/include/vki/vki-scnums-arm64-linux.h b/include/vki/vki-scnums-arm64-linux.h
139index 9aa3b2b5f..acdfb39c6 100644
140--- a/include/vki/vki-scnums-arm64-linux.h
141+++ b/include/vki/vki-scnums-arm64-linux.h
142@@ -323,9 +323,11 @@
143 #define __NR_pkey_alloc 289
144 #define __NR_pkey_free 290
145 #define __NR_statx 291
146+#define __NR_io_pgetevents 291
147+#define __NR_rseq 293
148
149 #undef __NR_syscalls
150-#define __NR_syscalls 292
151+#define __NR_syscalls 294
152
153 ///*
154 // * All syscalls below here should go away really,
155diff --git a/include/vki/vki-scnums-ppc32-linux.h b/include/vki/vki-scnums-ppc32-linux.h
156index 6987ad941..08fa77df0 100644
157--- a/include/vki/vki-scnums-ppc32-linux.h
158+++ b/include/vki/vki-scnums-ppc32-linux.h
159@@ -415,6 +415,7 @@
160 #define __NR_pkey_alloc 384
161 #define __NR_pkey_free 385
162 #define __NR_pkey_mprotect 386
163+#define __NR_rseq 387
164
165 #endif /* __VKI_SCNUMS_PPC32_LINUX_H */
166
167diff --git a/include/vki/vki-scnums-ppc64-linux.h b/include/vki/vki-scnums-ppc64-linux.h
168index 6827964fd..a76fa6d32 100644
169--- a/include/vki/vki-scnums-ppc64-linux.h
170+++ b/include/vki/vki-scnums-ppc64-linux.h
171@@ -407,6 +407,7 @@
172 #define __NR_pkey_alloc 384
173 #define __NR_pkey_free 385
174 #define __NR_pkey_mprotect 386
175+#define __NR_rseq 387
176
177 #endif /* __VKI_SCNUMS_PPC64_LINUX_H */
178
179diff --git a/include/vki/vki-scnums-s390x-linux.h b/include/vki/vki-scnums-s390x-linux.h
180index 6487e20c9..869c04584 100644
181--- a/include/vki/vki-scnums-s390x-linux.h
182+++ b/include/vki/vki-scnums-s390x-linux.h
183@@ -342,8 +342,11 @@
184 #define __NR_s390_guarded_storage 378
185 #define __NR_statx 379
186 #define __NR_s390_sthyi 380
187+#define __NR_kexec_file_load 381
188+#define __NR_io_pgetevents 382
189+#define __NR_rseq 383
190
191-#define NR_syscalls 381
192+#define NR_syscalls 384
193
194 /*
195 * There are some system calls that are not present on 64 bit, some
196--
1972.30.2
198
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-str_tester.c-Limit-rawmemchr-test-to-glibc.patch b/meta/recipes-devtools/valgrind/valgrind/0001-str_tester.c-Limit-rawmemchr-test-to-glibc.patch
deleted file mode 100644
index 8f771ed0bd..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-str_tester.c-Limit-rawmemchr-test-to-glibc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 568224da7e647d00abf14a7160997689d9745c89 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 10 Jun 2017 00:39:07 -0700
4Subject: [PATCH] str_tester.c: Limit rawmemchr() test to glibc
5
6rawmemchr() is a GNU extention therefore mark it so
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Upstream-Status: Pending
10---
11 memcheck/tests/str_tester.c | 4 ++--
12 1 file changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/memcheck/tests/str_tester.c b/memcheck/tests/str_tester.c
15index 7c2ff1e..8b82ced 100644
16--- a/memcheck/tests/str_tester.c
17+++ b/memcheck/tests/str_tester.c
18@@ -504,7 +504,7 @@ test_strchrnul (void)
19 #endif
20
21 // DDD: better done by testing for the function.
22-#if !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__)
23+#if !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__) && defined(__GLIBC__)
24 static void
25 test_rawmemchr (void)
26 {
27@@ -1451,7 +1451,7 @@ main (void)
28 test_strchrnul ();
29 # endif
30
31-# if !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__)
32+# if !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__) && defined(__GLIBC__)
33 /* rawmemchr. */
34 test_rawmemchr ();
35 # endif
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
deleted file mode 100644
index 9a25b67961..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch
+++ /dev/null
@@ -1,176 +0,0 @@
1From 59e3190e9121c5439d54298b083b44c5c3794a7f Mon Sep 17 00:00:00 2001
2From: Randy MacLeod <Randy.MacLeod@windriver.com>
3Date: Tue, 16 Oct 2018 21:01:04 -0400
4Subject: [PATCH] Fix out of tree builds.
5
6The paths to these files need to be fully specified in
7the out of tree build case. glibc-2.X.supp is a generated file so the
8full path
9is deliberately not specified in that case.
10
11RP 2013/03/23
12
13Patch refreshed for valgrind-3.14.0.
14
15Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=445211]
16
17Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
18Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
19
20---
21 configure.ac | 62 ++++++++++++++++++++++++++--------------------------
22 1 file changed, 31 insertions(+), 31 deletions(-)
23
24diff --git a/configure.ac b/configure.ac
25index b851798..d360896 100755
26--- a/configure.ac
27+++ b/configure.ac
28@@ -447,50 +447,50 @@ case "${host_os}" in
29 9.*)
30 AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard])
31 AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version])
32- DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}"
33- DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}"
34+ DEFAULT_SUPP="$srcdir/darwin9.supp ${DEFAULT_SUPP}"
35+ DEFAULT_SUPP="$srcdir/darwin9-drd.supp ${DEFAULT_SUPP}"
36 ;;
37 10.*)
38 AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard])
39 AC_DEFINE([DARWIN_VERS], DARWIN_10_6, [Darwin / Mac OS X version])
40- DEFAULT_SUPP="darwin10.supp ${DEFAULT_SUPP}"
41- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
42+ DEFAULT_SUPP="$srcdir/darwin10.supp ${DEFAULT_SUPP}"
43+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
44 ;;
45 11.*)
46 AC_MSG_RESULT([Darwin 11.x (${kernel}) / Mac OS X 10.7 Lion])
47 AC_DEFINE([DARWIN_VERS], DARWIN_10_7, [Darwin / Mac OS X version])
48- DEFAULT_SUPP="darwin11.supp ${DEFAULT_SUPP}"
49- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
50+ DEFAULT_SUPP="$srcdir/darwin11.supp ${DEFAULT_SUPP}"
51+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
52 ;;
53 12.*)
54 AC_MSG_RESULT([Darwin 12.x (${kernel}) / Mac OS X 10.8 Mountain Lion])
55 AC_DEFINE([DARWIN_VERS], DARWIN_10_8, [Darwin / Mac OS X version])
56- DEFAULT_SUPP="darwin12.supp ${DEFAULT_SUPP}"
57- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
58+ DEFAULT_SUPP="$srcdir/darwin12.supp ${DEFAULT_SUPP}"
59+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
60 ;;
61 13.*)
62 AC_MSG_RESULT([Darwin 13.x (${kernel}) / Mac OS X 10.9 Mavericks])
63 AC_DEFINE([DARWIN_VERS], DARWIN_10_9, [Darwin / Mac OS X version])
64- DEFAULT_SUPP="darwin13.supp ${DEFAULT_SUPP}"
65- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
66+ DEFAULT_SUPP="$srcdir/darwin13.supp ${DEFAULT_SUPP}"
67+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
68 ;;
69 14.*)
70 AC_MSG_RESULT([Darwin 14.x (${kernel}) / Mac OS X 10.10 Yosemite])
71 AC_DEFINE([DARWIN_VERS], DARWIN_10_10, [Darwin / Mac OS X version])
72- DEFAULT_SUPP="darwin14.supp ${DEFAULT_SUPP}"
73- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
74+ DEFAULT_SUPP="$srcdir/darwin14.supp ${DEFAULT_SUPP}"
75+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
76 ;;
77 15.*)
78 AC_MSG_RESULT([Darwin 15.x (${kernel}) / Mac OS X 10.11 El Capitan])
79 AC_DEFINE([DARWIN_VERS], DARWIN_10_11, [Darwin / Mac OS X version])
80- DEFAULT_SUPP="darwin15.supp ${DEFAULT_SUPP}"
81- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
82+ DEFAULT_SUPP="$srcdir/darwin15.supp ${DEFAULT_SUPP}"
83+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
84 ;;
85 16.*)
86 AC_MSG_RESULT([Darwin 16.x (${kernel}) / macOS 10.12 Sierra])
87 AC_DEFINE([DARWIN_VERS], DARWIN_10_12, [Darwin / Mac OS X version])
88- DEFAULT_SUPP="darwin16.supp ${DEFAULT_SUPP}"
89- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
90+ DEFAULT_SUPP="$srcdir/darwin16.supp ${DEFAULT_SUPP}"
91+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
92 ;;
93 17.*)
94 AC_MSG_RESULT([Darwin 17.x (${kernel}) / macOS 10.13 High Sierra])
95@@ -515,7 +515,7 @@ case "${host_os}" in
96 DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}"
97 ;;
98 *)
99- DEFAULT_SUPP="solaris11.supp ${DEFAULT_SUPP}"
100+ DEFAULT_SUPP="$srcdir/solaris11.supp ${DEFAULT_SUPP}"
101 ;;
102 esac
103 ;;
104@@ -523,7 +523,7 @@ case "${host_os}" in
105 solaris2.12*)
106 AC_MSG_RESULT([ok (${host_os})])
107 VGCONF_OS="solaris"
108- DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}"
109+ DEFAULT_SUPP="$srcdir/solaris12.supp ${DEFAULT_SUPP}"
110 ;;
111
112 *)
113@@ -1237,15 +1237,15 @@ AC_MSG_CHECKING([the glibc version])
114 case "${GLIBC_VERSION}" in
115 2.2)
116 AC_MSG_RESULT(${GLIBC_VERSION} family)
117- DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}"
118- DEFAULT_SUPP="glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}"
119- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
120+ DEFAULT_SUPP="$srcdir/glibc-2.2.supp ${DEFAULT_SUPP}"
121+ DEFAULT_SUPP="$srcdir/glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}"
122+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
123 ;;
124 2.[[3-6]])
125 AC_MSG_RESULT(${GLIBC_VERSION} family)
126- DEFAULT_SUPP="glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}"
127- DEFAULT_SUPP="glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
128- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
129+ DEFAULT_SUPP="$srcdir/glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}"
130+ DEFAULT_SUPP="$srcdir/glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
131+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
132 ;;
133 2.[[7-9]])
134 AC_MSG_RESULT(${GLIBC_VERSION} family)
135@@ -1258,8 +1258,8 @@ case "${GLIBC_VERSION}" in
136 AC_DEFINE([GLIBC_MANDATORY_STRLEN_REDIRECT], 1,
137 [Define to 1 if strlen() has been optimized heavily (amd64 glibc >= 2.10)])
138 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
139- DEFAULT_SUPP="glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
140- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
141+ DEFAULT_SUPP="$srcdir/glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
142+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
143 ;;
144 2.*)
145 AC_MSG_RESULT(${GLIBC_VERSION} family)
146@@ -1268,8 +1268,8 @@ case "${GLIBC_VERSION}" in
147 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)])
149 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
150- DEFAULT_SUPP="glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
151- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
152+ DEFAULT_SUPP="$srcdir/glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
153+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
154 ;;
155 darwin)
156 AC_MSG_RESULT(Darwin)
157@@ -1284,7 +1284,7 @@ case "${GLIBC_VERSION}" in
158 bionic)
159 AC_MSG_RESULT(Bionic)
160 AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic])
161- DEFAULT_SUPP="bionic.supp ${DEFAULT_SUPP}"
162+ DEFAULT_SUPP="$srcdir/bionic.supp ${DEFAULT_SUPP}"
163 ;;
164 solaris)
165 AC_MSG_RESULT(Solaris)
166@@ -1313,8 +1313,8 @@ if test "$VGCONF_OS" != "solaris"; then
167 # attempt to detect whether such libraries are installed on the
168 # build machine (or even if any X facilities are present); just
169 # add the suppressions antidisirregardless.
170- DEFAULT_SUPP="xfree-4.supp ${DEFAULT_SUPP}"
171- DEFAULT_SUPP="xfree-3.supp ${DEFAULT_SUPP}"
172+ DEFAULT_SUPP="$srcdir/xfree-4.supp ${DEFAULT_SUPP}"
173+ DEFAULT_SUPP="$srcdir/xfree-3.supp ${DEFAULT_SUPP}"
174 fi
175
176
diff --git a/meta/recipes-devtools/valgrind/valgrind/0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch b/meta/recipes-devtools/valgrind/valgrind/0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch
deleted file mode 100644
index 02241781d9..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From ace5fe19b3f13039d5d6bd5d99d54c20ea79e09c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 10 Jun 2017 01:07:59 -0700
4Subject: [PATCH] tc20_verifywrap.c: Fake __GLIBC_PREREQ with musl
5
6similar to sun
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12---
13 helgrind/tests/tc20_verifywrap.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/helgrind/tests/tc20_verifywrap.c b/helgrind/tests/tc20_verifywrap.c
17index ae97bde..db2eb70 100644
18--- a/helgrind/tests/tc20_verifywrap.c
19+++ b/helgrind/tests/tc20_verifywrap.c
20@@ -20,7 +20,7 @@
21
22 #if !defined(__APPLE__) && !defined(__FreeBSD__)
23
24-#if defined(__sun__)
25+#if defined(__sun__) || (defined(__linux__) && !defined(__GLIBC__))
26 /* Fake __GLIBC_PREREQ on Solaris. Pretend glibc >= 2.4. */
27 # define __GLIBC_PREREQ
28 #else
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.18.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.19.0.bb
index 0c297ad6b9..6e3234be6b 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.18.1.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.19.0.bb
@@ -19,22 +19,18 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
19 file://remove-for-aarch64 \ 19 file://remove-for-aarch64 \
20 file://remove-for-all \ 20 file://remove-for-all \
21 file://taskset_nondeterministic_tests \ 21 file://taskset_nondeterministic_tests \
22 file://0004-Fix-out-of-tree-builds.patch \
23 file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \ 22 file://0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch \
24 file://use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch \ 23 file://use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch \
25 file://avoid-neon-for-targets-which-don-t-support-it.patch \ 24 file://avoid-neon-for-targets-which-don-t-support-it.patch \
26 file://valgrind-make-ld-XXX.so-strlen-intercept-optional.patch \ 25 file://valgrind-make-ld-XXX.so-strlen-intercept-optional.patch \
27 file://0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch \ 26 file://0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch \
28 file://0001-str_tester.c-Limit-rawmemchr-test-to-glibc.patch \
29 file://0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch \ 27 file://0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch \
30 file://0002-context-APIs-are-not-available-on-musl.patch \ 28 file://0002-context-APIs-are-not-available-on-musl.patch \
31 file://0003-correct-include-directive-path-for-config.h.patch \ 29 file://0003-correct-include-directive-path-for-config.h.patch \
32 file://0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch \
33 file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \ 30 file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \
34 file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ 31 file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \
35 file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ 32 file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \
36 file://0001-fix-opcode-not-supported-on-mips32-linux.patch \ 33 file://0001-fix-opcode-not-supported-on-mips32-linux.patch \
37 file://0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch \
38 file://0001-Make-local-functions-static-to-avoid-assembler-error.patch \ 34 file://0001-Make-local-functions-static-to-avoid-assembler-error.patch \
39 file://0001-Return-a-valid-exit_code-from-vg_regtest.patch \ 35 file://0001-Return-a-valid-exit_code-from-vg_regtest.patch \
40 file://0001-valgrind-filter_xml_frames-do-not-filter-usr.patch \ 36 file://0001-valgrind-filter_xml_frames-do-not-filter-usr.patch \
@@ -42,10 +38,10 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
42 file://s390x_vec_op_t.patch \ 38 file://s390x_vec_op_t.patch \
43 file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ 39 file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \
44 file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ 40 file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \
45 file://0001-Implement-linux-rseq-syscall-as-ENOSYS.patch \
46 file://0001-docs-Disable-manual-validation.patch \ 41 file://0001-docs-Disable-manual-validation.patch \
42 file://0001-Fix-drd-tests-shared_timed_mutex.cpp.patch \
47 " 43 "
48SRC_URI[sha256sum] = "00859aa13a772eddf7822225f4b46ee0d39afbe071d32778da4d99984081f7f5" 44SRC_URI[sha256sum] = "dd5e34486f1a483ff7be7300cc16b4d6b24690987877c3278d797534d6738f02"
49UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar" 45UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar"
50 46
51COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux' 47COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux'
@@ -145,9 +141,10 @@ SKIP_FILEDEPS:${PN}-ptest = '1'
145INSANE_SKIP:${PN}-ptest = "debug-deps" 141INSANE_SKIP:${PN}-ptest = "debug-deps"
146 142
147do_compile_ptest() { 143do_compile_ptest() {
148 oe_runmake check 144 oe_runmake ${PARALLEL_MAKE} check
149} 145}
150 146
147
151do_install_ptest() { 148do_install_ptest() {
152 chmod +x ${B}/tests/vg_regtest 149 chmod +x ${B}/tests/vg_regtest
153 150
@@ -237,6 +234,9 @@ do_install_ptest() {
237 # This is known failure see https://bugs.kde.org/show_bug.cgi?id=435732 234 # This is known failure see https://bugs.kde.org/show_bug.cgi?id=435732
238 rm ${D}${PTEST_PATH}/memcheck/tests/leak_cpp_interior.vgtest 235 rm ${D}${PTEST_PATH}/memcheck/tests/leak_cpp_interior.vgtest
239 236
237 # https://bugs.kde.org/show_bug.cgi?id=445743
238 rm ${D}${PTEST_PATH}/drd/tests/pth_mutex_signal
239
240 # As the binary isn't stripped or debug-splitted, the source file isn't fetched 240 # As the binary isn't stripped or debug-splitted, the source file isn't fetched
241 # via dwarfsrcfiles either, so it needs to be installed manually. 241 # via dwarfsrcfiles either, so it needs to be installed manually.
242 mkdir -p ${D}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/${BP}/none/tests/ 242 mkdir -p ${D}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/${BP}/none/tests/
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 06:03:10 +0000