summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2021-10-17 11:46:56 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2021-10-17 13:59:16 +0200
commit22e161e3608f8151b2e406e31e42a1b2138582f1 (patch)
treee1daeb2c153ff02c99c948523eb9e61cad413efd
parent1074e43e77d4ad90cfcee81ac06018ca58f9101c (diff)
downloadarbor-22e161e3608f8151b2e406e31e42a1b2138582f1.tar.gz
arbor-22e161e3608f8151b2e406e31e42a1b2138582f1.tar.xz
valgrind: Version bump to 3.18.1
-rw-r--r--packages/dev-util/valgrind/files/0001-Add-missing-musl.supp.patch72
-rw-r--r--packages/dev-util/valgrind/files/200b6a5a0ea3e1e154663b0fc575bfe2becf177d.patch35
-rw-r--r--packages/dev-util/valgrind/files/44da99781e5bb954a0cd3c897b859012a125fec6.patch37
-rw-r--r--packages/dev-util/valgrind/files/52ed51fc35f8a6148c2940eb46932b02dd3b9b23.patch172
-rw-r--r--packages/dev-util/valgrind/files/6da22a4d246519cd1a638cfc7eff00cdd74413c4.patch44
-rw-r--r--packages/dev-util/valgrind/files/a1364805fc74b5690f763033c0c9b43f27613572.patch244
-rw-r--r--packages/dev-util/valgrind/valgrind-3.17.0.exheres-019
-rw-r--r--packages/dev-util/valgrind/valgrind-3.18.1.exheres-010
8 files changed, 10 insertions, 623 deletions
diff --git a/packages/dev-util/valgrind/files/0001-Add-missing-musl.supp.patch b/packages/dev-util/valgrind/files/0001-Add-missing-musl.supp.patch
deleted file mode 100644
index 2a73f7e81..000000000
--- a/packages/dev-util/valgrind/files/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/packages/dev-util/valgrind/files/200b6a5a0ea3e1e154663b0fc575bfe2becf177d.patch b/packages/dev-util/valgrind/files/200b6a5a0ea3e1e154663b0fc575bfe2becf177d.patch
deleted file mode 100644
index eb9ecc64a..000000000
--- a/packages/dev-util/valgrind/files/200b6a5a0ea3e1e154663b0fc575bfe2becf177d.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Source/Upstream: Yes, fixed in git master
-Reason: glibc 2.34
-
-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.
----
- 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/packages/dev-util/valgrind/files/44da99781e5bb954a0cd3c897b859012a125fec6.patch b/packages/dev-util/valgrind/files/44da99781e5bb954a0cd3c897b859012a125fec6.patch
deleted file mode 100644
index 7611fc086..000000000
--- a/packages/dev-util/valgrind/files/44da99781e5bb954a0cd3c897b859012a125fec6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Source/Upstream: Yes, fixed in git master
-Reason: glibc 2.34
-
-From 44da99781e5bb954a0cd3c897b859012a125fec6 Mon Sep 17 00:00:00 2001
-From: Mark Wielaard <mark@klomp.org>
-Date: Fri, 6 Aug 2021 19:08:17 +0200
-Subject: [PATCH] unhandled ppc64le-linux syscall: 252 (statfs64) and 253
- (fstatfs64)
-
-glibc 2.34 consolidated all statfs implementations. All other arches
-that have statfs64/fstat64 (including ppc32) already had that syscall
-hooked up, it was just ppc64 that was missing it.
-
-https://bugs.kde.org/show_bug.cgi?id=440670
----
- NEWS | 1 +
- coregrind/m_syswrap/syswrap-ppc64-linux.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/coregrind/m_syswrap/syswrap-ppc64-linux.c b/coregrind/m_syswrap/syswrap-ppc64-linux.c
-index 76610e1423..f1a88f7ceb 100644
---- a/coregrind/m_syswrap/syswrap-ppc64-linux.c
-+++ b/coregrind/m_syswrap/syswrap-ppc64-linux.c
-@@ -900,8 +900,8 @@ static SyscallTableEntry syscall_table[] = {
-
- LINXY(__NR_tgkill, sys_tgkill), // 250
- // _____(__NR_utimes, sys_utimes), // 251
--// _____(__NR_statfs64, sys_statfs64), // 252
--// _____(__NR_fstatfs64, sys_fstatfs64), // 253
-+ GENXY(__NR_statfs64, sys_statfs64), // 252
-+ GENXY(__NR_fstatfs64, sys_fstatfs64), // 253
- // /* #define __NR_fadvise64_64 254 32bit only */
-
- // _____(__NR_rtas, sys_rtas), // 255
---
-2.27.0
-
diff --git a/packages/dev-util/valgrind/files/52ed51fc35f8a6148c2940eb46932b02dd3b9b23.patch b/packages/dev-util/valgrind/files/52ed51fc35f8a6148c2940eb46932b02dd3b9b23.patch
deleted file mode 100644
index c093225ff..000000000
--- a/packages/dev-util/valgrind/files/52ed51fc35f8a6148c2940eb46932b02dd3b9b23.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-Source/Upstream: Yes, fixed in git master
-Reason: glibc 2.34
-
-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
----
- 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/packages/dev-util/valgrind/files/6da22a4d246519cd1a638cfc7eff00cdd74413c4.patch b/packages/dev-util/valgrind/files/6da22a4d246519cd1a638cfc7eff00cdd74413c4.patch
deleted file mode 100644
index 987753bee..000000000
--- a/packages/dev-util/valgrind/files/6da22a4d246519cd1a638cfc7eff00cdd74413c4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Source/Upstream: Yes, fixed in git master
-Reason: glibc 2.34
-
-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"
----
- 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/packages/dev-util/valgrind/files/a1364805fc74b5690f763033c0c9b43f27613572.patch b/packages/dev-util/valgrind/files/a1364805fc74b5690f763033c0c9b43f27613572.patch
deleted file mode 100644
index 3205e7967..000000000
--- a/packages/dev-util/valgrind/files/a1364805fc74b5690f763033c0c9b43f27613572.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-Source/Upstream: Yes, fixed in git master
-Reason: glibc 2.34
-
-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.
----
- 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%)
-
-diff --git a/Makefile.am b/Makefile.am
-index 66848afaa0..f5935eb692 100644
---- a/Makefile.am
-+++ b/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 \
-diff --git a/configure.ac b/configure.ac
-index 4582fb5d09..beb5bba792 100755
---- a/configure.ac
-+++ b/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="glibc-${GLIBC_VERSION}.supp ${DEFAULT_SUPP}"
-- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+ DEFAULT_SUPP="glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="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-helgrind.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="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="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+ DEFAULT_SUPP="glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="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="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+ DEFAULT_SUPP="glibc-2.X-helgrind.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="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
-@@ -4928,6 +4955,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
-diff --git a/glibc-2.X-drd.supp b/glibc-2.X-drd.supp.in
-similarity index 97%
-rename from glibc-2.X-drd.supp
-rename to glibc-2.X-drd.supp.in
-index cee5f22fb1..9a9b6f0752 100644
---- a/glibc-2.X-drd.supp
-+++ b/glibc-2.X-drd.supp.in
-@@ -1,3 +1,5 @@
-+# 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.
- #
-@@ -6,7 +8,7 @@
- {
- drd-ld
- drd:ConflictingAccess
-- obj:*/lib*/ld-*.so
-+ obj:*/lib*/ld*.so*
- }
-
- #
-@@ -22,7 +24,7 @@
- {
- drd-libc-stdio
- drd:ConflictingAccess
-- obj:*/lib*/libc-*
-+ obj:@GLIBC_LIBC_PATH@
- }
- {
- drd-libc-thread-cancellation-test
-diff --git a/glibc-2.34567-NPTL-helgrind.supp b/glibc-2.X-helgrind.supp.in
-similarity index 95%
-rename from glibc-2.34567-NPTL-helgrind.supp
-rename to glibc-2.X-helgrind.supp.in
-index 7ebd2c4b4e..cecf3ceab9 100644
---- a/glibc-2.34567-NPTL-helgrind.supp
-+++ b/glibc-2.X-helgrind.supp.in
-@@ -1,3 +1,5 @@
-+# 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.
-@@ -41,7 +43,7 @@
- {
- helgrind-glibc2X-004
- Helgrind:Race
-- obj:*/lib*/libc-2.*so*
-+ obj:@GLIBC_LIBC_PATH@
- }
-
- {
-@@ -49,13 +51,13 @@
- Helgrind:Race
- fun:__GI_mempcpy
- fun:_IO_*xsputn*
-- obj:*/lib*/libc-2.*so*
-+ obj:@GLIBC_LIBC_PATH@
- }
-
- {
- helgrind-glibc2X-005
- Helgrind:Race
-- obj:*/lib*/libpthread-2.*so*
-+ obj:@GLIBC_LIBPTHREAD_PATH@
- }
-
- # helgrind-glibc2X-006 was merged into helgrind-glibc2X-005
-@@ -90,14 +92,14 @@
- {
- helgrind-glibc2X-101
- Helgrind:Race
-- obj:*/lib*/libpthread-2.*so*
-+ obj:@GLIBC_LIBPTHREAD_PATH@
- fun:pthread_*
- }
- {
- helgrind-glibc2X-102
- Helgrind:Race
- fun:mythread_wrapper
-- obj:*/lib*/libpthread-2.*so*
-+ obj:@GLIBC_LIBPTHREAD_PATH@
- }
- {
- helgrind-glibc2X-103
-@@ -122,7 +124,7 @@
- {
- helgrind-glibc2X-107
- Helgrind:Race
-- obj:*/lib*/libpthread-2.*so*
-+ obj:@GLIBC_LIBPTHREAD_PATH@
- fun:sem_*
- }
- {
-@@ -138,7 +140,7 @@
- {
- helgrind-glibc2X-110
- Helgrind:Race
-- obj:*/lib*/libc-2.*so*
-+ obj:@GLIBC_LIBC_PATH@
- fun:pthread_*
- }
- {
---
-2.27.0
-
diff --git a/packages/dev-util/valgrind/valgrind-3.17.0.exheres-0 b/packages/dev-util/valgrind/valgrind-3.17.0.exheres-0
deleted file mode 100644
index 04899d822..000000000
--- a/packages/dev-util/valgrind/valgrind-3.17.0.exheres-0
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2008, 2009, 2011, 2012 Ingmar Vanhassel <ingmar@exherbo.org>
-# Copyright 2021 Ali Polatel <alip@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-# Based in part upon 'valgrind-3.3.0.ebuild' from Gentoo, which is:
-# Copyright 1999-2008 Gentoo Foundation.
-
-require valgrind
-
-PLATFORMS="-* ~amd64 ~armv7 ~x86"
-
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/0001-Add-missing-musl.supp.patch
- "${FILES}"/6da22a4d246519cd1a638cfc7eff00cdd74413c4.patch
- "${FILES}"/200b6a5a0ea3e1e154663b0fc575bfe2becf177d.patch
- "${FILES}"/a1364805fc74b5690f763033c0c9b43f27613572.patch
- "${FILES}"/52ed51fc35f8a6148c2940eb46932b02dd3b9b23.patch
- "${FILES}"/44da99781e5bb954a0cd3c897b859012a125fec6.patch
-)
-
diff --git a/packages/dev-util/valgrind/valgrind-3.18.1.exheres-0 b/packages/dev-util/valgrind/valgrind-3.18.1.exheres-0
new file mode 100644
index 000000000..afa4cb985
--- /dev/null
+++ b/packages/dev-util/valgrind/valgrind-3.18.1.exheres-0
@@ -0,0 +1,10 @@
+# Copyright 2008, 2009, 2011, 2012 Ingmar Vanhassel <ingmar@exherbo.org>
+# Copyright 2021 Ali Polatel <alip@exherbo.org>
+# Distributed under the terms of the GNU General Public License v2
+# Based in part upon 'valgrind-3.3.0.ebuild' from Gentoo, which is:
+# Copyright 1999-2008 Gentoo Foundation.
+
+require valgrind
+
+PLATFORMS="-* ~amd64 ~armv7 ~x86"
+