elfutils: bump to 0.163

Bugfix only release. Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com> SVN-Revision: 46136
2015-06-29 06:47:31 +00:00 · 2015-06-29 06:47:31 +00:00 · a47a5dd28d
commit a47a5dd28d
parent a742fcaf3b
6 changed files with 141 additions and 140 deletions
--- a/package/libs/elfutils/Makefile
+++ b/package/libs/elfutils/Makefile
@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=elfutils
-PKG_VERSION:=0.162
+PKG_VERSION:=0.163
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://fedorahosted.org/releases/e/l/$(PKG_NAME)/$(PKG_VERSION)
-PKG_MD5SUM:=9334cbcc0df7669b7bf07cf7fc3ad52c
+PKG_MD5SUM:=77ce87f259987d2e54e4d87b86cbee41
 PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>
 PKG_LICENSE:=GPL-3.0+
 PKG_LICENSE_FILES:=COPYING COPYING-GPLV2 COPYING-LGPLV3
--- a/package/libs/elfutils/patches/001-elfutils-portability.patch
+++ b/package/libs/elfutils/patches/001-elfutils-portability.patch
@ -1,3 +1,4 @@
+diffelfutils/backends/ChangeLog git-portable/backends/ChangeLog
 --- a/backends/ChangeLog
 +++ b/backends/ChangeLog
@@ -498,6 +498,10 @@
@ -46,17 +47,17 @@
 libebl_i386.so: $(cpu_i386)
 --- a/backends/Makefile.in
 +++ b/backends/Makefile.in
-@@ -83,7 +83,8 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- 	$(noinst_HEADERS) ChangeLog
+@@ -90,7 +90,8 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
 -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
 +@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING
 subdir = backends
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -289,6 +290,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -300,6 +301,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -64,7 +65,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -320,6 +322,7 @@ SHELL = @SHELL@
+@@ -331,6 +333,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@ -72,7 +73,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -387,14 +390,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
+@@ -398,14 +401,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
 
 # Warn about stack usage of more than 256K = 262144 bytes.
 @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144
@ -94,7 +95,7 @@
 CLEANFILES = *.gcno *.gcda $(foreach m,$(modules), libebl_$(m).map \
 	libebl_$(m).so $(am_libebl_$(m)_pic_a_OBJECTS))
 textrel_msg = echo "WARNING: TEXTREL found in '$@'"
-@@ -900,7 +903,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
+@@ -912,7 +915,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
 	$(LINK) -shared -o $(@:.map=.so) \
 		-Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
 		-Wl,--version-script,$(@:.so=.map) \
@ -105,7 +106,7 @@
 libebl_i386.so: $(cpu_i386)
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -253,6 +253,8 @@
+@@ -258,6 +258,8 @@
 
 2012-01-24  Mark Wielaard  <mjw@redhat.com>
 
@ -114,7 +115,7 @@
 	* COPYING: Fix address. Updated version from gnulib.
 
 2012-01-23  Mark Wielaard  <mjw@redhat.com>
-@@ -271,6 +273,9 @@
+@@ -276,6 +278,9 @@
 
 2011-10-08  Mike Frysinger  <vapier@gentoo.org>
 
@ -124,7 +125,7 @@
 	* configure.ac: Fix use of AC_ARG_ENABLE to handle $enableval correctly.
 
 2011-10-02  Ulrich Drepper  <drepper@gmail.com>
-@@ -292,6 +297,10 @@
+@@ -297,6 +302,10 @@
 
 	* configure.ac (LOCALEDIR, DATADIRNAME): Removed.
 
@ -135,7 +136,7 @@
 2009-09-21  Ulrich Drepper  <drepper@redhat.com>
 
 	* configure.ac: Update for more modern autoconf.
-@@ -300,6 +309,10 @@
+@@ -305,6 +314,10 @@
 
 	* configure.ac (zip_LIBS): Check for liblzma too.
 
@ -146,7 +147,7 @@
 2009-04-19  Roland McGrath  <roland@redhat.com>
 
 	* configure.ac (eu_version): Round down here, not in version.h macros.
-@@ -311,6 +324,8 @@
+@@ -316,6 +329,8 @@
 
 2009-01-23  Roland McGrath  <roland@redhat.com>
 
@ -155,7 +156,7 @@
 	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
 
 	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
-@@ -391,6 +406,10 @@
+@@ -396,6 +411,10 @@
 	* configure.ac: Add dummy automake conditional to get dependencies
 	for non-generic linker right.  See src/Makefile.am.
 
