diff options
| -rw-r--r-- | user/valgrind/APKBUILD | 12 | ||||
| -rw-r--r-- | user/valgrind/ppc64-support-tkill.patch | 14 | ||||
| -rw-r--r-- | user/valgrind/suppressions.patch | 24 |
3 files changed, 19 insertions, 31 deletions
diff --git a/user/valgrind/APKBUILD b/user/valgrind/APKBUILD index ff9c64d49..77772afc9 100644 --- a/user/valgrind/APKBUILD +++ b/user/valgrind/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=valgrind -pkgver=3.16.1 +pkgver=3.19.0 pkgrel=0 pkgdesc="A tool to help find memory-management problems in programs" url="http://valgrind.org/" @@ -18,9 +18,8 @@ subpackages="$pkgname-dev $pkgname-doc" source="ftp://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2 0001-Ensure-ELFv2-is-supported-on-PPC64.patch arm.patch + ppc64-support-tkill.patch realloc.patch - suppressions.patch - uclibc.patch " prepare() { @@ -62,9 +61,8 @@ package() { fi } -sha512sums="2a4173efe1b6facdd2f5c5ee8ed006704168eba1813736fccc8191d60363afd96197512cf42037e65f18d4ddd49adc74a54c47210df216fba3c46bf68ef0f950 valgrind-3.16.1.tar.bz2 +sha512sums="f720a89dc4c4989cc5714bff9efe97529f71990bcfad7a92b889ce099c4326d6da07fa4d5fbab2e9125e20f352354f6178471e49e419b613a3c82c2a1c667ab2 valgrind-3.19.0.tar.bz2 f90aa3cef5d3561d4602ff63b8f355b8427cbe6bb2ecd6bfc2e2bb063915fa40a70d923dbc60a643ee3fb7bcfbbddac049c6f6133c541189dd82b891f7ad9dbc 0001-Ensure-ELFv2-is-supported-on-PPC64.patch 9ee297d1b2b86891584443ad0caadc4977e1447979611ccf1cc55dbee61911b0b063bc4ad936d86c451cedae410cb3219b5a088b2ad0aa17df182d564fe36cfe arm.patch -57086a768f3876b26b0e507bc159a73f0955f03d5af8cc30e21103e348ca67f2e58b5555a5a97f299751c6602692ad43d8346bb68a80917d740fb4d65bba9665 realloc.patch -d011b2769d35ca3206967e6dac9f3fb24a6496e5bbfdc73342382245c89375b09d6948b10ba3cf8aa0050c79c0dd13b75764aec0ec5c6ac479fa930941067747 suppressions.patch -d59a10db9037e120df2ee94a103402ca95a79abee9d8be63e4e1bca29c82dca775cc402a79b854ec11a2160a4d2da202c237369418e221d1925267ea2613fd5d uclibc.patch" +daf819d0f9bbbaf4243c7bf931fed840f1f55304df1b45d4a72ceaf8403b8e0e1fc8079343b86106f0741aa812560a466389d7d3878c5547f3ff7a9e46e63df7 ppc64-support-tkill.patch +57086a768f3876b26b0e507bc159a73f0955f03d5af8cc30e21103e348ca67f2e58b5555a5a97f299751c6602692ad43d8346bb68a80917d740fb4d65bba9665 realloc.patch" diff --git a/user/valgrind/ppc64-support-tkill.patch b/user/valgrind/ppc64-support-tkill.patch new file mode 100644 index 000000000..b763be05e --- /dev/null +++ b/user/valgrind/ppc64-support-tkill.patch @@ -0,0 +1,14 @@ +On musl, the generic support works fine. + +This prevents spurious memcheck and cachegrind failures on ppc64. +--- valgrind-3.19.0/coregrind/m_syswrap/syswrap-ppc64-linux.c.old 2022-06-11 03:12:37.140000000 -0500 ++++ valgrind-3.19.0/coregrind/m_syswrap/syswrap-ppc64-linux.c 2022-06-11 03:13:33.550000000 -0500 +@@ -852,7 +852,7 @@ + GENX_(__NR_madvise, sys_madvise), // 205 + // _____(__NR_mincore, sys_mincore), // 206 + LINX_(__NR_gettid, sys_gettid), // 207 +-// _____(__NR_tkill, sys_tkill), // 208 ++ LINXY(__NR_tkill, sys_tkill), // 208 + LINX_(__NR_setxattr, sys_setxattr), // 209 + + LINX_(__NR_lsetxattr, sys_lsetxattr), // 210 diff --git a/user/valgrind/suppressions.patch b/user/valgrind/suppressions.patch deleted file mode 100644 index a91b93fdf..000000000 --- a/user/valgrind/suppressions.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- valgrind-3.13.0/configure.ac.old 2017-06-15 13:37:01.000000000 +0000 -+++ valgrind-3.13.0/configure.ac 2018-10-02 21:46:48.710000000 +0000 -@@ -1034,7 +1034,7 @@ - musl) - AC_MSG_RESULT(Musl) - AC_DEFINE([MUSL_LIBC], 1, [Define to 1 if you're using Musl libc]) -- # no DEFAULT_SUPP file yet for musl libc. -+ DEFAULT_SUPP="musl.supp ${DEFAULT_SUPP}" - ;; - 2.0|2.1|*) - AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) ---- /dev/null 2018-07-03 06:46:12.010000000 +0000 -+++ valgrind-3.13.0/musl.supp 2018-10-02 21:44:57.240000000 +0000 -@@ -0,0 +1,10 @@ -+# musl does not free `dso` structs allocated during linking on exit. -+{ -+ musl:dynlinker -+ Memcheck:Leak -+ match-leak-kinds: reachable -+ fun:calloc -+ ... -+ fun:__dls3 -+ obj:/lib/ld-musl-* -+} |