summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/valgrind/valgrind
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/valgrind/valgrind')
-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-Make-local-functions-static-to-avoid-assembler-error.patch182
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch51
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-Return-a-valid-exit_code-from-vg_regtest.patch27
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-Use-portable-syntax-for-pushsection-directive-in-inl.patch31
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch37
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-docs-Disable-manual-validation.patch33
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-drd-Port-to-Fedora-33.patch48
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-drd-musl-fix.patch31
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-fix-opcode-not-supported-on-mips32-linux.patch82
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-gdbserver_tests-Disable-nlcontrolc.vgtest-for-x86-64.patch36
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-helgrind-Intercept-libc-functions.patch54
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch47
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch32
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch32
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-memcheck-vgtests-remove-fullpath-after-flags.patch9
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch9
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch9
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-str_tester.c-Limit-rawmemchr-test-to-glibc.patch39
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-tests-arm-Use-O-instead-of-O0.patch36
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-valgrind-filter_xml_frames-do-not-filter-usr.patch9
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch52
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0002-memcheck-x86-Define-__THROW-if-not-defined.patch32
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0003-correct-include-directive-path-for-config.h.patch9
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch68
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch185
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch257
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch30
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch31
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch9
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch39
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64235
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/remove-for-all2
-rwxr-xr-xmeta/recipes-devtools/valgrind/valgrind/run-ptest32
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch21
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/taskset_nondeterministic_tests2
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch11
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch9
38 files changed, 264 insertions, 1630 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
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-Make-local-functions-static-to-avoid-assembler-error.patch b/meta/recipes-devtools/valgrind/valgrind/0001-Make-local-functions-static-to-avoid-assembler-error.patch
deleted file mode 100644
index 8d2ca5733e..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-Make-local-functions-static-to-avoid-assembler-error.patch
+++ /dev/null
@@ -1,182 +0,0 @@
1From 2155c1b2cf00e744e280c493eb74bf457dfcc3b1 Mon Sep 17 00:00:00 2001
2From: Randy MacLeod <Randy.MacLeod@windriver.com>
3Date: Sun, 21 Oct 2018 15:09:31 -0400
4Subject: [PATCH] Make local functions static to avoid assembler error
5
6Avoid mips32 x-compiler warnings such as:
7
8| ../../../valgrind-3.14.0/helgrind/tests/annotate_hbefore.c:360:6: warning: no previous prototype for 'do_signal' [-Wmissing-prototypes]
9| void do_signal ( UWord* w )
10| ^~~~~~~~~
11
12by making functions and global variables that are file scope be static
13and more importantly also avoid an assembler error:
14
15/tmp/cce22iiw.s: Assembler messages:
16/tmp/cce22iiw.s:446: Error: symbol `exit_0' is already defined
17/tmp/cce22iiw.s:448: Error: symbol `exit' is already defined
18/tmp/cce22iiw.s:915: Error: symbol `exit_0' is already defined
19/tmp/cce22iiw.s:917: Error: symbol `exit' is already defined
20
21Upstream-Status: Submitted https://bugs.kde.org/show_bug.cgi?id=400164
22
23Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
24---
25 helgrind/tests/annotate_hbefore.c | 34 +++++++++++++++----------------
26 1 file changed, 17 insertions(+), 17 deletions(-)
27
28diff --git a/helgrind/tests/annotate_hbefore.c b/helgrind/tests/annotate_hbefore.c
29index e311714f7..f55514e45 100644
30--- a/helgrind/tests/annotate_hbefore.c
31+++ b/helgrind/tests/annotate_hbefore.c
32@@ -24,7 +24,7 @@ typedef unsigned long int UWord;
33
34 // ppc64
35 /* return 1 if success, 0 if failure */
36-UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
37+static UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
38 {
39 UWord old, success;
40
41@@ -57,7 +57,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
42
43 // ppc32
44 /* return 1 if success, 0 if failure */
45-UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
46+static UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
47 {
48 UWord old, success;
49
50@@ -90,7 +90,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
51
52 // amd64
53 /* return 1 if success, 0 if failure */
54-UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
55+static UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
56 {
57 UWord block[4] = { (UWord)addr, expected, nyu, 2 };
58 __asm__ __volatile__(
59@@ -113,7 +113,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
60
61 // x86
62 /* return 1 if success, 0 if failure */
63-UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
64+static UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
65 {
66 UWord block[4] = { (UWord)addr, expected, nyu, 2 };
67 __asm__ __volatile__(
68@@ -138,7 +138,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
69
70 // arm
71 /* return 1 if success, 0 if failure */
72-UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
73+static UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
74 {
75 UWord old, success;
76 UWord block[2] = { (UWord)addr, nyu };
77@@ -171,7 +171,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
78
79 // arm64
80 /* return 1 if success, 0 if failure */
81-UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
82+static UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
83 {
84 UWord old, success;
85 UWord block[2] = { (UWord)addr, nyu };
86@@ -204,7 +204,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
87
88 // s390x
89 /* return 1 if success, 0 if failure */
90-UWord do_acasW(UWord* addr, UWord expected, UWord nyu )
91+static UWord do_acasW(UWord* addr, UWord expected, UWord nyu )
92 {
93 int cc;
94
95@@ -223,7 +223,7 @@ UWord do_acasW(UWord* addr, UWord expected, UWord nyu )
96
97 // mips32
98 /* return 1 if success, 0 if failure */
99-UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
100+static UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
101 {
102 UWord success;
103 UWord block[3] = { (UWord)addr, nyu, expected};
104@@ -256,7 +256,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
105
106 // mips64
107 /* return 1 if success, 0 if failure */
108-UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
109+static UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
110 {
111 UWord success;
112 UWord block[3] = { (UWord)addr, nyu, expected};
113@@ -287,7 +287,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
114
115 #endif
116
117-void atomic_incW ( UWord* w )
118+static void atomic_incW ( UWord* w )
119 {
120 while (1) {
121 UWord old = *w;
122@@ -301,7 +301,7 @@ void atomic_incW ( UWord* w )
123
124 #define NNN 1000000
125
126-void* thread_fn ( void* arg )
127+static void* thread_fn ( void* arg )
128 {
129 UWord* w = (UWord*)arg;
130 int i;
131@@ -331,10 +331,10 @@ int main ( void )
132
133 #endif
134
135-int shared_var = 0; // is not raced upon
136+static int shared_var = 0; // is not raced upon
137
138
139-void delayXms ( int i )
140+static void delayXms ( int i )
141 {
142 struct timespec ts = { 0, 1 * 1000 * 1000 };
143 // We do the sleep in small pieces to have scheduling
144@@ -348,7 +348,7 @@ void delayXms ( int i )
145 }
146 }
147
148-void do_wait ( UWord* w )
149+static void do_wait ( UWord* w )
150 {
151 UWord w0 = *w;
152 UWord volatile * wV = w;
153@@ -357,7 +357,7 @@ void do_wait ( UWord* w )
154 ANNOTATE_HAPPENS_AFTER(w);
155 }
156
157-void do_signal ( UWord* w )
158+static void do_signal ( UWord* w )
159 {
160 ANNOTATE_HAPPENS_BEFORE(w);
161 atomic_incW(w);
162@@ -365,7 +365,7 @@ void do_signal ( UWord* w )
163
164
165
166-void* thread_fn1 ( void* arg )
167+static void* thread_fn1 ( void* arg )
168 {
169 UWord* w = (UWord*)arg;
170 delayXms(500); // ensure t2 gets to its wait first
171@@ -376,7 +376,7 @@ void* thread_fn1 ( void* arg )
172 return NULL;
173 }
174
175-void* thread_fn2 ( void* arg )
176+static void* thread_fn2 ( void* arg )
177 {
178 UWord* w = (UWord*)arg;
179 do_wait(w); // wait for h-b edge from first thread
180--
1812.17.0
182
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch b/meta/recipes-devtools/valgrind/valgrind/0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch
deleted file mode 100644
index a78e1953ff..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From 9762fd23e1f1db66d4b977c694a17d3bca3fe99a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 8 Jan 2016 16:36:29 +0200
4Subject: [PATCH] Remove tests that fail to build on some PPC32 configurations
5
6Failures are documented here:
7http://errors.yoctoproject.org/Errors/Search/?items=10&query=862d702fbb99e484631315aa44b9e46f8fc567da&filter=valgrind&type=recipe
8
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10Upstream-Status: Pending
11---
12 memcheck/tests/ppc32/Makefile.am | 2 +-
13 none/tests/ppc32/Makefile.am | 4 ++--
14 2 files changed, 3 insertions(+), 3 deletions(-)
15
16diff --git a/memcheck/tests/ppc32/Makefile.am b/memcheck/tests/ppc32/Makefile.am
17index 26b95a2..8f05743 100644
18--- a/memcheck/tests/ppc32/Makefile.am
19+++ b/memcheck/tests/ppc32/Makefile.am
20@@ -10,7 +10,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
21 power_ISA2_07.stderr.exp power_ISA2_07.vgtest
22
23 check_PROGRAMS = \
24- power_ISA2_05 power_ISA2_07
25+ power_ISA2_07
26
27 power_ISA2_05_CFLAGS = $(AM_CFLAGS) $(WERROR) -Winline -Wall -Wshadow -g \
28 -I$(top_srcdir)/include @FLAG_M32@
29diff --git a/none/tests/ppc32/Makefile.am b/none/tests/ppc32/Makefile.am
30index 196239e..0fe3425 100644
31--- a/none/tests/ppc32/Makefile.am
32+++ b/none/tests/ppc32/Makefile.am
33@@ -50,13 +50,13 @@ EXTRA_DIST = \
34
35 check_PROGRAMS = \
36 allexec \
37- lsw jm-insns round \
38+ lsw \
39 test_isa_2_06_part1 test_isa_2_06_part2 test_isa_2_06_part3 \
40 test_dfp1 test_dfp2 test_dfp3 test_dfp4 test_dfp5 \
41 test_isa_2_07_part1 test_isa_2_07_part2 \
42 test_tm test_touch_tm ldst_multiple data-cache-instructions \
43 test_fx test_gx \
44- testVMX twi tw xlc_dbl_u32 power5+_round power6_bcmp \
45+ twi tw xlc_dbl_u32 power6_bcmp \
46 bug129390-ppc32 bug139050-ppc32 \
47 ldstrev mftocrf mcrfs
48
49--
502.6.4
51
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-Return-a-valid-exit_code-from-vg_regtest.patch b/meta/recipes-devtools/valgrind/valgrind/0001-Return-a-valid-exit_code-from-vg_regtest.patch
deleted file mode 100644
index e7af5efecc..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-Return-a-valid-exit_code-from-vg_regtest.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 5eebdefd2251803e7d21081745018fcb16b2ba71 Mon Sep 17 00:00:00 2001
2From: Randy MacLeod <Randy.MacLeod@windriver.com>
3Date: Wed, 8 May 2019 20:16:52 -0400
4Subject: [PATCH] Return a valid exit_code from vg_regtest
5
6Upstream-Status: Pending
7
8Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
9---
10 tests/vg_regtest.in | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in
14index 909af3be8..f2799c4e3 100755
15--- a/tests/vg_regtest.in
16+++ b/tests/vg_regtest.in
17@@ -403,6 +403,7 @@ sub mysystem($)
18 exit 1;
19 }
20 }
21+ return $exit_code;
22 }
23 # if $keepunfiltered, copies $1 to $1.unfiltered.out
24 # renames $0 tp $1
25--
262.17.0
27
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-Use-portable-syntax-for-pushsection-directive-in-inl.patch b/meta/recipes-devtools/valgrind/valgrind/0001-Use-portable-syntax-for-pushsection-directive-in-inl.patch
new file mode 100644
index 0000000000..b59c544223
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-Use-portable-syntax-for-pushsection-directive-in-inl.patch
@@ -0,0 +1,31 @@
1From 2089383a0e3a50f527337ea05188b3e302069888 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 14 May 2025 09:29:33 -0700
4Subject: [PATCH] Use portable syntax for pushsection directive in inline
5 assembly
6
7'@' does not work with clang inline assembler, but '%' works with both
8gcc and clang. Therefore use '%' to make it more portable
9
10Fixes
11<inline asm>:1:41: error: expected '%<type>' or "<type>"
12
13Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=504222]
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 coregrind/vg_preloaded.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c
20index 5bec51d..e4c2dbc 100644
21--- a/coregrind/vg_preloaded.c
22+++ b/coregrind/vg_preloaded.c
23@@ -55,7 +55,7 @@
24 /* Note: The "MS" section flags are to remove duplicates. */
25 #define DEFINE_GDB_PY_SCRIPT(script_name) \
26 asm("\
27-.pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n\
28+.pushsection \".debug_gdb_scripts\", \"MS\",%progbits,1\n\
29 .byte 1 /* Python */\n\
30 .asciz \"" script_name "\"\n\
31 .popsection \n\
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch b/meta/recipes-devtools/valgrind/valgrind/0001-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch
new file mode 100644
index 0000000000..3c8bec82b3
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch
@@ -0,0 +1,37 @@
1From 5a776e61af5ab7f0cfd10cde55c796189686916f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 10 May 2024 16:27:34 -0700
4Subject: [PATCH] configure: Drop setting mcpu=cortex-a8 on arm
5
6The -march settings from environment expresses the flags
7appropriately, moreover, this conflicts when using armhf
8without neon [1]
9
10[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=928224
11
12Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=454346]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 configure.ac | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
19index 2dfbd1c..b42fdd4 100755
20--- a/configure.ac
21+++ b/configure.ac
22@@ -251,13 +251,13 @@ case "${host_cpu}" in
23
24 armv8*)
25 AC_MSG_RESULT([ok (${host_cpu})])
26- VGCONF_PLATFORM_ARM_ARCH="-marm -mcpu=cortex-a8"
27+ VGCONF_PLATFORM_ARM_ARCH="-marm"
28 ARCH_MAX="arm"
29 ;;
30
31 armv7*)
32 AC_MSG_RESULT([ok (${host_cpu})])
33- VGCONF_PLATFORM_ARM_ARCH="-marm -mcpu=cortex-a8"
34+ VGCONF_PLATFORM_ARM_ARCH="-marm"
35 ARCH_MAX="arm"
36 ;;
37
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-docs-Disable-manual-validation.patch b/meta/recipes-devtools/valgrind/valgrind/0001-docs-Disable-manual-validation.patch
new file mode 100644
index 0000000000..fbd799eeea
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-docs-Disable-manual-validation.patch
@@ -0,0 +1,33 @@
1From 4f674f458b1f0675abdc0ced01239e99bfa40de8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 13 Jan 2022 18:26:02 -0800
4Subject: [PATCH] docs: Disable manual validation
5
6validating manual and manpages, this task involves calling xmllint which
7accesses network and --nonet option also does not disable this,
8therefore disable it.
9
10Fixes
11| error : Resource temporarily unavailable
12| ../callgrind/docs/cl-manual.xml:4: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
13| <!ENTITY % vg-entities SYSTEM "../../docs/xml/vg-entities.xml"> %vg-entities; ]
14
15Upstream-Status: Inappropriate [OE-Specific]
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 docs/Makefile.am | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/docs/Makefile.am b/docs/Makefile.am
22index 68a3da5..9833d5c 100644
23--- a/docs/Makefile.am
24+++ b/docs/Makefile.am
25@@ -202,7 +202,7 @@ valid-manpages: $(MANPAGES_XML_FILES)
26 fi \
27 fi
28
29-check-local: valid-manual valid-manpages
30+check-local:
31
32 # The text version of the FAQ.
33 FAQ.txt:
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-drd-Port-to-Fedora-33.patch b/meta/recipes-devtools/valgrind/valgrind/0001-drd-Port-to-Fedora-33.patch
deleted file mode 100644
index 37f6ea667d..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-drd-Port-to-Fedora-33.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 15330adf7c2471fbaa6a0818db07078d81dbff97 Mon Sep 17 00:00:00 2001
2From: Bart Van Assche <bvanassche@acm.org>
3Date: Sat, 19 Sep 2020 08:08:59 -0700
4Subject: [PATCH] drd: Port to Fedora 33
5
6Apparently on Fedora 33 the POSIX thread functions exist in both libc and
7libpthread. Hence this patch that intercepts the pthread functions in
8libc. See also https://bugs.kde.org/show_bug.cgi?id=426144 .
9
10Signed-off-by: Bart Van Assche <bvanassche@acm.org>
11
12This patch was imported from the valgrind sourceware server
13(https://sourceware.org/git/?p=valgrind.git;a=commit;h=15330adf7c2471fbaa6a0818db07078d81dbff97)
14It was modified to remove the changes to the valgrind NEWS file,
15as these are difficult to maintain and don't impact the valgrind
16code itself.
17
18Upstream-Status: Backport
19
20Signed-off-by: Stacy Gaikovaia <stacy.gaikovaia@windriver.com>
21---
22 drd/drd_pthread_intercepts.c | 9 +++++++++
23 1 file changed, 10 insertions(+)
24
25diff --git a/drd/drd_pthread_intercepts.c b/drd/drd_pthread_intercepts.c
26index 58c45aaec..c2882e5ab 100644
27--- a/drd/drd_pthread_intercepts.c
28+++ b/drd/drd_pthread_intercepts.c
29@@ -174,7 +174,16 @@ static int never_true;
30 ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBC_SONAME,zf) argl_decl \
31 { return implf argl; }
32 #else
33+/*
34+ * On Linux, intercept both the libc and the libpthread functions. At
35+ * least glibc 2.32.9000 (Fedora 34) has an implementation of all pthread
36+ * functions in both libc and libpthread. Older glibc versions only have an
37+ * implementation of the pthread functions in libpthread.
38+ */
39 #define PTH_FUNC(ret_ty, zf, implf, argl_decl, argl) \
40+ ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBC_SONAME,zf) argl_decl; \
41+ ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBC_SONAME,zf) argl_decl \
42+ { return implf argl; } \
43 ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBPTHREAD_SONAME,zf) argl_decl; \
44 ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBPTHREAD_SONAME,zf) argl_decl \
45 { return implf argl; }
46--
472.25.1
48
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-drd-musl-fix.patch b/meta/recipes-devtools/valgrind/valgrind/0001-drd-musl-fix.patch
deleted file mode 100644
index e96bf3c611..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-drd-musl-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1The changes in 0001-drd-Port-to-Fedora-33.patch break builds on musl. These
2need a __GLIBC__ guard to ensure musl builds continue to work.
3
4Upstream-Status: Pending
5Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
6
7Index: valgrind-3.16.1/drd/drd_pthread_intercepts.c
8===================================================================
9--- valgrind-3.16.1.orig/drd/drd_pthread_intercepts.c
10+++ valgrind-3.16.1/drd/drd_pthread_intercepts.c
11@@ -180,6 +180,7 @@ static int never_true;
12 * functions in both libc and libpthread. Older glibc versions only have an
13 * implementation of the pthread functions in libpthread.
14 */
15+#ifdef __GLIBC__
16 #define PTH_FUNC(ret_ty, zf, implf, argl_decl, argl) \
17 ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBC_SONAME,zf) argl_decl; \
18 ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBC_SONAME,zf) argl_decl \
19@@ -187,6 +188,12 @@ static int never_true;
20 ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBPTHREAD_SONAME,zf) argl_decl; \
21 ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBPTHREAD_SONAME,zf) argl_decl \
22 { return implf argl; }
23+#else
24+#define PTH_FUNC(ret_ty, zf, implf, argl_decl, argl) \
25+ ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBPTHREAD_SONAME,zf) argl_decl; \
26+ ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBPTHREAD_SONAME,zf) argl_decl \
27+ { return implf argl; }
28+#endif
29 #endif
30
31 /**
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-fix-opcode-not-supported-on-mips32-linux.patch b/meta/recipes-devtools/valgrind/valgrind/0001-fix-opcode-not-supported-on-mips32-linux.patch
deleted file mode 100644
index 39b624d9f6..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-fix-opcode-not-supported-on-mips32-linux.patch
+++ /dev/null
@@ -1,82 +0,0 @@
1From fb5362f205b37c5060fcd764a7ed393abe4f2f3d Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 27 Jul 2018 17:39:37 +0800
4Subject: [PATCH 1/2] fix opcode not supported on mips32-linux
5
6While build tests(`make check') on mips32-linux, there are
7serial failures such as:
8[snip]
9| mips-wrsmllib32-linux-gcc -meb -mabi=32 -mhard-float -c
10-o atomic_incs-atomic_incs.o `test -f 'atomic_incs.c' || echo
11'../../../valgrind-3.13.0/memcheck/tests/'`atomic_incs.c
12| /tmp/ccqrmINN.s: Assembler messages:
13| /tmp/ccqrmINN.s:247: Error: opcode not supported on this
14processor: mips1 (mips1) `ll $t3,0($t1)'
15| /tmp/ccqrmINN.s:249: Error: opcode not supported on this
16processor: mips1 (mips1) `sc $t3,0($t1)'
17[snip]
18
19Since the following commit applied, it defines CLFAGS for mips32,
20but missed to pass them to tests which caused the above failure
21...
223e344c57f Merge in a port for mips32-linux
23...
24
25Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=396905]
26Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
27---
28 helgrind/tests/Makefile.am | 5 +++++
29 memcheck/tests/Makefile.am | 5 +++++
30 none/tests/mips32/Makefile.am | 4 ++++
31 3 files changed, 14 insertions(+)
32
33diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am
34index ad1af191a..6209d35a7 100644
35--- a/helgrind/tests/Makefile.am
36+++ b/helgrind/tests/Makefile.am
37@@ -214,6 +214,11 @@ check_PROGRAMS += annotate_rwlock
38 endif
39
40 AM_CFLAGS += $(AM_FLAG_M3264_PRI)
41+
42+if VGCONF_PLATFORMS_INCLUDE_MIPS32_LINUX
43+AM_CFLAGS += $(AM_CFLAGS_MIPS32_LINUX)
44+endif
45+
46 AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
47
48 LDADD = -lpthread
49diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
50index 84e49405f..aff861a32 100644
51--- a/memcheck/tests/Makefile.am
52+++ b/memcheck/tests/Makefile.am
53@@ -443,6 +443,11 @@ check_PROGRAMS += reach_thread_register
54 endif
55
56 AM_CFLAGS += $(AM_FLAG_M3264_PRI)
57+
58+if VGCONF_PLATFORMS_INCLUDE_MIPS32_LINUX
59+AM_CFLAGS += $(AM_CFLAGS_MIPS32_LINUX)
60+endif
61+
62 AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
63
64 if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX
65diff --git a/none/tests/mips32/Makefile.am b/none/tests/mips32/Makefile.am
66index d11591d45..602cd26f6 100644
67--- a/none/tests/mips32/Makefile.am
68+++ b/none/tests/mips32/Makefile.am
69@@ -99,6 +99,10 @@ check_PROGRAMS = \
70 round_fpu64 \
71 fpu_branches
72
73+if VGCONF_PLATFORMS_INCLUDE_MIPS32_LINUX
74+AM_CFLAGS += $(AM_CFLAGS_MIPS32_LINUX)
75+endif
76+
77 AM_CFLAGS += @FLAG_M32@
78 AM_CXXFLAGS += @FLAG_M32@
79 AM_CCASFLAGS += @FLAG_M32@
80--
812.17.1
82
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-gdbserver_tests-Disable-nlcontrolc.vgtest-for-x86-64.patch b/meta/recipes-devtools/valgrind/valgrind/0001-gdbserver_tests-Disable-nlcontrolc.vgtest-for-x86-64.patch
deleted file mode 100644
index 0bd8273cd8..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-gdbserver_tests-Disable-nlcontrolc.vgtest-for-x86-64.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From d8c19e0bb9ca2fd48f223e1fdeffcafeb0aa1745 Mon Sep 17 00:00:00 2001
2From: Yi Fan Yu <yifan.yu@windriver.com>
3Date: Wed, 17 Feb 2021 14:53:44 -0500
4Subject: [PATCH] gdbserver_tests: Disable nlcontrolc.vgtest for x86-64
5
6Test hangs after glibc 2.33 uprev
7
8Using gdb to modify the timeout argument no longer
9affects how long `select` wait.
10
11https://bugs.kde.org/show_bug.cgi?id=432870
12Upstream-Status: Pending
13Waiting for upstream to take action.
14
15Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
16---
17 gdbserver_tests/nlcontrolc.vgtest | 3 ++-
18 1 file changed, 2 insertions(+), 1 deletion(-)
19
20diff --git a/gdbserver_tests/nlcontrolc.vgtest b/gdbserver_tests/nlcontrolc.vgtest
21index bb5308403..96d2b52bb 100644
22--- a/gdbserver_tests/nlcontrolc.vgtest
23+++ b/gdbserver_tests/nlcontrolc.vgtest
24@@ -13,7 +13,8 @@ args: 1000000000 1000000000 1000000000 BSBSBSBS 1
25 vgopts: --tool=none --vgdb=yes --vgdb-error=0 --vgdb-prefix=./vgdb-prefix-nlcontrolc
26 stderr_filter: filter_stderr
27 # Bug 338633 nlcontrol hangs on arm64 currently.
28-prereq: test -e gdb -a -f vgdb.invoker && ! ../tests/arch_test arm64 && ! ../tests/os_test solaris
29+# Bug 432870 nlcontrolc hangs on x86-64 starting with glibc 2.33
30+prereq: test -e gdb -a -f vgdb.invoker && ! ../tests/arch_test arm64 && ! ../tests/os_test solaris && ! ../tests/arch_test amd64
31 progB: gdb
32 argsB: --quiet -l 60 --nx ./sleepers
33 stdinB: nlcontrolc.stdinB.gdb
34--
352.29.2
36
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-helgrind-Intercept-libc-functions.patch b/meta/recipes-devtools/valgrind/valgrind/0001-helgrind-Intercept-libc-functions.patch
deleted file mode 100644
index f66df3d2d2..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-helgrind-Intercept-libc-functions.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1From cdec010444df5a4328e90d07a2024fdeefcc74b5 Mon Sep 17 00:00:00 2001
2From: Paul Floyd <paulf@free.fr>
3Date: Wed, 18 Nov 2020 12:49:20 -0400
4Subject: [PATCH] helgrind: Intercept libc functions
5
6PTH_FUNC definition needs to be modified in order to
7intercept posix thread functions in both libc and
8libpthread. In order to handle this in helgrind, weak alias
9the pthread functions in glibc.
10
11Upstream-Status: Submitted
12
13Signed-off-by: Paul Floyd <paulf@free.fr>
14Signed-off-by: Stacy Gaikovaia <stacy.gaikovaia@windriver.com>
15---
16 helgrind/hg_intercepts.c | 12 ++++++++++++
17 1 file changed, 12 insertions(+)
18
19diff --git a/helgrind/hg_intercepts.c b/helgrind/hg_intercepts.c
20index a10c3a4a3..316140ca6 100644
21--- a/helgrind/hg_intercepts.c
22+++ b/helgrind/hg_intercepts.c
23@@ -77,6 +77,11 @@
24 /*--- ---*/
25 /*----------------------------------------------------------------*/
26
27+#define hg_expand(tok) #tok
28+#define hg_str(tok) hg_expand(tok)
29+# define hg_weak_alias(name, aliasname) \
30+ extern __typeof (name) aliasname __attribute__ ((weak, alias(hg_str(name))))
31+
32 #if defined(VGO_solaris)
33 /* On Solaris, libpthread is just a filter library on top of libc.
34 * Threading and synchronization functions in runtime linker are not
35@@ -91,9 +96,16 @@
36 #define CREQ_PTHREAD_T Word
37 #define SEM_ERROR ret
38 #else
39+#ifdef MUSL_LIBC
40+#define PTH_FUNC(ret_ty, f, args...) \
41+ ret_ty I_WRAP_SONAME_FNNAME_ZZ(VG_Z_LIBPTHREAD_SONAME,f)(args); \
42+ ret_ty I_WRAP_SONAME_FNNAME_ZZ(VG_Z_LIBPTHREAD_SONAME,f)(args)
43+#else
44 #define PTH_FUNC(ret_ty, f, args...) \
45 ret_ty I_WRAP_SONAME_FNNAME_ZZ(VG_Z_LIBPTHREAD_SONAME,f)(args); \
46+ hg_weak_alias(I_WRAP_SONAME_FNNAME_ZZ(VG_Z_LIBPTHREAD_SONAME,f), I_WRAP_SONAME_FNNAME_ZZ(VG_Z_LIBC_SONAME,f)); \
47 ret_ty I_WRAP_SONAME_FNNAME_ZZ(VG_Z_LIBPTHREAD_SONAME,f)(args)
48+#endif
49 #define CREQ_PTHREAD_T pthread_t
50 #define SEM_ERROR errno
51 #endif /* VGO_solaris */
52--
532.17.1
54
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch b/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch
index 9f1da7bac6..f8d1e87ba9 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch
@@ -1,4 +1,4 @@
1From 715cf122388f3527afa5649cebf9f1522c240693 Mon Sep 17 00:00:00 2001 1From c878aaacadf8ec723be882f9335cb33240df13d6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 20 Apr 2017 10:11:16 -0700 3Date: Thu, 20 Apr 2017 10:11:16 -0700
4Subject: [PATCH] makefiles: Drop setting -mcpu to cortex-a8 on arm 4Subject: [PATCH] makefiles: Drop setting -mcpu to cortex-a8 on arm
@@ -10,39 +10,19 @@ implementation.
10Fixes 10Fixes
11| cc1: warning: switch -mcpu=cortex-a8 conflicts with -march=armv7ve switch 11| cc1: warning: switch -mcpu=cortex-a8 conflicts with -march=armv7ve switch
12 12
13Upstream-Status: Pending 13Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=454346]
14 14
15Signed-off-by: Khem Raj <raj.khem@gmail.com> 15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16--- 16---
17 Makefile.all.am | 6 +++---
18 helgrind/tests/Makefile.am | 6 +++--- 17 helgrind/tests/Makefile.am | 6 +++---
19 none/tests/arm/Makefile.am | 18 +++++++++--------- 18 none/tests/arm/Makefile.am | 18 +++++++++---------
20 3 files changed, 15 insertions(+), 15 deletions(-) 19 2 files changed, 12 insertions(+), 12 deletions(-)
21 20
22diff --git a/Makefile.all.am b/Makefile.all.am
23index 02059a3..c7c4700 100644
24--- a/Makefile.all.am
25+++ b/Makefile.all.am
26@@ -197,11 +197,11 @@ AM_CCASFLAGS_PPC64LE_LINUX = @FLAG_M64@ -g
27
28 AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@
29 AM_CFLAGS_ARM_LINUX = @FLAG_M32@ \
30- $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8
31+ $(AM_CFLAGS_BASE) -marm
32 AM_CFLAGS_PSO_ARM_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) \
33- -marm -mcpu=cortex-a8 $(AM_CFLAGS_PSO_BASE)
34+ -marm $(AM_CFLAGS_PSO_BASE)
35 AM_CCASFLAGS_ARM_LINUX = @FLAG_M32@ \
36- -marm -mcpu=cortex-a8 -g
37+ -marm -g
38
39 AM_FLAG_M3264_ARM64_LINUX = @FLAG_M64@
40 AM_CFLAGS_ARM64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE)
41diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am 21diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am
42index df82169..07eb66a 100644 22index 7adc5c6..cac23c9 100755
43--- a/helgrind/tests/Makefile.am 23--- a/helgrind/tests/Makefile.am
44+++ b/helgrind/tests/Makefile.am 24+++ b/helgrind/tests/Makefile.am
45@@ -189,9 +189,9 @@ if ! VGCONF_PLATFORMS_INCLUDE_X86_DARWIN 25@@ -226,9 +226,9 @@ if ! VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
46 endif 26 endif
47 27
48 if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX 28 if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX
@@ -56,10 +36,10 @@ index df82169..07eb66a 100644
56 annotate_hbefore_CFLAGS = $(AM_CFLAGS) 36 annotate_hbefore_CFLAGS = $(AM_CFLAGS)
57 tc07_hbl1_CFLAGS = $(AM_CFLAGS) 37 tc07_hbl1_CFLAGS = $(AM_CFLAGS)
58diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am 38diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am
59index 024eb6d..ccecb90 100644 39index 41a5a03..a76981e 100644
60--- a/none/tests/arm/Makefile.am 40--- a/none/tests/arm/Makefile.am
61+++ b/none/tests/arm/Makefile.am 41+++ b/none/tests/arm/Makefile.am
62@@ -52,10 +52,10 @@ allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@ 42@@ -56,10 +56,10 @@ allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@
63 # need special helping w.r.t -mfpu and -mfloat-abi, though. 43 # need special helping w.r.t -mfpu and -mfloat-abi, though.
64 # Also force -O0 since -O takes hundreds of MB of memory 44 # Also force -O0 since -O takes hundreds of MB of memory
65 # for v6intThumb.c. 45 # for v6intThumb.c.
@@ -71,11 +51,11 @@ index 024eb6d..ccecb90 100644
71-v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mthumb 51-v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mthumb
72+v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb 52+v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb
73 53
74 v8crypto_a_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -marm 54 v8crypto_a_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -marm -march=armv8-a
75 v8crypto_t_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -mthumb 55 v8crypto_t_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -mthumb -march=armv8-a
76@@ -65,23 +65,23 @@ v8memory_a_CFLAGS = $(AM_CFLAGS) -g -O0 \ 56@@ -74,23 +74,23 @@ v8memory_t_CFLAGS = $(AM_CFLAGS) -g -O0 \
77 v8memory_t_CFLAGS = $(AM_CFLAGS) -g -O0 \ 57
78 -march=armv8-a -mfpu=crypto-neon-fp-armv8 -mthumb 58 vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mfpu=neon
79 59
80-vfp_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \ 60-vfp_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \
81+vfp_CFLAGS = $(AM_CFLAGS) -g -O0 \ 61+vfp_CFLAGS = $(AM_CFLAGS) -g -O0 \
@@ -103,6 +83,3 @@ index 024eb6d..ccecb90 100644
103+vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mfpu=vfpv3 83+vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mfpu=vfpv3
104 84
105 vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm 85 vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm
106--
1072.12.2
108
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch
deleted file mode 100644
index a48d7db070..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 3409dc35c15bb14c8a525239806322648e079ab1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 5 Jul 2017 17:12:43 -0700
4Subject: [PATCH 1/3] memcheck/arm64: Define __THROW if not already defined
5
6Helps compiling with musl where __THROW is not available
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Submitted
11
12 memcheck/tests/arm64-linux/scalar.h | 4 ++++
13 1 file changed, 4 insertions(+)
14
15diff --git a/memcheck/tests/arm64-linux/scalar.h b/memcheck/tests/arm64-linux/scalar.h
16index 9008816..8ef050f 100644
17--- a/memcheck/tests/arm64-linux/scalar.h
18+++ b/memcheck/tests/arm64-linux/scalar.h
19@@ -12,6 +12,10 @@
20 #include <sys/types.h>
21 #include <sys/mman.h>
22
23+#ifndef __THROW
24+#define __THROW
25+#endif
26+
27 // Since we use vki_unistd.h, we can't include <unistd.h>. So we have to
28 // declare this ourselves.
29 extern long int syscall (long int __sysno, ...) __THROW;
30--
312.13.2
32
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch
index 15fbbe954f..200b2602cb 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch
@@ -1,4 +1,4 @@
1From 5d411fd147d652e9d7bb259f4048693c6e4742aa Mon Sep 17 00:00:00 2001 1From 3a51ed107f67732910dec12279a9279e158afbe7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 9 Mar 2020 16:30:19 -0700 3Date: Mon, 9 Mar 2020 16:30:19 -0700
4Subject: [PATCH] memcheck/tests: Fix timerfd syscall test 4Subject: [PATCH] memcheck/tests: Fix timerfd syscall test
@@ -10,14 +10,16 @@ have the implementation or syscall is not defined
10Upstream-Status: Submitted [https://sourceforge.net/p/valgrind/mailman/message/36943897/] 10Upstream-Status: Submitted [https://sourceforge.net/p/valgrind/mailman/message/36943897/]
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12--- 12---
13 config.h.in | 9 +++++++++ 13 config.h.in | 3 +++
14 configure.ac | 3 +++ 14 configure.ac | 1 +
15 memcheck/tests/linux/timerfd-syscall.c | 10 ++++++++-- 15 memcheck/tests/linux/timerfd-syscall.c | 14 +++++++++++---
16 5 files changed, 32 insertions(+), 2 deletions(-) 16 3 files changed, 15 insertions(+), 3 deletions(-)
17 17
18diff --git a/config.h.in b/config.h.in
19index 00db1a6..23fd77a 100644
18--- a/config.h.in 20--- a/config.h.in
19+++ b/config.h.in 21+++ b/config.h.in
20@@ -301,6 +301,9 @@ 22@@ -409,6 +409,9 @@
21 /* Define to 1 if you have the <sys/sysnvl.h> header file. */ 23 /* Define to 1 if you have the <sys/sysnvl.h> header file. */
22 #undef HAVE_SYS_SYSNVL_H 24 #undef HAVE_SYS_SYSNVL_H
23 25
@@ -27,9 +29,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
27 /* Define to 1 if you have the <sys/time.h> header file. */ 29 /* Define to 1 if you have the <sys/time.h> header file. */
28 #undef HAVE_SYS_TIME_H 30 #undef HAVE_SYS_TIME_H
29 31
32diff --git a/configure.ac b/configure.ac
33index b42fdd4..ec95146 100755
30--- a/configure.ac 34--- a/configure.ac
31+++ b/configure.ac 35+++ b/configure.ac
32@@ -4098,6 +4098,7 @@ AC_CHECK_HEADERS([ \ 36@@ -4892,6 +4892,7 @@ AC_CHECK_HEADERS([ \
33 sys/syscall.h \ 37 sys/syscall.h \
34 sys/sysnvl.h \ 38 sys/sysnvl.h \
35 sys/time.h \ 39 sys/time.h \
@@ -37,9 +41,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
37 sys/types.h \ 41 sys/types.h \
38 ]) 42 ])
39 43
44diff --git a/memcheck/tests/linux/timerfd-syscall.c b/memcheck/tests/linux/timerfd-syscall.c
45index 61d75b5..1ba888a 100644
40--- a/memcheck/tests/linux/timerfd-syscall.c 46--- a/memcheck/tests/linux/timerfd-syscall.c
41+++ b/memcheck/tests/linux/timerfd-syscall.c 47+++ b/memcheck/tests/linux/timerfd-syscall.c
42@@ -45,6 +45,9 @@ 48@@ -42,6 +42,9 @@
43 #if defined(HAVE_SYS_TIME_H) 49 #if defined(HAVE_SYS_TIME_H)
44 #include <sys/time.h> 50 #include <sys/time.h>
45 #endif 51 #endif
@@ -49,7 +55,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
49 #if defined(HAVE_SYS_TYPES_H) 55 #if defined(HAVE_SYS_TYPES_H)
50 #include <sys/types.h> 56 #include <sys/types.h>
51 #endif 57 #endif
52@@ -54,7 +57,8 @@ 58@@ -51,7 +54,8 @@
53 * timerfd_* system call numbers introduced in 2.6.23. These constants are 59 * timerfd_* system call numbers introduced in 2.6.23. These constants are
54 * not yet in the glibc 2.7 headers, that is why they are defined here. 60 * not yet in the glibc 2.7 headers, that is why they are defined here.
55 */ 61 */
@@ -59,7 +65,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
59 #if defined(__x86_64__) 65 #if defined(__x86_64__)
60 #define __NR_timerfd_create 283 66 #define __NR_timerfd_create 283
61 #elif defined(__i386__) 67 #elif defined(__i386__)
62@@ -67,8 +71,10 @@ 68@@ -64,8 +68,10 @@
63 #error Cannot detect your architecture! 69 #error Cannot detect your architecture!
64 #endif 70 #endif
65 #endif 71 #endif
@@ -71,7 +77,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
71 #if defined(__x86_64__) 77 #if defined(__x86_64__)
72 #define __NR_timerfd_settime 286 78 #define __NR_timerfd_settime 286
73 #define __NR_timerfd_gettime 287 79 #define __NR_timerfd_gettime 287
74@@ -85,7 +91,7 @@ 80@@ -82,7 +88,7 @@
75 #error Cannot detect your architecture! 81 #error Cannot detect your architecture!
76 #endif 82 #endif
77 #endif 83 #endif
@@ -80,7 +86,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
80 86
81 87
82 /* Definitions from include/linux/timerfd.h */ 88 /* Definitions from include/linux/timerfd.h */
83@@ -127,6 +133,7 @@ void set_timespec(struct timespec *tmr, 89@@ -124,6 +130,7 @@ void set_timespec(struct timespec *tmr, unsigned long long ustime)
84 tmr->tv_nsec = (long) (1000ULL * (ustime % 1000000ULL)); 90 tmr->tv_nsec = (long) (1000ULL * (ustime % 1000000ULL));
85 } 91 }
86 92
@@ -88,7 +94,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
88 int timerfd_create(int clockid, int flags) 94 int timerfd_create(int clockid, int flags)
89 { 95 {
90 return syscall(__NR_timerfd_create, clockid, flags); 96 return syscall(__NR_timerfd_create, clockid, flags);
91@@ -142,6 +149,7 @@ int timerfd_gettime(int ufc, struct itim 97@@ -139,6 +146,7 @@ int timerfd_gettime(int ufc, struct itimerspec *otmr)
92 { 98 {
93 return syscall(__NR_timerfd_gettime, ufc, otmr); 99 return syscall(__NR_timerfd_gettime, ufc, otmr);
94 } 100 }
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-vgtests-remove-fullpath-after-flags.patch b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-vgtests-remove-fullpath-after-flags.patch
index dce8b52ba3..9a3596cac1 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-vgtests-remove-fullpath-after-flags.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-vgtests-remove-fullpath-after-flags.patch
@@ -1,4 +1,4 @@
1From 3ff82dcb844f98dbf67c69f11f6516bc234725a9 Mon Sep 17 00:00:00 2001 1From b703b0d11adc9147a7d97817bd771ac40b8c4d39 Mon Sep 17 00:00:00 2001
2From: Stacy Gaikovaia <Stacy.Gaikovaia@windriver.com> 2From: Stacy Gaikovaia <Stacy.Gaikovaia@windriver.com>
3Date: Wed, 16 Sep 2020 13:45:07 -0400 3Date: Wed, 16 Sep 2020 13:45:07 -0400
4Subject: [PATCH] memcheck vgtests remove fullpath-after flags 4Subject: [PATCH] memcheck vgtests remove fullpath-after flags
@@ -20,7 +20,7 @@ Signed-off-by: Stacy Gaikovaia <Stacy.Gaikovaia@windriver.com>
20 2 files changed, 2 insertions(+), 2 deletions(-) 20 2 files changed, 2 insertions(+), 2 deletions(-)
21 21
22diff --git a/memcheck/tests/badfree3.vgtest b/memcheck/tests/badfree3.vgtest 22diff --git a/memcheck/tests/badfree3.vgtest b/memcheck/tests/badfree3.vgtest
23index 3dfc5fd8a..4ee03f00a 100644 23index 3dfc5fd..4ee03f0 100644
24--- a/memcheck/tests/badfree3.vgtest 24--- a/memcheck/tests/badfree3.vgtest
25+++ b/memcheck/tests/badfree3.vgtest 25+++ b/memcheck/tests/badfree3.vgtest
26@@ -1,3 +1,3 @@ 26@@ -1,3 +1,3 @@
@@ -29,7 +29,7 @@ index 3dfc5fd8a..4ee03f00a 100644
29+vgopts: -q 29+vgopts: -q
30 stderr_filter_args: badfree.c 30 stderr_filter_args: badfree.c
31diff --git a/memcheck/tests/varinfo5.vgtest b/memcheck/tests/varinfo5.vgtest 31diff --git a/memcheck/tests/varinfo5.vgtest b/memcheck/tests/varinfo5.vgtest
32index 063d00dce..79c4a72a4 100644 32index 063d00d..79c4a72 100644
33--- a/memcheck/tests/varinfo5.vgtest 33--- a/memcheck/tests/varinfo5.vgtest
34+++ b/memcheck/tests/varinfo5.vgtest 34+++ b/memcheck/tests/varinfo5.vgtest
35@@ -1,3 +1,3 @@ 35@@ -1,3 +1,3 @@
@@ -37,6 +37,3 @@ index 063d00dce..79c4a72a4 100644
37-vgopts: --fullpath-after=memcheck/ --fullpath-after=coregrind/ --read-var-info=yes --read-inline-info=yes -q 37-vgopts: --fullpath-after=memcheck/ --fullpath-after=coregrind/ --read-var-info=yes --read-inline-info=yes -q
38+vgopts: --read-var-info=yes --read-inline-info=yes -q 38+vgopts: --read-var-info=yes --read-inline-info=yes -q
39 stderr_filter: filter_varinfo3 39 stderr_filter: filter_varinfo3
40--
412.25.1
42
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch
index d641998d72..7deca99202 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch
@@ -1,4 +1,4 @@
1From f405297d3382cd98391d02f397e2387da1f42879 Mon Sep 17 00:00:00 2001 1From bbb5e8a6fc5eec178f8077ab006ab42c009528d4 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 24 Jan 2020 17:55:39 +0100 3Date: Fri, 24 Jan 2020 17:55:39 +0100
4Subject: [PATCH] none/tests/fdleak_cmsg.stderr.exp: adjust /tmp paths 4Subject: [PATCH] none/tests/fdleak_cmsg.stderr.exp: adjust /tmp paths
@@ -13,13 +13,13 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 1 file changed, 2 insertions(+), 2 deletions(-) 13 1 file changed, 2 insertions(+), 2 deletions(-)
14 14
15diff --git a/none/tests/fdleak_cmsg.stderr.exp b/none/tests/fdleak_cmsg.stderr.exp 15diff --git a/none/tests/fdleak_cmsg.stderr.exp b/none/tests/fdleak_cmsg.stderr.exp
16index 6e5a797b9..0ede1ab18 100644 16index 6b3b53f..45e7e2f 100644
17--- a/none/tests/fdleak_cmsg.stderr.exp 17--- a/none/tests/fdleak_cmsg.stderr.exp
18+++ b/none/tests/fdleak_cmsg.stderr.exp 18+++ b/none/tests/fdleak_cmsg.stderr.exp
19@@ -25,10 +25,10 @@ Open file descriptor ...: /dev/null 19@@ -25,10 +25,10 @@ Open file descriptor ...: /dev/null
20 20
21 21
22 FILE DESCRIPTORS: 6 open at exit. 22 FILE DESCRIPTORS: 6 open (3 inherited) at exit.
23-Open file descriptor ...: /tmp/data2 23-Open file descriptor ...: /tmp/data2
24+Open file descriptor ...: ... 24+Open file descriptor ...: ...
25 ... 25 ...
@@ -29,6 +29,3 @@ index 6e5a797b9..0ede1ab18 100644
29 ... 29 ...
30 30
31 Open AF_UNIX socket ...: <unknown> 31 Open AF_UNIX socket ...: <unknown>
32--
332.17.1
34
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch b/meta/recipes-devtools/valgrind/valgrind/0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch
index 27366153f7..efa6c2c895 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch
@@ -1,7 +1,7 @@
1From 64ad2744acfb4fa40b1c114633a053f87125a203 Mon Sep 17 00:00:00 2001 1From c287382a1f3dd9f2db3df54dde54b4b266791bb9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 10 Jun 2017 00:46:39 -0700 3Date: Sat, 10 Jun 2017 00:46:39 -0700
4Subject: [PATCH 1/6] sigqueue: Rename _sifields to __si_fields on musl 4Subject: [PATCH] sigqueue: Rename _sifields to __si_fields on musl
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
11 1 file changed, 5 insertions(+) 11 1 file changed, 5 insertions(+)
12 12
13diff --git a/memcheck/tests/linux/sigqueue.c b/memcheck/tests/linux/sigqueue.c 13diff --git a/memcheck/tests/linux/sigqueue.c b/memcheck/tests/linux/sigqueue.c
14index d18bd72..acb7cba 100644 14index 4b6fb0f..d37fe93 100644
15--- a/memcheck/tests/linux/sigqueue.c 15--- a/memcheck/tests/linux/sigqueue.c
16+++ b/memcheck/tests/linux/sigqueue.c 16+++ b/memcheck/tests/linux/sigqueue.c
17@@ -8,6 +8,11 @@ 17@@ -8,6 +8,11 @@
@@ -26,6 +26,3 @@ index d18bd72..acb7cba 100644
26 int main(int argc, char **argv) 26 int main(int argc, char **argv)
27 { 27 {
28 siginfo_t *si; 28 siginfo_t *si;
29--
302.13.1
31
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 185b8f9e60..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-str_tester.c-Limit-rawmemchr-test-to-glibc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From de692e359801a1f0488c76267e4f904dd2efe754 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>
9---
10Upstream-Status: Pending
11
12 memcheck/tests/str_tester.c | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/memcheck/tests/str_tester.c b/memcheck/tests/str_tester.c
16index 9f7790a..47e4b4a 100644
17--- a/memcheck/tests/str_tester.c
18+++ b/memcheck/tests/str_tester.c
19@@ -504,7 +504,7 @@ test_strchrnul (void)
20 #endif
21
22 // DDD: better done by testing for the function.
23-#if !defined(__APPLE__) && !defined(__sun)
24+#if !defined(__APPLE__) && !defined(__sun) && defined(__GLIBC__)
25 static void
26 test_rawmemchr (void)
27 {
28@@ -1442,7 +1442,7 @@ main (void)
29 test_strchrnul ();
30 # endif
31
32-# if !defined(__APPLE__) && !defined(__sun)
33+# if !defined(__APPLE__) && !defined(__sun) && defined(__GLIBC__)
34 /* rawmemchr. */
35 test_rawmemchr ();
36 # endif
37--
382.13.1
39
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-tests-arm-Use-O-instead-of-O0.patch b/meta/recipes-devtools/valgrind/valgrind/0001-tests-arm-Use-O-instead-of-O0.patch
new file mode 100644
index 0000000000..3eea195579
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-tests-arm-Use-O-instead-of-O0.patch
@@ -0,0 +1,36 @@
1From 8087ae8dcc46f3f81af58ed9b7176761b988ee61 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 10 May 2024 17:44:47 -0700
4Subject: [PATCH] tests/arm: Use -O instead of -O0
5
6GCC-14 fails to compile the testcase with -O2 [1]
7therefore workaround it by using -O1, which works
8and for OE/cross-compiling it is fine, -O0 is used
9to make these tests compile natively on an arm target
10and gcc would take less memory compiling with -O0
11-O would take a bit more memory but in cross compiling
12we have enough of it on build host.
13
14[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115042
15Upstream-Status: Inappropriate [WORKAROUND]
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 none/tests/arm/Makefile.am | 4 ++--
19 1 file changed, 2 insertions(+), 2 deletions(-)
20
21diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am
22index a76981e..a198f73 100644
23--- a/none/tests/arm/Makefile.am
24+++ b/none/tests/arm/Makefile.am
25@@ -57,9 +57,9 @@ allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@
26 # Also force -O0 since -O takes hundreds of MB of memory
27 # for v6intThumb.c.
28 v6intARM_CFLAGS = $(AM_CFLAGS) -g -O0 -marm
29-v6intThumb_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb
30+v6intThumb_CFLAGS = $(AM_CFLAGS) -g -O -mthumb
31
32-v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb
33+v6media_CFLAGS = $(AM_CFLAGS) -g -O -mthumb
34
35 v8crypto_a_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -marm -march=armv8-a
36 v8crypto_t_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -mthumb -march=armv8-a
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-filter_xml_frames-do-not-filter-usr.patch b/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-filter_xml_frames-do-not-filter-usr.patch
index bf0f0ded21..c64c2afd3f 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-filter_xml_frames-do-not-filter-usr.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-filter_xml_frames-do-not-filter-usr.patch
@@ -1,7 +1,7 @@
1From d1dea3c2bcf1e22baab39e2c0b8ca59db8a5bc37 Mon Sep 17 00:00:00 2001 1From f8fbebcf69e4a8bf2122b7c55f2ce372377af1bc Mon Sep 17 00:00:00 2001
2From: Randy MacLeod <Randy.MacLeod@windriver.com> 2From: Randy MacLeod <Randy.MacLeod@windriver.com>
3Date: Mon, 13 May 2019 17:12:21 -0400 3Date: Mon, 13 May 2019 17:12:21 -0400
4Subject: [PATCH 1/2] valgrind: filter_xml_frames: do not filter /usr 4Subject: [PATCH] valgrind: filter_xml_frames: do not filter /usr
5 5
6filter_xml_frames is intended to filter system paths under 6filter_xml_frames is intended to filter system paths under
7'/usr' that vary from platform to platform. In the ptest case 7'/usr' that vary from platform to platform. In the ptest case
@@ -21,7 +21,7 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
21 1 file changed, 2 insertions(+), 1 deletion(-) 21 1 file changed, 2 insertions(+), 1 deletion(-)
22 22
23diff --git a/tests/filter_xml_frames b/tests/filter_xml_frames 23diff --git a/tests/filter_xml_frames b/tests/filter_xml_frames
24index f1fa3f070..04fbc82de 100755 24index f1fa3f0..04fbc82 100755
25--- a/tests/filter_xml_frames 25--- a/tests/filter_xml_frames
26+++ b/tests/filter_xml_frames 26+++ b/tests/filter_xml_frames
27@@ -47,7 +47,8 @@ while (my $line = <>) 27@@ -47,7 +47,8 @@ while (my $line = <>)
@@ -34,6 +34,3 @@ index f1fa3f070..04fbc82de 100755
34 } 34 }
35 } 35 }
36 36
37--
382.17.0
39
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
deleted file mode 100644
index 480fe33247..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From bd4e926e7e14747b3cd4d7b2a1bd5410b22f3ea2 Mon Sep 17 00:00:00 2001
2From: Randy MacLeod <Randy.MacLeod@windriver.com>
3Date: Tue, 16 Oct 2018 21:27:46 -0400
4Subject: [PATCH] context APIs are not available on musl
5
6Upstream-Status: Pending
7
8Updated patch for valgrind-3.14
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
12---
13 memcheck/tests/linux/stack_changes.c | 7 ++++++-
14 1 file changed, 6 insertions(+), 1 deletion(-)
15
16diff --git a/memcheck/tests/linux/stack_changes.c b/memcheck/tests/linux/stack_changes.c
17index 7f97b90a5..a26cb4ae6 100644
18--- a/memcheck/tests/linux/stack_changes.c
19+++ b/memcheck/tests/linux/stack_changes.c
20@@ -10,6 +10,7 @@
21 // This test is checking the libc context calls (setcontext, etc.) and
22 // checks that Valgrind notices their stack changes properly.
23
24+#ifdef __GLIBC__
25 typedef ucontext_t mycontext;
26
27 mycontext ctx1, ctx2, oldc;
28@@ -51,9 +52,11 @@ int init_context(mycontext *uc)
29
30 return ret;
31 }
32+#endif
33
34 int main(int argc, char **argv)
35 {
36+#ifdef __GLIBC__
37 int c1 = init_context(&ctx1);
38 int c2 = init_context(&ctx2);
39
40@@ -66,6 +69,8 @@ int main(int argc, char **argv)
41 //free(ctx1.uc_stack.ss_sp);
42 VALGRIND_STACK_DEREGISTER(c2);
43 //free(ctx2.uc_stack.ss_sp);
44-
45+#else
46+ printf("libc context call APIs e.g. getcontext() are deprecated by posix\n");
47+#endif
48 return 0;
49 }
50--
512.17.0
52
diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-memcheck-x86-Define-__THROW-if-not-defined.patch b/meta/recipes-devtools/valgrind/valgrind/0002-memcheck-x86-Define-__THROW-if-not-defined.patch
deleted file mode 100644
index 5433472291..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0002-memcheck-x86-Define-__THROW-if-not-defined.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 67d199dbdcbb3feff5f8928f87725fc64c0307d7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 5 Jul 2017 17:36:42 -0700
4Subject: [PATCH 2/3] memcheck/x86: Define __THROW if not defined
5
6musl does not have __THROW, therefore make it null
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Submitted
11
12 memcheck/tests/x86-linux/scalar.h | 4 ++++
13 1 file changed, 4 insertions(+)
14
15diff --git a/memcheck/tests/x86-linux/scalar.h b/memcheck/tests/x86-linux/scalar.h
16index ef28b03..52f742e 100644
17--- a/memcheck/tests/x86-linux/scalar.h
18+++ b/memcheck/tests/x86-linux/scalar.h
19@@ -11,6 +11,10 @@
20 #include <sys/types.h>
21 #include <sys/mman.h>
22
23+#ifndef __THROW
24+#define __THROW
25+#endif
26+
27 // Since we use vki_unistd.h, we can't include <unistd.h>. So we have to
28 // declare this ourselves.
29 extern long int syscall (long int __sysno, ...) __THROW;
30--
312.13.2
32
diff --git a/meta/recipes-devtools/valgrind/valgrind/0003-correct-include-directive-path-for-config.h.patch b/meta/recipes-devtools/valgrind/valgrind/0003-correct-include-directive-path-for-config.h.patch
index c2965c40df..3acb5a28f4 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0003-correct-include-directive-path-for-config.h.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0003-correct-include-directive-path-for-config.h.patch
@@ -1,7 +1,7 @@
1From ecbdea7bd8b08205f1bc3f6b72d4b4a80f313fcb Mon Sep 17 00:00:00 2001 1From de4d7e478515b63f049b211266d9b946c15cc0b9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 10 Jun 2017 01:03:17 -0700 3Date: Sat, 10 Jun 2017 01:03:17 -0700
4Subject: [PATCH 3/6] correct include directive path for config.h 4Subject: [PATCH] correct include directive path for config.h
5 5
6when building out of source tree, it can not find 6when building out of source tree, it can not find
7the generated config.h otherwise 7the generated config.h otherwise
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 2 files changed, 2 insertions(+), 2 deletions(-) 15 2 files changed, 2 insertions(+), 2 deletions(-)
16 16
17diff --git a/memcheck/tests/linux/syscalls-2007.c b/memcheck/tests/linux/syscalls-2007.c 17diff --git a/memcheck/tests/linux/syscalls-2007.c b/memcheck/tests/linux/syscalls-2007.c
18index b61c6d5..cc3fd62 100644 18index b91df82..c15c3eb 100644
19--- a/memcheck/tests/linux/syscalls-2007.c 19--- a/memcheck/tests/linux/syscalls-2007.c
20+++ b/memcheck/tests/linux/syscalls-2007.c 20+++ b/memcheck/tests/linux/syscalls-2007.c
21@@ -10,7 +10,7 @@ 21@@ -10,7 +10,7 @@
@@ -40,6 +40,3 @@ index 1143722..21e758b 100644
40 #include <stdio.h> 40 #include <stdio.h>
41 #if defined(HAVE_SYS_KLOG_H) 41 #if defined(HAVE_SYS_KLOG_H)
42 #include <sys/klog.h> 42 #include <sys/klog.h>
43--
442.13.1
45
diff --git a/meta/recipes-devtools/valgrind/valgrind/0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch b/meta/recipes-devtools/valgrind/valgrind/0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch
deleted file mode 100644
index fa1344c853..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1From d103475875858ab8a2e6b53ce178bb2f63883d4c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 5 Jul 2017 17:37:56 -0700
4Subject: [PATCH 3/3] tests/seg_override: Replace __modify_ldt() with syscall()
5
6__modify_ldt() is specific to glibc, replacing it with syscall()
7makes it more portable.
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Submitted
12
13 none/tests/x86-linux/seg_override.c | 15 ++++++---------
14 1 file changed, 6 insertions(+), 9 deletions(-)
15
16diff --git a/none/tests/x86-linux/seg_override.c b/none/tests/x86-linux/seg_override.c
17index b7619c9..c89874b 100644
18--- a/none/tests/x86-linux/seg_override.c
19+++ b/none/tests/x86-linux/seg_override.c
20@@ -2,6 +2,8 @@
21 #include <stdio.h>
22 #include <errno.h>
23 #include <string.h>
24+#include <unistd.h>
25+#include <syscall.h>
26
27 /* Stuff from Wine. */
28
29@@ -52,14 +54,11 @@ inline static unsigned int wine_ldt_get_limit( const LDT_ENTRY *ent )
30 /* our copy of the ldt */
31 LDT_ENTRY ldt_copy[8192];
32
33-/* System call to set LDT entry. */
34-//extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
35-extern int __modify_ldt (int, void *, size_t);
36-
37 void print_ldt ( void )
38 {
39 int res;
40- res = __modify_ldt( 0, ldt_copy, 8192*sizeof(LDT_ENTRY) );
41+ /* System call to set LDT entry. */
42+ res = syscall(SYS_modify_ldt, 0, ldt_copy, 8192*sizeof(LDT_ENTRY) );
43 printf("got %d bytes\n", res );
44 perror("error is");
45 }
46@@ -83,9 +82,6 @@ struct modify_ldt_ldt_s
47 unsigned int empty:25;
48 };
49
50-/* System call to set LDT entry. */
51-//extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
52-
53 void set_ldt1 ( void* base )
54 {
55 int stat;
56@@ -102,7 +98,8 @@ void set_ldt1 ( void* base )
57 ldt_entry.read_exec_only = 0;
58 ldt_entry.limit_in_pages = 0;
59 ldt_entry.seg_not_present = 0;
60- stat = __modify_ldt (1, &ldt_entry, sizeof (ldt_entry));
61+ /* System call to set LDT entry. */
62+ stat = syscall(SYS_modify_ldt, 1, &ldt_entry, sizeof (ldt_entry));
63 printf("stat = %d\n", stat);
64 }
65
66--
672.13.2
68
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 4570f63995..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch
+++ /dev/null
@@ -1,185 +0,0 @@
1From 8f916dcb395fe5a2429f2867ba4daf8ef3af073a 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: Pending
16
17Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
18Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
19---
20 configure.ac | 66 ++++++++++++++++++++++++++--------------------------
21 1 file changed, 33 insertions(+), 33 deletions(-)
22
23diff --git a/configure.ac b/configure.ac
24index 524230d..54861c5 100755
25--- a/configure.ac
26+++ b/configure.ac
27@@ -396,50 +396,50 @@ case "${host_os}" in
28 9.*)
29 AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard])
30 AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version])
31- DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}"
32- DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}"
33+ DEFAULT_SUPP="$srcdir/darwin9.supp ${DEFAULT_SUPP}"
34+ DEFAULT_SUPP="$srcdir/darwin9-drd.supp ${DEFAULT_SUPP}"
35 ;;
36 10.*)
37 AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard])
38 AC_DEFINE([DARWIN_VERS], DARWIN_10_6, [Darwin / Mac OS X version])
39- DEFAULT_SUPP="darwin10.supp ${DEFAULT_SUPP}"
40- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
41+ DEFAULT_SUPP="$srcdir/darwin10.supp ${DEFAULT_SUPP}"
42+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
43 ;;
44 11.*)
45 AC_MSG_RESULT([Darwin 11.x (${kernel}) / Mac OS X 10.7 Lion])
46 AC_DEFINE([DARWIN_VERS], DARWIN_10_7, [Darwin / Mac OS X version])
47- DEFAULT_SUPP="darwin11.supp ${DEFAULT_SUPP}"
48- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
49+ DEFAULT_SUPP="$srcdir/darwin11.supp ${DEFAULT_SUPP}"
50+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
51 ;;
52 12.*)
53 AC_MSG_RESULT([Darwin 12.x (${kernel}) / Mac OS X 10.8 Mountain Lion])
54 AC_DEFINE([DARWIN_VERS], DARWIN_10_8, [Darwin / Mac OS X version])
55- DEFAULT_SUPP="darwin12.supp ${DEFAULT_SUPP}"
56- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
57+ DEFAULT_SUPP="$srcdir/darwin12.supp ${DEFAULT_SUPP}"
58+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
59 ;;
60 13.*)
61 AC_MSG_RESULT([Darwin 13.x (${kernel}) / Mac OS X 10.9 Mavericks])
62 AC_DEFINE([DARWIN_VERS], DARWIN_10_9, [Darwin / Mac OS X version])
63- DEFAULT_SUPP="darwin13.supp ${DEFAULT_SUPP}"
64- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
65+ DEFAULT_SUPP="$srcdir/darwin13.supp ${DEFAULT_SUPP}"
66+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
67 ;;
68 14.*)
69 AC_MSG_RESULT([Darwin 14.x (${kernel}) / Mac OS X 10.10 Yosemite])
70 AC_DEFINE([DARWIN_VERS], DARWIN_10_10, [Darwin / Mac OS X version])
71- DEFAULT_SUPP="darwin14.supp ${DEFAULT_SUPP}"
72- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
73+ DEFAULT_SUPP="$srcdir/darwin14.supp ${DEFAULT_SUPP}"
74+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
75 ;;
76 15.*)
77 AC_MSG_RESULT([Darwin 15.x (${kernel}) / Mac OS X 10.11 El Capitan])
78 AC_DEFINE([DARWIN_VERS], DARWIN_10_11, [Darwin / Mac OS X version])
79- DEFAULT_SUPP="darwin15.supp ${DEFAULT_SUPP}"
80- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
81+ DEFAULT_SUPP="$srcdir/darwin15.supp ${DEFAULT_SUPP}"
82+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
83 ;;
84 16.*)
85 AC_MSG_RESULT([Darwin 16.x (${kernel}) / macOS 10.12 Sierra])
86 AC_DEFINE([DARWIN_VERS], DARWIN_10_12, [Darwin / Mac OS X version])
87- DEFAULT_SUPP="darwin16.supp ${DEFAULT_SUPP}"
88- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
89+ DEFAULT_SUPP="$srcdir/darwin16.supp ${DEFAULT_SUPP}"
90+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}"
91 ;;
92 17.*)
93 AC_MSG_RESULT([Darwin 17.x (${kernel}) / macOS 10.13 High Sierra])
94@@ -464,7 +464,7 @@ case "${host_os}" in
95 DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}"
96 ;;
97 *)
98- DEFAULT_SUPP="solaris11.supp ${DEFAULT_SUPP}"
99+ DEFAULT_SUPP="$srcdir/solaris11.supp ${DEFAULT_SUPP}"
100 ;;
101 esac
102 ;;
103@@ -472,7 +472,7 @@ case "${host_os}" in
104 solaris2.12*)
105 AC_MSG_RESULT([ok (${host_os})])
106 VGCONF_OS="solaris"
107- DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}"
108+ DEFAULT_SUPP="$srcdir/solaris12.supp ${DEFAULT_SUPP}"
109 ;;
110
111 *)
112@@ -1095,29 +1095,29 @@ AC_MSG_CHECKING([the glibc version])
113 case "${GLIBC_VERSION}" in
114 2.2)
115 AC_MSG_RESULT(${GLIBC_VERSION} family)
116- DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}"
117- DEFAULT_SUPP="glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}"
118- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
119+ DEFAULT_SUPP="$srcdir/glibc-2.2.supp ${DEFAULT_SUPP}"
120+ DEFAULT_SUPP="$srcdir/glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}"
121+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
122 ;;
123 2.[[3-6]])
124 AC_MSG_RESULT(${GLIBC_VERSION} family)
125- DEFAULT_SUPP="glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}"
126- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
127- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
128+ DEFAULT_SUPP="$srcdir/glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}"
129+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
130+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
131 ;;
132 2.[[7-9]])
133 AC_MSG_RESULT(${GLIBC_VERSION} family)
134 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
135- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
136- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
137+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
138+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
139 ;;
140 2.10|2.11)
141 AC_MSG_RESULT(${GLIBC_VERSION} family)
142 AC_DEFINE([GLIBC_MANDATORY_STRLEN_REDIRECT], 1,
143 [Define to 1 if strlen() has been optimized heavily (amd64 glibc >= 2.10)])
144 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
145- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
146- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
147+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
148+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
149 ;;
150 2.*)
151 AC_MSG_RESULT(${GLIBC_VERSION} family)
152@@ -1126,8 +1126,8 @@ case "${GLIBC_VERSION}" in
153 AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1,
154 [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)])
155 DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
156- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
157- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
158+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
159+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
160 ;;
161 darwin)
162 AC_MSG_RESULT(Darwin)
163@@ -1137,7 +1137,7 @@ case "${GLIBC_VERSION}" in
164 bionic)
165 AC_MSG_RESULT(Bionic)
166 AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic])
167- DEFAULT_SUPP="bionic.supp ${DEFAULT_SUPP}"
168+ DEFAULT_SUPP="$srcdir/bionic.supp ${DEFAULT_SUPP}"
169 ;;
170 solaris)
171 AC_MSG_RESULT(Solaris)
172@@ -1164,8 +1164,8 @@ if test "$VGCONF_OS" != "solaris"; then
173 # attempt to detect whether such libraries are installed on the
174 # build machine (or even if any X facilities are present); just
175 # add the suppressions antidisirregardless.
176- DEFAULT_SUPP="xfree-4.supp ${DEFAULT_SUPP}"
177- DEFAULT_SUPP="xfree-3.supp ${DEFAULT_SUPP}"
178+ DEFAULT_SUPP="$srcdir/xfree-4.supp ${DEFAULT_SUPP}"
179+ DEFAULT_SUPP="$srcdir/xfree-3.supp ${DEFAULT_SUPP}"
180 fi
181
182
183--
1842.17.1
185
diff --git a/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch b/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch
deleted file mode 100644
index 0c399ef52c..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch
+++ /dev/null
@@ -1,257 +0,0 @@
1From f49f27f1bc67d07440b0ac9a7d767a8ea1589bfe Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 15 Dec 2015 15:50:44 +0200
4Subject: [PATCH 5/5] Modify vg_test wrapper to support PTEST formats
5
6Change the valgrind regression test script vg_regtest to
7support the yocto ptest stdout reporting format. The commit adds
8'--yocto-ptest' as an optional argument to vg_regtest, which alters
9the output to use the ptest infrastructure reporting format:
10 "[PASS|SKIP|FAIL]: testname"
11instead of valgrind's internal test reporting format. Without the added
12option, --yocto-ptest, the valgrind regression test output is unchanged.
13
14Enforce 30 seconds limit for the test.
15This resume execution of the remaining tests when valgrind hangs.
16
17Upstream-Status: Pending
18
19Signed-off-by: Dave Lerner <dave.lerner@windriver.com>
20Signed-off-by: Tudor Florea <tudor.florea@enea.com>
21Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
22
23Increase time limit to 90 s.
24(double of the expected time of drd/tests/std_list on qemuarm64)
25
26Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
27---
28 tests/vg_regtest.in | 75 +++++++++++++++++++++++++++++++++++++++--------------
29 1 file changed, 55 insertions(+), 20 deletions(-)
30
31diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in
32index a441f42..cb05b52 100755
33--- a/tests/vg_regtest.in
34+++ b/tests/vg_regtest.in
35@@ -47,6 +47,7 @@
36 # --loop-till-fail: loops on the test(s) till one fail, then exit
37 # This is useful to obtain detailed trace or --keep-unfiltered
38 # output of a non deterministic test failure
39+# --yocto-ptest: output in yocto ptest format
40 #
41 # The easiest way is to run all tests in valgrind/ with (assuming you installed
42 # in $PREFIX):
43@@ -139,7 +140,7 @@ my $usage="\n"
44 . "Usage:\n"
45 . " vg_regtest [--all, --valgrind, --valgrind-lib, --keep-unfiltered\n"
46 . " --outer-valgrind, --outer-tool, --outer-args\n"
47- . " --loop-till-fail]\n"
48+ . " --loop-till-fail, --yocto-ptest]\n"
49 . " Use EXTRA_REGTEST_OPTS to supply extra args for all tests\n"
50 . "\n";
51
52@@ -186,6 +187,7 @@ my $outer_args;
53 my $valgrind_lib = "$tests_dir/.in_place";
54 my $keepunfiltered = 0;
55 my $looptillfail = 0;
56+my $yoctoptest = 0;
57
58 # default filter is the one named "filter_stderr" in the test's directory
59 my $default_stderr_filter = "filter_stderr";
60@@ -244,6 +246,8 @@ sub process_command_line()
61 $keepunfiltered = 1;
62 } elsif ($arg =~ /^--loop-till-fail$/) {
63 $looptillfail = 1;
64+ } elsif ($arg =~ /^--yocto-ptest$/) {
65+ $yoctoptest = 1;
66 } else {
67 die $usage;
68 }
69@@ -365,13 +369,28 @@ sub read_vgtest_file($)
70 #----------------------------------------------------------------------------
71 # Since most of the program time is spent in system() calls, need this to
72 # propagate a Ctrl-C enabling us to quit.
73-sub mysystem($)
74+# Enforce 90 seconds limit for the test.
75+# This resume execution of the remaining tests if valgrind hangs.
76+sub mysystem($)
77 {
78- my $exit_code = system($_[0]);
79- ($exit_code == 2) and exit 1; # 2 is SIGINT
80- return $exit_code;
81+ my $exit_code=0;
82+ eval {
83+ local $SIG{'ALRM'} = sub { die "timed out\n" };
84+ alarm(90);
85+ $exit_code = system($_[0]);
86+ alarm (0);
87+ ($exit_code == 2) and die "SIGINT\n"; # 2 is SIGINT
88+ };
89+ if ($@) {
90+ if ($@ eq "timed out\n") {
91+ print "timed out\n";
92+ return 1;
93+ }
94+ if ($@ eq "SIGINT\n") {
95+ exit 1;
96+ }
97+ }
98 }
99-
100 # if $keepunfiltered, copies $1 to $1.unfiltered.out
101 # renames $0 tp $1
102 sub filtered_rename($$)
103@@ -419,23 +438,25 @@ sub do_diffs($$$$)
104 # A match; remove .out and any previously created .diff files.
105 unlink("$name.$mid.out");
106 unlink(<$name.$mid.diff*>);
107- return;
108+ return 0;
109 }
110 }
111 }
112 # If we reach here, none of the .exp files matched.
113- print "*** $name failed ($mid) ***\n";
114+ print "*** $name failed ($mid) ***\n" if ($yoctoptest == 0) ;
115 push(@failures, sprintf("%-40s ($mid)", "$fullname"));
116 $num_failures{$mid}++;
117 if ($looptillfail == 1) {
118 print "Failure encountered, stopping to loop\n";
119 exit 1
120 }
121+ return 1;
122 }
123
124 sub do_one_test($$)
125 {
126 my ($dir, $vgtest) = @_;
127+ my $diffStatus = 0;
128 $vgtest =~ /^(.*)\.vgtest/;
129 my $name = $1;
130 my $fullname = "$dir/$name";
131@@ -454,7 +475,11 @@ sub do_one_test($$)
132 } elsif (256 == $prereq_res) {
133 # Nb: weird Perl-ism -- exit code of '1' is seen by Perl as 256...
134 # Prereq failed, skip.
135- printf("%-16s (skipping, prereq failed: $prereq)\n", "$name:");
136+ if ($yoctoptest == 0) {
137+ printf("%-16s (skipping, prereq failed: $prereq)\n", "$name:");
138+ } else {
139+ printf("SKIP: $fullname\n");
140+ }
141 return;
142 } else {
143 # Bad prereq; abort.
144@@ -472,7 +497,7 @@ sub do_one_test($$)
145 }
146 # If there is a progB, let's start it in background:
147 printf("%-16s valgrind $extraopts $vgopts $prog $args (progB: $progB $argsB)\n",
148- "$name:");
149+ "$name:") if ($yoctoptest == 0);
150 # progB.done used to detect child has finished. See below.
151 # Note: redirection of stdout and stderr is before $progB to allow argsB
152 # to e.g. redirect stdoutB to stderrB
153@@ -488,7 +513,8 @@ sub do_one_test($$)
154 . "touch progB.done) &");
155 }
156 } else {
157- printf("%-16s valgrind $extraopts $vgopts $prog $args\n", "$name:");
158+ printf("%-16s valgrind $extraopts $vgopts $prog $args\n", "$name:")
159+ if ($yoctoptest == 0);
160 }
161
162 # Collect environment variables, if any.
163@@ -529,7 +555,7 @@ sub do_one_test($$)
164 # Find all the .stdout.exp files. If none, use /dev/null.
165 my @stdout_exps = <$name.stdout.exp*>;
166 @stdout_exps = ( "/dev/null" ) if (0 == scalar @stdout_exps);
167- do_diffs($fullname, $name, "stdout", \@stdout_exps);
168+ $diffStatus |= do_diffs($fullname, $name, "stdout", \@stdout_exps);
169
170 # Filter stderr
171 $stderr_filter_args = $name if (! defined $stderr_filter_args);
172@@ -538,7 +564,7 @@ sub do_one_test($$)
173 # Find all the .stderr.exp files. At least one must exist.
174 my @stderr_exps = <$name.stderr.exp*>;
175 (0 != scalar @stderr_exps) or die "Could not find `$name.stderr.exp*'\n";
176- do_diffs($fullname, $name, "stderr", \@stderr_exps);
177+ $diffStatus |= do_diffs($fullname, $name, "stderr", \@stderr_exps);
178
179 if (defined $progB) {
180 # wait for the child to be finished
181@@ -562,7 +588,7 @@ sub do_one_test($$)
182 # Find all the .stdoutB.exp files. If none, use /dev/null.
183 my @stdoutB_exps = <$name.stdoutB.exp*>;
184 @stdoutB_exps = ( "/dev/null" ) if (0 == scalar @stdoutB_exps);
185- do_diffs($fullname, $name, "stdoutB", \@stdoutB_exps);
186+ $diffStatus |= do_diffs($fullname, $name, "stdoutB", \@stdoutB_exps);
187
188 # Filter stderr
189 $stderrB_filter_args = $name if (! defined $stderrB_filter_args);
190@@ -571,7 +597,7 @@ sub do_one_test($$)
191 # Find all the .stderrB.exp files. At least one must exist.
192 my @stderrB_exps = <$name.stderrB.exp*>;
193 (0 != scalar @stderrB_exps) or die "Could not find `$name.stderrB.exp*'\n";
194- do_diffs($fullname, $name, "stderrB", \@stderrB_exps);
195+ $diffStatus |= do_diffs($fullname, $name, "stderrB", \@stderrB_exps);
196 }
197
198 # Maybe do post-test check
199@@ -583,7 +609,7 @@ sub do_one_test($$)
200 # Find all the .post.exp files. If none, use /dev/null.
201 my @post_exps = <$name.post.exp*>;
202 @post_exps = ( "/dev/null" ) if (0 == scalar @post_exps);
203- do_diffs($fullname, $name, "post", \@post_exps);
204+ $diffStatus |= do_diffs($fullname, $name, "post", \@post_exps);
205 }
206 }
207
208@@ -592,6 +618,13 @@ sub do_one_test($$)
209 print("(cleanup operation failed: $cleanup)\n");
210 }
211
212+ if ($yoctoptest == 1) {
213+ if ($diffStatus == 0) {
214+ print("PASS: $fullname\n");
215+ } else {
216+ print("FAIL: $fullname\n");
217+ }
218+ }
219 $num_tests_done++;
220 }
221
222@@ -631,7 +664,7 @@ sub test_one_dir($$)
223 my $found_tests = (0 != (grep { $_ =~ /\.vgtest$/ } @fs));
224
225 if ($found_tests) {
226- print "-- Running tests in $full_dir $dashes\n";
227+ print "-- Running tests in $full_dir $dashes\n" if ($yoctoptest == 0);
228 }
229 foreach my $f (@fs) {
230 if (-d $f) {
231@@ -641,7 +674,7 @@ sub test_one_dir($$)
232 }
233 }
234 if ($found_tests) {
235- print "-- Finished tests in $full_dir $dashes\n";
236+ print "-- Finished tests in $full_dir $dashes\n" if ($yoctoptest == 0);
237 }
238
239 chdir("..");
240@@ -667,10 +700,12 @@ sub summarise_results
241 $num_failures{"stdout"}, plural($num_failures{"stdout"}),
242 $num_failures{"stderrB"}, plural($num_failures{"stderrB"}),
243 $num_failures{"stdoutB"}, plural($num_failures{"stdoutB"}),
244- $num_failures{"post"}, plural($num_failures{"post"}));
245+ $num_failures{"post"}, plural($num_failures{"post"}))
246+ if ($yoctoptest == 0);
247
248 foreach my $failure (@failures) {
249- print "$failure\n";
250+ print "$failure\n"
251+ if ($yoctoptest == 0);
252 }
253 print "\n";
254 }
255--
2562.6.2
257
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 6176640e42..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From b4b9f072c22f96844e02cb9d68f7ff2408680817 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 5/6] 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 helgrind/tests/tc20_verifywrap.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/helgrind/tests/tc20_verifywrap.c b/helgrind/tests/tc20_verifywrap.c
16index c110000..a311a49 100644
17--- a/helgrind/tests/tc20_verifywrap.c
18+++ b/helgrind/tests/tc20_verifywrap.c
19@@ -20,7 +20,7 @@
20
21 #if !defined(__APPLE__)
22
23-#if defined(__sun__)
24+#if defined(__sun__) || (defined(__linux__) && !defined(__GLIBC__))
25 /* Fake __GLIBC_PREREQ on Solaris. Pretend glibc >= 2.4. */
26 # define __GLIBC_PREREQ
27 #else
28--
292.13.1
30
diff --git a/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch b/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
index 07774f38a9..109caf76ab 100644
--- a/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
@@ -1,27 +1,26 @@
1From 0bf4b0ac18d1ea41b32ad781d214b295ca1998f3 Mon Sep 17 00:00:00 2001 1From 85bff993087cd7367ffc35de525c2bf6162398d2 Mon Sep 17 00:00:00 2001
2From: Aneesh Bansal <aneesh.bansal@freescale.com> 2From: Aneesh Bansal <aneesh.bansal@freescale.com>
3Date: Mon, 21 Nov 2011 17:31:39 +0530 3Date: Mon, 21 Nov 2011 17:31:39 +0530
4Subject: [PATCH] Added support for PPC instructions mfatbu, mfatbl. 4Subject: [PATCH] Added support for PPC instructions mfatbu, mfatbl.
5 5
6Upstream-Status: Pending
7
8Signed-off-by: Aneesh Bansal <aneesh.bansal@freescale.com>
9---
10Currently Valgrind 3.7.0 does not have support for PPC instructions mfatbu and mfatbl. When we run a USDPAA application with VALGRIND, the following error is given by valgrind : 6Currently Valgrind 3.7.0 does not have support for PPC instructions mfatbu and mfatbl. When we run a USDPAA application with VALGRIND, the following error is given by valgrind :
11dis_proc_ctl(ppc)(mfspr,SPR)(0x20F) 7dis_proc_ctl(ppc)(mfspr,SPR)(0x20F)
12disInstr(ppc): unhandled instruction: 0x7C0F82A6 8disInstr(ppc): unhandled instruction: 0x7C0F82A6
13 9
10Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=289836]
14 11
15 VEX/priv/guest_ppc_defs.h | 2 ++ 12Signed-off-by: Aneesh Bansal <aneesh.bansal@freescale.com>
16 VEX/priv/guest_ppc_helpers.c | 18 ++++++++++++++++++ 13---
17 VEX/priv/guest_ppc_toIR.c | 22 ++++++++++++++++++++++ 14 VEX/priv/guest_ppc_defs.h | 2 ++
18 3 files changed, 42 insertions(+), 0 deletions(-) 15 VEX/priv/guest_ppc_helpers.c | 18 ++++++++++++++++++
16 VEX/priv/guest_ppc_toIR.c | 22 ++++++++++++++++++++++
17 3 files changed, 42 insertions(+)
19 18
20diff --git a/VEX/priv/guest_ppc_defs.h b/VEX/priv/guest_ppc_defs.h 19diff --git a/VEX/priv/guest_ppc_defs.h b/VEX/priv/guest_ppc_defs.h
21index dd3c62e..11a34aa 100644 20index 220fbf1..cd259f3 100644
22--- a/VEX/priv/guest_ppc_defs.h 21--- a/VEX/priv/guest_ppc_defs.h
23+++ b/VEX/priv/guest_ppc_defs.h 22+++ b/VEX/priv/guest_ppc_defs.h
24@@ -146,6 +146,8 @@ extern UInt ppc32g_dirtyhelper_MFSPR_268_269 ( UInt ); 23@@ -233,6 +233,8 @@ extern UInt ppc32g_dirtyhelper_MFSPR_268_269 ( UInt );
25 24
26 extern UInt ppc32g_dirtyhelper_MFSPR_287 ( void ); 25 extern UInt ppc32g_dirtyhelper_MFSPR_287 ( void );
27 26
@@ -31,10 +30,10 @@ index dd3c62e..11a34aa 100644
31 UInt vD_idx, UInt sh, 30 UInt vD_idx, UInt sh,
32 UInt shift_right ); 31 UInt shift_right );
33diff --git a/VEX/priv/guest_ppc_helpers.c b/VEX/priv/guest_ppc_helpers.c 32diff --git a/VEX/priv/guest_ppc_helpers.c b/VEX/priv/guest_ppc_helpers.c
34index 11aa428..b49ea3f 100644 33index 2611e52..72c349b 100644
35--- a/VEX/priv/guest_ppc_helpers.c 34--- a/VEX/priv/guest_ppc_helpers.c
36+++ b/VEX/priv/guest_ppc_helpers.c 35+++ b/VEX/priv/guest_ppc_helpers.c
37@@ -119,6 +119,24 @@ UInt ppc32g_dirtyhelper_MFSPR_287 ( void ) 36@@ -118,6 +118,24 @@ UInt ppc32g_dirtyhelper_MFSPR_287 ( void )
38 # endif 37 # endif
39 } 38 }
40 39
@@ -60,10 +59,10 @@ index 11aa428..b49ea3f 100644
60 /* CALLED FROM GENERATED CODE */ 59 /* CALLED FROM GENERATED CODE */
61 /* DIRTY HELPER (reads guest state, writes guest mem) */ 60 /* DIRTY HELPER (reads guest state, writes guest mem) */
62diff --git a/VEX/priv/guest_ppc_toIR.c b/VEX/priv/guest_ppc_toIR.c 61diff --git a/VEX/priv/guest_ppc_toIR.c b/VEX/priv/guest_ppc_toIR.c
63index f8d220d..37c8974 100644 62index 18716dd..b2e72a0 100644
64--- a/VEX/priv/guest_ppc_toIR.c 63--- a/VEX/priv/guest_ppc_toIR.c
65+++ b/VEX/priv/guest_ppc_toIR.c 64+++ b/VEX/priv/guest_ppc_toIR.c
66@@ -5657,6 +5657,28 @@ static Bool dis_proc_ctl ( VexAbiInfo* vbi, UInt theInstr ) 65@@ -11875,6 +11875,28 @@ static Bool dis_proc_ctl ( const VexAbiInfo* vbi, UInt prefix, UInt theInstr )
67 break; 66 break;
68 } 67 }
69 68
@@ -92,5 +91,3 @@ index f8d220d..37c8974 100644
92 default: 91 default:
93 vex_printf("dis_proc_ctl(ppc)(mfspr,SPR)(0x%x)\n", SPR); 92 vex_printf("dis_proc_ctl(ppc)(mfspr,SPR)(0x%x)\n", SPR);
94 return False; 93 return False;
95--
961.7.0.4
diff --git a/meta/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch b/meta/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch
index 5fcfec0015..1597b3a021 100644
--- a/meta/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch
@@ -1,4 +1,4 @@
1From 8facc29c3c56e6cf9cfef70986cf73876044a3fb Mon Sep 17 00:00:00 2001 1From 596372bc9b4d31bc9811881cfa747d99a8c25141 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com> 2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Tue, 19 Jan 2016 16:42:36 -0800 3Date: Tue, 19 Jan 2016 16:42:36 -0800
4Subject: [PATCH] avoid neon for targets which don't support it 4Subject: [PATCH] avoid neon for targets which don't support it
@@ -8,7 +8,7 @@ test 64-bit float copies when building for ARM. Allow it to do so if
8possible, but fallback to C when building for ARM targets which don't 8possible, but fallback to C when building for ARM targets which don't
9support neon. 9support neon.
10 10
11Upstream-Status: Pending 11Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=454346]
12 12
13Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 13Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
14--- 14---
@@ -16,7 +16,7 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
16 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
17 17
18diff --git a/memcheck/tests/sh-mem-random.c b/memcheck/tests/sh-mem-random.c 18diff --git a/memcheck/tests/sh-mem-random.c b/memcheck/tests/sh-mem-random.c
19index ae82248..816e139 100644 19index 0e01684..e41957e 100644
20--- a/memcheck/tests/sh-mem-random.c 20--- a/memcheck/tests/sh-mem-random.c
21+++ b/memcheck/tests/sh-mem-random.c 21+++ b/memcheck/tests/sh-mem-random.c
22@@ -191,7 +191,7 @@ void do_test_at ( U1* arr ) 22@@ -191,7 +191,7 @@ void do_test_at ( U1* arr )
@@ -28,6 +28,3 @@ index ae82248..816e139 100644
28 /* On arm32, many compilers generate a 64-bit float move 28 /* On arm32, many compilers generate a 64-bit float move
29 using two 32 bit integer registers, which completely 29 using two 32 bit integer registers, which completely
30 defeats this test. Hence force a 64-bit NEON load and 30 defeats this test. Hence force a 64-bit NEON load and
31--
321.9.1
33
diff --git a/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch b/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch
index b431d3356e..6bfc6035ed 100644
--- a/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch
@@ -1,4 +1,4 @@
1From 67e7a690107efb16d6d5aebfe420b64a552accdf Mon Sep 17 00:00:00 2001 1From 408f9b39ca4f5709b668f13829a94c4cae855006 Mon Sep 17 00:00:00 2001
2From: Qing He <qing.he@intel.com> 2From: Qing He <qing.he@intel.com>
3Date: Tue, 31 Aug 2010 22:51:58 +0800 3Date: Tue, 31 Aug 2010 22:51:58 +0800
4Subject: [PATCH] valgrind: fix perl scripts 4Subject: [PATCH] valgrind: fix perl scripts
@@ -18,34 +18,13 @@ Upstream-Status: Inappropriate [configuration]
18 18
19Signed-off-by: Maxin B. John <maxin.john@intel.com> 19Signed-off-by: Maxin B. John <maxin.john@intel.com>
20--- 20---
21 cachegrind/cg_annotate.in | 2 +- 21 massif/ms_print.in | 2 +-
22 cachegrind/cg_diff.in | 2 +- 22 perf/vg_perf.in | 2 +-
23 massif/ms_print.in | 2 +- 23 tests/vg_regtest.in | 2 +-
24 perf/vg_perf.in | 2 +- 24 3 files changed, 3 insertions(+), 3 deletions(-)
25 4 files changed, 4 insertions(+), 4 deletions(-)
26 25
27diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in
28index 69365e8..978265d 100644
29--- a/cachegrind/cg_annotate.in
30+++ b/cachegrind/cg_annotate.in
31@@ -1,4 +1,4 @@
32-#! @PERL@
33+#! /usr/bin/perl
34
35 ##--------------------------------------------------------------------##
36 ##--- Cachegrind's annotator. cg_annotate.in ---##
37diff --git a/cachegrind/cg_diff.in b/cachegrind/cg_diff.in
38index 395460b..05873cc 100755
39--- a/cachegrind/cg_diff.in
40+++ b/cachegrind/cg_diff.in
41@@ -1,4 +1,4 @@
42-#! @PERL@
43+#! /usr/bin/perl
44
45 ##--------------------------------------------------------------------##
46 ##--- Cachegrind's differencer. cg_diff.in ---##
47diff --git a/massif/ms_print.in b/massif/ms_print.in 26diff --git a/massif/ms_print.in b/massif/ms_print.in
48index e6fae89..3b85b40 100755 27index a206ce4..df1bc31 100755
49--- a/massif/ms_print.in 28--- a/massif/ms_print.in
50+++ b/massif/ms_print.in 29+++ b/massif/ms_print.in
51@@ -1,4 +1,4 @@ 30@@ -1,4 +1,4 @@
@@ -55,7 +34,7 @@ index e6fae89..3b85b40 100755
55 ##--------------------------------------------------------------------## 34 ##--------------------------------------------------------------------##
56 ##--- Massif's results printer ms_print.in ---## 35 ##--- Massif's results printer ms_print.in ---##
57diff --git a/perf/vg_perf.in b/perf/vg_perf.in 36diff --git a/perf/vg_perf.in b/perf/vg_perf.in
58index 7a80cb0..28f6156 100644 37index 90ee1d2..c585096 100644
59--- a/perf/vg_perf.in 38--- a/perf/vg_perf.in
60+++ b/perf/vg_perf.in 39+++ b/perf/vg_perf.in
61@@ -1,4 +1,4 @@ 40@@ -1,4 +1,4 @@
@@ -65,7 +44,7 @@ index 7a80cb0..28f6156 100644
65 ##--- Valgrind performance testing script vg_perf ---## 44 ##--- Valgrind performance testing script vg_perf ---##
66 ##--------------------------------------------------------------------## 45 ##--------------------------------------------------------------------##
67diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in 46diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in
68index cb05b52..032e947 100755 47index 3471322..49e1114 100755
69--- a/tests/vg_regtest.in 48--- a/tests/vg_regtest.in
70+++ b/tests/vg_regtest.in 49+++ b/tests/vg_regtest.in
71@@ -1,4 +1,4 @@ 50@@ -1,4 +1,4 @@
@@ -74,5 +53,3 @@ index cb05b52..032e947 100755
74 ##--------------------------------------------------------------------## 53 ##--------------------------------------------------------------------##
75 ##--- Valgrind regression testing script vg_regtest ---## 54 ##--- Valgrind regression testing script vg_regtest ---##
76 ##--------------------------------------------------------------------## 55 ##--------------------------------------------------------------------##
77---
782.4.0
diff --git a/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 b/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64
deleted file mode 100644
index 93bfd45a4e..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64
+++ /dev/null
@@ -1,235 +0,0 @@
1gdbserver_tests/hgtls
2cachegrind/tests/ann1
3callgrind/tests/simwork1
4callgrind/tests/simwork2
5callgrind/tests/simwork3
6callgrind/tests/simwork-both
7callgrind/tests/simwork-cache
8callgrind/tests/threads
9callgrind/tests/threads-use
10drd/tests/annotate_barrier
11drd/tests/annotate_barrier_xml
12drd/tests/annotate_hbefore
13drd/tests/annotate_hb_err
14drd/tests/annotate_hb_race
15drd/tests/annotate_ignore_read
16drd/tests/annotate_ignore_rw
17drd/tests/annotate_ignore_rw2
18drd/tests/annotate_ignore_write
19drd/tests/annotate_ignore_write2
20drd/tests/annotate_order_1
21drd/tests/annotate_order_2
22drd/tests/annotate_order_3
23drd/tests/annotate_publish_hg
24drd/tests/annotate_rwlock
25drd/tests/annotate_rwlock_hg
26drd/tests/annotate_sem
27drd/tests/annotate_smart_pointer
28drd/tests/annotate_smart_pointer2
29drd/tests/annotate_spinlock
30drd/tests/annotate_static
31drd/tests/annotate_trace_memory
32drd/tests/annotate_trace_memory_xml
33drd/tests/atomic_var
34drd/tests/bar_trivial
35drd/tests/bug-235681
36drd/tests/bug322621
37drd/tests/circular_buffer
38drd/tests/concurrent_close
39drd/tests/custom_alloc
40drd/tests/custom_alloc_fiw
41drd/tests/dlopen
42drd/tests/fork-parallel
43drd/tests/fork-serial
44drd/tests/fp_race
45drd/tests/fp_race2
46drd/tests/fp_race_xml
47drd/tests/free_is_write
48drd/tests/free_is_write2
49drd/tests/hg01_all_ok
50drd/tests/hg02_deadlock
51drd/tests/hg03_inherit
52drd/tests/hg04_race
53drd/tests/hg05_race2
54drd/tests/hg06_readshared
55drd/tests/hold_lock_1
56drd/tests/hold_lock_2
57drd/tests/linuxthreads_det
58drd/tests/matinv
59drd/tests/memory_allocation
60drd/tests/monitor_example
61drd/tests/new_delete
62drd/tests/pth_barrier
63drd/tests/pth_barrier2
64drd/tests/pth_barrier3
65drd/tests/pth_barrier_race
66drd/tests/pth_barrier_reinit
67drd/tests/pth_barrier_thr_cr
68drd/tests/pth_broadcast
69drd/tests/pth_cancel_locked
70drd/tests/pth_cleanup_handler
71drd/tests/pth_cond_race
72drd/tests/pth_cond_race2
73drd/tests/pth_detached2
74drd/tests/pth_detached3
75drd/tests/pth_detached_sem
76drd/tests/pth_inconsistent_cond_wait
77drd/tests/pth_mutex_reinit
78drd/tests/pth_once
79drd/tests/pth_process_shared_mutex
80drd/tests/pth_spinlock
81drd/tests/pth_uninitialized_cond
82drd/tests/read_and_free_race
83drd/tests/recursive_mutex
84drd/tests/rwlock_race
85drd/tests/rwlock_test
86drd/tests/rwlock_type_checking
87drd/tests/sem_as_mutex
88drd/tests/sem_as_mutex2
89drd/tests/sem_as_mutex3
90drd/tests/sem_open
91drd/tests/sem_open2
92drd/tests/sem_open3
93drd/tests/sem_open_traced
94drd/tests/sem_wait
95drd/tests/sigalrm
96drd/tests/sigaltstack
97drd/tests/std_atomic
98drd/tests/std_string
99drd/tests/std_thread
100drd/tests/std_thread2
101drd/tests/str_tester
102drd/tests/tc01_simple_race
103drd/tests/tc02_simple_tls
104drd/tests/tc03_re_excl
105drd/tests/tc04_free_lock
106drd/tests/tc05_simple_race
107drd/tests/tc06_two_races
108drd/tests/tc07_hbl1
109drd/tests/tc08_hbl2
110drd/tests/tc09_bad_unlock
111drd/tests/tc10_rec_lock
112drd/tests/tc11_XCHG
113drd/tests/tc12_rwl_trivial
114drd/tests/tc13_laog1
115drd/tests/tc15_laog_lockdel
116drd/tests/tc16_byterace
117drd/tests/tc17_sembar
118drd/tests/tc18_semabuse
119drd/tests/tc19_shadowmem
120drd/tests/tc21_pthonce
121drd/tests/tc22_exit_w_lock
122drd/tests/tc23_bogus_condwait
123helgrind/tests/annotate_rwlock
124helgrind/tests/annotate_smart_pointer
125helgrind/tests/bar_bad
126helgrind/tests/bar_trivial
127helgrind/tests/bug322621
128helgrind/tests/cond_init_destroy
129helgrind/tests/cond_timedwait_invalid
130helgrind/tests/cond_timedwait_test
131helgrind/tests/free_is_write
132helgrind/tests/hg01_all_ok
133helgrind/tests/hg03_inherit
134helgrind/tests/hg04_race
135helgrind/tests/hg05_race2
136helgrind/tests/hg06_readshared
137helgrind/tests/locked_vs_unlocked1_fwd
138helgrind/tests/locked_vs_unlocked1_rev
139helgrind/tests/locked_vs_unlocked2
140helgrind/tests/locked_vs_unlocked3
141helgrind/tests/pth_barrier1
142helgrind/tests/pth_barrier2
143helgrind/tests/pth_barrier3
144helgrind/tests/pth_destroy_cond
145helgrind/tests/rwlock_race
146helgrind/tests/rwlock_test
147helgrind/tests/shmem_abits
148helgrind/tests/stackteardown
149helgrind/tests/t2t_laog
150helgrind/tests/tc01_simple_race
151helgrind/tests/tc02_simple_tls
152helgrind/tests/tc03_re_excl
153helgrind/tests/tc04_free_lock
154helgrind/tests/tc05_simple_race
155helgrind/tests/tc06_two_races
156helgrind/tests/tc06_two_races_xml
157helgrind/tests/tc07_hbl1
158helgrind/tests/tc08_hbl2
159helgrind/tests/tc09_bad_unlock
160helgrind/tests/tc10_rec_lock
161helgrind/tests/tc11_XCHG
162helgrind/tests/tc12_rwl_trivial
163helgrind/tests/tc13_laog1
164helgrind/tests/tc14_laog_dinphils
165helgrind/tests/tc15_laog_lockdel
166helgrind/tests/tc16_byterace
167helgrind/tests/tc17_sembar
168helgrind/tests/tc18_semabuse
169helgrind/tests/tc19_shadowmem
170helgrind/tests/tc20_verifywrap
171helgrind/tests/tc21_pthonce
172helgrind/tests/tc22_exit_w_lock
173helgrind/tests/tc23_bogus_condwait
174helgrind/tests/tc24_nonzero_sem
175helgrind/tests/tls_threads
176memcheck/tests/accounting
177memcheck/tests/addressable
178memcheck/tests/arm64-linux/scalar
179memcheck/tests/atomic_incs
180memcheck/tests/badaddrvalue
181memcheck/tests/badfree
182memcheck/tests/badfree-2trace
183memcheck/tests/badfree3
184memcheck/tests/badjump
185memcheck/tests/badjump2
186memcheck/tests/badloop
187memcheck/tests/badpoll
188memcheck/tests/badrw
189memcheck/tests/big_blocks_freed_list
190memcheck/tests/brk2
191memcheck/tests/dw4
192memcheck/tests/err_disable4
193memcheck/tests/err_disable_arange1
194memcheck/tests/leak-autofreepool-5
195memcheck/tests/leak_cpp_interior
196memcheck/tests/linux/lsframe1
197memcheck/tests/linux/lsframe2
198memcheck/tests/linux/with-space
199memcheck/tests/origin5-bz2
200memcheck/tests/origin6-fp
201memcheck/tests/overlap
202memcheck/tests/partial_load_dflt
203memcheck/tests/pdb-realloc2
204memcheck/tests/sh-mem
205memcheck/tests/sh-mem-random
206memcheck/tests/sigaltstack
207memcheck/tests/sigkill
208memcheck/tests/signal2
209memcheck/tests/supp_unknown
210memcheck/tests/threadname
211memcheck/tests/threadname_xml
212memcheck/tests/unit_oset
213memcheck/tests/varinfo1
214memcheck/tests/varinfo2
215memcheck/tests/varinfo3
216memcheck/tests/varinfo4
217memcheck/tests/varinfo5
218memcheck/tests/varinfo6
219memcheck/tests/varinforestrict
220memcheck/tests/vcpu_bz2
221memcheck/tests/vcpu_fbench
222memcheck/tests/vcpu_fnfns
223memcheck/tests/wcs
224memcheck/tests/wrap1
225memcheck/tests/wrap2
226memcheck/tests/wrap3
227memcheck/tests/wrap4
228memcheck/tests/wrap5
229memcheck/tests/wrap6
230memcheck/tests/wrap7
231memcheck/tests/wrap8
232memcheck/tests/wrapmalloc
233memcheck/tests/wrapmallocstatic
234memcheck/tests/writev1
235memcheck/tests/xml1
diff --git a/meta/recipes-devtools/valgrind/valgrind/remove-for-all b/meta/recipes-devtools/valgrind/valgrind/remove-for-all
deleted file mode 100644
index d6a85c4735..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/remove-for-all
+++ /dev/null
@@ -1,2 +0,0 @@
1drd/tests/bar_bad
2drd/tests/bar_bad_xml
diff --git a/meta/recipes-devtools/valgrind/valgrind/run-ptest b/meta/recipes-devtools/valgrind/valgrind/run-ptest
index e8a1a668fc..15cf03f9d2 100755
--- a/meta/recipes-devtools/valgrind/valgrind/run-ptest
+++ b/meta/recipes-devtools/valgrind/valgrind/run-ptest
@@ -7,6 +7,7 @@
7# Randy MacLeod <Randy.MacLeod@windriver.com> 7# Randy MacLeod <Randy.MacLeod@windriver.com>
8############################################################### 8###############################################################
9VALGRIND_LIB=@libdir@/valgrind 9VALGRIND_LIB=@libdir@/valgrind
10VALGRIND_LIBEXECDIR=@libexecdir@/valgrind
10VALGRIND_BIN=@bindir@/valgrind 11VALGRIND_BIN=@bindir@/valgrind
11 12
12LOG="${VALGRIND_LIB}/ptest/valgrind_ptest_$(date +%Y%m%d-%H%M%S).log" 13LOG="${VALGRIND_LIB}/ptest/valgrind_ptest_$(date +%Y%m%d-%H%M%S).log"
@@ -31,18 +32,35 @@ if [ "$arch" = "aarch64" ]; then
31 done 32 done
32fi 33fi
33 34
35echo "Run non-deterministic tests using taskset to limit them to a single core."
36for i in `cat taskset_nondeterministic_tests`; do
37 # The remove-for-aarch64 and taskset_nondeterministic_tests may overlap so
38 # check if a file exist.
39 if test -f "${i}.vgtest"; then
40 taskset 0x00000001 perl tests/vg_regtest --valgrind=${VALGRIND_BIN} --valgrind-lib=${VALGRIND_LIBEXECDIR} --yocto-ptest $i 2>&1|tee -a ${LOG}
41 mv $i.vgtest $i.IGNORE
42 fi
43done
44
34cd ${VALGRIND_LIB}/ptest && ./tests/vg_regtest \ 45cd ${VALGRIND_LIB}/ptest && ./tests/vg_regtest \
35 --valgrind=${VALGRIND_BIN} \ 46 --valgrind=${VALGRIND_BIN} \
36 --valgrind-lib=${VALGRIND_LIB} \ 47 --valgrind-lib=${VALGRIND_LIBEXECDIR} \
37 --yocto-ptest \ 48 --yocto-ptest \
38 gdbserver_tests ${TOOLS} ${EXP_TOOLS} \ 49 gdbserver_tests ${TOOLS} ${EXP_TOOLS} \
39 2>&1|tee ${LOG} 50 2>&1|tee -a ${LOG}
40 51
41cd ${VALGRIND_LIB}/ptest && \ 52cd ${VALGRIND_LIB}/ptest && \
42 ./tests/post_regtest_checks $(pwd) \ 53 ./tests/post_regtest_checks $(pwd) \
43 gdbserver_tests ${TOOLS} ${EXP_TOOLS} \ 54 gdbserver_tests ${TOOLS} ${EXP_TOOLS} \
44 2>&1|tee -a ${LOG} 55 2>&1|tee -a ${LOG}
45 56
57echo "Restore non-deterministic tests"
58for i in `cat taskset_nondeterministic_tests`; do
59 if test -f "${i}.vgtest.IGNORE"; then
60 mv $i.IGNORE $i.vgtest;
61 fi
62done
63
46if [ "$arch" = "aarch64" ]; then 64if [ "$arch" = "aarch64" ]; then
47 echo "Aarch64: Restore valgrind tests that result in defunct process and then out of memory" 65 echo "Aarch64: Restore valgrind tests that result in defunct process and then out of memory"
48 for i in `cat remove-for-aarch64`; do 66 for i in `cat remove-for-aarch64`; do
@@ -55,6 +73,16 @@ for i in `cat remove-for-all`; do
55 mv $i.IGNORE $i.vgtest; 73 mv $i.IGNORE $i.vgtest;
56done 74done
57 75
76echo "Failed test details..."
77failed_tests=`grep FAIL: ${LOG} | awk '{print $2}'`
78for test in $failed_tests; do
79 for diff_results in `ls $test*.diff`; do
80 echo $diff_results
81 echo '************'
82 cat $diff_results
83 done
84done
85
58passed=`grep PASS: ${LOG}|wc -l` 86passed=`grep PASS: ${LOG}|wc -l`
59failed=`grep FAIL: ${LOG}|wc -l` 87failed=`grep FAIL: ${LOG}|wc -l`
60skipped=`grep SKIP: ${LOG}|wc -l` 88skipped=`grep SKIP: ${LOG}|wc -l`
diff --git a/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch b/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch
index eea671da0a..19690e5ebb 100644
--- a/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch
@@ -1,3 +1,8 @@
1From 8c92089741d809cfd18354f1b4df18cd28398a20 Mon Sep 17 00:00:00 2001
2From: Yi Fan Yu <yifan.yu@windriver.com>
3Date: Wed, 17 Mar 2021 12:16:31 -0400
4Subject: [PATCH] remove s390x_vec_op_t
5
1s390x_vec_op_t is not needed anywhere, only elements of enum are accessed 6s390x_vec_op_t is not needed anywhere, only elements of enum are accessed
2removing it ensures that valgrind can be built with -fno-common option 7removing it ensures that valgrind can be built with -fno-common option
3 8
@@ -6,12 +11,20 @@ ld: ../../VEX/libvex-amd64-linux.a(libvex_amd64_linux_a-guest_s390_helpers.o):/u
6 11
7Upstream-Status: Pending 12Upstream-Status: Pending
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14
15Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
16---
17 VEX/priv/guest_s390_defs.h | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/VEX/priv/guest_s390_defs.h b/VEX/priv/guest_s390_defs.h
21index 29efa01..3a8f0a0 100644
9--- a/VEX/priv/guest_s390_defs.h 22--- a/VEX/priv/guest_s390_defs.h
10+++ b/VEX/priv/guest_s390_defs.h 23+++ b/VEX/priv/guest_s390_defs.h
11@@ -286,7 +286,7 @@ enum { 24@@ -285,7 +285,7 @@ typedef enum {
12 S390_VEC_OP_VFCHE = 18, 25 S390_VEC_OP_VCLFNL,
13 S390_VEC_OP_VFTCI = 19, 26 S390_VEC_OP_VCRNF,
14 S390_VEC_OP_LAST = 20 // supposed to be the last element in enum 27 S390_VEC_OP_LAST // supposed to be the last element in enum
15-} s390x_vec_op_t; 28-} s390x_vec_op_t;
16+}; 29+};
17 30
diff --git a/meta/recipes-devtools/valgrind/valgrind/taskset_nondeterministic_tests b/meta/recipes-devtools/valgrind/valgrind/taskset_nondeterministic_tests
new file mode 100644
index 0000000000..e15100ade7
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/taskset_nondeterministic_tests
@@ -0,0 +1,2 @@
1helgrind/tests/hg05_race2
2helgrind/tests/tc09_bad_unlock
diff --git a/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch b/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch
index adea405213..0c18a63c2b 100644
--- a/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch
@@ -1,4 +1,4 @@
1From d134dafc2f11e0d247420a0ba360bcdef77b4093 Mon Sep 17 00:00:00 2001 1From a5cd00f1c2d78e2a15f4a0c595f5ac10ca4c3290 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com> 2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Tue, 19 Jan 2016 16:00:00 -0800 3Date: Tue, 19 Jan 2016 16:00:00 -0800
4Subject: [PATCH] use appropriate -march/-mcpu/-mfpu for ARM test apps 4Subject: [PATCH] use appropriate -march/-mcpu/-mfpu for ARM test apps
@@ -15,7 +15,7 @@ over-ride that).
15 15
16See similar cases in none/tests/arm/Makefile.am 16See similar cases in none/tests/arm/Makefile.am
17 17
18Upstream-Status: Pending 18Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=454346]
19 19
20Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 20Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
21--- 21---
@@ -23,10 +23,10 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
23 1 file changed, 4 insertions(+), 2 deletions(-) 23 1 file changed, 4 insertions(+), 2 deletions(-)
24 24
25diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am 25diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am
26index 4507a20..825290f 100644 26index 79b957c..41a5a03 100644
27--- a/none/tests/arm/Makefile.am 27--- a/none/tests/arm/Makefile.am
28+++ b/none/tests/arm/Makefile.am 28+++ b/none/tests/arm/Makefile.am
29@@ -62,8 +62,10 @@ neon64_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \ 29@@ -87,8 +87,10 @@ neon64_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \
30 -mfpu=neon \ 30 -mfpu=neon \
31 -mthumb 31 -mthumb
32 32
@@ -39,6 +39,3 @@ index 4507a20..825290f 100644
39+vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mfpu=vfpv3 39+vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mfpu=vfpv3
40+ 40+
41+vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm 41+vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm
42--
431.9.1
44
diff --git a/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch b/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch
index d04297dca8..ca7f721d9c 100644
--- a/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch
@@ -1,4 +1,4 @@
1From 005bd11809a1ce65e9f2c28e884354a4741650b9 Mon Sep 17 00:00:00 2001 1From b407514aa1a4fd3667b30527260e271da34ce4a7 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com> 2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Tue, 13 Dec 2016 11:29:55 +0800 3Date: Tue, 13 Dec 2016 11:29:55 +0800
4Subject: [PATCH] make ld-XXX.so strlen intercept optional 4Subject: [PATCH] make ld-XXX.so strlen intercept optional
@@ -17,10 +17,10 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
17 1 file changed, 12 insertions(+), 1 deletion(-) 17 1 file changed, 12 insertions(+), 1 deletion(-)
18 18
19diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c 19diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c
20index ff35009..d7d6816 100644 20index 63172b9..1b5bf95 100644
21--- a/coregrind/m_redir.c 21--- a/coregrind/m_redir.c
22+++ b/coregrind/m_redir.c 22+++ b/coregrind/m_redir.c
23@@ -1275,7 +1275,18 @@ static void add_hardwired_spec (const HChar* sopatt, const HChar* fnpatt, 23@@ -1321,7 +1321,18 @@ static void add_hardwired_spec (const HChar* sopatt, const HChar* fnpatt,
24 spec->to_addr = to_addr; 24 spec->to_addr = to_addr;
25 spec->isWrap = False; 25 spec->isWrap = False;
26 spec->isGlobal = False; 26 spec->isGlobal = False;
@@ -40,6 +40,3 @@ index ff35009..d7d6816 100644
40 /* VARIABLE PARTS */ 40 /* VARIABLE PARTS */
41 spec->mark = False; /* not significant */ 41 spec->mark = False; /* not significant */
42 spec->done = False; /* not significant */ 42 spec->done = False; /* not significant */
43--
441.9.1
45