@ -166,7 +167,7 @@
 2005-11-18  Roland McGrath  <roland@redhat.com>
 
 	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -438,6 +457,17 @@
+@@ -443,6 +462,17 @@
 	* Makefile.am (all_SUBDIRS): Add libdwfl.
 	* configure.ac: Write libdwfl/Makefile.
 
@ -186,7 +187,7 @@
 	* configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
 --- a/config/ChangeLog
 +++ b/config/ChangeLog
-@@ -106,6 +106,10 @@
+@@ -110,6 +110,10 @@
 
 	* known-dwarf.awk: Use gawk.
 
@ -239,7 +240,7 @@
 DEFS.os = -DPIC -DSHARED
 --- a/config/Makefile.in
 +++ b/config/Makefile.in
-@@ -150,6 +150,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -160,6 +160,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -247,7 +248,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -181,6 +182,7 @@ SHELL = @SHELL@
+@@ -191,6 +192,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@ -388,7 +389,7 @@
 # ac_fn_c_try_run LINENO
 # ----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-@@ -4824,6 +4897,18 @@ else
+@@ -4825,6 +4898,18 @@ else
 fi
 
 
@ -407,7 +408,7 @@
 # We use -std=gnu99 but have explicit checks for some language constructs
 # and GNU extensions since some compilers claim GNU99 support, but don't
 # really support all language extensions. In particular we need
-@@ -4872,6 +4957,130 @@ if test "x$ac_cv_c99" != xyes; then :
+@@ -4873,6 +4958,130 @@ if test "x$ac_cv_c99" != xyes; then :
   as_fn_error $? "gcc with GNU99 support required" "$LINENO" 5
 fi
 
@ -538,7 +539,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread support" >&5
 $as_echo_n "checking for __thread support... " >&6; }
 if ${ac_cv_tls+:} false; then :
-@@ -4909,7 +5118,13 @@ fi
+@@ -4910,7 +5119,13 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5
 $as_echo "$ac_cv_tls" >&6; }
 if test "x$ac_cv_tls" != xyes; then :
@ -553,7 +554,7 @@
 fi
 
 # Check whether --enable-largefile was given.
-@@ -5317,6 +5532,22 @@ else
+@@ -5318,6 +5533,22 @@ else
 fi
 
 
@ -576,7 +577,7 @@
 # Check whether --enable-tests-rpath was given.
 if test "${enable_tests_rpath+set}" = set; then :
   enableval=$enable_tests_rpath; tests_use_rpath=$enableval
-@@ -6198,7 +6429,7 @@ case "$eu_version" in
+@@ -6199,7 +6430,7 @@ case "$eu_version" in
 esac
 
 # Round up to the next release API (x.y) version.
@ -585,7 +586,7 @@
 
 MODVERSION="Build for ${LIBEBL_SUBDIR} ${eu_version} ${ac_cv_build}"
 
-@@ -7087,6 +7318,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes
+@@ -7088,6 +7319,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes
   as_fn_error $? "conditional \"BUILD_STATIC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
@ -741,17 +742,17 @@
 # define OLD_VERSION(name, version) \
 --- a/lib/Makefile.in
 +++ b/lib/Makefile.in
-@@ -82,7 +82,8 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- 	$(noinst_HEADERS) ChangeLog
+@@ -89,7 +89,8 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
 -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
 +@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING
 subdir = lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -201,6 +202,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -212,6 +213,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -759,7 +760,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -232,6 +234,7 @@ SHELL = @SHELL@
+@@ -243,6 +245,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@ -767,7 +768,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -298,13 +301,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
+@@ -309,13 +312,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
 
 # Warn about stack usage of more than 256K = 262144 bytes.
 @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144
@ -802,10 +803,10 @@
 	* Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
 --- a/libasm/Makefile.in
 +++ b/libasm/Makefile.in
-@@ -83,9 +83,10 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- 	$(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog
+@@ -90,9 +90,10 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
 -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
 +@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING
@ -815,7 +816,7 @@
 subdir = libasm
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -252,6 +253,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -263,6 +264,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -823,7 +824,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -283,6 +285,7 @@ SHELL = @SHELL@
+@@ -294,6 +296,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = 1
@ -831,7 +832,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -350,14 +353,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
+@@ -361,14 +364,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
 
 # Warn about stack usage of more than 256K = 262144 bytes.
 @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144
@ -853,7 +854,7 @@
 CLEANFILES = *.gcno *.gcda $(am_libasm_pic_a_OBJECTS) \
 	libasm.so.$(VERSION)
 textrel_msg = echo "WARNING: TEXTREL found in '$@'"
-@@ -384,7 +387,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort
+@@ -395,7 +398,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort
 
 libasm_pic_a_SOURCES = 
 am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os)
