experimental/elfutils: bump to 0.179, fixup

10 files changed, 122 insertions, 142 deletions

diff --git a/experimental/elfutils/APKBUILD b/experimental/elfutils/APKBUILD
index 4a129216f..1548d1528 100644
--- a/experimental/elfutils/APKBUILD
+++ b/experimental/elfutils/APKBUILD
@@ -1,20 +1,21 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=elfutils
-pkgver=0.176
+pkgver=0.179
 pkgrel=0
 pkgdesc="A collection of utilities and DSOs to handle ELF files and DWARF data"
 url="https://sourceware.org/elfutils/"
 arch="all"
 license="GPL-3.0+ AND (GPL-2.0+ or LGPL-3.0+) AND LGPL-2.1+"
 depends=""
-makedepends="argp-standalone bsd-compat-headers bzip2-dev flex
-	fts-dev musl-obstack-dev xz-dev zlib-dev"
-subpackages="$pkgname-dev $pkgname-lang $pkgname-tools"
+makedepends="argp-standalone autoconf automake bsd-compat-headers
+	bzip2-dev flex fts-dev musl-obstack-dev xz-dev zlib-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-tools"
 source="https://sourceware.org/elfutils/ftp/$pkgver/$pkgname-$pkgver.tar.bz2
-	extmatch.patch
 	fix-aarch64_fregs.patch
 	fix-uninitialized.patch
+	getconf-long-bit.patch
+	musl-asm-ptrace-h.patch
 	musl-cdefs.patch
 	musl-fts-obstack.patch
 	musl-macros.patch
@@ -22,25 +23,8 @@ source="https://sourceware.org/elfutils/ftp/$pkgver/$pkgname-$pkgver.tar.bz2
 	musl-strerror_r.patch
 	musl-strndupa.patch
 	test-disable-backtrace.patch
