diff options
Diffstat (limited to 'meta/recipes-devtools/valgrind/valgrind')
33 files changed, 225 insertions, 3016 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-Add-missing-musl.supp.patch b/meta/recipes-devtools/valgrind/valgrind/0001-Add-missing-musl.supp.patch deleted file mode 100644 index 2a73f7e81f..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0001-Add-missing-musl.supp.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 61bc8664f93cd980831c9da4a3e8a385b089a0ab Mon Sep 17 00:00:00 2001 -From: Yi Fan Yu <yifan.yu@windriver.com> -Date: Tue, 23 Mar 2021 09:32:22 -0700 -Subject: [PATCH] Add missing musl.supp - -3.17 did not ship musl.supp in the tarball. - -This is a workaround until next release. - -Upstream-Status: Backport [dde556d51f8226a6de564a00bf82536bb7042c54] - -Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> ---- - musl.supp | 46 ++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 46 insertions(+) - create mode 100644 musl.supp - -diff --git a/musl.supp b/musl.supp -new file mode 100644 -index 000000000..864172a24 ---- /dev/null -+++ b/musl.supp -@@ -0,0 +1,46 @@ -+# Suppressions for musl libc -+# See: https://www.openwall.com/lists/musl/2017/06/15/4 -+ -+{ -+ musl-dynlink-false-positive1 -+ Memcheck:Leak -+ fun:calloc -+ fun:load_direct_deps -+ fun:load_deps -+ fun:load_deps -+ fun:__dls3 -+ fun:__dls2b -+ fun:__dls2 -+} -+ -+{ -+ musl-dynlink-false-positive2 -+ Memcheck:Leak -+ fun:calloc -+ fun:load_direct_deps -+ fun:load_deps -+ fun:load_deps -+ fun:__dls3 -+ fun:__dls2 -+} -+ -+{ -+ musl-dynlink-false-positive3 -+ Memcheck:Leak -+ fun:calloc -+ fun:load_library -+ fun:load_preload -+ fun:__dls3 -+ fun:__dls2b -+ fun:__dls2 -+} -+ -+{ -+ musl-dynlink-false-positive4 -+ Memcheck:Leak -+ fun:calloc -+ fun:load_library -+ fun:load_preload -+ fun:__dls3 -+ fun:__dls2 -+} --- -2.17.1 - 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 @@ -From 1b5b6f827ac1153a41fc93e78bf34ccdf5720b9b Mon Sep 17 00:00:00 2001 -From: Randy MacLeod <Randy.MacLeod@windriver.com> -Date: Fri, 19 Oct 2018 10:31:12 -0400 -Subject: [PATCH] Guard against __GLIBC_PREREQ for musl libc - -Upstream-Status: Submitted https://bugs.kde.org/show_bug.cgi?id=400162 - -Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> ---- - memcheck/tests/linux/sys-statx.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/memcheck/tests/linux/sys-statx.c b/memcheck/tests/linux/sys-statx.c -index fe9f9ba45..473c2cd7f 100644 ---- a/memcheck/tests/linux/sys-statx.c -+++ b/memcheck/tests/linux/sys-statx.c -@@ -7,11 +7,16 @@ - #include <assert.h> - #include <string.h> - #include <sys/syscall.h> -+ -+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) - #if __GLIBC_PREREQ(2,28) - /* struct statx provided in sys/stat.h */ - #else - #include <linux/stat.h> - #endif -+#else -+#include <linux/stat.h> -+#endif - #include <errno.h> - - int check_stat2; --- -2.17.0 - 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 @@ -From 2155c1b2cf00e744e280c493eb74bf457dfcc3b1 Mon Sep 17 00:00:00 2001 -From: Randy MacLeod <Randy.MacLeod@windriver.com> -Date: Sun, 21 Oct 2018 15:09:31 -0400 -Subject: [PATCH] Make local functions static to avoid assembler error - -Avoid mips32 x-compiler warnings such as: - -| ../../../valgrind-3.14.0/helgrind/tests/annotate_hbefore.c:360:6: warning: no previous prototype for 'do_signal' [-Wmissing-prototypes] -| void do_signal ( UWord* w ) -| ^~~~~~~~~ - -by making functions and global variables that are file scope be static -and more importantly also avoid an assembler error: - -/tmp/cce22iiw.s: Assembler messages: -/tmp/cce22iiw.s:446: Error: symbol `exit_0' is already defined -/tmp/cce22iiw.s:448: Error: symbol `exit' is already defined -/tmp/cce22iiw.s:915: Error: symbol `exit_0' is already defined -/tmp/cce22iiw.s:917: Error: symbol `exit' is already defined - -Upstream-Status: Submitted https://bugs.kde.org/show_bug.cgi?id=400164 - -Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> ---- - helgrind/tests/annotate_hbefore.c | 34 +++++++++++++++---------------- - 1 file changed, 17 insertions(+), 17 deletions(-) - -diff --git a/helgrind/tests/annotate_hbefore.c b/helgrind/tests/annotate_hbefore.c -index e311714f7..f55514e45 100644 ---- a/helgrind/tests/annotate_hbefore.c -+++ b/helgrind/tests/annotate_hbefore.c -@@ -24,7 +24,7 @@ typedef unsigned long int UWord; - - // ppc64 - /* return 1 if success, 0 if failure */ --UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) -+static UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) - { - UWord old, success; - -@@ -57,7 +57,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) - - // ppc32 - /* return 1 if success, 0 if failure */ --UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) -+static UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) - { - UWord old, success; - -@@ -90,7 +90,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) - - // amd64 - /* return 1 if success, 0 if failure */ --UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) -+static UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) - { - UWord block[4] = { (UWord)addr, expected, nyu, 2 }; - __asm__ __volatile__( -@@ -113,7 +113,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) - - // x86 - /* return 1 if success, 0 if failure */ --UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) -+static UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) - { - UWord block[4] = { (UWord)addr, expected, nyu, 2 }; - __asm__ __volatile__( -@@ -138,7 +138,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) - - // arm - /* return 1 if success, 0 if failure */ --UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) -+static UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) - { - UWord old, success; - UWord block[2] = { (UWord)addr, nyu }; -@@ -171,7 +171,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) - - // arm64 - /* return 1 if success, 0 if failure */ --UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) -+static UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) - { - UWord old, success; - UWord block[2] = { (UWord)addr, nyu }; -@@ -204,7 +204,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) - - // s390x - /* return 1 if success, 0 if failure */ --UWord do_acasW(UWord* addr, UWord expected, UWord nyu ) -+static UWord do_acasW(UWord* addr, UWord expected, UWord nyu ) - { - int cc; - -@@ -223,7 +223,7 @@ UWord do_acasW(UWord* addr, UWord expected, UWord nyu ) - - // mips32 - /* return 1 if success, 0 if failure */ --UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) -+static UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) - { - UWord success; - UWord block[3] = { (UWord)addr, nyu, expected}; -@@ -256,7 +256,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) - - // mips64 - /* return 1 if success, 0 if failure */ --UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) -+static UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) - { - UWord success; - UWord block[3] = { (UWord)addr, nyu, expected}; -@@ -287,7 +287,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu ) - - #endif - --void atomic_incW ( UWord* w ) -+static void atomic_incW ( UWord* w ) - { - while (1) { - UWord old = *w; -@@ -301,7 +301,7 @@ void atomic_incW ( UWord* w ) - - #define NNN 1000000 - --void* thread_fn ( void* arg ) -+static void* thread_fn ( void* arg ) - { - UWord* w = (UWord*)arg; - int i; -@@ -331,10 +331,10 @@ int main ( void ) - - #endif - --int shared_var = 0; // is not raced upon -+static int shared_var = 0; // is not raced upon - - --void delayXms ( int i ) -+static void delayXms ( int i ) - { - struct timespec ts = { 0, 1 * 1000 * 1000 }; - // We do the sleep in small pieces to have scheduling -@@ -348,7 +348,7 @@ void delayXms ( int i ) - } - } - --void do_wait ( UWord* w ) -+static void do_wait ( UWord* w ) - { - UWord w0 = *w; - UWord volatile * wV = w; -@@ -357,7 +357,7 @@ void do_wait ( UWord* w ) - ANNOTATE_HAPPENS_AFTER(w); - } - --void do_signal ( UWord* w ) -+static void do_signal ( UWord* w ) - { - ANNOTATE_HAPPENS_BEFORE(w); - atomic_incW(w); -@@ -365,7 +365,7 @@ void do_signal ( UWord* w ) - - - --void* thread_fn1 ( void* arg ) -+static void* thread_fn1 ( void* arg ) - { - UWord* w = (UWord*)arg; - delayXms(500); // ensure t2 gets to its wait first -@@ -376,7 +376,7 @@ void* thread_fn1 ( void* arg ) - return NULL; - } - --void* thread_fn2 ( void* arg ) -+static void* thread_fn2 ( void* arg ) - { - UWord* w = (UWord*)arg; - do_wait(w); // wait for h-b edge from first thread --- -2.17.0 - 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 @@ -From 9762fd23e1f1db66d4b977c694a17d3bca3fe99a Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 8 Jan 2016 16:36:29 +0200 -Subject: [PATCH] Remove tests that fail to build on some PPC32 configurations - -Failures are documented here: -http://errors.yoctoproject.org/Errors/Search/?items=10&query=862d702fbb99e484631315aa44b9e46f8fc567da&filter=valgrind&type=recipe - -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> -Upstream-Status: Pending ---- - memcheck/tests/ppc32/Makefile.am | 2 +- - none/tests/ppc32/Makefile.am | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/memcheck/tests/ppc32/Makefile.am b/memcheck/tests/ppc32/Makefile.am -index 26b95a2..8f05743 100644 ---- a/memcheck/tests/ppc32/Makefile.am -+++ b/memcheck/tests/ppc32/Makefile.am -@@ -10,7 +10,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ - power_ISA2_07.stderr.exp power_ISA2_07.vgtest - - check_PROGRAMS = \ -- power_ISA2_05 power_ISA2_07 -+ power_ISA2_07 - - power_ISA2_05_CFLAGS = $(AM_CFLAGS) $(WERROR) -Winline -Wall -Wshadow -g \ - -I$(top_srcdir)/include @FLAG_M32@ -diff --git a/none/tests/ppc32/Makefile.am b/none/tests/ppc32/Makefile.am -index 196239e..0fe3425 100644 ---- a/none/tests/ppc32/Makefile.am -+++ b/none/tests/ppc32/Makefile.am -@@ -50,13 +50,13 @@ EXTRA_DIST = \ - - check_PROGRAMS = \ - allexec \ -- lsw jm-insns round \ -+ lsw \ - test_isa_2_06_part1 test_isa_2_06_part2 test_isa_2_06_part3 \ - test_dfp1 test_dfp2 test_dfp3 test_dfp4 test_dfp5 \ - test_isa_2_07_part1 test_isa_2_07_part2 \ - test_tm test_touch_tm ldst_multiple data-cache-instructions \ - test_fx test_gx \ -- testVMX twi tw xlc_dbl_u32 power5+_round power6_bcmp \ -+ twi tw xlc_dbl_u32 power6_bcmp \ - bug129390-ppc32 bug139050-ppc32 \ - ldstrev mftocrf mcrfs - --- -2.6.4 - 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 index e7af5efecc..832a1c3d6e 100644 --- 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 @@ -10,11 +10,9 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> tests/vg_regtest.in | 1 + 1 file changed, 1 insertion(+) -diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in -index 909af3be8..f2799c4e3 100755 --- a/tests/vg_regtest.in +++ b/tests/vg_regtest.in -@@ -403,6 +403,7 @@ sub mysystem($) +@@ -401,6 +401,7 @@ sub mysystem($) exit 1; } } @@ -22,6 +20,3 @@ index 909af3be8..f2799c4e3 100755 } # if $keepunfiltered, copies $1 to $1.unfiltered.out # renames $0 tp $1 --- -2.17.0 - 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..63a1a58c04 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch @@ -0,0 +1,40 @@ +From b17b6d7d3a65c14f91f090f3f4f9898d6fa3a9e4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 10 May 2024 16:27:34 -0700 +Subject: [PATCH] configure: Drop setting mcpu=cortex-a8 on arm + +The -march settings from environment expresses the flags +appropriately, moreover, this conflicts when using armhf +without neon [1] + +[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=928224 + +Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=454346] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 39d8b6d..d61b3a6 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -275,13 +275,13 @@ case "${host_cpu}" in + + armv8*) + AC_MSG_RESULT([ok (${host_cpu})]) +- VGCONF_PLATFORM_ARM_ARCH="-marm -mcpu=cortex-a8" ++ VGCONF_PLATFORM_ARM_ARCH="-marm" + ARCH_MAX="arm" + ;; + + armv7*) + AC_MSG_RESULT([ok (${host_cpu})]) +- VGCONF_PLATFORM_ARM_ARCH="-marm -mcpu=cortex-a8" ++ VGCONF_PLATFORM_ARM_ARCH="-marm" + ARCH_MAX="arm" + ;; + +-- +2.45.0 + 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..eba569c884 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-docs-Disable-manual-validation.patch @@ -0,0 +1,31 @@ +From 99fc6fe9b66becac3c94068129e84217330a71a6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 13 Jan 2022 18:26:02 -0800 +Subject: [PATCH] docs: Disable manual validation + +validating manual and manpages, this task involves calling xmllint which +accesses network and --nonet option also does not disable this, +therefore disable it. + +Fixes +| error : Resource temporarily unavailable +| ../callgrind/docs/cl-manual.xml:4: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" +| <!ENTITY % vg-entities SYSTEM "../../docs/xml/vg-entities.xml"> %vg-entities; ] + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/docs/Makefile.am ++++ b/docs/Makefile.am +@@ -194,7 +194,7 @@ valid-manpages: $(MANPAGES_XML_FILES) + touch $@; \ + fi + +-check-local: valid-manual valid-manpages ++check-local: + + # The text version of the FAQ. + FAQ.txt: diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-swapcontext-Add-SIGALRM-handler-to-avoid-s.patch b/meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-swapcontext-Add-SIGALRM-handler-to-avoid-s.patch deleted file mode 100644 index 371c1701d0..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-swapcontext-Add-SIGALRM-handler-to-avoid-s.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 4c8c4a9c3a92300e3e6500e5a278ca37514a1fdb Mon Sep 17 00:00:00 2001 -From: Yi Fan Yu <yifan.yu@windriver.com> -Date: Thu, 1 Apr 2021 15:31:47 -0400 -Subject: [PATCH] drd/tests/swapcontext: Add SIGALRM handler to avoid - stacktrace - -During testing for oe-core build on QEMU, -SIGALRM can trigger during nanosleep. -This results a different stderr output than expected. - -``` -==277== Process terminating with default action of signal 14 (SIGALRM) -==277== at 0x36C74C3943: clock_nanosleep@@GLIBC_2.17 (clock_nanosleep.c:43) -==277== by 0x36C74C8726: nanosleep (nanosleep.c:25) -``` - -This stacktrace printing will not occur -if we add a handler that simply exits. - -https://bugs.kde.org/show_bug.cgi?id=435160 - -Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> ---- - drd/tests/swapcontext.c | 5 +++++ - drd/tests/swapcontext.stderr.exp | 4 ---- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/drd/tests/swapcontext.c b/drd/tests/swapcontext.c -index 622c70bc5..2cb969a5e 100644 ---- a/drd/tests/swapcontext.c -+++ b/drd/tests/swapcontext.c -@@ -25,6 +25,10 @@ typedef struct thread_local { - size_t nrsw; - } thread_local_t; - -+static void sig_alrm_handler(int signo) { -+ _exit(1); -+} -+ - static void f(void *data, int n) - { - enum { NR_SWITCHES = 200000 }; -@@ -76,6 +80,7 @@ int main(int argc, char *argv[]) - pthread_attr_t attr; - int i, res; - -+ signal(SIGALRM, sig_alrm_handler); - memset(tlocal, 0, sizeof(tlocal)); - - pthread_attr_init(&attr); -diff --git a/drd/tests/swapcontext.stderr.exp b/drd/tests/swapcontext.stderr.exp -index fcb5d5ed4..d18786f80 100644 ---- a/drd/tests/swapcontext.stderr.exp -+++ b/drd/tests/swapcontext.stderr.exp -@@ -1,7 +1,3 @@ - - --Process terminating with default action of signal 14 (SIGALRM) -- at 0x........: swapcontext (in /...libc...) -- by 0x........: f (swapcontext.c:?) -- - ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0) --- -2.17.1 - 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 @@ -From fb5362f205b37c5060fcd764a7ed393abe4f2f3d Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 27 Jul 2018 17:39:37 +0800 -Subject: [PATCH 1/2] fix opcode not supported on mips32-linux - -While build tests(`make check') on mips32-linux, there are -serial failures such as: -[snip] -| mips-wrsmllib32-linux-gcc -meb -mabi=32 -mhard-float -c --o atomic_incs-atomic_incs.o `test -f 'atomic_incs.c' || echo -'../../../valgrind-3.13.0/memcheck/tests/'`atomic_incs.c -| /tmp/ccqrmINN.s: Assembler messages: -| /tmp/ccqrmINN.s:247: Error: opcode not supported on this -processor: mips1 (mips1) `ll $t3,0($t1)' -| /tmp/ccqrmINN.s:249: Error: opcode not supported on this -processor: mips1 (mips1) `sc $t3,0($t1)' -[snip] - -Since the following commit applied, it defines CLFAGS for mips32, -but missed to pass them to tests which caused the above failure -... -3e344c57f Merge in a port for mips32-linux -... - -Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=396905] -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - helgrind/tests/Makefile.am | 5 +++++ - memcheck/tests/Makefile.am | 5 +++++ - none/tests/mips32/Makefile.am | 4 ++++ - 3 files changed, 14 insertions(+) - -diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am -index ad1af191a..6209d35a7 100644 ---- a/helgrind/tests/Makefile.am -+++ b/helgrind/tests/Makefile.am -@@ -214,6 +214,11 @@ check_PROGRAMS += annotate_rwlock - endif - - AM_CFLAGS += $(AM_FLAG_M3264_PRI) -+ -+if VGCONF_PLATFORMS_INCLUDE_MIPS32_LINUX -+AM_CFLAGS += $(AM_CFLAGS_MIPS32_LINUX) -+endif -+ - AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) - - LDADD = -lpthread -diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am -index 84e49405f..aff861a32 100644 ---- a/memcheck/tests/Makefile.am -+++ b/memcheck/tests/Makefile.am -@@ -443,6 +443,11 @@ check_PROGRAMS += reach_thread_register - endif - - AM_CFLAGS += $(AM_FLAG_M3264_PRI) -+ -+if VGCONF_PLATFORMS_INCLUDE_MIPS32_LINUX -+AM_CFLAGS += $(AM_CFLAGS_MIPS32_LINUX) -+endif -+ - AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) - - if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX -diff --git a/none/tests/mips32/Makefile.am b/none/tests/mips32/Makefile.am -index d11591d45..602cd26f6 100644 ---- a/none/tests/mips32/Makefile.am -+++ b/none/tests/mips32/Makefile.am -@@ -99,6 +99,10 @@ check_PROGRAMS = \ - round_fpu64 \ - fpu_branches - -+if VGCONF_PLATFORMS_INCLUDE_MIPS32_LINUX -+AM_CFLAGS += $(AM_CFLAGS_MIPS32_LINUX) -+endif -+ - AM_CFLAGS += @FLAG_M32@ - AM_CXXFLAGS += @FLAG_M32@ - AM_CCASFLAGS += @FLAG_M32@ --- -2.17.1 - 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..7996fa6e8f 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 @@ -10,7 +10,7 @@ implementation. Fixes | cc1: warning: switch -mcpu=cortex-a8 conflicts with -march=armv7ve switch -Upstream-Status: Pending +Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=454346] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- @@ -19,30 +19,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> none/tests/arm/Makefile.am | 18 +++++++++--------- 3 files changed, 15 insertions(+), 15 deletions(-) -diff --git a/Makefile.all.am b/Makefile.all.am -index 02059a3..c7c4700 100644 ---- a/Makefile.all.am -+++ b/Makefile.all.am -@@ -197,11 +197,11 @@ AM_CCASFLAGS_PPC64LE_LINUX = @FLAG_M64@ -g - - AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@ - AM_CFLAGS_ARM_LINUX = @FLAG_M32@ \ -- $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8 -+ $(AM_CFLAGS_BASE) -marm - AM_CFLAGS_PSO_ARM_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) \ -- -marm -mcpu=cortex-a8 $(AM_CFLAGS_PSO_BASE) -+ -marm $(AM_CFLAGS_PSO_BASE) - AM_CCASFLAGS_ARM_LINUX = @FLAG_M32@ \ -- -marm -mcpu=cortex-a8 -g -+ -marm -g - - AM_FLAG_M3264_ARM64_LINUX = @FLAG_M64@ - AM_CFLAGS_ARM64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) -diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am -index df82169..07eb66a 100644 --- a/helgrind/tests/Makefile.am +++ b/helgrind/tests/Makefile.am -@@ -189,9 +189,9 @@ if ! VGCONF_PLATFORMS_INCLUDE_X86_DARWIN +@@ -223,9 +223,9 @@ if ! VGCONF_PLATFORMS_INCLUDE_X86_DARWIN endif if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX @@ -55,11 +34,9 @@ index df82169..07eb66a 100644 else annotate_hbefore_CFLAGS = $(AM_CFLAGS) tc07_hbl1_CFLAGS = $(AM_CFLAGS) -diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am -index 024eb6d..ccecb90 100644 --- a/none/tests/arm/Makefile.am +++ b/none/tests/arm/Makefile.am -@@ -52,10 +52,10 @@ allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@ +@@ -56,10 +56,10 @@ allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_N # need special helping w.r.t -mfpu and -mfloat-abi, though. # Also force -O0 since -O takes hundreds of MB of memory # for v6intThumb.c. @@ -71,11 +48,11 @@ index 024eb6d..ccecb90 100644 -v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mthumb +v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb - v8crypto_a_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -marm - v8crypto_t_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -mthumb -@@ -65,23 +65,23 @@ v8memory_a_CFLAGS = $(AM_CFLAGS) -g -O0 \ - v8memory_t_CFLAGS = $(AM_CFLAGS) -g -O0 \ - -march=armv8-a -mfpu=crypto-neon-fp-armv8 -mthumb + v8crypto_a_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -marm -march=armv8-a + v8crypto_t_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -mthumb -march=armv8-a +@@ -74,23 +74,23 @@ v8memory_t_CFLAGS = $(AM_CFLAGS) -g -O0 + + vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mfpu=neon -vfp_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \ +vfp_CFLAGS = $(AM_CFLAGS) -g -O0 \ @@ -103,6 +80,3 @@ index 024eb6d..ccecb90 100644 +vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mfpu=vfpv3 vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm --- -2.12.2 - 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 @@ -From 3409dc35c15bb14c8a525239806322648e079ab1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 5 Jul 2017 17:12:43 -0700 -Subject: [PATCH 1/3] memcheck/arm64: Define __THROW if not already defined - -Helps compiling with musl where __THROW is not available - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - memcheck/tests/arm64-linux/scalar.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/memcheck/tests/arm64-linux/scalar.h b/memcheck/tests/arm64-linux/scalar.h -index 9008816..8ef050f 100644 ---- a/memcheck/tests/arm64-linux/scalar.h -+++ b/memcheck/tests/arm64-linux/scalar.h -@@ -12,6 +12,10 @@ - #include <sys/types.h> - #include <sys/mman.h> - -+#ifndef __THROW -+#define __THROW -+#endif -+ - // Since we use vki_unistd.h, we can't include <unistd.h>. So we have to - // declare this ourselves. - extern long int syscall (long int __sysno, ...) __THROW; --- -2.13.2 - 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..29a9e95a90 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 @@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/config.h.in +++ b/config.h.in -@@ -301,6 +301,9 @@ +@@ -424,6 +424,9 @@ /* Define to 1 if you have the <sys/sysnvl.h> header file. */ #undef HAVE_SYS_SYSNVL_H @@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/configure.ac +++ b/configure.ac -@@ -4098,6 +4098,7 @@ AC_CHECK_HEADERS([ \ +@@ -4881,6 +4881,7 @@ AC_CHECK_HEADERS([ \ sys/syscall.h \ sys/sysnvl.h \ sys/time.h \ @@ -39,7 +39,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/memcheck/tests/linux/timerfd-syscall.c +++ b/memcheck/tests/linux/timerfd-syscall.c -@@ -45,6 +45,9 @@ +@@ -42,6 +42,9 @@ #if defined(HAVE_SYS_TIME_H) #include <sys/time.h> #endif @@ -49,7 +49,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #if defined(HAVE_SYS_TYPES_H) #include <sys/types.h> #endif -@@ -54,7 +57,8 @@ +@@ -51,7 +54,8 @@ * timerfd_* system call numbers introduced in 2.6.23. These constants are * not yet in the glibc 2.7 headers, that is why they are defined here. */ @@ -59,7 +59,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #if defined(__x86_64__) #define __NR_timerfd_create 283 #elif defined(__i386__) -@@ -67,8 +71,10 @@ +@@ -64,8 +68,10 @@ #error Cannot detect your architecture! #endif #endif @@ -71,7 +71,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #if defined(__x86_64__) #define __NR_timerfd_settime 286 #define __NR_timerfd_gettime 287 -@@ -85,7 +91,7 @@ +@@ -82,7 +88,7 @@ #error Cannot detect your architecture! #endif #endif @@ -80,7 +80,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> /* Definitions from include/linux/timerfd.h */ -@@ -127,6 +133,7 @@ void set_timespec(struct timespec *tmr, +@@ -124,6 +130,7 @@ void set_timespec(struct timespec *tmr, tmr->tv_nsec = (long) (1000ULL * (ustime % 1000000ULL)); } @@ -88,7 +88,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> int timerfd_create(int clockid, int flags) { return syscall(__NR_timerfd_create, clockid, flags); -@@ -142,6 +149,7 @@ int timerfd_gettime(int ufc, struct itim +@@ -139,6 +146,7 @@ int timerfd_gettime(int ufc, struct itim { return syscall(__NR_timerfd_gettime, ufc, otmr); } 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 @@ -From de692e359801a1f0488c76267e4f904dd2efe754 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 10 Jun 2017 00:39:07 -0700 -Subject: [PATCH] str_tester.c: Limit rawmemchr() test to glibc - -rawmemchr() is a GNU extention therefore mark it so - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - memcheck/tests/str_tester.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/memcheck/tests/str_tester.c b/memcheck/tests/str_tester.c -index 9f7790a..47e4b4a 100644 ---- a/memcheck/tests/str_tester.c -+++ b/memcheck/tests/str_tester.c -@@ -504,7 +504,7 @@ test_strchrnul (void) - #endif - - // DDD: better done by testing for the function. --#if !defined(__APPLE__) && !defined(__sun) -+#if !defined(__APPLE__) && !defined(__sun) && defined(__GLIBC__) - static void - test_rawmemchr (void) - { -@@ -1442,7 +1442,7 @@ main (void) - test_strchrnul (); - # endif - --# if !defined(__APPLE__) && !defined(__sun) -+# if !defined(__APPLE__) && !defined(__sun) && defined(__GLIBC__) - /* rawmemchr. */ - test_rawmemchr (); - # endif --- -2.13.1 - 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..2d28bcb6c4 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-tests-arm-Use-O-instead-of-O0.patch @@ -0,0 +1,34 @@ +From 8e907753625faba3284925983ef8e83f8491aa76 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 10 May 2024 17:44:47 -0700 +Subject: [PATCH] tests/arm: Use -O instead of -O0 + +GCC-14 fails to compile the testcase with -O2 [1] +therefore workaround it by using -O1, which works +and for OE/cross-compiling it is fine, -O0 is used +to make these tests compile natively on an arm target +and gcc would take less memory compiling with -O0 +-O would take a bit more memory but in cross compiling +we have enough of it on build host. + +[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115042 +Upstream-Status: Inappropriate [WORKAROUND] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + none/tests/arm/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/none/tests/arm/Makefile.am ++++ b/none/tests/arm/Makefile.am +@@ -57,9 +57,9 @@ allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_N + # Also force -O0 since -O takes hundreds of MB of memory + # for v6intThumb.c. + v6intARM_CFLAGS = $(AM_CFLAGS) -g -O0 -marm +-v6intThumb_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb ++v6intThumb_CFLAGS = $(AM_CFLAGS) -g -O -mthumb + +-v6media_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb ++v6media_CFLAGS = $(AM_CFLAGS) -g -O -mthumb + + v8crypto_a_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -marm -march=armv8-a + v8crypto_t_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -mthumb -march=armv8-a 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 7f0e38cb95..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 26c104adf6c5162572b7aa2fac89d0835b7f8f0b Mon Sep 17 00:00:00 2001 -From: Randy MacLeod <Randy.MacLeod@windriver.com> -Date: Tue, 16 Oct 2018 21:27:46 -0400 -Subject: [PATCH] context APIs are not available on musl - -Updated patch for valgrind-3.14 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> - -Apply same patch to drd/tests/swapcontext.c -for valgrind-3.17. - -Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=434775] - -Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> ---- - drd/tests/swapcontext.c | 6 ++++++ - memcheck/tests/linux/stack_changes.c | 7 ++++++- - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/drd/tests/swapcontext.c b/drd/tests/swapcontext.c -index 622c70bc5..5e72bb0f3 100644 ---- a/drd/tests/swapcontext.c -+++ b/drd/tests/swapcontext.c -@@ -20,6 +20,7 @@ - - #define STACKSIZE (PTHREAD_STACK_MIN + 4096) - -+#ifdef __GLIBC__ - typedef struct thread_local { - ucontext_t uc[3]; - size_t nrsw; -@@ -67,9 +68,11 @@ void *worker(void *data) - swapcontext(&tlocal->uc[0], &tlocal->uc[1]); - return NULL; - } -+#endif - - int main(int argc, char *argv[]) - { -+#ifdef __GLIBC__ - enum { NR = 32 }; - thread_local_t tlocal[NR]; - pthread_t thread[NR]; -@@ -94,6 +97,9 @@ int main(int argc, char *argv[]) - - for (i = 0; i < NR; i++) - pthread_join(thread[i], NULL); -+#else -+ printf("libc context call APIs e.g. getcontext() are deprecated by posix\n"); -+#endif - - return 0; - } -diff --git a/memcheck/tests/linux/stack_changes.c b/memcheck/tests/linux/stack_changes.c -index 7f97b90a5..a26cb4ae6 100644 ---- a/memcheck/tests/linux/stack_changes.c -+++ b/memcheck/tests/linux/stack_changes.c -@@ -10,6 +10,7 @@ - // This test is checking the libc context calls (setcontext, etc.) and - // checks that Valgrind notices their stack changes properly. - -+#ifdef __GLIBC__ - typedef ucontext_t mycontext; - - mycontext ctx1, ctx2, oldc; -@@ -51,9 +52,11 @@ int init_context(mycontext *uc) - - return ret; - } -+#endif - - int main(int argc, char **argv) - { -+#ifdef __GLIBC__ - int c1 = init_context(&ctx1); - int c2 = init_context(&ctx2); - -@@ -66,6 +69,8 @@ int main(int argc, char **argv) - //free(ctx1.uc_stack.ss_sp); - VALGRIND_STACK_DEREGISTER(c2); - //free(ctx2.uc_stack.ss_sp); -- -+#else -+ printf("libc context call APIs e.g. getcontext() are deprecated by posix\n"); -+#endif - return 0; - } --- -2.17.1 - 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 @@ -From 67d199dbdcbb3feff5f8928f87725fc64c0307d7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 5 Jul 2017 17:36:42 -0700 -Subject: [PATCH 2/3] memcheck/x86: Define __THROW if not defined - -musl does not have __THROW, therefore make it null - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - memcheck/tests/x86-linux/scalar.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/memcheck/tests/x86-linux/scalar.h b/memcheck/tests/x86-linux/scalar.h -index ef28b03..52f742e 100644 ---- a/memcheck/tests/x86-linux/scalar.h -+++ b/memcheck/tests/x86-linux/scalar.h -@@ -11,6 +11,10 @@ - #include <sys/types.h> - #include <sys/mman.h> - -+#ifndef __THROW -+#define __THROW -+#endif -+ - // Since we use vki_unistd.h, we can't include <unistd.h>. So we have to - // declare this ourselves. - extern long int syscall (long int __sysno, ...) __THROW; --- -2.13.2 - 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 @@ -From d103475875858ab8a2e6b53ce178bb2f63883d4c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 5 Jul 2017 17:37:56 -0700 -Subject: [PATCH 3/3] tests/seg_override: Replace __modify_ldt() with syscall() - -__modify_ldt() is specific to glibc, replacing it with syscall() -makes it more portable. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - none/tests/x86-linux/seg_override.c | 15 ++++++--------- - 1 file changed, 6 insertions(+), 9 deletions(-) - -diff --git a/none/tests/x86-linux/seg_override.c b/none/tests/x86-linux/seg_override.c -index b7619c9..c89874b 100644 ---- a/none/tests/x86-linux/seg_override.c -+++ b/none/tests/x86-linux/seg_override.c -@@ -2,6 +2,8 @@ - #include <stdio.h> - #include <errno.h> - #include <string.h> -+#include <unistd.h> -+#include <syscall.h> - - /* Stuff from Wine. */ - -@@ -52,14 +54,11 @@ inline static unsigned int wine_ldt_get_limit( const LDT_ENTRY *ent ) - /* our copy of the ldt */ - LDT_ENTRY ldt_copy[8192]; - --/* System call to set LDT entry. */ --//extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t); --extern int __modify_ldt (int, void *, size_t); -- - void print_ldt ( void ) - { - int res; -- res = __modify_ldt( 0, ldt_copy, 8192*sizeof(LDT_ENTRY) ); -+ /* System call to set LDT entry. */ -+ res = syscall(SYS_modify_ldt, 0, ldt_copy, 8192*sizeof(LDT_ENTRY) ); - printf("got %d bytes\n", res ); - perror("error is"); - } -@@ -83,9 +82,6 @@ struct modify_ldt_ldt_s - unsigned int empty:25; - }; - --/* System call to set LDT entry. */ --//extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t); -- - void set_ldt1 ( void* base ) - { - int stat; -@@ -102,7 +98,8 @@ void set_ldt1 ( void* base ) - ldt_entry.read_exec_only = 0; - ldt_entry.limit_in_pages = 0; - ldt_entry.seg_not_present = 0; -- stat = __modify_ldt (1, &ldt_entry, sizeof (ldt_entry)); -+ /* System call to set LDT entry. */ -+ stat = syscall(SYS_modify_ldt, 1, &ldt_entry, sizeof (ldt_entry)); - printf("stat = %d\n", stat); - } - --- -2.13.2 - 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 @@ -From 8f916dcb395fe5a2429f2867ba4daf8ef3af073a Mon Sep 17 00:00:00 2001 -From: Randy MacLeod <Randy.MacLeod@windriver.com> -Date: Tue, 16 Oct 2018 21:01:04 -0400 -Subject: [PATCH] Fix out of tree builds. - -The paths to these files need to be fully specified in -the out of tree build case. glibc-2.X.supp is a generated file so the -full path -is deliberately not specified in that case. - -RP 2013/03/23 - -Patch refreshed for valgrind-3.14.0. - -Upstream-Status: Pending - -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> -Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> ---- - configure.ac | 66 ++++++++++++++++++++++++++-------------------------- - 1 file changed, 33 insertions(+), 33 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 524230d..54861c5 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -396,50 +396,50 @@ case "${host_os}" in - 9.*) - AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard]) - AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version]) -- DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin9.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin9-drd.supp ${DEFAULT_SUPP}" - ;; - 10.*) - AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard]) - AC_DEFINE([DARWIN_VERS], DARWIN_10_6, [Darwin / Mac OS X version]) -- DEFAULT_SUPP="darwin10.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin10.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" - ;; - 11.*) - AC_MSG_RESULT([Darwin 11.x (${kernel}) / Mac OS X 10.7 Lion]) - AC_DEFINE([DARWIN_VERS], DARWIN_10_7, [Darwin / Mac OS X version]) -- DEFAULT_SUPP="darwin11.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin11.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" - ;; - 12.*) - AC_MSG_RESULT([Darwin 12.x (${kernel}) / Mac OS X 10.8 Mountain Lion]) - AC_DEFINE([DARWIN_VERS], DARWIN_10_8, [Darwin / Mac OS X version]) -- DEFAULT_SUPP="darwin12.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin12.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" - ;; - 13.*) - AC_MSG_RESULT([Darwin 13.x (${kernel}) / Mac OS X 10.9 Mavericks]) - AC_DEFINE([DARWIN_VERS], DARWIN_10_9, [Darwin / Mac OS X version]) -- DEFAULT_SUPP="darwin13.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin13.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" - ;; - 14.*) - AC_MSG_RESULT([Darwin 14.x (${kernel}) / Mac OS X 10.10 Yosemite]) - AC_DEFINE([DARWIN_VERS], DARWIN_10_10, [Darwin / Mac OS X version]) -- DEFAULT_SUPP="darwin14.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin14.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" - ;; - 15.*) - AC_MSG_RESULT([Darwin 15.x (${kernel}) / Mac OS X 10.11 El Capitan]) - AC_DEFINE([DARWIN_VERS], DARWIN_10_11, [Darwin / Mac OS X version]) -- DEFAULT_SUPP="darwin15.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin15.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" - ;; - 16.*) - AC_MSG_RESULT([Darwin 16.x (${kernel}) / macOS 10.12 Sierra]) - AC_DEFINE([DARWIN_VERS], DARWIN_10_12, [Darwin / Mac OS X version]) -- DEFAULT_SUPP="darwin16.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin16.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/darwin10-drd.supp ${DEFAULT_SUPP}" - ;; - 17.*) - AC_MSG_RESULT([Darwin 17.x (${kernel}) / macOS 10.13 High Sierra]) -@@ -464,7 +464,7 @@ case "${host_os}" in - DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}" - ;; - *) -- DEFAULT_SUPP="solaris11.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/solaris11.supp ${DEFAULT_SUPP}" - ;; - esac - ;; -@@ -472,7 +472,7 @@ case "${host_os}" in - solaris2.12*) - AC_MSG_RESULT([ok (${host_os})]) - VGCONF_OS="solaris" -- DEFAULT_SUPP="solaris12.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/solaris12.supp ${DEFAULT_SUPP}" - ;; - - *) -@@ -1095,29 +1095,29 @@ AC_MSG_CHECKING([the glibc version]) - case "${GLIBC_VERSION}" in - 2.2) - AC_MSG_RESULT(${GLIBC_VERSION} family) -- DEFAULT_SUPP="glibc-2.2.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.2.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.2-LinuxThreads-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; - 2.[[3-6]]) - AC_MSG_RESULT(${GLIBC_VERSION} family) -- DEFAULT_SUPP="glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; - 2.[[7-9]]) - AC_MSG_RESULT(${GLIBC_VERSION} family) - DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; - 2.10|2.11) - AC_MSG_RESULT(${GLIBC_VERSION} family) - AC_DEFINE([GLIBC_MANDATORY_STRLEN_REDIRECT], 1, - [Define to 1 if strlen() has been optimized heavily (amd64 glibc >= 2.10)]) - DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; - 2.*) - AC_MSG_RESULT(${GLIBC_VERSION} family) -@@ -1126,8 +1126,8 @@ case "${GLIBC_VERSION}" in - AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1, - [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)]) - DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; - darwin) - AC_MSG_RESULT(Darwin) -@@ -1137,7 +1137,7 @@ case "${GLIBC_VERSION}" in - bionic) - AC_MSG_RESULT(Bionic) - AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic]) -- DEFAULT_SUPP="bionic.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/bionic.supp ${DEFAULT_SUPP}" - ;; - solaris) - AC_MSG_RESULT(Solaris) -@@ -1164,8 +1164,8 @@ if test "$VGCONF_OS" != "solaris"; then - # attempt to detect whether such libraries are installed on the - # build machine (or even if any X facilities are present); just - # add the suppressions antidisirregardless. -- DEFAULT_SUPP="xfree-4.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="xfree-3.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/xfree-4.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/xfree-3.supp ${DEFAULT_SUPP}" - fi - - --- -2.17.1 - 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 index 0c399ef52c..fea3b00f62 100644 --- 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 @@ -1,7 +1,7 @@ -From f49f27f1bc67d07440b0ac9a7d767a8ea1589bfe Mon Sep 17 00:00:00 2001 +From e244a72c6f8803550f37e81f72bbae039651013b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Tue, 15 Dec 2015 15:50:44 +0200 -Subject: [PATCH 5/5] Modify vg_test wrapper to support PTEST formats +Subject: [PATCH] Modify vg_test wrapper to support PTEST formats Change the valgrind regression test script vg_regtest to support the yocto ptest stdout reporting format. The commit adds @@ -14,7 +14,7 @@ option, --yocto-ptest, the valgrind regression test output is unchanged. Enforce 30 seconds limit for the test. This resume execution of the remaining tests when valgrind hangs. -Upstream-Status: Pending +Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Dave Lerner <dave.lerner@windriver.com> Signed-off-by: Tudor Florea <tudor.florea@enea.com> @@ -25,11 +25,11 @@ Increase time limit to 90 s. Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> --- - tests/vg_regtest.in | 75 +++++++++++++++++++++++++++++++++++++++-------------- + tests/vg_regtest.in | 75 +++++++++++++++++++++++++++++++++------------ 1 file changed, 55 insertions(+), 20 deletions(-) diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in -index a441f42..cb05b52 100755 +index ad18800..e4bd8cb 100755 --- a/tests/vg_regtest.in +++ b/tests/vg_regtest.in @@ -47,6 +47,7 @@ @@ -49,7 +49,7 @@ index a441f42..cb05b52 100755 . " Use EXTRA_REGTEST_OPTS to supply extra args for all tests\n" . "\n"; -@@ -186,6 +187,7 @@ my $outer_args; +@@ -187,6 +188,7 @@ my $run_outer_args = ""; my $valgrind_lib = "$tests_dir/.in_place"; my $keepunfiltered = 0; my $looptillfail = 0; @@ -57,7 +57,7 @@ index a441f42..cb05b52 100755 # default filter is the one named "filter_stderr" in the test's directory my $default_stderr_filter = "filter_stderr"; -@@ -244,6 +246,8 @@ sub process_command_line() +@@ -245,6 +247,8 @@ sub process_command_line() $keepunfiltered = 1; } elsif ($arg =~ /^--loop-till-fail$/) { $looptillfail = 1; @@ -66,7 +66,7 @@ index a441f42..cb05b52 100755 } else { die $usage; } -@@ -365,13 +369,28 @@ sub read_vgtest_file($) +@@ -376,13 +380,28 @@ sub read_vgtest_file($) #---------------------------------------------------------------------------- # Since most of the program time is spent in system() calls, need this to # propagate a Ctrl-C enabling us to quit. @@ -100,7 +100,7 @@ index a441f42..cb05b52 100755 # if $keepunfiltered, copies $1 to $1.unfiltered.out # renames $0 tp $1 sub filtered_rename($$) -@@ -419,23 +438,25 @@ sub do_diffs($$$$) +@@ -430,23 +449,25 @@ sub do_diffs($$$$) # A match; remove .out and any previously created .diff files. unlink("$name.$mid.out"); unlink(<$name.$mid.diff*>); @@ -128,7 +128,7 @@ index a441f42..cb05b52 100755 $vgtest =~ /^(.*)\.vgtest/; my $name = $1; my $fullname = "$dir/$name"; -@@ -454,7 +475,11 @@ sub do_one_test($$) +@@ -465,7 +486,11 @@ sub do_one_test($$) } elsif (256 == $prereq_res) { # Nb: weird Perl-ism -- exit code of '1' is seen by Perl as 256... # Prereq failed, skip. @@ -141,7 +141,7 @@ index a441f42..cb05b52 100755 return; } else { # Bad prereq; abort. -@@ -472,7 +497,7 @@ sub do_one_test($$) +@@ -483,7 +508,7 @@ sub do_one_test($$) } # If there is a progB, let's start it in background: printf("%-16s valgrind $extraopts $vgopts $prog $args (progB: $progB $argsB)\n", @@ -150,7 +150,7 @@ index a441f42..cb05b52 100755 # progB.done used to detect child has finished. See below. # Note: redirection of stdout and stderr is before $progB to allow argsB # to e.g. redirect stdoutB to stderrB -@@ -488,7 +513,8 @@ sub do_one_test($$) +@@ -499,7 +524,8 @@ sub do_one_test($$) . "touch progB.done) &"); } } else { @@ -160,7 +160,7 @@ index a441f42..cb05b52 100755 } # Collect environment variables, if any. -@@ -529,7 +555,7 @@ sub do_one_test($$) +@@ -540,7 +566,7 @@ sub do_one_test($$) # Find all the .stdout.exp files. If none, use /dev/null. my @stdout_exps = <$name.stdout.exp*>; @stdout_exps = ( "/dev/null" ) if (0 == scalar @stdout_exps); @@ -169,7 +169,7 @@ index a441f42..cb05b52 100755 # Filter stderr $stderr_filter_args = $name if (! defined $stderr_filter_args); -@@ -538,7 +564,7 @@ sub do_one_test($$) +@@ -549,7 +575,7 @@ sub do_one_test($$) # Find all the .stderr.exp files. At least one must exist. my @stderr_exps = <$name.stderr.exp*>; (0 != scalar @stderr_exps) or die "Could not find `$name.stderr.exp*'\n"; @@ -178,7 +178,7 @@ index a441f42..cb05b52 100755 if (defined $progB) { # wait for the child to be finished -@@ -562,7 +588,7 @@ sub do_one_test($$) +@@ -573,7 +599,7 @@ sub do_one_test($$) # Find all the .stdoutB.exp files. If none, use /dev/null. my @stdoutB_exps = <$name.stdoutB.exp*>; @stdoutB_exps = ( "/dev/null" ) if (0 == scalar @stdoutB_exps); @@ -187,7 +187,7 @@ index a441f42..cb05b52 100755 # Filter stderr $stderrB_filter_args = $name if (! defined $stderrB_filter_args); -@@ -571,7 +597,7 @@ sub do_one_test($$) +@@ -582,7 +608,7 @@ sub do_one_test($$) # Find all the .stderrB.exp files. At least one must exist. my @stderrB_exps = <$name.stderrB.exp*>; (0 != scalar @stderrB_exps) or die "Could not find `$name.stderrB.exp*'\n"; @@ -196,7 +196,7 @@ index a441f42..cb05b52 100755 } # Maybe do post-test check -@@ -583,7 +609,7 @@ sub do_one_test($$) +@@ -594,7 +620,7 @@ sub do_one_test($$) # Find all the .post.exp files. If none, use /dev/null. my @post_exps = <$name.post.exp*>; @post_exps = ( "/dev/null" ) if (0 == scalar @post_exps); @@ -205,7 +205,7 @@ index a441f42..cb05b52 100755 } } -@@ -592,6 +618,13 @@ sub do_one_test($$) +@@ -603,6 +629,13 @@ sub do_one_test($$) print("(cleanup operation failed: $cleanup)\n"); } @@ -219,25 +219,25 @@ index a441f42..cb05b52 100755 $num_tests_done++; } -@@ -631,7 +664,7 @@ sub test_one_dir($$) - my $found_tests = (0 != (grep { $_ =~ /\.vgtest$/ } @fs)); +@@ -643,7 +676,7 @@ sub test_one_dir($$) + my $tests_start_time = time; if ($found_tests) { - print "-- Running tests in $full_dir $dashes\n"; + print "-- Running tests in $full_dir $dashes\n" if ($yoctoptest == 0); } foreach my $f (@fs) { if (-d $f) { -@@ -641,7 +674,7 @@ sub test_one_dir($$) - } - } - if ($found_tests) { -- print "-- Finished tests in $full_dir $dashes\n"; +@@ -657,7 +690,7 @@ sub test_one_dir($$) + my $end_time = "(in $tests_cost_time sec)"; + my $end_dashes = "-" x (50 - (length $full_dir) + - (length $end_time) - 1); +- print "-- Finished tests in $full_dir $end_time $end_dashes\n"; + print "-- Finished tests in $full_dir $dashes\n" if ($yoctoptest == 0); } chdir(".."); -@@ -667,10 +700,12 @@ sub summarise_results +@@ -683,10 +716,12 @@ sub summarise_results $num_failures{"stdout"}, plural($num_failures{"stdout"}), $num_failures{"stderrB"}, plural($num_failures{"stderrB"}), $num_failures{"stdoutB"}, plural($num_failures{"stdoutB"}), @@ -253,5 +253,5 @@ index a441f42..cb05b52 100755 print "\n"; } -- -2.6.2 +2.30.2 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 @@ -From b4b9f072c22f96844e02cb9d68f7ff2408680817 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 10 Jun 2017 01:07:59 -0700 -Subject: [PATCH 5/6] tc20_verifywrap.c: Fake __GLIBC_PREREQ with musl - -similar to sun - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - helgrind/tests/tc20_verifywrap.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/helgrind/tests/tc20_verifywrap.c b/helgrind/tests/tc20_verifywrap.c -index c110000..a311a49 100644 ---- a/helgrind/tests/tc20_verifywrap.c -+++ b/helgrind/tests/tc20_verifywrap.c -@@ -20,7 +20,7 @@ - - #if !defined(__APPLE__) - --#if defined(__sun__) -+#if defined(__sun__) || (defined(__linux__) && !defined(__GLIBC__)) - /* Fake __GLIBC_PREREQ on Solaris. Pretend glibc >= 2.4. */ - # define __GLIBC_PREREQ - #else --- -2.13.1 - diff --git a/meta/recipes-devtools/valgrind/valgrind/200b6a5a0ea3e1e154663b0fc575bfe2becf177d.patch b/meta/recipes-devtools/valgrind/valgrind/200b6a5a0ea3e1e154663b0fc575bfe2becf177d.patch deleted file mode 100644 index 9a5f6a3f51..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/200b6a5a0ea3e1e154663b0fc575bfe2becf177d.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 200b6a5a0ea3e1e154663b0fc575bfe2becf177d Mon Sep 17 00:00:00 2001 -From: Mark Wielaard <mark@klomp.org> -Date: Wed, 21 Jul 2021 17:55:40 +0200 -Subject: [PATCH] m_debuginfo/debuginfo.c VG_(get_fnname_kind) _start is below - main - -With glibc 2.34 we might see the _start symbol as the frame that -called main instead of directly after __libc_start_main or -generic_start_main. - -Fixes memcheck/tests/badjump[2], memcheck/tests/origin4-many, -helgrind/tests/tc04_free_lock, helgrind/tests/tc09_bad_unlock -and helgrind/tests/tc20_verifywrap. - -Upstream-Status: Backport ---- - coregrind/m_debuginfo/debuginfo.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/coregrind/m_debuginfo/debuginfo.c b/coregrind/m_debuginfo/debuginfo.c -index bc2578b377..e2218f2668 100644 ---- a/coregrind/m_debuginfo/debuginfo.c -+++ b/coregrind/m_debuginfo/debuginfo.c -@@ -2289,6 +2289,7 @@ Vg_FnNameKind VG_(get_fnname_kind) ( const HChar* name ) - VG_STREQN(18, "__libc_start_main.", name) || // gcc optimization - VG_STREQ("generic_start_main", name) || // Yellow Dog doggedness - VG_STREQN(19, "generic_start_main.", name) || // gcc optimization -+ VG_STREQ("_start", name) || - # elif defined(VGO_darwin) - // See readmacho.c for an explanation of this. - VG_STREQ("start_according_to_valgrind", name) || // Darwin, darling --- -2.27.0 - diff --git a/meta/recipes-devtools/valgrind/valgrind/52ed51fc35f8a6148c2940eb46932b02dd3b9b23.patch b/meta/recipes-devtools/valgrind/valgrind/52ed51fc35f8a6148c2940eb46932b02dd3b9b23.patch deleted file mode 100644 index 451a459ea7..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/52ed51fc35f8a6148c2940eb46932b02dd3b9b23.patch +++ /dev/null @@ -1,171 +0,0 @@ -From 52ed51fc35f8a6148c2940eb46932b02dd3b9b23 Mon Sep 17 00:00:00 2001 -From: Mark Wielaard <mark@klomp.org> -Date: Wed, 21 Jul 2021 19:53:13 +0200 -Subject: [PATCH] Generate a ENOSYS (sys_ni_syscall) for clone3 on all linux - arches - -glibc 2.34 will try to use clone3 first before falling back to -the clone syscall. So implement clone3 as sys_ni_syscall which -simply return ENOSYS without producing a warning. - -https://bugs.kde.org/show_bug.cgi?id=439590 - -Upstream-Status: Backport ---- - coregrind/m_syswrap/syswrap-amd64-linux.c | 2 ++ - coregrind/m_syswrap/syswrap-arm-linux.c | 2 ++ - coregrind/m_syswrap/syswrap-arm64-linux.c | 2 ++ - coregrind/m_syswrap/syswrap-mips32-linux.c | 2 ++ - coregrind/m_syswrap/syswrap-mips64-linux.c | 1 + - coregrind/m_syswrap/syswrap-nanomips-linux.c | 1 + - coregrind/m_syswrap/syswrap-ppc32-linux.c | 2 ++ - coregrind/m_syswrap/syswrap-ppc64-linux.c | 2 ++ - coregrind/m_syswrap/syswrap-s390x-linux.c | 2 ++ - coregrind/m_syswrap/syswrap-x86-linux.c | 2 ++ - include/vki/vki-scnums-shared-linux.h | 2 ++ - 11 files changed, 20 insertions(+) - -diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c -index 45e1f3d1bb..3b2dcb8e30 100644 ---- a/coregrind/m_syswrap/syswrap-amd64-linux.c -+++ b/coregrind/m_syswrap/syswrap-amd64-linux.c -@@ -874,6 +874,8 @@ static SyscallTableEntry syscall_table[] = { - LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 - LINXY(__NR_io_uring_register, sys_io_uring_register), // 427 - -+ GENX_(__NR_clone3, sys_ni_syscall), // 435 -+ - LINX_(__NR_faccessat2, sys_faccessat2), // 439 - }; - -diff --git a/coregrind/m_syswrap/syswrap-arm-linux.c b/coregrind/m_syswrap/syswrap-arm-linux.c -index 428cb7c6fc..7f41b07491 100644 ---- a/coregrind/m_syswrap/syswrap-arm-linux.c -+++ b/coregrind/m_syswrap/syswrap-arm-linux.c -@@ -1051,6 +1051,8 @@ static SyscallTableEntry syscall_main_table[] = { - LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 - LINXY(__NR_io_uring_register, sys_io_uring_register), // 427 - -+ GENX_(__NR_clone3, sys_ni_syscall), // 435 -+ - LINX_(__NR_faccessat2, sys_faccessat2), // 439 - }; - -diff --git a/coregrind/m_syswrap/syswrap-arm64-linux.c b/coregrind/m_syswrap/syswrap-arm64-linux.c -index 024ece27f5..0d717f44be 100644 ---- a/coregrind/m_syswrap/syswrap-arm64-linux.c -+++ b/coregrind/m_syswrap/syswrap-arm64-linux.c -@@ -830,6 +830,8 @@ static SyscallTableEntry syscall_main_table[] = { - LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 - LINXY(__NR_io_uring_register, sys_io_uring_register), // 427 - -+ GENX_(__NR_clone3, sys_ni_syscall), // 435 -+ - LINX_(__NR_faccessat2, sys_faccessat2), // 439 - }; - -diff --git a/coregrind/m_syswrap/syswrap-mips32-linux.c b/coregrind/m_syswrap/syswrap-mips32-linux.c -index 62b085ea21..b62129111b 100644 ---- a/coregrind/m_syswrap/syswrap-mips32-linux.c -+++ b/coregrind/m_syswrap/syswrap-mips32-linux.c -@@ -1136,6 +1136,8 @@ static SyscallTableEntry syscall_main_table[] = { - LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 - LINXY(__NR_io_uring_register, sys_io_uring_register), // 427 - -+ GENX_(__NR_clone3, sys_ni_syscall), // 435 -+ - LINX_ (__NR_faccessat2, sys_faccessat2), // 439 - }; - -diff --git a/coregrind/m_syswrap/syswrap-mips64-linux.c b/coregrind/m_syswrap/syswrap-mips64-linux.c -index b73c03da16..94f38366f0 100644 ---- a/coregrind/m_syswrap/syswrap-mips64-linux.c -+++ b/coregrind/m_syswrap/syswrap-mips64-linux.c -@@ -815,6 +815,7 @@ static SyscallTableEntry syscall_main_table[] = { - LINXY (__NR_io_uring_setup, sys_io_uring_setup), - LINXY (__NR_io_uring_enter, sys_io_uring_enter), - LINXY (__NR_io_uring_register, sys_io_uring_register), -+ GENX_ (__NR_clone3, sys_ni_syscall), - LINX_ (__NR_faccessat2, sys_faccessat2), - }; - -diff --git a/coregrind/m_syswrap/syswrap-nanomips-linux.c b/coregrind/m_syswrap/syswrap-nanomips-linux.c -index 14127b181a..102c155507 100644 ---- a/coregrind/m_syswrap/syswrap-nanomips-linux.c -+++ b/coregrind/m_syswrap/syswrap-nanomips-linux.c -@@ -824,6 +824,7 @@ static SyscallTableEntry syscall_main_table[] = { - LINXY (__NR_io_uring_setup, sys_io_uring_setup), - LINXY (__NR_io_uring_enter, sys_io_uring_enter), - LINXY (__NR_io_uring_register, sys_io_uring_register), -+ GENX_ (__NR_clone3, sys_ni_syscall), - LINX_ (__NR_faccessat2, sys_faccessat2), - }; - -diff --git a/coregrind/m_syswrap/syswrap-ppc32-linux.c b/coregrind/m_syswrap/syswrap-ppc32-linux.c -index aad14f8ba4..1e2efc6777 100644 ---- a/coregrind/m_syswrap/syswrap-ppc32-linux.c -+++ b/coregrind/m_syswrap/syswrap-ppc32-linux.c -@@ -1054,6 +1054,8 @@ static SyscallTableEntry syscall_table[] = { - LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 - LINXY(__NR_io_uring_register, sys_io_uring_register), // 427 - -+ GENX_(__NR_clone3, sys_ni_syscall), // 435 -+ - LINX_(__NR_faccessat2, sys_faccessat2), // 439 - }; - -diff --git a/coregrind/m_syswrap/syswrap-ppc64-linux.c b/coregrind/m_syswrap/syswrap-ppc64-linux.c -index c0e3f55491..76610e1423 100644 ---- a/coregrind/m_syswrap/syswrap-ppc64-linux.c -+++ b/coregrind/m_syswrap/syswrap-ppc64-linux.c -@@ -1023,6 +1023,8 @@ static SyscallTableEntry syscall_table[] = { - LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 - LINXY(__NR_io_uring_register, sys_io_uring_register), // 427 - -+ GENX_(__NR_clone3, sys_ni_syscall), // 435 -+ - LINX_(__NR_faccessat2, sys_faccessat2), // 439 - }; - -diff --git a/coregrind/m_syswrap/syswrap-s390x-linux.c b/coregrind/m_syswrap/syswrap-s390x-linux.c -index af6c4eb210..5283c19fe4 100644 ---- a/coregrind/m_syswrap/syswrap-s390x-linux.c -+++ b/coregrind/m_syswrap/syswrap-s390x-linux.c -@@ -864,6 +864,8 @@ static SyscallTableEntry syscall_table[] = { - LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 - LINXY(__NR_io_uring_register, sys_io_uring_register), // 427 - -+ GENX_(__NR_clone3, sys_ni_syscall), // 435 -+ - LINX_(__NR_faccessat2, sys_faccessat2), // 439 - }; - -diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c -index 67d866497d..418c769750 100644 ---- a/coregrind/m_syswrap/syswrap-x86-linux.c -+++ b/coregrind/m_syswrap/syswrap-x86-linux.c -@@ -1645,6 +1645,8 @@ static SyscallTableEntry syscall_table[] = { - LINXY(__NR_io_uring_enter, sys_io_uring_enter), // 426 - LINXY(__NR_io_uring_register, sys_io_uring_register),// 427 - -+ GENX_(__NR_clone3, sys_ni_syscall), // 435 -+ - LINX_(__NR_faccessat2, sys_faccessat2), // 439 - }; - -diff --git a/include/vki/vki-scnums-shared-linux.h b/include/vki/vki-scnums-shared-linux.h -index c8bc31b4b3..6c70c9981d 100644 ---- a/include/vki/vki-scnums-shared-linux.h -+++ b/include/vki/vki-scnums-shared-linux.h -@@ -39,6 +39,8 @@ - #define __NR_fsmount 432 - #define __NR_fspick 433 - -+#define __NR_clone3 435 -+ - #define __NR_faccessat2 439 - - #endif --- -2.27.0 - diff --git a/meta/recipes-devtools/valgrind/valgrind/6da22a4d246519cd1a638cfc7eff00cdd74413c4.patch b/meta/recipes-devtools/valgrind/valgrind/6da22a4d246519cd1a638cfc7eff00cdd74413c4.patch deleted file mode 100644 index fce66b96ae..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/6da22a4d246519cd1a638cfc7eff00cdd74413c4.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6da22a4d246519cd1a638cfc7eff00cdd74413c4 Mon Sep 17 00:00:00 2001 -From: Mark Wielaard <mark@klomp.org> -Date: Fri, 16 Jul 2021 21:37:21 +0200 -Subject: [PATCH] gdbserver_tests: update filters for newer glibc/gdb - -With newer glibc/gdb we might see a __select call without anything -following on the line. Also when gdb cannot find a file it might -now print "Inappropriate ioctl for device" instead of the message -"No such file or directory" - -Upstream-Status: Backport ---- - gdbserver_tests/filter_gdb | 1 + - gdbserver_tests/filter_vgdb | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/gdbserver_tests/filter_gdb b/gdbserver_tests/filter_gdb -index 3bcd26d86c..4a5b5d7a5b 100755 ---- a/gdbserver_tests/filter_gdb -+++ b/gdbserver_tests/filter_gdb -@@ -111,6 +111,7 @@ s/\(0x........\) in ?? ()$/\1 in syscall .../ - # If select.c sources are present, we can also get a line containing: - # return SYSCALL_CANCEL.... - s/in __select .*/in syscall .../ -+s/in __select$/in syscall .../ - /exceptfds/d - /sysv\/linux\/select\.c/d - /return SYSCALL_CANCEL /d -diff --git a/gdbserver_tests/filter_vgdb b/gdbserver_tests/filter_vgdb -index f8028a39ad..679ca4b31c 100755 ---- a/gdbserver_tests/filter_vgdb -+++ b/gdbserver_tests/filter_vgdb -@@ -18,6 +18,7 @@ sed -e '/relaying data between gdb and process/d' \ - - # filter some debuginfo problems with ld.so and SLES11 - sed -e '/^1 rtld.c: No such file or directory\./d' | -+sed -e '/rtld.c: Inappropriate ioctl for device\./d' | - - # and filter out any remaining empty lines - sed -e '/^$/d' --- -2.27.0 - 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..65de427d36 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 @@ -3,25 +3,23 @@ From: Aneesh Bansal <aneesh.bansal@freescale.com> Date: Mon, 21 Nov 2011 17:31:39 +0530 Subject: [PATCH] Added support for PPC instructions mfatbu, mfatbl. -Upstream-Status: Pending - -Signed-off-by: Aneesh Bansal <aneesh.bansal@freescale.com> ---- Currently 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 : dis_proc_ctl(ppc)(mfspr,SPR)(0x20F) disInstr(ppc): unhandled instruction: 0x7C0F82A6 +Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=289836] + +Signed-off-by: Aneesh Bansal <aneesh.bansal@freescale.com> +--- VEX/priv/guest_ppc_defs.h | 2 ++ VEX/priv/guest_ppc_helpers.c | 18 ++++++++++++++++++ VEX/priv/guest_ppc_toIR.c | 22 ++++++++++++++++++++++ 3 files changed, 42 insertions(+), 0 deletions(-) -diff --git a/VEX/priv/guest_ppc_defs.h b/VEX/priv/guest_ppc_defs.h -index dd3c62e..11a34aa 100644 --- a/VEX/priv/guest_ppc_defs.h +++ b/VEX/priv/guest_ppc_defs.h -@@ -146,6 +146,8 @@ extern UInt ppc32g_dirtyhelper_MFSPR_268_269 ( UInt ); +@@ -233,6 +233,8 @@ extern UInt ppc32g_dirtyhelper_MFSPR_268 extern UInt ppc32g_dirtyhelper_MFSPR_287 ( void ); @@ -30,11 +28,9 @@ index dd3c62e..11a34aa 100644 extern void ppc32g_dirtyhelper_LVS ( VexGuestPPC32State* gst, UInt vD_idx, UInt sh, UInt shift_right ); -diff --git a/VEX/priv/guest_ppc_helpers.c b/VEX/priv/guest_ppc_helpers.c -index 11aa428..b49ea3f 100644 --- a/VEX/priv/guest_ppc_helpers.c +++ b/VEX/priv/guest_ppc_helpers.c -@@ -119,6 +119,24 @@ UInt ppc32g_dirtyhelper_MFSPR_287 ( void ) +@@ -118,6 +118,24 @@ UInt ppc32g_dirtyhelper_MFSPR_287 ( void # endif } @@ -59,11 +55,9 @@ index 11aa428..b49ea3f 100644 /* CALLED FROM GENERATED CODE */ /* DIRTY HELPER (reads guest state, writes guest mem) */ -diff --git a/VEX/priv/guest_ppc_toIR.c b/VEX/priv/guest_ppc_toIR.c -index f8d220d..37c8974 100644 --- a/VEX/priv/guest_ppc_toIR.c +++ b/VEX/priv/guest_ppc_toIR.c -@@ -5657,6 +5657,28 @@ static Bool dis_proc_ctl ( VexAbiInfo* vbi, UInt theInstr ) +@@ -11875,6 +11875,28 @@ static Bool dis_proc_ctl ( const VexAbiI break; } @@ -92,5 +86,3 @@ index f8d220d..37c8974 100644 default: vex_printf("dis_proc_ctl(ppc)(mfspr,SPR)(0x%x)\n", SPR); return False; --- -1.7.0.4 diff --git a/meta/recipes-devtools/valgrind/valgrind/a1364805fc74b5690f763033c0c9b43f27613572.patch b/meta/recipes-devtools/valgrind/valgrind/a1364805fc74b5690f763033c0c9b43f27613572.patch deleted file mode 100644 index ece88406c6..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/a1364805fc74b5690f763033c0c9b43f27613572.patch +++ /dev/null @@ -1,1422 +0,0 @@ -From a1364805fc74b5690f763033c0c9b43f27613572 Mon Sep 17 00:00:00 2001 -From: Mark Wielaard <mark@klomp.org> -Date: Fri, 16 Jul 2021 15:47:08 -0400 -Subject: [PATCH] Update helgrind and drd suppression libc and libpthread paths - in glibc 2.34 - -glibc 2.34 moved all pthread functions into the main libc library. -And it changed the (in memory) path of the main libc library to -libc.so.6 (before it was libc-2.xx.so). - -This breaks various standard suppressions for helgrind and drd. -Fix this by doing a configure check for whether we are using glibc -2.34 by checking whether pthread_create is in libc instead of in -libpthread. If we are using glibc then define GLIBC_LIBC_PATH and -GLIBC_LIBPTHREAD_PATH variables that point to the (regexp) path -of the library that contains all libc functions and pthread functions -(which will be the same path for glibc 2.34+). - -Rename glibc-2.34567-NPTL-helgrind.supp to glibc-2.X-helgrind.supp.in -and glibc-2.X-drd.supp to glibc-2.X-drd.supp.in and replace the -GLIBC_LIBC_PATH and GLIBC_LIBPTHREAD_PATH at configure time. - -The same could be done for the glibc-2.X.supp.in file, but hasn't -yet because it looks like most suppressions in that file are obsolete. - -Upstream-Status: Backport ---- - Makefile.am | 2 +- - configure.ac | 37 +++++++++++++++++-- - glibc-2.X-drd.supp => glibc-2.X-drd.supp.in | 6 ++- - ...elgrind.supp => glibc-2.X-helgrind.supp.in | 16 ++++---- - 4 files changed, 47 insertions(+), 14 deletions(-) - rename glibc-2.X-drd.supp => glibc-2.X-drd.supp.in (97%) - rename glibc-2.34567-NPTL-helgrind.supp => glibc-2.X-helgrind.supp.in (95%) - -Index: valgrind-3.17.0/Makefile.am -=================================================================== ---- valgrind-3.17.0.orig/Makefile.am -+++ valgrind-3.17.0/Makefile.am -@@ -41,7 +41,7 @@ SUPP_FILES = \ - glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp \ - glibc-2.6.supp glibc-2.7.supp glibc-2.X.supp.in \ - xfree-3.supp xfree-4.supp \ -- glibc-2.34567-NPTL-helgrind.supp \ -+ glibc-2.X-helgrind.supp \ - glibc-2.2-LinuxThreads-helgrind.supp \ - glibc-2.X-drd.supp \ - darwin9.supp darwin9-drd.supp \ -Index: valgrind-3.17.0/configure.ac -=================================================================== ---- valgrind-3.17.0.orig/configure.ac -+++ valgrind-3.17.0/configure.ac -@@ -1090,6 +1090,31 @@ if test x$GLIBC_VERSION = x; then - fi - fi - -+# If this is glibc then figure out the generic (in file) libc.so and -+# libpthread.so file paths to use in suppressions. Before 2.34 libpthread -+# was a separate library, afterwards it was merged into libc.so and -+# the library is called libc.so.6 (before it was libc-2.[0-9]+.so). -+# Use this fact to set GLIBC_LIBC_PATH and GLIBC_LIBPTHREAD_PATH. -+case ${GLIBC_VERSION} in -+2*) -+ AC_MSG_CHECKING([whether pthread_create needs libpthread]) -+ AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_create])], -+ [ -+ AC_MSG_RESULT([no]) -+ GLIBC_LIBC_PATH="*/lib*/libc.so.6" -+ GLIBC_LIBPTHREAD_PATH="$GLIBC_LIBC_PATH" -+ ], [ -+ AC_MSG_RESULT([yes]) -+ GLIBC_LIBC_PATH="*/lib*/libc-2.*so*" -+ GLIBC_LIBPTHREAD_PATH="*/lib*/libpthread-2.*so*" -+ ]) -+ ;; -+*) -+ AC_MSG_CHECKING([not glibc...]) -+ AC_MSG_RESULT([${GLIBC_VERSION}]) -+ ;; -+esac -+ - AC_MSG_CHECKING([the glibc version]) - - case "${GLIBC_VERSION}" in -@@ -1102,13 +1127,13 @@ case "${GLIBC_VERSION}" in - 2.[[3-6]]) - AC_MSG_RESULT(${GLIBC_VERSION} family) - DEFAULT_SUPP="$srcdir/glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.X-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; - 2.[[7-9]]) - AC_MSG_RESULT(${GLIBC_VERSION} family) - DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.X-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; - 2.10|2.11) -@@ -1116,7 +1141,7 @@ case "${GLIBC_VERSION}" in - AC_DEFINE([GLIBC_MANDATORY_STRLEN_REDIRECT], 1, - [Define to 1 if strlen() has been optimized heavily (amd64 glibc >= 2.10)]) - DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.X-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; - 2.*) -@@ -1126,7 +1151,7 @@ case "${GLIBC_VERSION}" in - AC_DEFINE([GLIBC_MANDATORY_INDEX_AND_STRLEN_REDIRECT], 1, - [Define to 1 if index() and strlen() have been optimized heavily (x86 glibc >= 2.12)]) - DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -- DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="$srcdir/glibc-2.X-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; - darwin) -@@ -1157,6 +1182,8 @@ case "${GLIBC_VERSION}" in - esac - - AC_SUBST(GLIBC_VERSION) -+AC_SUBST(GLIBC_LIBC_PATH) -+AC_SUBST(GLIBC_LIBPTHREAD_PATH) - - - if test "$VGCONF_OS" != "solaris"; then -@@ -4910,6 +4937,8 @@ AC_CONFIG_FILES([ - valgrind.spec - valgrind.pc - glibc-2.X.supp -+ glibc-2.X-helgrind.supp -+ glibc-2.X-drd.supp - docs/Makefile - tests/Makefile - tests/vg_regtest -Index: valgrind-3.17.0/glibc-2.X-drd.supp -=================================================================== ---- valgrind-3.17.0.orig/glibc-2.X-drd.supp -+++ /dev/null -@@ -1,330 +0,0 @@ --# --# Suppression patterns for ld, the dynamic loader. --# -- --# Suppress all data races triggered by ld. --{ -- drd-ld -- drd:ConflictingAccess -- obj:*/lib*/ld-*.so --} -- --# --# Suppression patterns for libc. --# -- --# Suppress all data races where the topmost frame is inside libc.so. Although --# this could hide some real data races, unfortunately this is the only way to --# not report any false positives on stdio functions. The glibc functions --# manipulating FILE objects use locking primitives that cannot be intercepted --# easily. See also the definitions of _IO_lock_lock() etc. in the file --# nptl/sysdeps/pthread/bits/stdio-lock.h in the glibc source tree. --{ -- drd-libc-stdio -- drd:ConflictingAccess -- obj:*/lib*/libc-* --} --{ -- drd-libc-thread-cancellation-test -- drd:ConflictingAccess -- fun:write --} --{ -- drd-libc-random -- drd:ConflictingAccess -- fun:random_r -- fun:random --} -- --# --# Suppression patterns for libstdc++, the implementation of the standard C++ --# library included with the gcc compiler. --# --# Note: several versions of the libstdc++ library (4.2.2, 4.3.2, 4.4.0, 4.5.0 --# and their predecessors) contain an implementation of the std::string class --# that triggers conflicting memory accesses. See also --# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40518 --# -- --# { --# drd-libstdc++-std::string::string() --# drd:ConflictingAccess --# fun:_ZNSsC1ERKSs --# } -- --{ -- drd-libstdc++-cxa_guard_release -- drd:CondErr -- fun:pthread_cond_broadcast@* -- fun:__cxa_guard_release --} --{ -- drd-libstdc++-std::__ostream_insert() -- drd:ConflictingAccess -- fun:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l -- fun:_ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKc --} --{ -- drd-libstdc++-std::ostream::_M_insert<long>() -- drd:ConflictingAccess -- ... -- fun:_ZNSo9_M_insertIlEERSoT_ --} -- -- --# --# Suppression patterns for libpthread. --# -- --{ -- drd-libpthread-pthread_create -- drd:ConflictingAccess -- ... -- fun:pthread_create* --} --{ -- drd-libpthread-pthread_join -- drd:ConflictingAccess -- fun:pthread_join -- fun:pthread_join --} --{ -- drd-libpthread-__deallocate_stack -- drd:ConflictingAccess -- ... -- fun:__deallocate_stack --} --{ -- drd-libpthread-__free_stacks -- drd:ConflictingAccess -- fun:__free_stacks --} --{ -- drd-libpthread-__free_tcb -- drd:ConflictingAccess -- ... -- fun:__free_tcb --} --{ -- drd-libpthread-__nptl_deallocate_tsd -- drd:ConflictingAccess -- fun:__nptl_deallocate_tsd --} --{ -- drd-libpthread-pthread_detach -- drd:ConflictingAccess -- fun:pthread_detach -- fun:pthread_detach --} --{ -- drd-libpthread-pthread_once -- drd:ConflictingAccess -- fun:pthread_once --} --{ -- drd-libpthread-pthread_cancel_init -- drd:ConflictingAccess -- fun:pthread_cancel_init --} --{ -- drd-libpthread-pthread_cancel -- drd:ConflictingAccess -- fun:pthread_cancel -- fun:pthread_cancel_intercept --} --{ -- drd-libpthread-_Unwind_ForcedUnwind -- drd:ConflictingAccess -- ... -- fun:_Unwind_ForcedUnwind --} --{ -- drd-libpthread-_Unwind_GetCFA -- drd:ConflictingAccess -- fun:_Unwind_GetCFA --} --{ -- drd-libpthread-_Unwind_Resume -- drd:ConflictingAccess -- ... -- fun:_Unwind_Resume --} --{ -- drd-libpthread-? -- drd:ConflictingAccess -- obj:*/lib/libgcc_s.so.1 --} --{ -- drd-libpthread-nanosleep -- drd:ConflictingAccess -- fun:nanosleep --} -- --# --# Suppression patterns for libgomp. --# -- --# Unfortunately many statements in libgomp trigger conflicting accesses. It is --# not clear to me which of these are safe and which ones not. See also --# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40362 --{ -- drd-libgomp -- drd:ConflictingAccess -- obj:/usr/lib*/libgomp.so* --} -- --# --# Suppression patterns for libX11. --# -- --{ -- drd-libX11-XCreateFontSet -- drd:CondErr -- fun:pthread_cond_init* -- fun:_XReply -- fun:XListFontsWithInfo -- obj:/usr/lib*/libX11.so* -- fun:XCreateOC -- fun:XCreateFontSet --} -- --# --# Suppression patterns for libxcb. --# -- --{ -- drd-libxcb-xcb_wait_for_reply -- drd:CondErr -- ... -- fun:pthread_cond_destroy* -- fun:xcb_wait_for_reply --} -- --# --# Suppression patterns for libglib. --# -- --{ -- drd-libglib-access-g_threads_got_initialized -- drd:ConflictingAccess -- ... -- fun:g_slice_alloc -- fun:g_ptr_array_sized_new --} --{ -- drd-libglib-access-g_threads_got_initialized -- drd:ConflictingAccess -- ... -- fun:_ZN27QEventDispatcherGlibPrivateC1EP13_GMainContext -- fun:_ZN20QEventDispatcherGlibC1EP7QObject -- obj:/usr/lib*/libQtCore.so.4.* -- obj:/usr/lib*/libQtCore.so.4.* --} --{ -- drd-libglib-access-g_mem_initialized -- drd:ConflictingAccess -- fun:g_malloc0 --} --{ -- drd-libglib-g_private_get_posix_impl -- drd:ConflictingAccess -- fun:g_private_get_posix_impl --} --{ -- drd-libglib-g_private_set_posix_impl -- drd:ConflictingAccess -- fun:g_private_set_posix_impl --} --{ -- drd-libglib-g_get_language_names -- drd:ConflictingAccess -- fun:g_slice_free_chain_with_offset --} --{ -- drd-libglib-g_main_context_new -- drd:ConflictingAccess -- fun:fcntl -- obj:/usr/lib*/libglib-*.so* -- fun:g_main_context_new --} -- --# --# Suppression patterns for libQtCore. --# -- --{ -- drd-libQtCore-deref-that-calls-QThreadData-destructor -- drd:ConflictingAccess -- fun:_ZN11QThreadDataD1Ev -- obj:/usr/lib*/libQtCore.so.4.* --} --{ -- drd-libQtCore-4.0/4.1-Q_GLOBAL_STATIC-connectionList -- drd:ConflictingAccess -- obj:/usr/lib*/libQtCore.so.4.* -- fun:_ZN11QMetaObject8activateEP7QObjectiiPPv -- fun:_ZN11QMetaObject8activateEP7QObjectPKS_iPPv --} --{ -- drd-libQtCore-QObjectPrivate::clearGuards(QObject*) -- drd:ConflictingAccess -- fun:_ZN14QReadWriteLock12lockForWriteEv -- fun:_ZN14QObjectPrivate11clearGuardsEP7QObject -- fun:_ZN7QObjectD2Ev --} --{ -- drd-libQtCore-QObjectPrivate::clearGuards(QObject*) -- drd:ConflictingAccess -- fun:_ZN14QReadWriteLock12lockForWriteEv -- fun:_ZN12QWriteLocker6relockEv -- fun:_ZN12QWriteLockerC1EP14QReadWriteLock -- fun:_ZN14QObjectPrivate11clearGuardsEP7QObject -- fun:_ZN7QObjectD2Ev -- fun:_ZN24QAbstractEventDispatcherD2Ev -- fun:_ZN20QEventDispatcherGlibD0Ev --} --{ -- drd-libQtCore-QMutexPool::get(void const*) -- drd:ConflictingAccess -- fun:_ZN10QMutexPool3getEPKv --} --{ -- drd-libQtCore-qt_gettime_is_monotonic() -- drd:ConflictingAccess -- fun:_Z23qt_gettime_is_monotonicv --} -- --# --# Suppression patterns for libboost. --# -- --# Suppress the races on boost::once_flag::epoch and on --# boost::detail::this_thread_epoch. See also the source file --# boost/thread/pthread/once.hpp in the Boost source tree --# (https://svn.boost.org/trac/boost/browser/trunk/boost/thread/pthread/once.hpp). --{ -- drd-libboost-boost::call_once<void (*)()>(boost::once_flag&, void (*)()) -- drd:ConflictingAccess -- ... -- fun:_ZN5boost9call_onceIPFvvEEEvRNS_9once_flagET_ --} --{ -- drd-libboost-boost::detail::get_once_per_thread_epoch() -- drd:ConflictingAccess -- fun:_ZN5boost6detail25get_once_per_thread_epochEv --} --# Suppress the race reports on boost::detail::current_thread_tls_key. See also --# https://svn.boost.org/trac/boost/ticket/3526 for more information about why --# the access pattern of current_thread_tls_key is safe. --{ -- drd-libboost-boost::detail::get_current_thread_data() -- drd:ConflictingAccess -- ... -- fun:_ZN5boost6detail23get_current_thread_dataEv --} --{ -- drd-libboost-boost::detail::set_current_thread_data(boost::detail::thread_data_base*) -- drd:ConflictingAccess -- ... -- fun:_ZN5boost6detail23set_current_thread_dataEPNS0_16thread_data_baseE --} -Index: valgrind-3.17.0/glibc-2.X-drd.supp.in -=================================================================== ---- /dev/null -+++ valgrind-3.17.0/glibc-2.X-drd.supp.in -@@ -0,0 +1,332 @@ -+# IMPORTANT: DO NOT EDIT glibc-2.X-drd.supp, as it is as a generated -+# file. Instead edit glibc-2.X-drd.supp.in. -+# -+# Suppression patterns for ld, the dynamic loader. -+# -+ -+# Suppress all data races triggered by ld. -+{ -+ drd-ld -+ drd:ConflictingAccess -+ obj:*/lib*/ld*.so* -+} -+ -+# -+# Suppression patterns for libc. -+# -+ -+# Suppress all data races where the topmost frame is inside libc.so. Although -+# this could hide some real data races, unfortunately this is the only way to -+# not report any false positives on stdio functions. The glibc functions -+# manipulating FILE objects use locking primitives that cannot be intercepted -+# easily. See also the definitions of _IO_lock_lock() etc. in the file -+# nptl/sysdeps/pthread/bits/stdio-lock.h in the glibc source tree. -+{ -+ drd-libc-stdio -+ drd:ConflictingAccess -+ obj:@GLIBC_LIBC_PATH@ -+} -+{ -+ drd-libc-thread-cancellation-test -+ drd:ConflictingAccess -+ fun:write -+} -+{ -+ drd-libc-random -+ drd:ConflictingAccess -+ fun:random_r -+ fun:random -+} -+ -+# -+# Suppression patterns for libstdc++, the implementation of the standard C++ -+# library included with the gcc compiler. -+# -+# Note: several versions of the libstdc++ library (4.2.2, 4.3.2, 4.4.0, 4.5.0 -+# and their predecessors) contain an implementation of the std::string class -+# that triggers conflicting memory accesses. See also -+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40518 -+# -+ -+# { -+# drd-libstdc++-std::string::string() -+# drd:ConflictingAccess -+# fun:_ZNSsC1ERKSs -+# } -+ -+{ -+ drd-libstdc++-cxa_guard_release -+ drd:CondErr -+ fun:pthread_cond_broadcast@* -+ fun:__cxa_guard_release -+} -+{ -+ drd-libstdc++-std::__ostream_insert() -+ drd:ConflictingAccess -+ fun:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l -+ fun:_ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKc -+} -+{ -+ drd-libstdc++-std::ostream::_M_insert<long>() -+ drd:ConflictingAccess -+ ... -+ fun:_ZNSo9_M_insertIlEERSoT_ -+} -+ -+ -+# -+# Suppression patterns for libpthread. -+# -+ -+{ -+ drd-libpthread-pthread_create -+ drd:ConflictingAccess -+ ... -+ fun:pthread_create* -+} -+{ -+ drd-libpthread-pthread_join -+ drd:ConflictingAccess -+ fun:pthread_join -+ fun:pthread_join -+} -+{ -+ drd-libpthread-__deallocate_stack -+ drd:ConflictingAccess -+ ... -+ fun:__deallocate_stack -+} -+{ -+ drd-libpthread-__free_stacks -+ drd:ConflictingAccess -+ fun:__free_stacks -+} -+{ -+ drd-libpthread-__free_tcb -+ drd:ConflictingAccess -+ ... -+ fun:__free_tcb -+} -+{ -+ drd-libpthread-__nptl_deallocate_tsd -+ drd:ConflictingAccess -+ fun:__nptl_deallocate_tsd -+} -+{ -+ drd-libpthread-pthread_detach -+ drd:ConflictingAccess -+ fun:pthread_detach -+ fun:pthread_detach -+} -+{ -+ drd-libpthread-pthread_once -+ drd:ConflictingAccess -+ fun:pthread_once -+} -+{ -+ drd-libpthread-pthread_cancel_init -+ drd:ConflictingAccess -+ fun:pthread_cancel_init -+} -+{ -+ drd-libpthread-pthread_cancel -+ drd:ConflictingAccess -+ fun:pthread_cancel -+ fun:pthread_cancel_intercept -+} -+{ -+ drd-libpthread-_Unwind_ForcedUnwind -+ drd:ConflictingAccess -+ ... -+ fun:_Unwind_ForcedUnwind -+} -+{ -+ drd-libpthread-_Unwind_GetCFA -+ drd:ConflictingAccess -+ fun:_Unwind_GetCFA -+} -+{ -+ drd-libpthread-_Unwind_Resume -+ drd:ConflictingAccess -+ ... -+ fun:_Unwind_Resume -+} -+{ -+ drd-libpthread-? -+ drd:ConflictingAccess -+ obj:*/lib/libgcc_s.so.1 -+} -+{ -+ drd-libpthread-nanosleep -+ drd:ConflictingAccess -+ fun:nanosleep -+} -+ -+# -+# Suppression patterns for libgomp. -+# -+ -+# Unfortunately many statements in libgomp trigger conflicting accesses. It is -+# not clear to me which of these are safe and which ones not. See also -+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40362 -+{ -+ drd-libgomp -+ drd:ConflictingAccess -+ obj:/usr/lib*/libgomp.so* -+} -+ -+# -+# Suppression patterns for libX11. -+# -+ -+{ -+ drd-libX11-XCreateFontSet -+ drd:CondErr -+ fun:pthread_cond_init* -+ fun:_XReply -+ fun:XListFontsWithInfo -+ obj:/usr/lib*/libX11.so* -+ fun:XCreateOC -+ fun:XCreateFontSet -+} -+ -+# -+# Suppression patterns for libxcb. -+# -+ -+{ -+ drd-libxcb-xcb_wait_for_reply -+ drd:CondErr -+ ... -+ fun:pthread_cond_destroy* -+ fun:xcb_wait_for_reply -+} -+ -+# -+# Suppression patterns for libglib. -+# -+ -+{ -+ drd-libglib-access-g_threads_got_initialized -+ drd:ConflictingAccess -+ ... -+ fun:g_slice_alloc -+ fun:g_ptr_array_sized_new -+} -+{ -+ drd-libglib-access-g_threads_got_initialized -+ drd:ConflictingAccess -+ ... -+ fun:_ZN27QEventDispatcherGlibPrivateC1EP13_GMainContext -+ fun:_ZN20QEventDispatcherGlibC1EP7QObject -+ obj:/usr/lib*/libQtCore.so.4.* -+ obj:/usr/lib*/libQtCore.so.4.* -+} -+{ -+ drd-libglib-access-g_mem_initialized -+ drd:ConflictingAccess -+ fun:g_malloc0 -+} -+{ -+ drd-libglib-g_private_get_posix_impl -+ drd:ConflictingAccess -+ fun:g_private_get_posix_impl -+} -+{ -+ drd-libglib-g_private_set_posix_impl -+ drd:ConflictingAccess -+ fun:g_private_set_posix_impl -+} -+{ -+ drd-libglib-g_get_language_names -+ drd:ConflictingAccess -+ fun:g_slice_free_chain_with_offset -+} -+{ -+ drd-libglib-g_main_context_new -+ drd:ConflictingAccess -+ fun:fcntl -+ obj:/usr/lib*/libglib-*.so* -+ fun:g_main_context_new -+} -+ -+# -+# Suppression patterns for libQtCore. -+# -+ -+{ -+ drd-libQtCore-deref-that-calls-QThreadData-destructor -+ drd:ConflictingAccess -+ fun:_ZN11QThreadDataD1Ev -+ obj:/usr/lib*/libQtCore.so.4.* -+} -+{ -+ drd-libQtCore-4.0/4.1-Q_GLOBAL_STATIC-connectionList -+ drd:ConflictingAccess -+ obj:/usr/lib*/libQtCore.so.4.* -+ fun:_ZN11QMetaObject8activateEP7QObjectiiPPv -+ fun:_ZN11QMetaObject8activateEP7QObjectPKS_iPPv -+} -+{ -+ drd-libQtCore-QObjectPrivate::clearGuards(QObject*) -+ drd:ConflictingAccess -+ fun:_ZN14QReadWriteLock12lockForWriteEv -+ fun:_ZN14QObjectPrivate11clearGuardsEP7QObject -+ fun:_ZN7QObjectD2Ev -+} -+{ -+ drd-libQtCore-QObjectPrivate::clearGuards(QObject*) -+ drd:ConflictingAccess -+ fun:_ZN14QReadWriteLock12lockForWriteEv -+ fun:_ZN12QWriteLocker6relockEv -+ fun:_ZN12QWriteLockerC1EP14QReadWriteLock -+ fun:_ZN14QObjectPrivate11clearGuardsEP7QObject -+ fun:_ZN7QObjectD2Ev -+ fun:_ZN24QAbstractEventDispatcherD2Ev -+ fun:_ZN20QEventDispatcherGlibD0Ev -+} -+{ -+ drd-libQtCore-QMutexPool::get(void const*) -+ drd:ConflictingAccess -+ fun:_ZN10QMutexPool3getEPKv -+} -+{ -+ drd-libQtCore-qt_gettime_is_monotonic() -+ drd:ConflictingAccess -+ fun:_Z23qt_gettime_is_monotonicv -+} -+ -+# -+# Suppression patterns for libboost. -+# -+ -+# Suppress the races on boost::once_flag::epoch and on -+# boost::detail::this_thread_epoch. See also the source file -+# boost/thread/pthread/once.hpp in the Boost source tree -+# (https://svn.boost.org/trac/boost/browser/trunk/boost/thread/pthread/once.hpp). -+{ -+ drd-libboost-boost::call_once<void (*)()>(boost::once_flag&, void (*)()) -+ drd:ConflictingAccess -+ ... -+ fun:_ZN5boost9call_onceIPFvvEEEvRNS_9once_flagET_ -+} -+{ -+ drd-libboost-boost::detail::get_once_per_thread_epoch() -+ drd:ConflictingAccess -+ fun:_ZN5boost6detail25get_once_per_thread_epochEv -+} -+# Suppress the race reports on boost::detail::current_thread_tls_key. See also -+# https://svn.boost.org/trac/boost/ticket/3526 for more information about why -+# the access pattern of current_thread_tls_key is safe. -+{ -+ drd-libboost-boost::detail::get_current_thread_data() -+ drd:ConflictingAccess -+ ... -+ fun:_ZN5boost6detail23get_current_thread_dataEv -+} -+{ -+ drd-libboost-boost::detail::set_current_thread_data(boost::detail::thread_data_base*) -+ drd:ConflictingAccess -+ ... -+ fun:_ZN5boost6detail23set_current_thread_dataEPNS0_16thread_data_baseE -+} -Index: valgrind-3.17.0/glibc-2.34567-NPTL-helgrind.supp -=================================================================== ---- valgrind-3.17.0.orig/glibc-2.34567-NPTL-helgrind.supp -+++ /dev/null -@@ -1,301 +0,0 @@ -- --# FIXME 22 Jan 09: helgrind-glibc2X-005 overlaps with a lot of --# other stuff. They should be removed. -- --##----------------------------------------------------------------------## --# Suppressions for the Helgrind tool when using --# a glibc-2.{3,4,5,6,7,8,9} system -- --#################################################### --# glibc-2.X specific --# These are generic cover-alls which catch a lot of stuff --# in various combinations of ld, libc and libpthread --# --# Note this is heavyhanded and not very clever: --# --# - suppress anything that has its top frame in ld.so --# That's fine, since it's mostly dynamic linking stuff, --# which has various deliberate (harmless) races --# --# - suppress anything that has its top frame in libc.so. --# This really isn't clever, since it could hide some --# legitimate races. But the problem is, if we don't do --# this, then loads of errors to do with stdio are reported, because --# H fails to see glibc's internal locking/unlocking of FILE*s --# as required by POSIX. A better solution is needed. --# --# - some of the stdio functions in newer glibc manipulate stdio --# FILE*s state through mempcpy, which we intercept, so we also need --# to suppress such manipulations. -- --#{ --# helgrind-glibc2X-001 --# Helgrind:Race --# obj:*/lib*/ld-2.*so* --#} -- --# helgrind-glibc2X-002 was merged into helgrind-glibc2X-001 -- --# helgrind-glibc2X-003 was merged into helgrind-glibc2X-001 -- --{ -- helgrind-glibc2X-004 -- Helgrind:Race -- obj:*/lib*/libc-2.*so* --} -- --{ -- helgrind-glibc-io-xsputn-mempcpy -- Helgrind:Race -- fun:__GI_mempcpy -- fun:_IO_*xsputn* -- obj:*/lib*/libc-2.*so* --} -- --{ -- helgrind-glibc2X-005 -- Helgrind:Race -- obj:*/lib*/libpthread-2.*so* --} -- --# helgrind-glibc2X-006 was merged into helgrind-glibc2X-005 -- --# helgrind-glibc2X-007 was merged into helgrind-glibc2X-001 -- --# helgrind-glibc2X-008 was merged into helgrind-glibc2X-004 -- --# helgrind-glibc2X-009 was merged into helgrind-glibc2X-004 -- --# helgrind-glibc2X-010 was merged into helgrind-glibc2X-001 -- --# helgrind-glibc2X-011 was merged into helgrind-glibc2X-004 -- --# helgrind-glibc2X-012 was merged into helgrind-glibc2X-001 -- --# helgrind-glibc2X-013 was merged into helgrind-glibc2X-001 -- --# helgrind-glibc2X-014 was merged into helgrind-glibc2X-001 -- --# helgrind-glibc2X-015 was merged into helgrind-glibc2X-004 -- --# helgrind-glibc2X-016 was merged into helgrind-glibc2X-004 -- --# These are very ugly. They are needed to suppress errors inside (eg) --# NPTL's pthread_cond_signal. Why only one stack frame -- at least we --# should see the wrapper calling the real functions, right? --# Unfortunately, no: the real functions are handwritten assembly (in --# the glibc-2.5 sources) and does not create a proper stack frame. --# Therefore it's only one level of unwinding before we're back out in --# user code rather than the 2 levels you'd expect. --{ -- helgrind-glibc2X-101 -- Helgrind:Race -- obj:*/lib*/libpthread-2.*so* -- fun:pthread_* --} --{ -- helgrind-glibc2X-102 -- Helgrind:Race -- fun:mythread_wrapper -- obj:*/lib*/libpthread-2.*so* --} --{ -- helgrind-glibc2X-103 -- Helgrind:Race -- fun:pthread_cond_*@@GLIBC_2.* --} --{ -- helgrind-glibc2X-104 -- Helgrind:Race -- fun:__lll_mutex_* --} --{ -- helgrind-glibc2X-105 -- Helgrind:Race -- fun:pthread_rwlock_*lock* --} --{ -- helgrind-glibc2X-106 -- Helgrind:Race -- fun:__lll_lock_wait --} --{ -- helgrind-glibc2X-107 -- Helgrind:Race -- obj:*/lib*/libpthread-2.*so* -- fun:sem_* --} --{ -- helgrind-glibc2X-108 -- Helgrind:Race -- fun:clone --} --{ -- helgrind-glibc2X-109 -- Helgrind:Race -- fun:start_thread --} --{ -- helgrind-glibc2X-110 -- Helgrind:Race -- obj:*/lib*/libc-2.*so* -- fun:pthread_* --} --{ -- helgrind-glibc2X-111 -- Helgrind:Race -- fun:__lll_*lock_* --} --{ -- helgrind-glibc2X-113 -- Helgrind:Race -- fun:pthread_barrier_wait* --} -- -- --#################################################### --# qt4 specific (GNU mangling) --# --{ -- helgrind-qt4---QMutex::lock()-QMutex::lock() -- Helgrind:Race -- ... -- fun:_ZN6QMutex4lockEv -- fun:_ZN6QMutex4lockEv --} -- --{ -- helgrind-qt4---QMutex::unlock()-QMutex::unlock() -- Helgrind:Race -- ... -- fun:_ZN6QMutex6unlockEv -- fun:_ZN6QMutex6unlockEv --} -- --{ -- helgrind-qt4---pthread_setspecific-QThreadPrivate::start(void*) -- Helgrind:Race -- fun:pthread_setspecific -- fun:_ZN14QThreadPrivate5startEPv --} -- -- --#################################################### --# Other stuff. --# --# pthread_exit apparently calls some kind of unwind --# mechanism - maybe to remove some number of frames --# from the thread's stack, so as to get back to the --# outermost frame for the thread? Anyway.. -- --{ -- helgrind---*Unwind*-...-pthread_exit -- Helgrind:Race -- fun:*Unwind* -- ... -- fun:pthread_exit --} -- --{ -- helgrind---...-*Unwind*-*pthread_unwind* -- Helgrind:Race -- ... -- fun:*Unwind* -- fun:*pthread_unwind* --} -- --{ -- helgrind---...-*Unwind*-*pthread_unwind* -- Helgrind:Race -- ... -- fun:_Unwind* -- ... -- fun:_Unwind_Backtrace --} -- -- -- -- --#################################################### --# To do with thread stack allocation and deallocation? --# --{ -- helgrind---free_stacks-__deallocate_stack -- Helgrind:Race -- fun:free_stacks -- fun:__deallocate_stack --} -- --{ -- helgrind---__deallocate_stack-start_thread-clone -- Helgrind:Race -- fun:__deallocate_stack -- fun:start_thread -- fun:clone --} -- -- --#################################################### --# To do with pthread_{set,get}specific --# --{ -- helgrind---pthread_setspecific -- Helgrind:Race -- fun:pthread_setspecific --} -- --{ -- helgrind---pthread_getspecific -- Helgrind:Race -- fun:pthread_getspecific --} -- -- --#################################################### --# To do with dynamic linking --# --# helgrind---ld.so-...-dlsym was merged into helgrind-glibc2X-001 -- --{ -- helgrind---_dl_allocate_tls -- Helgrind:Race -- fun:mempcpy -- fun:_dl_allocate_tls_init -- ... -- fun:pthread_create@@GLIBC_2.2* -- fun:pthread_create_WRK -- fun:pthread_create@* --} -- --{ -- helgrind---_dl_allocate_tls2 -- Helgrind:Race -- fun:memcpy -- fun:__mempcpy_inline -- fun:_dl_allocate_tls_init -- ... -- fun:pthread_create@@GLIBC_2.2* -- fun:pthread_create_WRK -- fun:pthread_create@* --} -- --#################################################### --# To do with GNU libgomp --# --{ -- helgrind---libgomp43-1 -- Helgrind:Race -- fun:gomp_ordered_sync --} -- --{ -- helgrind---libgomp43-1 -- Helgrind:Race -- fun:gomp_ordered_next --} -- --{ -- helgrind---libgomp43-1 -- Helgrind:Race -- fun:gomp_ordered_last --} -Index: valgrind-3.17.0/glibc-2.X-helgrind.supp.in -=================================================================== ---- /dev/null -+++ valgrind-3.17.0/glibc-2.X-helgrind.supp.in -@@ -0,0 +1,303 @@ -+# IMPORTANT: DO NOT EDIT glibc-2.X-helgrind.supp, as it is as a generated -+# file. Instead edit glibc-2.X-helgrind.supp.in. -+ -+# FIXME 22 Jan 09: helgrind-glibc2X-005 overlaps with a lot of -+# other stuff. They should be removed. -+ -+##----------------------------------------------------------------------## -+# Suppressions for the Helgrind tool when using -+# a glibc-2.{3,4,5,6,7,8,9} system -+ -+#################################################### -+# glibc-2.X specific -+# These are generic cover-alls which catch a lot of stuff -+# in various combinations of ld, libc and libpthread -+# -+# Note this is heavyhanded and not very clever: -+# -+# - suppress anything that has its top frame in ld.so -+# That's fine, since it's mostly dynamic linking stuff, -+# which has various deliberate (harmless) races -+# -+# - suppress anything that has its top frame in libc.so. -+# This really isn't clever, since it could hide some -+# legitimate races. But the problem is, if we don't do -+# this, then loads of errors to do with stdio are reported, because -+# H fails to see glibc's internal locking/unlocking of FILE*s -+# as required by POSIX. A better solution is needed. -+# -+# - some of the stdio functions in newer glibc manipulate stdio -+# FILE*s state through mempcpy, which we intercept, so we also need -+# to suppress such manipulations. -+ -+#{ -+# helgrind-glibc2X-001 -+# Helgrind:Race -+# obj:*/lib*/ld-2.*so* -+#} -+ -+# helgrind-glibc2X-002 was merged into helgrind-glibc2X-001 -+ -+# helgrind-glibc2X-003 was merged into helgrind-glibc2X-001 -+ -+{ -+ helgrind-glibc2X-004 -+ Helgrind:Race -+ obj:@GLIBC_LIBC_PATH@ -+} -+ -+{ -+ helgrind-glibc-io-xsputn-mempcpy -+ Helgrind:Race -+ fun:__GI_mempcpy -+ fun:_IO_*xsputn* -+ obj:@GLIBC_LIBC_PATH@ -+} -+ -+{ -+ helgrind-glibc2X-005 -+ Helgrind:Race -+ obj:@GLIBC_LIBPTHREAD_PATH@ -+} -+ -+# helgrind-glibc2X-006 was merged into helgrind-glibc2X-005 -+ -+# helgrind-glibc2X-007 was merged into helgrind-glibc2X-001 -+ -+# helgrind-glibc2X-008 was merged into helgrind-glibc2X-004 -+ -+# helgrind-glibc2X-009 was merged into helgrind-glibc2X-004 -+ -+# helgrind-glibc2X-010 was merged into helgrind-glibc2X-001 -+ -+# helgrind-glibc2X-011 was merged into helgrind-glibc2X-004 -+ -+# helgrind-glibc2X-012 was merged into helgrind-glibc2X-001 -+ -+# helgrind-glibc2X-013 was merged into helgrind-glibc2X-001 -+ -+# helgrind-glibc2X-014 was merged into helgrind-glibc2X-001 -+ -+# helgrind-glibc2X-015 was merged into helgrind-glibc2X-004 -+ -+# helgrind-glibc2X-016 was merged into helgrind-glibc2X-004 -+ -+# These are very ugly. They are needed to suppress errors inside (eg) -+# NPTL's pthread_cond_signal. Why only one stack frame -- at least we -+# should see the wrapper calling the real functions, right? -+# Unfortunately, no: the real functions are handwritten assembly (in -+# the glibc-2.5 sources) and does not create a proper stack frame. -+# Therefore it's only one level of unwinding before we're back out in -+# user code rather than the 2 levels you'd expect. -+{ -+ helgrind-glibc2X-101 -+ Helgrind:Race -+ obj:@GLIBC_LIBPTHREAD_PATH@ -+ fun:pthread_* -+} -+{ -+ helgrind-glibc2X-102 -+ Helgrind:Race -+ fun:mythread_wrapper -+ obj:@GLIBC_LIBPTHREAD_PATH@ -+} -+{ -+ helgrind-glibc2X-103 -+ Helgrind:Race -+ fun:pthread_cond_*@@GLIBC_2.* -+} -+{ -+ helgrind-glibc2X-104 -+ Helgrind:Race -+ fun:__lll_mutex_* -+} -+{ -+ helgrind-glibc2X-105 -+ Helgrind:Race -+ fun:pthread_rwlock_*lock* -+} -+{ -+ helgrind-glibc2X-106 -+ Helgrind:Race -+ fun:__lll_lock_wait -+} -+{ -+ helgrind-glibc2X-107 -+ Helgrind:Race -+ obj:@GLIBC_LIBPTHREAD_PATH@ -+ fun:sem_* -+} -+{ -+ helgrind-glibc2X-108 -+ Helgrind:Race -+ fun:clone -+} -+{ -+ helgrind-glibc2X-109 -+ Helgrind:Race -+ fun:start_thread -+} -+{ -+ helgrind-glibc2X-110 -+ Helgrind:Race -+ obj:@GLIBC_LIBC_PATH@ -+ fun:pthread_* -+} -+{ -+ helgrind-glibc2X-111 -+ Helgrind:Race -+ fun:__lll_*lock_* -+} -+{ -+ helgrind-glibc2X-113 -+ Helgrind:Race -+ fun:pthread_barrier_wait* -+} -+ -+ -+#################################################### -+# qt4 specific (GNU mangling) -+# -+{ -+ helgrind-qt4---QMutex::lock()-QMutex::lock() -+ Helgrind:Race -+ ... -+ fun:_ZN6QMutex4lockEv -+ fun:_ZN6QMutex4lockEv -+} -+ -+{ -+ helgrind-qt4---QMutex::unlock()-QMutex::unlock() -+ Helgrind:Race -+ ... -+ fun:_ZN6QMutex6unlockEv -+ fun:_ZN6QMutex6unlockEv -+} -+ -+{ -+ helgrind-qt4---pthread_setspecific-QThreadPrivate::start(void*) -+ Helgrind:Race -+ fun:pthread_setspecific -+ fun:_ZN14QThreadPrivate5startEPv -+} -+ -+ -+#################################################### -+# Other stuff. -+# -+# pthread_exit apparently calls some kind of unwind -+# mechanism - maybe to remove some number of frames -+# from the thread's stack, so as to get back to the -+# outermost frame for the thread? Anyway.. -+ -+{ -+ helgrind---*Unwind*-...-pthread_exit -+ Helgrind:Race -+ fun:*Unwind* -+ ... -+ fun:pthread_exit -+} -+ -+{ -+ helgrind---...-*Unwind*-*pthread_unwind* -+ Helgrind:Race -+ ... -+ fun:*Unwind* -+ fun:*pthread_unwind* -+} -+ -+{ -+ helgrind---...-*Unwind*-*pthread_unwind* -+ Helgrind:Race -+ ... -+ fun:_Unwind* -+ ... -+ fun:_Unwind_Backtrace -+} -+ -+ -+ -+ -+#################################################### -+# To do with thread stack allocation and deallocation? -+# -+{ -+ helgrind---free_stacks-__deallocate_stack -+ Helgrind:Race -+ fun:free_stacks -+ fun:__deallocate_stack -+} -+ -+{ -+ helgrind---__deallocate_stack-start_thread-clone -+ Helgrind:Race -+ fun:__deallocate_stack -+ fun:start_thread -+ fun:clone -+} -+ -+ -+#################################################### -+# To do with pthread_{set,get}specific -+# -+{ -+ helgrind---pthread_setspecific -+ Helgrind:Race -+ fun:pthread_setspecific -+} -+ -+{ -+ helgrind---pthread_getspecific -+ Helgrind:Race -+ fun:pthread_getspecific -+} -+ -+ -+#################################################### -+# To do with dynamic linking -+# -+# helgrind---ld.so-...-dlsym was merged into helgrind-glibc2X-001 -+ -+{ -+ helgrind---_dl_allocate_tls -+ Helgrind:Race -+ fun:mempcpy -+ fun:_dl_allocate_tls_init -+ ... -+ fun:pthread_create@@GLIBC_2.2* -+ fun:pthread_create_WRK -+ fun:pthread_create@* -+} -+ -+{ -+ helgrind---_dl_allocate_tls2 -+ Helgrind:Race -+ fun:memcpy -+ fun:__mempcpy_inline -+ fun:_dl_allocate_tls_init -+ ... -+ fun:pthread_create@@GLIBC_2.2* -+ fun:pthread_create_WRK -+ fun:pthread_create@* -+} -+ -+#################################################### -+# To do with GNU libgomp -+# -+{ -+ helgrind---libgomp43-1 -+ Helgrind:Race -+ fun:gomp_ordered_sync -+} -+ -+{ -+ helgrind---libgomp43-1 -+ Helgrind:Race -+ fun:gomp_ordered_next -+} -+ -+{ -+ helgrind---libgomp43-1 -+ Helgrind:Race -+ fun:gomp_ordered_last -+} 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..82b8344279 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 @@ -8,7 +8,7 @@ test 64-bit float copies when building for ARM. Allow it to do so if possible, but fallback to C when building for ARM targets which don't support neon. -Upstream-Status: Pending +Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=454346] Signed-off-by: Andre McCurdy <armccurdy@gmail.com> --- diff --git a/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch b/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch index db6867f625..b9804e7451 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 @@ -From d85cc45e0ddeda68adf594dead715964cb32d0e7 Mon Sep 17 00:00:00 2001 +From beaa5b64c60d501fa9cd59fdc563e5f5bccf6882 Mon Sep 17 00:00:00 2001 From: Qing He <qing.he@intel.com> Date: Tue, 31 Aug 2010 22:51:58 +0800 Subject: [PATCH] valgrind: fix perl scripts @@ -17,34 +17,13 @@ a better fix would need: Upstream-Status: Inappropriate [configuration] Signed-off-by: Maxin B. John <maxin.john@intel.com> + --- - cachegrind/cg_annotate.in | 2 +- - cachegrind/cg_diff.in | 2 +- - massif/ms_print.in | 2 +- - perf/vg_perf.in | 2 +- - tests/vg_regtest.in | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) + massif/ms_print.in | 2 +- + perf/vg_perf.in | 2 +- + tests/vg_regtest.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in -index fea114b..5e814fd 100644 ---- a/cachegrind/cg_annotate.in -+++ b/cachegrind/cg_annotate.in -@@ -1,4 +1,4 @@ --#! @PERL@ -+#! /usr/bin/perl - - ##--------------------------------------------------------------------## - ##--- Cachegrind's annotator. cg_annotate.in ---## -diff --git a/cachegrind/cg_diff.in b/cachegrind/cg_diff.in -index 9d9258e..d0f0ec7 100755 ---- a/cachegrind/cg_diff.in -+++ b/cachegrind/cg_diff.in -@@ -1,4 +1,4 @@ --#! @PERL@ -+#! /usr/bin/perl - - ##--------------------------------------------------------------------## - ##--- Cachegrind's differencer. cg_diff.in ---## diff --git a/massif/ms_print.in b/massif/ms_print.in index a206ce4..df1bc31 100755 --- a/massif/ms_print.in @@ -66,7 +45,7 @@ index 90ee1d2..c585096 100644 ##--- Valgrind performance testing script vg_perf ---## ##--------------------------------------------------------------------## diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in -index 0fe6341..1b45eb7 100755 +index 7152765..ad18800 100755 --- a/tests/vg_regtest.in +++ b/tests/vg_regtest.in @@ -1,4 +1,4 @@ @@ -75,6 +54,3 @@ index 0fe6341..1b45eb7 100755 ##--------------------------------------------------------------------## ##--- Valgrind regression testing script vg_regtest ---## ##--------------------------------------------------------------------## --- -2.29.2 - diff --git a/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 b/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 index 440e8bec31..5bfba1c8d3 100644 --- a/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 +++ b/meta/recipes-devtools/valgrind/valgrind/remove-for-aarch64 @@ -1,217 +1,8 @@ -gdbserver_tests/hgtls -cachegrind/tests/ann1 -callgrind/tests/simwork1 -callgrind/tests/simwork2 -callgrind/tests/simwork3 -callgrind/tests/simwork-both -callgrind/tests/simwork-cache -callgrind/tests/threads -callgrind/tests/threads-use -drd/tests/annotate_barrier -drd/tests/annotate_barrier_xml -drd/tests/annotate_hbefore -drd/tests/annotate_hb_err -drd/tests/annotate_hb_race -drd/tests/annotate_ignore_read -drd/tests/annotate_ignore_rw -drd/tests/annotate_ignore_rw2 -drd/tests/annotate_ignore_write -drd/tests/annotate_ignore_write2 -drd/tests/annotate_order_1 -drd/tests/annotate_order_2 -drd/tests/annotate_order_3 -drd/tests/annotate_publish_hg -drd/tests/annotate_rwlock -drd/tests/annotate_rwlock_hg drd/tests/annotate_sem -drd/tests/annotate_smart_pointer -drd/tests/annotate_smart_pointer2 -drd/tests/annotate_spinlock -drd/tests/annotate_static -drd/tests/annotate_trace_memory -drd/tests/annotate_trace_memory_xml -drd/tests/atomic_var -drd/tests/bar_bad -drd/tests/bar_bad_xml -drd/tests/bar_trivial -drd/tests/bug-235681 -drd/tests/bug322621 -drd/tests/circular_buffer -drd/tests/concurrent_close -drd/tests/custom_alloc -drd/tests/custom_alloc_fiw -drd/tests/dlopen -drd/tests/fork-parallel -drd/tests/fork-serial -drd/tests/fp_race -drd/tests/fp_race2 -drd/tests/fp_race_xml -drd/tests/free_is_write -drd/tests/free_is_write2 -drd/tests/hg01_all_ok -drd/tests/hg02_deadlock -drd/tests/hg03_inherit -drd/tests/hg04_race -drd/tests/hg05_race2 -drd/tests/hg06_readshared -drd/tests/hold_lock_1 -drd/tests/hold_lock_2 -drd/tests/linuxthreads_det -drd/tests/matinv -drd/tests/memory_allocation -drd/tests/monitor_example -drd/tests/new_delete -drd/tests/pth_barrier -drd/tests/pth_barrier2 -drd/tests/pth_barrier3 -drd/tests/pth_barrier_race -drd/tests/pth_barrier_reinit -drd/tests/pth_barrier_thr_cr -drd/tests/pth_broadcast -drd/tests/pth_cancel_locked -drd/tests/pth_cleanup_handler -drd/tests/pth_cond_race -drd/tests/pth_cond_race2 -drd/tests/pth_detached2 -drd/tests/pth_detached3 -drd/tests/pth_detached_sem -drd/tests/pth_inconsistent_cond_wait -drd/tests/pth_mutex_reinit -drd/tests/pth_once -drd/tests/pth_process_shared_mutex -drd/tests/pth_spinlock -drd/tests/pth_uninitialized_cond -drd/tests/read_and_free_race -drd/tests/recursive_mutex -drd/tests/rwlock_race -drd/tests/rwlock_test -drd/tests/rwlock_type_checking -drd/tests/sem_as_mutex -drd/tests/sem_as_mutex2 -drd/tests/sem_as_mutex3 -drd/tests/sem_open -drd/tests/sem_open2 -drd/tests/sem_open3 -drd/tests/sem_open_traced -drd/tests/sem_wait -drd/tests/sigalrm -drd/tests/sigaltstack -drd/tests/std_atomic -drd/tests/std_string -drd/tests/std_thread -drd/tests/std_thread2 -drd/tests/str_tester -drd/tests/tc01_simple_race -drd/tests/tc02_simple_tls -drd/tests/tc03_re_excl -drd/tests/tc04_free_lock -drd/tests/tc05_simple_race -drd/tests/tc06_two_races -drd/tests/tc07_hbl1 -drd/tests/tc08_hbl2 -drd/tests/tc09_bad_unlock -drd/tests/tc10_rec_lock -drd/tests/tc11_XCHG -drd/tests/tc12_rwl_trivial -drd/tests/tc13_laog1 -drd/tests/tc15_laog_lockdel -drd/tests/tc16_byterace -drd/tests/tc17_sembar -drd/tests/tc18_semabuse -drd/tests/tc19_shadowmem -drd/tests/tc21_pthonce -drd/tests/tc22_exit_w_lock -drd/tests/tc23_bogus_condwait -helgrind/tests/annotate_rwlock -helgrind/tests/annotate_smart_pointer -helgrind/tests/bar_bad -helgrind/tests/bar_trivial -helgrind/tests/bug322621 -helgrind/tests/cond_init_destroy -helgrind/tests/cond_timedwait_invalid -helgrind/tests/cond_timedwait_test -helgrind/tests/free_is_write -helgrind/tests/hg01_all_ok -helgrind/tests/hg03_inherit -helgrind/tests/hg04_race +gdbserver_tests/hgtls helgrind/tests/hg05_race2 -helgrind/tests/hg06_readshared -helgrind/tests/locked_vs_unlocked1_fwd -helgrind/tests/locked_vs_unlocked1_rev -helgrind/tests/locked_vs_unlocked2 -helgrind/tests/locked_vs_unlocked3 -helgrind/tests/pth_barrier1 -helgrind/tests/pth_barrier2 -helgrind/tests/pth_barrier3 -helgrind/tests/pth_destroy_cond -helgrind/tests/rwlock_race -helgrind/tests/rwlock_test -helgrind/tests/shmem_abits -helgrind/tests/stackteardown -helgrind/tests/t2t_laog -helgrind/tests/tc01_simple_race -helgrind/tests/tc02_simple_tls -helgrind/tests/tc03_re_excl -helgrind/tests/tc04_free_lock -helgrind/tests/tc05_simple_race -helgrind/tests/tc06_two_races -helgrind/tests/tc06_two_races_xml -helgrind/tests/tc07_hbl1 -helgrind/tests/tc08_hbl2 -helgrind/tests/tc09_bad_unlock -helgrind/tests/tc10_rec_lock -helgrind/tests/tc11_XCHG -helgrind/tests/tc12_rwl_trivial -helgrind/tests/tc13_laog1 -helgrind/tests/tc14_laog_dinphils -helgrind/tests/tc15_laog_lockdel -helgrind/tests/tc16_byterace -helgrind/tests/tc17_sembar -helgrind/tests/tc18_semabuse -helgrind/tests/tc19_shadowmem helgrind/tests/tc20_verifywrap -helgrind/tests/tc21_pthonce -helgrind/tests/tc22_exit_w_lock -helgrind/tests/tc23_bogus_condwait -helgrind/tests/tc24_nonzero_sem -helgrind/tests/tls_threads -memcheck/tests/accounting -memcheck/tests/addressable -memcheck/tests/arm64-linux/scalar -memcheck/tests/atomic_incs -memcheck/tests/badaddrvalue -memcheck/tests/badfree -memcheck/tests/badfree-2trace -memcheck/tests/badfree3 -memcheck/tests/badjump -memcheck/tests/badjump2 -memcheck/tests/badloop -memcheck/tests/badpoll -memcheck/tests/badrw -memcheck/tests/big_blocks_freed_list -memcheck/tests/brk2 memcheck/tests/dw4 -memcheck/tests/err_disable4 -memcheck/tests/err_disable_arange1 -memcheck/tests/leak-autofreepool-5 -memcheck/tests/leak_cpp_interior -memcheck/tests/linux/lsframe1 -memcheck/tests/linux/lsframe2 -memcheck/tests/linux/with-space -memcheck/tests/origin5-bz2 -memcheck/tests/origin6-fp -memcheck/tests/overlap -memcheck/tests/partial_load_dflt -memcheck/tests/pdb-realloc2 -memcheck/tests/sh-mem -memcheck/tests/sh-mem-random -memcheck/tests/sigaltstack -memcheck/tests/sigkill -memcheck/tests/signal2 -memcheck/tests/supp_unknown -memcheck/tests/threadname -memcheck/tests/threadname_xml -memcheck/tests/unit_oset memcheck/tests/varinfo1 memcheck/tests/varinfo2 memcheck/tests/varinfo3 @@ -219,22 +10,23 @@ memcheck/tests/varinfo4 memcheck/tests/varinfo5 memcheck/tests/varinfo6 memcheck/tests/varinforestrict -memcheck/tests/vcpu_bz2 -memcheck/tests/vcpu_fbench -memcheck/tests/vcpu_fnfns -memcheck/tests/wcs -memcheck/tests/wrap1 -memcheck/tests/wrap2 -memcheck/tests/wrap3 -memcheck/tests/wrap4 -memcheck/tests/wrap5 -memcheck/tests/wrap6 -memcheck/tests/wrap7 -memcheck/tests/wrap8 -memcheck/tests/wrapmalloc -memcheck/tests/wrapmallocstatic -memcheck/tests/writev1 -memcheck/tests/xml1 -memcheck/tests/linux/stack_changes -gdbserver_tests/hginfo -memcheck/tests/linux/timerfd-syscall +memcheck/tests/atomic_incs +memcheck/tests/bug464969_d_demangle +memcheck/tests/cxx17_aligned_new +memcheck/tests/demangle +memcheck/tests/long_namespace_xml +memcheck/tests/mismatches +memcheck/tests/mismatches_xml +memcheck/tests/new_aligned_delete_default +memcheck/tests/new_delete_mismatch_size +memcheck/tests/new_nothrow +memcheck/tests/realloc_size_zero_mismatch +memcheck/tests/sized_aligned_new_delete_args +memcheck/tests/sized_aligned_new_delete_misaligned1 +memcheck/tests/sized_aligned_new_delete_misaligned1_xml +memcheck/tests/sized_aligned_new_delete_misaligned2 +memcheck/tests/sized_aligned_new_delete_misaligned2_xml +memcheck/tests/sized_aligned_new_delete_misaligned3 +memcheck/tests/sized_aligned_new_delete_misaligned3_xml +memcheck/tests/sized_delete +none/tests/bigcode diff --git a/meta/recipes-devtools/valgrind/valgrind/remove-for-all b/meta/recipes-devtools/valgrind/valgrind/remove-for-all index cb8d10b18f..8435a6d41d 100644 --- a/meta/recipes-devtools/valgrind/valgrind/remove-for-all +++ b/meta/recipes-devtools/valgrind/valgrind/remove-for-all @@ -1,8 +1,29 @@ +cachegrind/tests/wrap5 +drd/tests/boost_thread none/tests/amd64/fb_test_amd64 +none/tests/tls gdbserver_tests/hginfo +gdbserver_tests/mcinvokeRU +memcheck/tests/linux/dlclose_leak-no-keep +memcheck/tests/linux/dlclose_leak +memcheck/tests/linux/timerfd-syscall memcheck/tests/supp_unknown +memcheck/tests/wrap1 +memcheck/tests/wrap2 +memcheck/tests/wrap3 +memcheck/tests/wrap4 +memcheck/tests/wrap5 +memcheck/tests/wrap6 +memcheck/tests/wrap7 +memcheck/tests/wrap8 helgrind/tests/tls_threads +helgrind/tests/pth_mempcpy_false_races +drd/tests/bar_bad drd/tests/bar_bad_xml drd/tests/pth_barrier_thr_cr +drd/tests/std_thread2 drd/tests/thread_name_xml massif/tests/deep-D +massif/tests/bug469146 +massif/tests/new-cpp +massif/tests/overloaded-new diff --git a/meta/recipes-devtools/valgrind/valgrind/run-ptest b/meta/recipes-devtools/valgrind/valgrind/run-ptest index caeae84d4f..15cf03f9d2 100755 --- a/meta/recipes-devtools/valgrind/valgrind/run-ptest +++ b/meta/recipes-devtools/valgrind/valgrind/run-ptest @@ -32,13 +32,16 @@ if [ "$arch" = "aarch64" ]; then done fi -echo "Run flaky tests using taskset to limit them to a single core." +echo "Run non-deterministic tests using taskset to limit them to a single core." for i in `cat taskset_nondeterministic_tests`; do - taskset 0x00000001 perl tests/vg_regtest --valgrind=${VALGRIND_BIN} --valgrind-lib=${VALGRIND_LIBEXECDIR} --yocto-ptest $i 2>&1|tee -a ${LOG} - mv $i.vgtest $i.IGNORE + # The remove-for-aarch64 and taskset_nondeterministic_tests may overlap so + # check if a file exist. + if test -f "${i}.vgtest"; then + taskset 0x00000001 perl tests/vg_regtest --valgrind=${VALGRIND_BIN} --valgrind-lib=${VALGRIND_LIBEXECDIR} --yocto-ptest $i 2>&1|tee -a ${LOG} + mv $i.vgtest $i.IGNORE + fi done - cd ${VALGRIND_LIB}/ptest && ./tests/vg_regtest \ --valgrind=${VALGRIND_BIN} \ --valgrind-lib=${VALGRIND_LIBEXECDIR} \ @@ -51,6 +54,13 @@ cd ${VALGRIND_LIB}/ptest && \ gdbserver_tests ${TOOLS} ${EXP_TOOLS} \ 2>&1|tee -a ${LOG} +echo "Restore non-deterministic tests" +for i in `cat taskset_nondeterministic_tests`; do + if test -f "${i}.vgtest.IGNORE"; then + mv $i.IGNORE $i.vgtest; + fi +done + if [ "$arch" = "aarch64" ]; then echo "Aarch64: Restore valgrind tests that result in defunct process and then out of memory" for i in `cat remove-for-aarch64`; do @@ -63,11 +73,6 @@ for i in `cat remove-for-all`; do mv $i.IGNORE $i.vgtest; done -echo "Restore flaky and other non-deterministic tests" -for i in `cat taskset_nondeterministic_tests`; do - mv $i.IGNORE $i.vgtest; -done - echo "Failed test details..." failed_tests=`grep FAIL: ${LOG} | awk '{print $2}'` for test in $failed_tests; do 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 bde1241dc7..3ab339d215 100644 --- a/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch +++ b/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch @@ -17,19 +17,14 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> VEX/priv/guest_s390_defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/VEX/priv/guest_s390_defs.h b/VEX/priv/guest_s390_defs.h -index 9054290..dab8002 100644 --- a/VEX/priv/guest_s390_defs.h +++ b/VEX/priv/guest_s390_defs.h @@ -284,7 +284,7 @@ typedef enum { - S390_VEC_OP_VBPERM, - S390_VEC_OP_VMSL, + S390_VEC_OP_VCLFNL, + S390_VEC_OP_VCRNF, S390_VEC_OP_LAST // supposed to be the last element in enum -} s390x_vec_op_t; +}; /* Arguments of s390x_dirtyhelper_vec_op(...) which are packed into one ULong variable. --- -2.29.2 - 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..afca874d02 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 @@ -15,18 +15,16 @@ over-ride that). See similar cases in none/tests/arm/Makefile.am -Upstream-Status: Pending +Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=454346] Signed-off-by: Andre McCurdy <armccurdy@gmail.com> --- none/tests/arm/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am -index 4507a20..825290f 100644 --- a/none/tests/arm/Makefile.am +++ b/none/tests/arm/Makefile.am -@@ -62,8 +62,10 @@ neon64_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \ +@@ -87,8 +87,10 @@ neon64_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=neon \ -mthumb @@ -39,6 +37,3 @@ index 4507a20..825290f 100644 +vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mfpu=vfpv3 + +vfpv4_fma_CFLAGS = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm --- -1.9.1 - 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..0895473fc0 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 @@ -16,11 +16,9 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> coregrind/m_redir.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c -index ff35009..d7d6816 100644 --- a/coregrind/m_redir.c +++ b/coregrind/m_redir.c -@@ -1275,7 +1275,18 @@ static void add_hardwired_spec (const HChar* sopatt, const HChar* fnpatt, +@@ -1307,7 +1307,18 @@ static void add_hardwired_spec (const H spec->to_addr = to_addr; spec->isWrap = False; spec->isGlobal = False; @@ -40,6 +38,3 @@ index ff35009..d7d6816 100644 /* VARIABLE PARTS */ spec->mark = False; /* not significant */ spec->done = False; /* not significant */ --- -1.9.1 - |