@ -898,17 +899,17 @@
 		  else
 --- a/libcpu/Makefile.in
 +++ b/libcpu/Makefile.in
-@@ -84,7 +84,8 @@ DIST_COMMON = $(top_srcdir)/config/eu.am
- 	$(srcdir)/Makefile.am i386_lex.c i386_parse.c \
- 	$(top_srcdir)/config/depcomp $(top_srcdir)/config/ylwrap \
- 	$(am__noinst_HEADERS_DIST) ChangeLog
+@@ -90,7 +90,8 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
 -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
 +@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING
 @MAINTAINER_MODE_TRUE@noinst_PROGRAMS = i386_gendis$(EXEEXT)
 subdir = libcpu
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -227,6 +228,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -238,6 +239,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -916,7 +917,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = lex.$(<F:lex.l=)
-@@ -258,6 +260,7 @@ SHELL = @SHELL@
+@@ -269,6 +271,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@ -924,7 +925,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -325,13 +328,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
+@@ -336,13 +339,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
 
 # Warn about stack usage of more than 256K = 262144 bytes.
 @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144
@ -945,7 +946,7 @@
 textrel_msg = echo "WARNING: TEXTREL found in '$@'"
 --- a/libdw/ChangeLog
 +++ b/libdw/ChangeLog
-@@ -889,6 +889,10 @@
+@@ -904,6 +904,10 @@
 
 	* Makefile.am (known-dwarf.h): Run gawk on config/known-dwarf.awk.
 
@ -956,7 +957,7 @@
 2011-07-14  Mark Wielaard  <mjw@redhat.com>
 
 	* libdw.h (dwarf_offdie): Fix documentation to mention .debug_info.
-@@ -1248,6 +1252,10 @@
+@@ -1263,6 +1267,10 @@
 
 	* dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.
 
@ -967,7 +968,7 @@
 2009-08-10  Roland McGrath  <roland@redhat.com>
 
 	* dwarf_getscopevar.c: Use dwarf_diename.
-@@ -2016,6 +2024,11 @@
+@@ -2031,6 +2039,11 @@
 
 2005-05-31  Roland McGrath  <roland@redhat.com>
 
@ -1009,10 +1010,10 @@
 dwarf_whatattr (Dwarf_Attribute *attr)
 --- a/libdw/Makefile.in
 +++ b/libdw/Makefile.in
-@@ -84,8 +84,9 @@ DIST_COMMON = $(top_srcdir)/config/eu.am
- 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- 	$(include_HEADERS) $(noinst_HEADERS) $(pkginclude_HEADERS) \
- 	ChangeLog
+@@ -90,8 +90,9 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
 -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING
 -@BUILD_STATIC_TRUE@am__append_2 = -fpic
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
@ -1021,7 +1022,7 @@
 noinst_PROGRAMS = $(am__EXEEXT_1)
 subdir = libdw
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -302,6 +303,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -312,6 +313,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -1029,7 +1030,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -333,6 +335,7 @@ SHELL = @SHELL@
+@@ -343,6 +345,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = 1
@ -1037,7 +1038,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -399,13 +402,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
+@@ -409,13 +412,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
 
 # Warn about stack usage of more than 256K = 262144 bytes.
 @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144
@ -1058,17 +1059,17 @@
 @FATAL_TEXTREL_FALSE@textrel_found = $(textrel_msg)
 --- a/libdwelf/Makefile.in
 +++ b/libdwelf/Makefile.in