-	test-disable-biarch.patch
-	error.h"
-
-# Internal only - should not be exposed to other packages
-somask="libebl_aarch64-$pkgver.so
-	libebl_alpha-$pkgver.so
-	libebl_arm-$pkgver.so
-	libebl_bpf-$pkgver.so
-	libebl_i386-$pkgver.so
-	libebl_ia64-$pkgver.so
-	libebl_m68k-$pkgver.so
-	libebl_ppc-$pkgver.so
-	libebl_ppc64-$pkgver.so
-	libebl_riscv-$pkgver.so
-	libebl_s390-$pkgver.so
-	libebl_sh-$pkgver.so
-	libebl_sparc-$pkgver.so
-	libebl_tilegx-$pkgver.so
-	libebl_x86_64-$pkgver.so"
+	error.h
+	"
 
 prepare() {
 	default_prepare
@@ -50,14 +34,18 @@ prepare() {
 }
 
 build() {
-	export CFLAGS="$CFLAGS -Wno-error -g"
+	export CFLAGS="$CFLAGS -Wno-error"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--localstatedir=/var
+		--localstatedir=/var \
+		--enable-deterministic-archives \
+		--disable-debuginfod \
+		--disable-symbol-versioning \
+		--with-biarch=no
 	make
 }
 
@@ -75,16 +63,16 @@ tools() {
 	mv "$pkgdir"/usr/bin/eu-* "$subpkgdir"/usr/bin
 }
 
-sha512sums="7f032913be363a43229ded85d495dcf7542b3c85974aaaba0d984228dc9ac1721da3dc388d3fa02325a80940161db7e9ad2c9e4521a424ad8a7d050c0902915b  elfutils-0.176.tar.bz2
+sha512sums="ff2d96ad1db08e3a2ddaa60bd5a05e9b61ffa71d646f889cebb6bef51322e874930809c6dd0a257ced8c6e8de4b59ecf13ca6741dc68f9400293208278a0c052  elfutils-0.179.tar.bz2
 c3676b0b8b40d6e437f5d88c0d658dc0829ec97d1955e4bbf96f4cff9ee9001b8f2f06174450ae7aa5858b91c7905bdbd49073b561c346416132338a9c94731b  fix-aarch64_fregs.patch
-8b421bc411fd240ada1d6f4010e222cb430bceebea613b79dc96d8244835b87272e9964f95c6ac54d054978fdc170f3b852606c207804df7fc261bb544f61c53  fix-uninitialized.patch
-3d8c7aee5d509486b680c1eb8903052060386520e8576068a8144019857933b86bd708c2a0a44c383667c4205888435402733dbd8ea0a88c32223a639b0404f0  extmatch.patch
-8c5c2fab616a01df7b57c9338122eb054503c0d76808d1914ae112106c2e73b9cef517719242b8ee3a78479e73e97187fe42d6e897e0b822e5a0a9e30b2246b9  musl-cdefs.patch
-7a22dc1a3423d1e4dd8f1ddbc5c1e1ee87db679d7b9fba0f7e695c207c9fefef5cacdee3d7c5b64ff2751a1d5b155751f0e77ee9af844048a32a8dd890623ef2  musl-fts-obstack.patch
-37a8cd13262115b64b51d47e9d5667185155d1b1159aa333ac34df7cc6d7d71d9c809a9fd99094e5f4102c6535a32f75159ac80f4986e029a0e2cd49b76884d3  musl-macros.patch
-38e5403d645fe2da4df9425c6a3fb00dc8ca8016ed86a19482de3d6a2e4200f3953e628b0a6bc33d3d3ce25733b7171ad887448e21981c0ae39343c163fdff41  musl-qsort_r.patch
+3a0996f33e485f4ed5fbb447e40be9ce078d2ad8a9d2e3bd4bc8295cbedbcd9f1799fafcbe36c060630e902054346b608770ce3d64a3d05af0128864f37f8353  fix-uninitialized.patch
+85ff9ca71220878fb947012e300e381d4309ee46aad7056ed0f6269d21a259f64f61a35f059586ec7ee13399aaaaab5004616263cf6f030d7c28bb60fff2adf6  getconf-long-bit.patch
+7c529f88dc248f657a8d690044560c20a222c5b37d0d7dcb057bf2eea8938c406cccd6129bce19542088511a026b233234c9a83933a525c4691810be9ca712bf  musl-asm-ptrace-h.patch
+f061fa2a62593a77fdb70d69ac81624a718381e748483855cbcd50be9e9a6f21ae3feea8a567108044c4afe808cd6948e82a69ccd9f8739d8d2aaa469d2973cb  musl-cdefs.patch
+9b21ba63246b0bcc733c9fc1f88fca28d8c91753cd1703a0727777c044bec4001ff36ae90c74f57727e189e88350772934c9223b948e6524f9cf619dbc5abec1  musl-fts-obstack.patch
+32b9ee6140ba0138a957422f452098caa5ebca850aa4705ffaf0bc2e91c9dd408a9d586007a1d186ec36ed12c9fcd6967f56e35a0587306781f6f7491a8c3ed9  musl-macros.patch
+86550bc04a26e3cece6b08f0fce7db8667946cfbd5eed31cdd956856b6d6bd0c3dd2cc81283b482efd1ec62d3356aacce61210811e2002915e05fa9b80d983ab  musl-qsort_r.patch
 a0d986100c8ff2ef0595645ec1b2eeb1d517b7442aef5f349ebf27fcb66c76e51fadeda25bed5f04b4bb16a61aa23ac6e86a1f34a0087d2136acf0f64c3fa4d1  musl-strerror_r.patch
 83ad42f672e1d5ca479bc44166c423624ab14d70f74bd6f703ef5fd98694ae201db975026ae8bd507d87b038e3403d878c90da40cfcf6d2364bbd3cad8cedb5b  musl-strndupa.patch
 edfeaad36b52997a43612b8bc2d26bcde7d2edb6b1b932e42f88a859c46747eb57a4ae963a98157e60d89f3d4f04efe50a69ea91cc0552cb5b0db17e8cc833c1  test-disable-backtrace.patch
-d3263c42b1638a416e95c2b8e68b15a9723e748490c8eca727da94bf7bb3dd8389222dd01bf69612ba45a20114ee1427d77935c41436d1ca9180fcfd71d3cdfe  test-disable-biarch.patch
 b33d7f210b9652b7b919afb32b4674ca125b660bf5f81fafb4e4e8405ea16be74ce85f653e6c0ac83e5fff1b192e82e273c5b5baa3802fdc7602edfa1086936d  error.h"
diff --git a/experimental/elfutils/extmatch.patch b/experimental/elfutils/extmatch.patch
deleted file mode 100644
index ea9d3653f..000000000
--- a/experimental/elfutils/extmatch.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- elfutils-0.176/src/elfcompress.c	2019-02-15 15:46:47.000000000 +0000
-+++ elfutils-0.176/src/elfcompress.c	2019-07-18 09:13:29.159806022 +0000
-@@ -134,8 +142,10 @@ parse_opt (int key, char *arg __attribut
-     case ARGP_KEY_SUCCESS:
-       if (type == T_UNSET)
- 	type = T_COMPRESS_ZLIB;
--      if (patterns == NULL)
--	add_pattern (".?(z)debug*");
-+      if (patterns == NULL) {
-+	add_pattern (".debug*");
-+	add_pattern (".zdebug*");
-+      }
-       break;
- 
-     case ARGP_KEY_NO_ARGS:
-@@ -1312,7 +1322,7 @@ main (int argc, char **argv)
- 	N_("What type of compression to apply. TYPE can be 'none' (decompress), 'zlib' (ELF ZLIB compression, the default, 'zlib-gabi' is an alias) or 'zlib-gnu' (.zdebug GNU style compression, 'gnu' is an alias)"),
- 	0 },
-       { "name", 'n', "SECTION", 0,
--	N_("SECTION name to (de)compress, SECTION is an extended wildcard pattern (defaults to '.?(z)debug*')"),
-+	N_("SECTION name to (de)compress, SECTION is an wildcard pattern (defaults to '.debug*' and '.zdebug*')"),
- 	0 },
-       { "verbose", 'v', NULL, 0,
- 	N_("Print a message for each section being (de)compressed"),
diff --git a/experimental/elfutils/fix-uninitialized.patch b/experimental/elfutils/fix-uninitialized.patch
index 5bc174c86..3a2ddd525 100644
--- a/experimental/elfutils/fix-uninitialized.patch
+++ b/experimental/elfutils/fix-uninitialized.patch
@@ -1,6 +1,6 @@
---- a/libcpu/i386_disasm.c	2015-08-21 14:22:37.000000000 +0200
-+++ b/libcpu/i386_disasm.c	2015-11-20 06:30:59.250629957 +0100
-@@ -710,6 +710,7 @@
+--- elfutils-0.179/libcpu/i386_disasm.c	2020-03-30 07:17:45.000000000 -0500
++++ elfutils-0.179/libcpu/i386_disasm.c	2020-04-17 03:48:44.199416141 -0500
+@@ -712,6 +712,7 @@ i386_disasm (Ebl *ebl __attribute__((unu
  
  		case 'm':
  		  /* Mnemonic.  */
diff --git a/experimental/elfutils/getconf-long-bit.patch b/experimental/elfutils/getconf-long-bit.patch
new file mode 100644
index 000000000..24f73c087
--- /dev/null
+++ b/experimental/elfutils/getconf-long-bit.patch
@@ -0,0 +1,23 @@
+Our getconf currently doesn't support LONG_BIT
+
+--- elfutils-0.179/tests/run-large-elf-file.sh	2020-03-30 07:17:45.000000000 -0500
++++ elfutils-0.179/tests/run-large-elf-file.sh	2020-04-17 01:16:37.479546189 -0500
+@@ -19,12 +19,14 @@
+ 
+ # Only run on 64bit systems, 32bit systems don't support > 4GB
+ # ELF files.
+-long_bit=$(getconf LONG_BIT)
+-echo "long_bit: $long_bit"
+-if test $long_bit -ne 64; then
++case "$(uname -m)" in
++*64)
++  ;;
++*)
+   echo "Only 64bit systems can create > 4GB ELF files"
+   exit 77
+-fi
++  ;;
++esac
+ 
+ # These tests need lots of disk space since they test files > 4GB.
+ # Skip if there just isn't enough (2.5 * 4 = 10GB).
diff --git a/experimental/elfutils/musl-asm-ptrace-h.patch b/experimental/elfutils/musl-asm-ptrace-h.patch
new file mode 100644
index 000000000..fc1468690
--- /dev/null
+++ b/experimental/elfutils/musl-asm-ptrace-h.patch
@@ -0,0 +1,10 @@
+--- a/backends/ppc_initreg.c	2019-11-26 23:48:42.000000000 +0100
++++ b/backends/ppc_initreg.c	2019-12-08 16:57:58.334872602 +0100
+@@ -32,6 +32,7 @@
+ 
+ #include <stdlib.h>
+ #if defined(__powerpc__) && defined(__linux__)
++# include <asm/ptrace.h>
+ # include <sys/ptrace.h>
+ # include <sys/user.h>
+ #endif
diff --git a/experimental/elfutils/musl-cdefs.patch b/experimental/elfutils/musl-cdefs.patch
index b74561f46..2c8dc4e50 100644
--- a/experimental/elfutils/musl-cdefs.patch
+++ b/experimental/elfutils/musl-cdefs.patch
@@ -1,5 +1,5 @@
---- elfutils-0.176/libelf/elf.h	2019-02-15 10:46:47.000000000 -0500
-+++ elfutils-0.176/libelf/elf.h	2019-07-18 01:52:14.789891340 -0400
+--- elfutils-0.179/libelf/elf.h	2020-03-30 07:17:45.000000000 -0500
++++ elfutils-0.179/libelf/elf.h	2020-04-17 03:48:44.199416141 -0500
 @@ -21,7 +21,9 @@
  
  #include <features.h>
@@ -11,9 +11,9 @@
  
  /* Standard ELF types.  */
  
-@@ -3915,6 +3917,8 @@ enum
- #define R_METAG_TLS_LE_HI16	60
- #define R_METAG_TLS_LE_LO16	61
+@@ -4007,6 +4009,8 @@ enum
+ #define R_NDS32_TLS_TPOFF	102
+ #define R_NDS32_TLS_DESC	119
  
 -__END_DECLS
 +#ifdef __cplusplus
diff --git a/experimental/elfutils/musl-fts-obstack.patch b/experimental/elfutils/musl-fts-obstack.patch
index a9e5fec71..610f0378f 100644
--- a/experimental/elfutils/musl-fts-obstack.patch
+++ b/experimental/elfutils/musl-fts-obstack.patch
@@ -1,6 +1,6 @@
---- a/configure.ac	2015-10-15 15:16:57.000000000 +0200
-+++ b/configure.ac	2015-11-20 05:32:57.723901582 +0100
-@@ -305,6 +305,62 @@
+--- elfutils-0.179/configure.ac	2020-03-30 07:17:45.000000000 -0500
++++ elfutils-0.179/configure.ac	2020-04-17 04:06:48.379400693 -0500
+@@ -538,6 +538,60 @@ else
  fi
  AC_SUBST([argp_LDADD])
  
@@ -58,58 +58,28 @@
 +fi
 +AC_SUBST([obstack_LDADD])
 +
-+dnl The directories with content.
-+
  dnl The directories with content.
  
  dnl Documentation.
---- a/src/Makefile.am.orig	2016-08-29 21:38:11.179295769 +0200
-+++ b/src/Makefile.am	2016-08-03 18:19:47.000000000 +0200
-@@ -67,22 +67,22 @@
- ar_no_Wstack_usage = yes
- unstrip_no_Wstack_usage = yes
- 
-+readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl
-+nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl \
--readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
--nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl \
- 	   $(demanglelib)
-+size_LDADD = $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD)
-+strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl
-+elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl
-+findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD)
-+addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) $(demanglelib)
-+elfcmp_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl
--size_LDADD = $(libelf) $(libeu) $(argp_LDADD)
--strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl
--elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
--findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD)
--addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(demanglelib)
--elfcmp_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
- objdump_LDADD  = $(libasm) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
-+ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD)
-+strings_LDADD = $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD)
-+ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD)
-+unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl
-+stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl $(demanglelib)
-+elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD)
--ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD)
--strings_LDADD = $(libelf) $(libeu) $(argp_LDADD)
--ar_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD)
--unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl
--stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl $(demanglelib)
--elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
- 
- installcheck-binPROGRAMS: $(bin_PROGRAMS)
-	bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \
---- a/libdw/Makefile.am.orig	2017-08-05 01:41:04.103553705 +0000
-+++ b/libdw/Makefile.am	2017-08-05 01:43:55.366543497 +0000
-@@ -105,7 +105,7 @@
- libdw_so_LIBS = libdw_pic.a ../libdwelf/libdwelf_pic.a \
- 	  ../libdwfl/libdwfl_pic.a ../libebl/libebl.a
+--- elfutils-0.179/src/Makefile.am	2020-03-30 07:17:45.000000000 -0500
++++ elfutils-0.179/src/Makefile.am	2020-04-17 04:06:48.379400693 -0500
+@@ -46,7 +46,7 @@ libelf = ../libelf/libelf.a -lz
+ else
+ libasm = ../libasm/libasm.so
+ libdw = ../libdw/libdw.so
+-libelf = ../libelf/libelf.so
++libelf = ../libelf/libelf.so $(fts_LDADD) $(obstack_LDADD)
+ endif
+ libebl = ../libebl/libebl.a ../backends/libebl_backends.a ../libcpu/libcpu.a
+ libeu = ../lib/libeu.a
+--- a/libdw/Makefile.am.orig
++++ b/libdw/Makefile.am
+@@ -109,7 +109,7 @@
+ 		../libcpu/libcpu_pic.a libdw_pic.a ../libdwelf/libdwelf_pic.a \
+ 		../libdwfl/libdwfl_pic.a
  libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so
--libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS)
-+libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) $(zip_LIBS)
+-libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) -pthread
++libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) $(zip_LIBS) -pthread
  libdw_so_SOURCES =
  libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS)
- # The rpath is necessary for libebl because its $ORIGIN use will
+ 	$(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \
diff --git a/experimental/elfutils/musl-macros.patch b/experimental/elfutils/musl-macros.patch
index fb44d4f33..37c14cd46 100644
--- a/experimental/elfutils/musl-macros.patch
+++ b/experimental/elfutils/musl-macros.patch
@@ -17,11 +17,11 @@
  
  /* State of -D/-U flags.  */
  extern bool arlib_deterministic_output;
---- a/src/elfcompress.c.orig	2016-04-02 12:51:26.903848894 +0200
-+++ b/src/elfcompress.c	2016-04-02 12:55:15.076996338 +0200
-@@ -35,6 +35,14 @@
- #include <gelf.h>
- #include "system.h"
+--- elfutils-0.179/src/elfcompress.c	2020-03-30 07:17:45.000000000 -0500
++++ elfutils-0.179/src/elfcompress.c	2020-04-17 04:03:53.719403182 -0500
+@@ -37,6 +37,14 @@
+ #include "libeu.h"
+ #include "printversion.h"
  
 +#if !defined(FNM_EXTMATCH)
 +# define FNM_EXTMATCH 0
@@ -32,11 +32,33 @@
 +#endif
 +
  /* Name and version of program.  */
- static void print_version (FILE *stream, struct argp_state *state);
  ARGP_PROGRAM_VERSION_HOOK_DEF = print_version;
---- a/src/strip.c.orig	2017-08-02 12:06:25.000000000 +0000
-+++ b/src/strip.c	2017-08-05 01:58:01.523493062 +0000
-@@ -47,6 +47,14 @@
+ 
+@@ -134,8 +142,10 @@ parse_opt (int key, char *arg __attribut
+     case ARGP_KEY_SUCCESS:
+       if (type == T_UNSET)
+ 	type = T_COMPRESS_ZLIB;
+-      if (patterns == NULL)
+-	add_pattern (".?(z)debug*");
++      if (patterns == NULL) {
++	add_pattern (".debug*");
++	add_pattern (".zdebug*");
++      }
+       break;
+ 
+     case ARGP_KEY_NO_ARGS:
+@@ -1312,7 +1322,7 @@ main (int argc, char **argv)
+ 	N_("What type of compression to apply. TYPE can be 'none' (decompress), 'zlib' (ELF ZLIB compression, the default, 'zlib-gabi' is an alias) or 'zlib-gnu' (.zdebug GNU style compression, 'gnu' is an alias)"),
+ 	0 },
+       { "name", 'n', "SECTION", 0,
+-	N_("SECTION name to (de)compress, SECTION is an extended wildcard pattern (defaults to '.?(z)debug*')"),
++	N_("SECTION name to (de)compress, SECTION is an wildcard pattern (defaults to '.debug*' and '.zdebug*')"),
+ 	0 },
+       { "verbose", 'v', NULL, 0,
+ 	N_("Print a message for each section being (de)compressed"),
+--- elfutils-0.179/src/strip.c	2020-03-30 07:17:45.000000000 -0500
++++ elfutils-0.179/src/strip.c	2020-04-17 04:03:53.719403182 -0500
+@@ -46,6 +46,14 @@
  #include <system.h>
  #include <printversion.h>
  
diff --git a/experimental/elfutils/musl-qsort_r.patch b/experimental/elfutils/musl-qsort_r.patch
index 9be21bd25..be9126a21 100644
--- a/experimental/elfutils/musl-qsort_r.patch
+++ b/experimental/elfutils/musl-qsort_r.patch
@@ -1,6 +1,6 @@
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -4773,10 +4773,11 @@ listptr_base (struct listptr *p)
+--- elfutils-0.179/src/readelf.c	2020-03-30 07:17:45.000000000 -0500
++++ elfutils-0.179/src/readelf.c	2020-04-17 03:48:44.199416141 -0500
+@@ -4829,10 +4829,11 @@ listptr_base (struct listptr *p)
    return cudie_base (&cu);
  }
  
@@ -14,7 +14,7 @@
    struct listptr *p1 = (void *) a;
    struct listptr *p2 = (void *) b;
  
-@@ -4792,21 +4793,21 @@ compare_listptr (const void *a, const void *b, void *arg)
+@@ -4848,21 +4849,21 @@ compare_listptr (const void *a, const vo
  	  p1->warned = p2->warned = true;
  	  error (0, 0,
  		 gettext ("%s %#" PRIx64 " used with different address sizes"),
@@ -39,7 +39,7 @@
  	}
        if (p1->attr != p2 ->attr)
  	{
-@@ -4814,7 +4815,7 @@ compare_listptr (const void *a, const void *b, void *arg)
+@@ -4870,7 +4871,7 @@ compare_listptr (const void *a, const vo
  	  error (0, 0,
  		 gettext ("%s %#" PRIx64
  			  " used with different attribute %s and %s"),
@@ -48,7 +48,7 @@
  		 dwarf_attr_name (p2->attr));
  	}
      }
-@@ -4885,9 +4886,11 @@ notice_listptr (enum section_e section, struct listptr_table *table,
+@@ -4941,9 +4942,11 @@ notice_listptr (enum section_e section,
  static void
  sort_listptr (struct listptr_table *table, const char *name)
  {
diff --git a/experimental/elfutils/test-disable-biarch.patch b/experimental/elfutils/test-disable-biarch.patch
deleted file mode 100644
index 809c3df1e..000000000
--- a/experimental/elfutils/test-disable-biarch.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-https://sourceware.org/PR24158
-
-Tets fails when 32-bit elfutils tries to dump 64-bit process.
---- a/tests/run-backtrace-native-biarch.sh
-+++ b/tests/run-backtrace-native-biarch.sh
-@@ -17,2 +17,3 @@
- 
-+ELFUTILS_DISABLE_BIARCH=yes # https://sourceware.org/PR24158
- if test -n "$ELFUTILS_DISABLE_BIARCH"; then