-@@ -82,7 +82,8 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- 	$(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog
+@@ -89,7 +89,8 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
 -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
 +@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING
 subdir = libdwelf
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -231,6 +232,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -242,6 +243,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -1076,7 +1077,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -262,6 +264,7 @@ SHELL = @SHELL@
+@@ -273,6 +275,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = 1
@ -1084,7 +1085,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -329,14 +332,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
+@@ -340,14 +343,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
 
 # Warn about stack usage of more than 256K = 262144 bytes.
 @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144
@ -1108,7 +1109,7 @@
 @FATAL_TEXTREL_FALSE@textrel_found = $(textrel_msg)
 --- a/libdwfl/ChangeLog
 +++ b/libdwfl/ChangeLog
-@@ -704,6 +704,21 @@
+@@ -713,6 +713,21 @@
 	(dwfl_module_addrsym) (i_to_symfile): New function.
 	(dwfl_module_addrsym) (search_table): Use it.
 
@ -1130,7 +1131,7 @@
 2013-11-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
 	    Mark Wielaard  <mjw@redhat.com>
 
-@@ -2469,6 +2484,11 @@
+@@ -2478,6 +2493,11 @@
 
 2005-07-21  Roland McGrath  <roland@redhat.com>
 
@ -1212,10 +1213,10 @@
 static void
 --- a/libdwfl/Makefile.in
 +++ b/libdwfl/Makefile.in
-@@ -82,10 +82,11 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- 	$(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog
+@@ -89,10 +89,11 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
 -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING
 -@ZLIB_TRUE@am__append_2 = gzip.c
 -@BZLIB_TRUE@am__append_3 = bzip2.c
@ -1228,7 +1229,7 @@
 subdir = libdwfl
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -290,6 +291,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -301,6 +302,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -1236,7 +1237,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -321,6 +323,7 @@ SHELL = @SHELL@
+@@ -332,6 +334,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = 1
@ -1244,7 +1245,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -388,14 +391,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
+@@ -399,14 +402,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
 
 # Warn about stack usage of more than 256K = 262144 bytes.
 @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144
@ -1266,7 +1267,7 @@
 CLEANFILES = *.gcno *.gcda $(am_libdwfl_pic_a_OBJECTS)
 textrel_msg = echo "WARNING: TEXTREL found in '$@'"
 @FATAL_TEXTREL_FALSE@textrel_found = $(textrel_msg)
-@@ -424,8 +427,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
+@@ -435,8 +438,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
 	dwfl_module_register_names.c dwfl_segment_report_module.c \
 	link_map.c core-file.c open.c image-header.c dwfl_frame.c \
 	frame_unwind.c dwfl_frame_pc.c linux-pid-attach.c \
@ -1279,7 +1280,7 @@
 libelf = ../libelf/libelf.so
 --- a/libebl/ChangeLog
 +++ b/libebl/ChangeLog
-@@ -780,6 +780,11 @@
+@@ -785,6 +785,11 @@
 	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
 	tracking works right.
 
@ -1293,17 +1294,17 @@
 	* libebl_x86_64.map: Add x86_64_core_note.
 --- a/libebl/Makefile.in
 +++ b/libebl/Makefile.in
-@@ -82,7 +82,8 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- 	$(noinst_HEADERS) $(pkginclude_HEADERS) ChangeLog
+@@ -89,7 +89,8 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
 -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
 +@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING
 subdir = libebl
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -253,6 +254,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -264,6 +265,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -1311,7 +1312,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -284,6 +286,7 @@ SHELL = @SHELL@
+@@ -295,6 +297,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = 1
@ -1319,7 +1320,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -351,13 +354,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
+@@ -362,13 +365,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
 
 # Warn about stack usage of more than 256K = 262144 bytes.
 @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144
@ -1340,7 +1341,7 @@
 @FATAL_TEXTREL_FALSE@textrel_found = $(textrel_msg)
 --- a/libelf/ChangeLog
 +++ b/libelf/ChangeLog
-@@ -398,6 +398,11 @@
+@@ -412,6 +412,11 @@
 
 	* elf-knowledge.h (SECTION_STRIP_P): Remove < SHT_NUM check.
 
@ -1352,7 +1353,7 @@
 2011-02-26  Mark Wielaard  <mjw@redhat.com>
 
 	* elf_end.c (elf_end): Call rwlock_unlock before rwlock_fini.
-@@ -1075,6 +1080,11 @@
+@@ -1089,6 +1094,11 @@
 
 	* elf.h: Update from glibc.
 
@ -1406,10 +1407,10 @@
 }
 --- a/libelf/Makefile.in
 +++ b/libelf/Makefile.in
-@@ -84,10 +84,11 @@ DIST_COMMON = $(top_srcdir)/config/eu.am
- 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- 	$(include_HEADERS) $(noinst_HEADERS) $(pkginclude_HEADERS) \
- 	ChangeLog
+@@ -90,10 +90,11 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
 -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING
 -@BUILD_STATIC_TRUE@am__append_2 = -fpic
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
@ -1421,7 +1422,7 @@
 subdir = libelf
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -295,6 +296,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -305,6 +306,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -1429,7 +1430,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -326,6 +328,7 @@ SHELL = @SHELL@
+@@ -336,6 +338,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = 1
@ -1437,7 +1438,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -391,13 +394,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
+@@ -401,13 +404,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
 
 # Warn about stack usage of more than 256K = 262144 bytes.
 @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144
@ -1456,7 +1457,7 @@
 CLEANFILES = *.gcno *.gcda $(am_libelf_pic_a_OBJECTS) \
 	libelf.so.$(VERSION)
 textrel_msg = echo "WARNING: TEXTREL found in '$@'"
-@@ -460,7 +464,7 @@ libelf_a_SOURCES = elf_version.c elf_has
+@@ -470,7 +474,7 @@ libelf_a_SOURCES = elf_version.c elf_has
 
 libelf_pic_a_SOURCES = 
 am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os)
@ -1467,7 +1468,7 @@
 		 version_xlate.h gnuhash_xlate.h note_xlate.h dl-hash.h
 --- a/m4/Makefile.in
 +++ b/m4/Makefile.in
-@@ -148,6 +148,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -159,6 +159,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -1475,7 +1476,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -179,6 +180,7 @@ SHELL = @SHELL@
+@@ -190,6 +191,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@ -1485,7 +1486,7 @@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -266,6 +266,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -277,6 +277,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -1493,7 +1494,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -297,6 +298,7 @@ SHELL = @SHELL@
+@@ -308,6 +309,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@ -1535,7 +1536,7 @@
 			     gettext ("cannot change modification time of %s"),
 --- a/src/ChangeLog
 +++ b/src/ChangeLog
-@@ -1598,8 +1598,16 @@
+@@ -1626,8 +1626,16 @@
 	* readelf.c (attr_callback): Use print_block only when we don't use
 	print_ops.
 
@ -1552,7 +1553,7 @@
 	* ar.c (do_oper_extract): Use pathconf instead of statfs.
 
 2009-08-01  Ulrich Drepper  <drepper@redhat.com>
-@@ -1763,6 +1771,8 @@
+@@ -1791,6 +1799,8 @@
 	* readelf.c (print_debug_frame_section): Use t instead of j formats
 	for ptrdiff_t OFFSET.
 
@ -1561,7 +1562,7 @@
 2009-01-21  Ulrich Drepper  <drepper@redhat.com>
 
 	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
-@@ -1946,6 +1956,11 @@
+@@ -1974,6 +1984,11 @@
 	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
 	is valid in RELRO.
 
@ -1573,7 +1574,7 @@
 2008-02-29  Roland McGrath  <roland@redhat.com>
 
 	* readelf.c (print_attributes): Add a cast.
-@@ -2197,6 +2212,8 @@
+@@ -2225,6 +2240,8 @@
 
 	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
 
@ -1582,7 +1583,7 @@
 2007-10-15  Roland McGrath  <roland@redhat.com>
 
 	* make-debug-archive.in: New file.
-@@ -2636,6 +2653,10 @@
+@@ -2664,6 +2681,10 @@
 	* elflint.c (valid_e_machine): Add EM_ALPHA.
 	Reported by Christian Aichinger <Greek0@gmx.net>.
 
@ -1593,7 +1594,7 @@
 2006-08-08  Ulrich Drepper  <drepper@redhat.com>
 
 	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -2712,6 +2733,10 @@
+@@ -2740,6 +2761,10 @@
 	* Makefile.am: Add hacks to create dependency files for non-generic
 	linker.
 
@ -1604,7 +1605,7 @@
 2006-06-12  Ulrich Drepper  <drepper@redhat.com>
 
 	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -3060,6 +3085,11 @@
+@@ -3088,6 +3113,11 @@
 	* readelf.c (print_debug_loc_section): Fix indentation for larger
 	address size.
 
@ -1618,7 +1619,7 @@
 	* readelf.c (print_debug_line_section): Print section offset of each
 --- a/src/findtextrel.c
 +++ b/src/findtextrel.c
-@@ -502,7 +502,11 @@ ptrcompare (const void *p1, const void *
+@@ -503,7 +503,11 @@ ptrcompare (const void *p1, const void *
 
 
 static void
@ -1664,17 +1665,17 @@
 nm_no_Wstack_usage = yes
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -85,7 +85,8 @@ DIST_COMMON = $(top_srcdir)/config/eu.am
- 	$(srcdir)/Makefile.am ldlex.c ldscript.c \
- 	$(top_srcdir)/config/depcomp $(top_srcdir)/config/ylwrap \
- 	$(noinst_HEADERS) ChangeLog
+@@ -91,7 +91,8 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
 -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
 +@SYMBOL_VERSIONING_TRUE@am__append_2 = -DSYMBOL_VERSIONING
 bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEEXT) size$(EXEEXT) \
 	strip$(EXEEXT) ld$(EXEEXT) elflint$(EXEEXT) \
 	findtextrel$(EXEEXT) addr2line$(EXEEXT) elfcmp$(EXEEXT) \
-@@ -94,9 +95,9 @@ bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEE
+@@ -100,9 +101,9 @@ bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEE
 @NATIVE_LD_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
 # We never build this library but we need to get the dependency files
 # of all the linker backends that might be used in a non-generic linker.
@ -1686,7 +1687,7 @@
 @NATIVE_LD_TRUE@am_libld_elf_i386_pic_a_OBJECTS =
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -164,7 +165,7 @@ am_ld_OBJECTS = ld.$(OBJEXT) ldgeneric.$
+@@ -172,7 +173,7 @@ am_ld_OBJECTS = ld.$(OBJEXT) ldgeneric.$
 	versionhash.$(OBJEXT)
 ld_OBJECTS = $(am_ld_OBJECTS)
 ld_DEPENDENCIES = $(libebl) $(libelf) $(libeu) $(am__DEPENDENCIES_1) \
@ -1695,7 +1696,7 @@
 ld_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ld_LDFLAGS) $(LDFLAGS) -o \
 	$@
 am_libld_elf_i386_so_OBJECTS =
-@@ -350,6 +351,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -361,6 +362,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -1703,7 +1704,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -381,6 +383,7 @@ SHELL = @SHELL@
+@@ -392,6 +394,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@ -1711,7 +1712,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -449,14 +452,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
+@@ -460,14 +463,14 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
 
 # Warn about stack usage of more than 256K = 262144 bytes.
 @ADD_STACK_USAGE_WARNING_TRUE@STACK_USAGE_WARNING = -Wstack-usage=262144
@ -1733,7 +1734,7 @@
 CLEANFILES = *.gcno *.gcda make-debug-archive none_ld.os \
 	$(ld_modules:.c=.os) *.gconv
 textrel_msg = echo "WARNING: TEXTREL found in '$@'"
-@@ -469,8 +472,8 @@ AM_LFLAGS = -Pld -olex.yy.c
+@@ -480,8 +483,8 @@ AM_LFLAGS = -Pld -olex.yy.c
 native_ld = @native_ld@
 ld_dsos = libld_elf_i386_pic.a
 @NATIVE_LD_FALSE@noinst_LIBRARIES = libld_elf.a libar.a $(ld_dsos) \
@ -1744,7 +1745,7 @@
 @NATIVE_LD_TRUE@native_ld_cflags = -DBASE_ELF_NAME=elf_$(base_cpu)
 @NEVER_TRUE@libdummy_a_SOURCES = i386_ld.c
 ld_SOURCES = ld.c ldgeneric.c ldlex.l ldscript.y symbolhash.c sectionhash.c \
-@@ -498,6 +501,11 @@ libeu = ../lib/libeu.a
+@@ -509,6 +512,11 @@ libeu = ../lib/libeu.a
 ldgeneric_no_Wunused = yes
 ldgeneric_no_Wstack_usage = yes
 
@ -1756,7 +1757,7 @@
 # Bad, bad stack usage...
 readelf_no_Wstack_usage = yes
 nm_no_Wstack_usage = yes
-@@ -517,7 +525,7 @@ nm_LDADD = $(libdw) $(libebl) $(libelf)
+@@ -528,7 +536,7 @@ nm_LDADD = $(libdw) $(libebl) $(libelf)
 size_LDADD = $(libelf) $(libeu) $(argp_LDADD)
 strip_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
 ld_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl \
@ -1767,7 +1768,7 @@
 findtextrel_LDADD = $(libdw) $(libelf) $(argp_LDADD)
 --- a/src/readelf.c
 +++ b/src/readelf.c
-@@ -4364,10 +4364,12 @@ listptr_base (struct listptr *p)
+@@ -4366,10 +4366,12 @@ listptr_base (struct listptr *p)
   return base;
 }
 
@ -1782,7 +1783,7 @@
   struct listptr *p1 = (void *) a;
   struct listptr *p2 = (void *) b;
 
-@@ -4463,8 +4465,11 @@ static void
+@@ -4465,8 +4467,11 @@ static void
 sort_listptr (struct listptr_table *table, const char *name)
 {
   if (table->n > 0)
@ -1796,7 +1797,7 @@
 }
 
 static bool
-@@ -9561,7 +9566,7 @@ dump_archive_index (Elf *elf, const char
+@@ -9563,7 +9568,7 @@ dump_archive_index (Elf *elf, const char
 	  if (unlikely (elf_rand (elf, as_off) == 0)
 	      || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
 			   == NULL))
@ -1888,7 +1889,7 @@
 #ifndef __linux__
 --- a/tests/ChangeLog
 +++ b/tests/ChangeLog
-@@ -609,6 +609,13 @@
+@@ -614,6 +614,13 @@
 
 2013-12-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
@ -1902,7 +1903,7 @@
 	* Makefile.am (check_PROGRAMS): Add backtrace, backtrace-child,
 	backtrace-data and backtrace-dwarf.
 	(BUILT_SOURCES, clean-local, backtrace-child-biarch): New.
-@@ -1473,6 +1480,8 @@
+@@ -1478,6 +1485,8 @@
 
 2008-01-21  Roland McGrath  <roland@redhat.com>
 
@ -1911,7 +1912,7 @@
 	* testfile45.S.bz2: Add tests for cltq, cqto.
 	* testfile45.expect.bz2: Adjust.
 
-@@ -2181,6 +2190,11 @@
+@@ -2186,6 +2195,11 @@
 	* Makefile.am (TESTS): Add run-elflint-test.sh.
 	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
 
@ -1946,10 +1947,10 @@
 funcscopes_LDADD = $(libdw) $(argp_LDADD)
 --- a/tests/Makefile.in
 +++ b/tests/Makefile.in
-@@ -80,14 +80,15 @@ host_triplet = @host@
- DIST_COMMON = $(top_srcdir)/config/eu.am $(srcdir)/Makefile.in \
- 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
- 	$(top_srcdir)/config/test-driver ChangeLog
+@@ -87,14 +87,15 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
 -@SYMBOL_VERSIONING_TRUE@am__append_1 = -DSYMBOL_VERSIONING
 -@STANDALONE_FALSE@am__append_2 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
@ -1966,7 +1967,7 @@
 check_PROGRAMS = arextract$(EXEEXT) arsymtest$(EXEEXT) \
 	newfile$(EXEEXT) saridx$(EXEEXT) scnnames$(EXEEXT) \
 	sectiondump$(EXEEXT) showptable$(EXEEXT) update1$(EXEEXT) \
-@@ -116,7 +117,7 @@ check_PROGRAMS = arextract$(EXEEXT) arsy
+@@ -123,7 +124,7 @@ check_PROGRAMS = arextract$(EXEEXT) arsy
 	aggregate_size$(EXEEXT) vdsosyms$(EXEEXT) getsrc_die$(EXEEXT) \
 	strptr$(EXEEXT) newdata$(EXEEXT) elfstrtab$(EXEEXT) \
 	$(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_4)
@ -1975,7 +1976,7 @@
 TESTS = run-arextract.sh run-arsymtest.sh newfile$(EXEEXT) \
 	test-nlist$(EXEEXT) update1$(EXEEXT) update2$(EXEEXT) \
 	update3$(EXEEXT) update4$(EXEEXT) run-show-die-info.sh \
-@@ -166,14 +167,14 @@ TESTS = run-arextract.sh run-arsymtest.s
+@@ -173,14 +174,14 @@ TESTS = run-arextract.sh run-arsymtest.s
 	run-allfcts-multi.sh run-deleted.sh run-linkmap-cut.sh \
 	run-aggregate-size.sh vdsosyms$(EXEEXT) run-readelf-A.sh \
 	run-getsrc-die.sh run-strptr.sh newdata$(EXEEXT) \
@ -1996,7 +1997,7 @@
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -819,6 +820,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -830,6 +831,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -2004,7 +2005,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -850,6 +852,7 @@ SHELL = @SHELL@
+@@ -861,6 +863,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@ -2012,7 +2013,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -910,26 +913,26 @@ top_build_prefix = @top_build_prefix@
+@@ -921,26 +924,26 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 zip_LIBS = @zip_LIBS@
@ -2048,7 +2049,7 @@
 @TESTS_RPATH_FALSE@tests_rpath = no
 @TESTS_RPATH_TRUE@tests_rpath = yes
 asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \
-@@ -1156,6 +1159,7 @@ get_lines_LDADD = $(libdw) $(libelf)
+@@ -1167,6 +1170,7 @@ get_lines_LDADD = $(libdw) $(libelf)
 get_files_LDADD = $(libdw) $(libelf)
 get_aranges_LDADD = $(libdw) $(libelf)
 allfcts_LDADD = $(libdw) $(libelf)
--- a/package/libs/elfutils/patches/005-build_only_libs.patch
+++ b/package/libs/elfutils/patches/005-build_only_libs.patch
@ -1,6 +1,6 @@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -363,8 +363,7 @@ ACLOCAL_AMFLAGS = -I m4
+@@ -374,8 +374,7 @@ ACLOCAL_AMFLAGS = -I m4
 pkginclude_HEADERS = version.h
 
 # Add doc back when we have some real content.
--- a/package/libs/elfutils/patches/006-libdw_LIBS.patch
+++ b/package/libs/elfutils/patches/006-libdw_LIBS.patch
@ -1,6 +1,6 @@
 --- a/libdw/Makefile.in
 +++ b/libdw/Makefile.in
-@@ -980,7 +980,7 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map l
+@@ -991,7 +991,7 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map l
 		-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
 		-Wl,--version-script,$<,--no-undefined \
 		-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
--- a/package/libs/elfutils/patches/100-musl-compat.patch
+++ b/package/libs/elfutils/patches/100-musl-compat.patch
@ -755,7 +755,7 @@
 typedef struct Dwfl Dwfl;
 --- a/libdwfl/find-debuginfo.c
 +++ b/libdwfl/find-debuginfo.c
-@@ -360,7 +360,7 @@ dwfl_standard_find_debuginfo (Dwfl_Modul
+@@ -361,7 +361,7 @@ dwfl_standard_find_debuginfo (Dwfl_Modul
       /* If FILE_NAME is a symlink, the debug file might be associated
 	 with the symlink target name instead.  */
 
--- a/package/libs/elfutils/patches/101-no-fts.patch
+++ b/package/libs/elfutils/patches/101-no-fts.patch
@ -72,7 +72,7 @@
 	struct parse_opt *opt = state->hook;
 --- a/libdwfl/Makefile.in
 +++ b/libdwfl/Makefile.in
-@@ -114,7 +114,7 @@ am__libdwfl_a_SOURCES_DIST = dwfl_begin.
+@@ -123,7 +123,7 @@ am__libdwfl_a_SOURCES_DIST = dwfl_begin.
 	dwfl_getmodules.c dwfl_getdwarf.c dwfl_module_getdwarf.c \
 	dwfl_module_getelf.c dwfl_validate_address.c argp-std.c \
 	find-debuginfo.c dwfl_build_id_find_elf.c \
@ -81,7 +81,7 @@
 	linux-proc-maps.c dwfl_addrmodule.c dwfl_addrdwarf.c cu.c \
 	dwfl_module_nextcu.c dwfl_nextcu.c dwfl_cumodule.c \
 	dwfl_module_addrdie.c dwfl_addrdie.c lines.c dwfl_lineinfo.c \
-@@ -143,7 +143,7 @@ am_libdwfl_a_OBJECTS = dwfl_begin.$(OBJE
+@@ -152,7 +152,7 @@ am_libdwfl_a_OBJECTS = dwfl_begin.$(OBJE
 	dwfl_validate_address.$(OBJEXT) argp-std.$(OBJEXT) \
 	find-debuginfo.$(OBJEXT) dwfl_build_id_find_elf.$(OBJEXT) \
 	dwfl_build_id_find_debuginfo.$(OBJEXT) \
@ -90,7 +90,7 @@
 	dwfl_addrmodule.$(OBJEXT) dwfl_addrdwarf.$(OBJEXT) \
 	cu.$(OBJEXT) dwfl_module_nextcu.$(OBJEXT) \
 	dwfl_nextcu.$(OBJEXT) dwfl_cumodule.$(OBJEXT) \
-@@ -413,7 +413,7 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
+@@ -424,7 +424,7 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
 	dwfl_getmodules.c dwfl_getdwarf.c dwfl_module_getdwarf.c \
 	dwfl_module_getelf.c dwfl_validate_address.c argp-std.c \
 	find-debuginfo.c dwfl_build_id_find_elf.c \
@ -99,7 +99,7 @@
 	linux-proc-maps.c dwfl_addrmodule.c dwfl_addrdwarf.c cu.c \
 	dwfl_module_nextcu.c dwfl_nextcu.c dwfl_cumodule.c \
 	dwfl_module_addrdie.c dwfl_addrdie.c lines.c dwfl_lineinfo.c \
-@@ -551,7 +551,6 @@ distclean-compile:
+@@ -561,7 +561,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lines.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link_map.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-core-attach.Po@am__quote@