From 4605d9926cc9c4385d6cbb93cf82bcf11378b9d5ca5be1fbc578d7fda9f5e4fe Mon Sep 17 00:00:00 2001
From: Tony Jones <tonyj@suse.com>
Date: Thu, 14 Nov 2013 18:19:54 +0000
Subject: [PATCH] Accepting request 206750 from
 home:rudi_m:branches:Base:System

update to 0.157, see ChangeLog

OBS-URL: https://build.opensuse.org/request/show/206750
OBS-URL: https://build.opensuse.org/package/show/Base:System/elfutils?expand=0&rev=52
---
 elfutils-0.155.tar.bz2                  |   3 -
 elfutils-0.157.tar.bz2                  |   3 +
 elfutils-aarch64.patch                  | 203 --------
 elfutils-portability.patch              | 587 +++++++++++-------------
 elfutils-robustify.patch                | 332 ++++++--------
 elfutils-sizeof-pointer-memaccess.patch |  38 --
 elfutils.changes                        |  36 ++
 elfutils.spec                           |  10 +-
 8 files changed, 437 insertions(+), 775 deletions(-)
 delete mode 100644 elfutils-0.155.tar.bz2
 create mode 100644 elfutils-0.157.tar.bz2
 delete mode 100644 elfutils-aarch64.patch
 delete mode 100644 elfutils-sizeof-pointer-memaccess.patch

diff --git a/elfutils-0.155.tar.bz2 b/elfutils-0.155.tar.bz2
deleted file mode 100644
index 0ac2107..0000000
--- a/elfutils-0.155.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:68444a4526416ffd68852ec3c6a40ceddcca46538297322405319884c5d30ed8
-size 2477883
diff --git a/elfutils-0.157.tar.bz2 b/elfutils-0.157.tar.bz2
new file mode 100644
index 0000000..d438a38
--- /dev/null
+++ b/elfutils-0.157.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4fadc9c0c19d02fb6d2bdfee65f20ddbecba398d3f714e2b6c42ffc4615cce85
+size 2624207
diff --git a/elfutils-aarch64.patch b/elfutils-aarch64.patch
deleted file mode 100644
index 8f1fd86..0000000
--- a/elfutils-aarch64.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-Index: elfutils-0.155/config/config.guess
-===================================================================
---- elfutils-0.155.orig/config/config.guess
-+++ elfutils-0.155/config/config.guess
-@@ -17,9 +17,7 @@ timestamp='2012-01-01'
- # General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program; if not, see <http://www.gnu.org/licenses/>.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -202,6 +200,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- 	echo "${machine}-${os}${release}"
- 	exit ;;
-+    *:Bitrig:*:*)
-+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-+	exit ;;
-     *:OpenBSD:*:*)
- 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-@@ -279,7 +281,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- 	# Should we change UNAME_MACHINE based on the output of uname instead
- 	# of the specific Alpha model?
- 	echo alpha-pc-interix
--	exit ;;
-+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-+	exitcode=$?
-+	trap '' 0
-+	exit $exitcode ;;
-     21064:Windows_NT:50:3)
- 	echo alpha-dec-winnt3.5
- 	exit ;;
-@@ -863,6 +868,13 @@ EOF
-     i*86:Minix:*:*)
- 	echo ${UNAME_MACHINE}-pc-minix
- 	exit ;;
-+    aarch64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    aarch64_be:Linux:*:*)
-+	UNAME_MACHINE=aarch64_be
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-     alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- 	  EV5)   UNAME_MACHINE=alphaev5 ;;
-@@ -1196,6 +1208,9 @@ EOF
-     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
- 	echo i586-pc-haiku
- 	exit ;;
-+    x86_64:Haiku:*:*)
-+	echo x86_64-unknown-haiku
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
- 	exit ;;
-@@ -1251,7 +1266,10 @@ EOF
-     NEO-?:NONSTOP_KERNEL:*:*)
- 	echo neo-tandem-nsk${UNAME_RELEASE}
- 	exit ;;
--    NSE-?:NONSTOP_KERNEL:*:*)
-+    NEO-?:NONSTOP_KERNEL:*:*)
-+	echo neo-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-+    NSE-*:NONSTOP_KERNEL:*:*)
- 	echo nse-tandem-nsk${UNAME_RELEASE}
- 	exit ;;
-     NSR-?:NONSTOP_KERNEL:*:*)
-@@ -1320,11 +1338,11 @@ EOF
-     i*86:AROS:*:*)
- 	echo ${UNAME_MACHINE}-pc-aros
- 	exit ;;
-+    x86_64:VMkernel:*:*)
-+	echo ${UNAME_MACHINE}-unknown-esx
-+	exit ;;
- esac
- 
--#echo '(No uname command or uname output not recognized.)' 1>&2
--#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
--
- eval $set_cc_for_build
- cat >$dummy.c <<EOF
- #ifdef _SEQUENT_
-Index: elfutils-0.155/config/config.sub
-===================================================================
---- elfutils-0.155.orig/config/config.sub
-+++ elfutils-0.155/config/config.sub
-@@ -21,9 +21,7 @@ timestamp='2012-01-01'
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program; if not, see <http://www.gnu.org/licenses/>.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -223,6 +221,12 @@ case $os in
- 	-isc*)
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- 		;;
-+	-lynx*178)
-+		os=-lynxos178
-+		;;
-+	-lynx*5)
-+		os=-lynxos5
-+		;;
- 	-lynx*)
- 		os=-lynxos
- 		;;
-@@ -341,6 +345,21 @@ case $basic_machine in
- 		basic_machine=armel-unknown
- 		;;
- 
-+	strongarm | thumb | xscale)
-+		basic_machine=arm-unknown
-+		;;
-+	xgate)
-+		basic_machine=$basic_machine-unknown
-+		os=-none
-+		;;
-+	xscaleeb)
-+		basic_machine=armeb-unknown
-+		;;
-+
-+	xscaleel)
-+		basic_machine=armel-unknown
-+		;;
-+
- 	# We use `pc' rather than `unknown'
- 	# because (1) that's what they normally are, and
- 	# (2) the word "unknown" tends to confuse beginning users.
-@@ -818,6 +837,10 @@ case $basic_machine in
- 		basic_machine=i386-pc
- 		os=-msys
- 		;;
-+	msys)
-+		basic_machine=i386-pc
-+		os=-msys
-+		;;
- 	mvs)
- 		basic_machine=i370-ibm
- 		os=-mvs
-@@ -826,6 +849,10 @@ case $basic_machine in
- 		basic_machine=le32-unknown
- 		os=-nacl
- 		;;
-+	nacl)
-+		basic_machine=le32-unknown
-+		os=-nacl
-+		;;
- 	ncr3000)
- 		basic_machine=i486-ncr
- 		os=-sysv4
-@@ -896,6 +923,12 @@ case $basic_machine in
- 	nse-tandem)
- 		basic_machine=nse-tandem
- 		;;
-+	neo-tandem)
-+		basic_machine=neo-tandem
-+		;;
-+	nse-tandem)
-+		basic_machine=nse-tandem
-+		;;
- 	nsr-tandem)
- 		basic_machine=nsr-tandem
- 		;;
-@@ -1078,6 +1111,9 @@ case $basic_machine in
- 	strongarm-* | thumb-*)
- 		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
-+	strongarm-* | thumb-*)
-+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	sun2)
- 		basic_machine=m68000-sun
- 		;;
-@@ -1208,6 +1244,9 @@ case $basic_machine in
- 	xscale-* | xscalee[bl]-*)
- 		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
- 		;;
-+	xscale-* | xscalee[bl]-*)
-+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-+		;;
- 	ymp)
- 		basic_machine=ymp-cray
- 		os=-unicos
-@@ -1490,6 +1529,8 @@ case $os in
- 		;;
- 	-nacl*)
- 		;;
-+	-nacl*)
-+		;;
- 	-none)
- 		;;
- 	*)
diff --git a/elfutils-portability.patch b/elfutils-portability.patch
index f7b9717..72eb9af 100644
--- a/elfutils-portability.patch
+++ b/elfutils-portability.patch
@@ -1,8 +1,6 @@
-Index: elfutils-0.155/backends/ChangeLog
-===================================================================
---- elfutils-0.155.orig/backends/ChangeLog
-+++ elfutils-0.155/backends/ChangeLog
-@@ -135,6 +135,10 @@
+--- elfutils/backends/ChangeLog
++++ elfutils/backends/ChangeLog
+@@ -188,6 +188,10 @@
  	* ppc_attrs.c (ppc_check_object_attribute): Handle tag
  	GNU_Power_ABI_Struct_Return.
  
@@ -13,7 +11,7 @@ Index: elfutils-0.155/backends/ChangeLog
  2008-10-04  Ulrich Drepper  <drepper@redhat.com>
  
  	* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
-@@ -462,6 +466,11 @@
+@@ -515,6 +519,11 @@
  	* sparc_init.c: Likewise.
  	* x86_64_init.c: Likewise.
  
@@ -25,7 +23,7 @@ Index: elfutils-0.155/backends/ChangeLog
  2005-11-19  Roland McGrath  <roland@redhat.com>
  
  	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -484,6 +493,9 @@
+@@ -537,6 +546,9 @@
  	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
  	(CLEANFILES): Add libebl_$(m).so.
  
@@ -35,11 +33,9 @@ Index: elfutils-0.155/backends/ChangeLog
  	* ppc_reloc.def: Update bits per Alan Modra <amodra@bigpond.net.au>.
  	* ppc64_reloc.def: Likewise.
  
-Index: elfutils-0.155/backends/Makefile.am
-===================================================================
---- elfutils-0.155.orig/backends/Makefile.am
-+++ elfutils-0.155/backends/Makefile.am
-@@ -111,7 +111,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
+--- elfutils/backends/Makefile.am
++++ elfutils/backends/Makefile.am
+@@ -112,7 +112,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) \
@@ -48,21 +44,19 @@ Index: elfutils-0.155/backends/Makefile.am
  	$(textrel_check)
  
  libebl_i386.so: $(cpu_i386)
-Index: elfutils-0.155/backends/Makefile.in
-===================================================================
---- elfutils-0.155.orig/backends/Makefile.in
-+++ elfutils-0.155/backends/Makefile.in
-@@ -38,7 +38,8 @@ build_triplet = @build@
- host_triplet = @host@
- DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog
+--- elfutils/backends/Makefile.in
++++ elfutils/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
 -@MUDFLAP_TRUE@am__append_1 = -fmudflap
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
 +@MUDFLAP_TRUE@am__append_2 = -fmudflap
  subdir = backends
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-@@ -172,6 +173,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -266,6 +267,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -70,7 +64,7 @@ Index: elfutils-0.155/backends/Makefile.in
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -201,6 +203,7 @@ SHELL = @SHELL@
+@@ -295,6 +297,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -78,7 +72,7 @@ Index: elfutils-0.155/backends/Makefile.in
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -263,10 +266,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
+@@ -357,10 +360,9 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
  	-I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \
  	-I$(top_srcdir)/libelf -I$(top_srcdir)/libdw
  AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
@@ -91,7 +85,7 @@ Index: elfutils-0.155/backends/Makefile.in
  @MUDFLAP_FALSE@libmudflap = 
  @MUDFLAP_TRUE@libmudflap = -lmudflap
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-@@ -725,7 +727,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
+@@ -834,7 +836,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) \
@@ -100,11 +94,9 @@ Index: elfutils-0.155/backends/Makefile.in
  	$(textrel_check)
  
  libebl_i386.so: $(cpu_i386)
-Index: elfutils-0.155/ChangeLog
-===================================================================
---- elfutils-0.155.orig/ChangeLog
-+++ elfutils-0.155/ChangeLog
-@@ -16,6 +16,8 @@
+--- elfutils/ChangeLog
++++ elfutils/ChangeLog
+@@ -38,6 +38,8 @@
  
  2012-01-24  Mark Wielaard  <mjw@redhat.com>
  
@@ -113,7 +105,7 @@ Index: elfutils-0.155/ChangeLog
  	* COPYING: Fix address. Updated version from gnulib.
  
  2012-01-23  Mark Wielaard  <mjw@redhat.com>
-@@ -34,6 +36,9 @@
+@@ -56,6 +58,9 @@
  
  2011-10-08  Mike Frysinger  <vapier@gentoo.org>
  
@@ -123,7 +115,7 @@ Index: elfutils-0.155/ChangeLog
  	* configure.ac: Fix use of AC_ARG_ENABLE to handle $enableval correctly.
  
  2011-10-02  Ulrich Drepper  <drepper@gmail.com>
-@@ -55,6 +60,10 @@
+@@ -77,6 +82,10 @@
  
  	* configure.ac (LOCALEDIR, DATADIRNAME): Removed.
  
@@ -134,7 +126,7 @@ Index: elfutils-0.155/ChangeLog
  2009-09-21  Ulrich Drepper  <drepper@redhat.com>
  
  	* configure.ac: Update for more modern autoconf.
-@@ -63,6 +72,10 @@
+@@ -85,6 +94,10 @@
  
  	* configure.ac (zip_LIBS): Check for liblzma too.
  
@@ -145,7 +137,7 @@ Index: elfutils-0.155/ChangeLog
  2009-04-19  Roland McGrath  <roland@redhat.com>
  
  	* configure.ac (eu_version): Round down here, not in version.h macros.
-@@ -74,6 +87,8 @@
+@@ -96,6 +109,8 @@
  
  2009-01-23  Roland McGrath  <roland@redhat.com>
  
@@ -154,7 +146,7 @@ Index: elfutils-0.155/ChangeLog
  	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
  
  	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
-@@ -154,6 +169,10 @@
+@@ -176,6 +191,10 @@
  	* configure.ac: Add dummy automake conditional to get dependencies
  	for non-generic linker right.  See src/Makefile.am.
  
@@ -165,7 +157,7 @@ Index: elfutils-0.155/ChangeLog
  2005-11-18  Roland McGrath  <roland@redhat.com>
  
  	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -201,6 +220,17 @@
+@@ -223,6 +242,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -183,11 +175,9 @@ Index: elfutils-0.155/ChangeLog
  2005-05-19  Roland McGrath  <roland@redhat.com>
  
  	* configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
-Index: elfutils-0.155/config/ChangeLog
-===================================================================
---- elfutils-0.155.orig/config/ChangeLog
-+++ elfutils-0.155/config/ChangeLog
-@@ -19,6 +19,10 @@
+--- elfutils/config/ChangeLog
++++ elfutils/config/ChangeLog
+@@ -23,6 +23,10 @@
  
  	* known-dwarf.awk: Use gawk.
  
@@ -198,10 +188,8 @@ Index: elfutils-0.155/config/ChangeLog
  2010-07-02  Ulrich Drepper  <drepper@redhat.com>
  
  	* elfutils.spec.in: Add more BuildRequires.
-Index: elfutils-0.155/config/eu.am
-===================================================================
---- elfutils-0.155.orig/config/eu.am
-+++ elfutils-0.155/config/eu.am
+--- elfutils/config/eu.am
++++ elfutils/config/eu.am
 @@ -1,6 +1,6 @@
  ## Common automake fragments for elfutils subdirectory makefiles.
  ##
@@ -218,7 +206,7 @@ Index: elfutils-0.155/config/eu.am
 +LD_AS_NEEDED = @LD_AS_NEEDED@
 +
  DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'
- INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
+ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
  AM_CFLAGS = -std=gnu99 -Wall -Wshadow \
 -	    $(if $($(*F)_no_Werror),,-Werror) \
 -	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
@@ -233,11 +221,9 @@ Index: elfutils-0.155/config/eu.am
  if MUDFLAP
  AM_CFLAGS += -fmudflap
  libmudflap = -lmudflap
-Index: elfutils-0.155/config/Makefile.in
-===================================================================
---- elfutils-0.155.orig/config/Makefile.in
-+++ elfutils-0.155/config/Makefile.in
-@@ -76,6 +76,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+--- elfutils/config/Makefile.in
++++ elfutils/config/Makefile.in
+@@ -140,6 +140,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -245,7 +231,7 @@ Index: elfutils-0.155/config/Makefile.in
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -105,6 +106,7 @@ SHELL = @SHELL@
+@@ -169,6 +170,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -253,10 +239,8 @@ Index: elfutils-0.155/config/Makefile.in
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-Index: elfutils-0.155/config.h.in
-===================================================================
---- elfutils-0.155.orig/config.h.in
-+++ elfutils-0.155/config.h.in
+--- elfutils/config.h.in
++++ elfutils/config.h.in
 @@ -6,6 +6,9 @@
  /* Defined if libdw should support GNU ref_alt FORM, dwz multi files. */
  #undef ENABLE_DWZ
@@ -267,7 +251,7 @@ Index: elfutils-0.155/config.h.in
  /* $libdir subdirectory containing libebl modules. */
  #undef LIBEBL_SUBDIR
  
-@@ -64,4 +67,7 @@
+@@ -69,4 +72,7 @@
  /* Define for large files, on AIX-style hosts. */
  #undef _LARGE_FILES
  
@@ -275,11 +259,9 @@ Index: elfutils-0.155/config.h.in
 +#undef __thread
 +
  #include <eu-config.h>
-Index: elfutils-0.155/configure
-===================================================================
---- elfutils-0.155.orig/configure
-+++ elfutils-0.155/configure
-@@ -598,6 +598,8 @@ ZLIB_TRUE
+--- elfutils/configure
++++ elfutils/configure
+@@ -618,6 +618,8 @@ ZLIB_TRUE
  LIBEBL_SUBDIR
  TESTS_RPATH_FALSE
  TESTS_RPATH_TRUE
@@ -287,8 +269,8 @@ Index: elfutils-0.155/configure
 +BUILD_WERROR_TRUE
  BUILD_STATIC_FALSE
  BUILD_STATIC_TRUE
- GCOV_FALSE
-@@ -612,6 +614,8 @@ NEVER_TRUE
+ USE_VALGRIND_FALSE
+@@ -635,6 +637,8 @@ NEVER_TRUE
  base_cpu
  NATIVE_LD_FALSE
  NATIVE_LD_TRUE
@@ -297,23 +279,23 @@ Index: elfutils-0.155/configure
  LEXLIB
  LEX_OUTPUT_ROOT
  LEX
-@@ -726,6 +730,7 @@ enable_mudflap
- enable_debugpred
+@@ -755,6 +759,7 @@ enable_debugpred
  enable_gprof
  enable_gcov
+ enable_valgrind
 +enable_werror
  enable_tests_rpath
  enable_libebl_subdir
  with_zlib
-@@ -1379,6 +1384,7 @@ Optional Features:
-                           prediction
+@@ -1412,6 +1417,7 @@ Optional Features:
    --enable-gprof          build binaries with gprof support
    --enable-gcov           build binaries with gcov support
+   --enable-valgrind       run all tests under valgrind
 +  --disable-werror        do not build with -Werror
    --enable-tests-rpath    build $ORIGIN-using rpath into tests
    --enable-libebl-subdir=DIR
                            install libebl_CPU modules in $(libdir)/DIR
-@@ -3920,6 +3926,130 @@ if test "x$ac_cv_c99" != xyes; then :
+@@ -4012,6 +4018,130 @@ if test "x$ac_cv_c99" != xyes; then :
    as_fn_error $? "gcc with C99 support required" "$LINENO" 5
  fi
  
@@ -444,7 +426,7 @@ Index: elfutils-0.155/configure
  { $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 :
-@@ -3956,7 +4086,13 @@ fi
+@@ -4048,7 +4178,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 :
@@ -459,7 +441,7 @@ Index: elfutils-0.155/configure
  fi
  
  # Check whether --enable-largefile was given.
-@@ -4305,6 +4441,22 @@ else
+@@ -4458,6 +4594,22 @@ else
  fi
  
  
@@ -482,7 +464,7 @@ Index: elfutils-0.155/configure
  # Check whether --enable-tests-rpath was given.
  if test "${enable_tests_rpath+set}" = set; then :
    enableval=$enable_tests_rpath; tests_use_rpath=$enableval
-@@ -5025,7 +5177,7 @@ case "$eu_version" in
+@@ -5178,7 +5330,7 @@ case "$eu_version" in
  esac
  
  # Round up to the next release API (x.y) version.
@@ -491,7 +473,7 @@ Index: elfutils-0.155/configure
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -5188,6 +5340,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes
+@@ -5353,6 +5505,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
@@ -502,10 +484,8 @@ Index: elfutils-0.155/configure
  if test -z "${TESTS_RPATH_TRUE}" && test -z "${TESTS_RPATH_FALSE}"; then
    as_fn_error $? "conditional \"TESTS_RPATH\" was never defined.
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
-Index: elfutils-0.155/configure.ac
-===================================================================
---- elfutils-0.155.orig/configure.ac
-+++ elfutils-0.155/configure.ac
+--- elfutils/configure.ac
++++ elfutils/configure.ac
 @@ -90,6 +90,54 @@ CFLAGS="$old_CFLAGS"])
  AS_IF([test "x$ac_cv_c99" != xyes],
        AC_MSG_ERROR([gcc with C99 support required]))
@@ -573,7 +553,7 @@ Index: elfutils-0.155/configure.ac
  
  dnl This test must come as early as possible after the compiler configuration
  dnl tests, because the choice of the file model can (in principle) affect
-@@ -193,6 +244,11 @@ AM_CONDITIONAL(GCOV, test "$use_gcov" =
+@@ -204,6 +255,11 @@ AM_CONDITIONAL(USE_VALGRIND, test "$use_
  AM_CONDITIONAL(BUILD_STATIC, [dnl
  test "$use_mudflap" = yes -o "$use_gprof" = yes -o "$use_gcov" = yes])
  
@@ -585,7 +565,7 @@ Index: elfutils-0.155/configure.ac
  AC_ARG_ENABLE([tests-rpath],
  AS_HELP_STRING([--enable-tests-rpath],[build $ORIGIN-using rpath into tests]),
  	       [tests_use_rpath=$enableval], [tests_use_rpath=no])
-@@ -304,6 +360,6 @@ case "$eu_version" in
+@@ -315,6 +371,6 @@ case "$eu_version" in
  esac
  
  # Round up to the next release API (x.y) version.
@@ -593,11 +573,9 @@ Index: elfutils-0.155/configure.ac
 +eu_version=`expr \( $eu_version + 999 \) / 1000`
  
  AC_OUTPUT
-Index: elfutils-0.155/lib/ChangeLog
-===================================================================
---- elfutils-0.155.orig/lib/ChangeLog
-+++ elfutils-0.155/lib/ChangeLog
-@@ -35,6 +35,9 @@
+--- elfutils/lib/ChangeLog
++++ elfutils/lib/ChangeLog
+@@ -57,6 +57,9 @@
  
  2009-01-23  Roland McGrath  <roland@redhat.com>
  
@@ -607,7 +585,7 @@ Index: elfutils-0.155/lib/ChangeLog
  	* eu-config.h: Add multiple inclusion protection.
  
  2009-01-17  Ulrich Drepper  <drepper@redhat.com>
-@@ -91,6 +94,11 @@
+@@ -113,6 +116,11 @@
  	* Makefile.am (libeu_a_SOURCES): Add it.
  	* system.h: Declare crc32_file.
  
@@ -619,10 +597,8 @@ Index: elfutils-0.155/lib/ChangeLog
  2005-04-30  Ulrich Drepper  <drepper@redhat.com>
  
  	* Makefile.am: Use -ffunction-sections for xmalloc.c.
-Index: elfutils-0.155/lib/eu-config.h
-===================================================================
---- elfutils-0.155.orig/lib/eu-config.h
-+++ elfutils-0.155/lib/eu-config.h
+--- elfutils/lib/eu-config.h
++++ elfutils/lib/eu-config.h
 @@ -162,6 +162,17 @@ asm (".section predict_data, \"aw\"; .pr
  /* This macro is used by the tests conditionalize for standalone building.  */
  #define ELFUTILS_HEADER(name) <lib##name.h>
@@ -641,21 +617,19 @@ Index: elfutils-0.155/lib/eu-config.h
  
  #ifdef SHARED
  # define OLD_VERSION(name, version) \
-Index: elfutils-0.155/lib/Makefile.in
-===================================================================
---- elfutils-0.155.orig/lib/Makefile.in
-+++ elfutils-0.155/lib/Makefile.in
-@@ -37,7 +37,8 @@ build_triplet = @build@
- host_triplet = @host@
- DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog
+--- elfutils/lib/Makefile.in
++++ elfutils/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
 -@MUDFLAP_TRUE@am__append_1 = -fmudflap
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
 +@MUDFLAP_TRUE@am__append_2 = -fmudflap
  subdir = lib
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-@@ -100,6 +101,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -193,6 +194,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -663,7 +637,7 @@ Index: elfutils-0.155/lib/Makefile.in
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -129,6 +131,7 @@ SHELL = @SHELL@
+@@ -222,6 +224,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -671,8 +645,8 @@ Index: elfutils-0.155/lib/Makefile.in
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -190,10 +193,9 @@ zip_LIBS = @zip_LIBS@
- INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
+@@ -283,10 +286,9 @@ zip_LIBS = @zip_LIBS@
+ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
  	-I$(srcdir)/../libelf
  AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
 -	$($(*F)_no_Werror),,-Werror) $(if \
@@ -684,11 +658,9 @@ Index: elfutils-0.155/lib/Makefile.in
  @MUDFLAP_FALSE@libmudflap = 
  @MUDFLAP_TRUE@libmudflap = -lmudflap
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-Index: elfutils-0.155/libasm/ChangeLog
-===================================================================
---- elfutils-0.155.orig/libasm/ChangeLog
-+++ elfutils-0.155/libasm/ChangeLog
-@@ -71,6 +71,11 @@
+--- elfutils/libasm/ChangeLog
++++ elfutils/libasm/ChangeLog
+@@ -75,6 +75,11 @@
  	* asm_error.c: Add new error ASM_E_IOERROR.
  	* libasmP.h: Add ASM_E_IOERROR definition.
  
@@ -700,14 +672,12 @@ Index: elfutils-0.155/libasm/ChangeLog
  2005-02-15  Ulrich Drepper  <drepper@redhat.com>
  
  	* Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
-Index: elfutils-0.155/libasm/Makefile.in
-===================================================================
---- elfutils-0.155.orig/libasm/Makefile.in
-+++ elfutils-0.155/libasm/Makefile.in
-@@ -39,10 +39,11 @@ host_triplet = @host@
- DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \
- 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/config/eu.am ChangeLog
+--- elfutils/libasm/Makefile.in
++++ elfutils/libasm/Makefile.in
+@@ -83,10 +83,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
 -@MUDFLAP_TRUE@am__append_1 = -fmudflap
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
 +@MUDFLAP_TRUE@am__append_2 = -fmudflap
@@ -718,7 +688,7 @@ Index: elfutils-0.155/libasm/Makefile.in
  subdir = libasm
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-@@ -153,6 +154,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -245,6 +246,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -726,7 +696,7 @@ Index: elfutils-0.155/libasm/Makefile.in
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -182,6 +184,7 @@ SHELL = @SHELL@
+@@ -274,6 +276,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -734,7 +704,7 @@ Index: elfutils-0.155/libasm/Makefile.in
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -244,10 +247,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
+@@ -336,10 +339,9 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
  	-I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \
  	-I$(top_srcdir)/libdw
  AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
@@ -747,7 +717,7 @@ Index: elfutils-0.155/libasm/Makefile.in
  @MUDFLAP_FALSE@libmudflap = 
  @MUDFLAP_TRUE@libmudflap = -lmudflap
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-@@ -276,7 +278,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort
+@@ -368,7 +370,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort
  
  @MUDFLAP_FALSE@libasm_pic_a_SOURCES = 
  @MUDFLAP_FALSE@am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os)
@@ -756,11 +726,9 @@ Index: elfutils-0.155/libasm/Makefile.in
  @MUDFLAP_FALSE@libasm_so_SOURCES = 
  noinst_HEADERS = libasmP.h symbolhash.h
  EXTRA_DIST = libasm.map
-Index: elfutils-0.155/libcpu/ChangeLog
-===================================================================
---- elfutils-0.155.orig/libcpu/ChangeLog
-+++ elfutils-0.155/libcpu/ChangeLog
-@@ -38,6 +38,9 @@
+--- elfutils/libcpu/ChangeLog
++++ elfutils/libcpu/ChangeLog
+@@ -47,6 +47,9 @@
  
  2009-01-23  Roland McGrath  <roland@redhat.com>
  
@@ -770,7 +738,7 @@ Index: elfutils-0.155/libcpu/ChangeLog
  	* Makefile.am (i386_parse_CFLAGS): Use quotes around command
  	substitution that can produce leading whitespace.
  
-@@ -367,6 +370,11 @@
+@@ -376,6 +379,11 @@
  	* defs/i386.doc: New file.
  	* defs/x86_64: New file.
  
@@ -782,10 +750,8 @@ Index: elfutils-0.155/libcpu/ChangeLog
  2005-02-15  Ulrich Drepper  <drepper@redhat.com>
  
  	* Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
-Index: elfutils-0.155/libcpu/i386_disasm.c
-===================================================================
---- elfutils-0.155.orig/libcpu/i386_disasm.c
-+++ elfutils-0.155/libcpu/i386_disasm.c
+--- elfutils/libcpu/i386_disasm.c
++++ elfutils/libcpu/i386_disasm.c
 @@ -822,6 +822,7 @@ i386_disasm (const uint8_t **startp, con
  
  			default:
@@ -794,21 +760,19 @@ Index: elfutils-0.155/libcpu/i386_disasm.c
  			}
  		    }
  		  else
-Index: elfutils-0.155/libcpu/Makefile.in
-===================================================================
---- elfutils-0.155.orig/libcpu/Makefile.in
-+++ elfutils-0.155/libcpu/Makefile.in
-@@ -39,7 +39,8 @@ host_triplet = @host@
- DIST_COMMON = $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog \
- 	i386_lex.c i386_parse.c
+--- elfutils/libcpu/Makefile.in
++++ elfutils/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
 -@MUDFLAP_TRUE@am__append_1 = -fmudflap
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
 +@MUDFLAP_TRUE@am__append_2 = -fmudflap
  @MAINTAINER_MODE_TRUE@noinst_PROGRAMS = i386_gendis$(EXEEXT)
  subdir = libcpu
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -117,6 +118,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -220,6 +221,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -816,7 +780,7 @@ Index: elfutils-0.155/libcpu/Makefile.in
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = lex.$(<F:lex.l=)
-@@ -146,6 +148,7 @@ SHELL = @SHELL@
+@@ -249,6 +251,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -824,7 +788,7 @@ Index: elfutils-0.155/libcpu/Makefile.in
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -208,10 +211,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
+@@ -311,10 +314,9 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
  	-I$(srcdir)/../libelf -I$(srcdir)/../libebl \
  	-I$(srcdir)/../libdw -I$(srcdir)/../libasm
  AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
@@ -837,11 +801,9 @@ Index: elfutils-0.155/libcpu/Makefile.in
  @MUDFLAP_FALSE@libmudflap = 
  @MUDFLAP_TRUE@libmudflap = -lmudflap
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-Index: elfutils-0.155/libdw/ChangeLog
-===================================================================
---- elfutils-0.155.orig/libdw/ChangeLog
-+++ elfutils-0.155/libdw/ChangeLog
-@@ -82,6 +82,10 @@
+--- elfutils/libdw/ChangeLog
++++ elfutils/libdw/ChangeLog
+@@ -177,6 +177,10 @@
  
  	* Makefile.am (known-dwarf.h): Run gawk on config/known-dwarf.awk.
  
@@ -852,7 +814,7 @@ Index: elfutils-0.155/libdw/ChangeLog
  2011-07-14  Mark Wielaard  <mjw@redhat.com>
  
  	* libdw.h (dwarf_offdie): Fix documentation to mention .debug_info.
-@@ -441,6 +445,10 @@
+@@ -536,6 +540,10 @@
  
  	* dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.
  
@@ -863,7 +825,7 @@ Index: elfutils-0.155/libdw/ChangeLog
  2009-08-10  Roland McGrath  <roland@redhat.com>
  
  	* dwarf_getscopevar.c: Use dwarf_diename.
-@@ -1209,6 +1217,11 @@
+@@ -1304,6 +1312,11 @@
  
  2005-05-31  Roland McGrath  <roland@redhat.com>
  
@@ -875,10 +837,8 @@ Index: elfutils-0.155/libdw/ChangeLog
  	* dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to
  	formref offset.
  
-Index: elfutils-0.155/libdw/dwarf_begin_elf.c
-===================================================================
---- elfutils-0.155.orig/libdw/dwarf_begin_elf.c
-+++ elfutils-0.155/libdw/dwarf_begin_elf.c
+--- elfutils/libdw/dwarf_begin_elf.c
++++ elfutils/libdw/dwarf_begin_elf.c
 @@ -48,6 +48,14 @@
  #if USE_ZLIB
  # include <endian.h>
@@ -894,10 +854,8 @@ Index: elfutils-0.155/libdw/dwarf_begin_elf.c
  # include <zlib.h>
  # undef crc32
  #endif
-Index: elfutils-0.155/libdw/libdw.h
-===================================================================
---- elfutils-0.155.orig/libdw/libdw.h
-+++ elfutils-0.155/libdw/libdw.h
+--- elfutils/libdw/libdw.h
++++ elfutils/libdw/libdw.h
 @@ -831,7 +831,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (
  
  
@@ -907,14 +865,12 @@ Index: elfutils-0.155/libdw/libdw.h
  /* Return attribute code of given attribute.  */
  __libdw_extern_inline unsigned int
  dwarf_whatattr (Dwarf_Attribute *attr)
-Index: elfutils-0.155/libdw/Makefile.in
-===================================================================
---- elfutils-0.155.orig/libdw/Makefile.in
-+++ elfutils-0.155/libdw/Makefile.in
-@@ -39,8 +39,9 @@ host_triplet = @host@
- DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \
- 	$(pkginclude_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog
+--- elfutils/libdw/Makefile.in
++++ elfutils/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
 -@MUDFLAP_TRUE@am__append_1 = -fmudflap
 -@BUILD_STATIC_TRUE@am__append_2 = -fpic
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
@@ -923,7 +879,7 @@ Index: elfutils-0.155/libdw/Makefile.in
  @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
  @MUDFLAP_TRUE@am_libdw_pic_a_OBJECTS =
  subdir = libdw
-@@ -198,6 +199,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -291,6 +292,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -931,7 +887,7 @@ Index: elfutils-0.155/libdw/Makefile.in
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -227,6 +229,7 @@ SHELL = @SHELL@
+@@ -320,6 +322,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -939,8 +895,8 @@ Index: elfutils-0.155/libdw/Makefile.in
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -288,10 +291,9 @@ zip_LIBS = @zip_LIBS@
- INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
+@@ -381,10 +384,9 @@ zip_LIBS = @zip_LIBS@
+ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. \
  	-I$(srcdir)/../libelf
  AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
 -	$($(*F)_no_Werror),,-Werror) $(if \
@@ -952,11 +908,9 @@ Index: elfutils-0.155/libdw/Makefile.in
  @MUDFLAP_FALSE@libmudflap = 
  @MUDFLAP_TRUE@libmudflap = -lmudflap
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-Index: elfutils-0.155/libdwfl/ChangeLog
-===================================================================
---- elfutils-0.155.orig/libdwfl/ChangeLog
-+++ elfutils-0.155/libdwfl/ChangeLog
-@@ -1420,6 +1420,11 @@
+--- elfutils/libdwfl/ChangeLog
++++ elfutils/libdwfl/ChangeLog
+@@ -1624,6 +1624,11 @@
  
  2005-07-21  Roland McGrath  <roland@redhat.com>
  
@@ -968,14 +922,12 @@ Index: elfutils-0.155/libdwfl/ChangeLog
  	* Makefile.am (noinst_HEADERS): Add loc2c.c.
  
  	* test2.c (main): Check sscanf result to quiet warning.
-Index: elfutils-0.155/libdwfl/Makefile.in
-===================================================================
---- elfutils-0.155.orig/libdwfl/Makefile.in
-+++ elfutils-0.155/libdwfl/Makefile.in
-@@ -38,11 +38,12 @@ host_triplet = @host@
- DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \
- 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/config/eu.am ChangeLog
+--- elfutils/libdwfl/Makefile.in
++++ elfutils/libdwfl/Makefile.in
+@@ -82,11 +82,12 @@ 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
 -@MUDFLAP_TRUE@am__append_1 = -fmudflap
 -@MUDFLAP_FALSE@am__append_2 = libdwfl_pic.a
 -@ZLIB_TRUE@am__append_3 = gzip.c
@@ -990,7 +942,7 @@ Index: elfutils-0.155/libdwfl/Makefile.in
  @MUDFLAP_TRUE@am_libdwfl_pic_a_OBJECTS =
  subdir = libdwfl
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -188,6 +189,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -280,6 +281,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -998,7 +950,7 @@ Index: elfutils-0.155/libdwfl/Makefile.in
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -217,6 +219,7 @@ SHELL = @SHELL@
+@@ -309,6 +311,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -1006,7 +958,7 @@ Index: elfutils-0.155/libdwfl/Makefile.in
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -279,10 +282,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
+@@ -371,10 +374,9 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
  	-I$(srcdir)/../libelf -I$(srcdir)/../libebl \
  	-I$(srcdir)/../libdw
  AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
@@ -1019,7 +971,7 @@ Index: elfutils-0.155/libdwfl/Makefile.in
  @MUDFLAP_FALSE@libmudflap = 
  @MUDFLAP_TRUE@libmudflap = -lmudflap
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-@@ -290,7 +292,7 @@ COMPILE.os = $(filter-out -fprofile-arcs
+@@ -382,7 +384,7 @@ COMPILE.os = $(filter-out -fprofile-arcs
  
  CLEANFILES = *.gcno *.gcda $(am_libdwfl_pic_a_OBJECTS)
  textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
@@ -1028,7 +980,7 @@ Index: elfutils-0.155/libdwfl/Makefile.in
  pkginclude_HEADERS = libdwfl.h
  libdwfl_a_SOURCES = dwfl_begin.c dwfl_end.c dwfl_error.c \
  	dwfl_version.c dwfl_module.c dwfl_report_elf.c relocate.c \
-@@ -311,8 +313,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
+@@ -403,8 +405,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
  	dwfl_module_getsym.c dwfl_module_addrname.c \
  	dwfl_module_addrsym.c dwfl_module_return_value_location.c \
  	dwfl_module_register_names.c dwfl_segment_report_module.c \
@@ -1039,11 +991,9 @@ Index: elfutils-0.155/libdwfl/Makefile.in
  @MUDFLAP_FALSE@libdwfl = $(libdw)
  @MUDFLAP_TRUE@libdwfl = libdwfl.a $(libdw) $(libebl) $(libelf) $(libeu)
  @MUDFLAP_FALSE@libdw = ../libdw/libdw.so
-Index: elfutils-0.155/libebl/ChangeLog
-===================================================================
---- elfutils-0.155.orig/libebl/ChangeLog
-+++ elfutils-0.155/libebl/ChangeLog
-@@ -658,6 +658,11 @@
+--- elfutils/libebl/ChangeLog
++++ elfutils/libebl/ChangeLog
+@@ -674,6 +674,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -1055,21 +1005,19 @@ Index: elfutils-0.155/libebl/ChangeLog
  2005-05-21  Ulrich Drepper  <drepper@redhat.com>
  
  	* libebl_x86_64.map: Add x86_64_core_note.
-Index: elfutils-0.155/libebl/Makefile.in
-===================================================================
---- elfutils-0.155.orig/libebl/Makefile.in
-+++ elfutils-0.155/libebl/Makefile.in
-@@ -38,7 +38,8 @@ host_triplet = @host@
- DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \
- 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/config/eu.am ChangeLog
+--- elfutils/libebl/Makefile.in
++++ elfutils/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
 -@MUDFLAP_TRUE@am__append_1 = -fmudflap
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
 +@MUDFLAP_TRUE@am__append_2 = -fmudflap
  subdir = libebl
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-@@ -150,6 +151,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@
@@ -1077,7 +1025,7 @@ Index: elfutils-0.155/libebl/Makefile.in
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -179,6 +181,7 @@ SHELL = @SHELL@
+@@ -271,6 +273,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -1085,7 +1033,7 @@ Index: elfutils-0.155/libebl/Makefile.in
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -241,10 +244,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
+@@ -333,10 +336,9 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
  	-I$(srcdir)/../libelf -I$(srcdir)/../libdw \
  	-I$(srcdir)/../libasm
  AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
@@ -1098,11 +1046,9 @@ Index: elfutils-0.155/libebl/Makefile.in
  @MUDFLAP_FALSE@libmudflap = 
  @MUDFLAP_TRUE@libmudflap = -lmudflap
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-Index: elfutils-0.155/libelf/ChangeLog
-===================================================================
---- elfutils-0.155.orig/libelf/ChangeLog
-+++ elfutils-0.155/libelf/ChangeLog
-@@ -34,6 +34,11 @@
+--- elfutils/libelf/ChangeLog
++++ elfutils/libelf/ChangeLog
+@@ -46,6 +46,11 @@
  
  	* elf-knowledge.h (SECTION_STRIP_P): Remove < SHT_NUM check.
  
@@ -1114,7 +1060,7 @@ Index: elfutils-0.155/libelf/ChangeLog
  2011-02-26  Mark Wielaard  <mjw@redhat.com>
  
  	* elf_end.c (elf_end): Call rwlock_unlock before rwlock_fini.
-@@ -711,6 +716,11 @@
+@@ -723,6 +728,11 @@
  
  	* elf.h: Update from glibc.
  
@@ -1126,10 +1072,8 @@ Index: elfutils-0.155/libelf/ChangeLog
  2005-05-08  Roland McGrath  <roland@redhat.com>
  
  	* elf_begin.c (read_file) [_MUDFLAP]: Don't use mmap for now.
-Index: elfutils-0.155/libelf/common.h
-===================================================================
---- elfutils-0.155.orig/libelf/common.h
-+++ elfutils-0.155/libelf/common.h
+--- elfutils/libelf/common.h
++++ elfutils/libelf/common.h
 @@ -139,7 +139,7 @@ libelf_release_all (Elf *elf)
    (Var) = (sizeof (Var) == 1						      \
  	   ? (unsigned char) (Var)					      \
@@ -1148,10 +1092,8 @@ Index: elfutils-0.155/libelf/common.h
  	      : (sizeof (Var) == 4					      \
  		 ? bswap_32 (Var)					      \
  		 : bswap_64 (Var))))
-Index: elfutils-0.155/libelf/gnuhash_xlate.h
-===================================================================
---- elfutils-0.155.orig/libelf/gnuhash_xlate.h
-+++ elfutils-0.155/libelf/gnuhash_xlate.h
+--- elfutils/libelf/gnuhash_xlate.h
++++ elfutils/libelf/gnuhash_xlate.h
 @@ -1,5 +1,5 @@
  /* Conversion functions for versioning information.
 -   Copyright (C) 2006, 2007 Red Hat, Inc.
@@ -1170,14 +1112,12 @@ Index: elfutils-0.155/libelf/gnuhash_xlate.h
        len -= 4;
      }
  }
-Index: elfutils-0.155/libelf/Makefile.in
-===================================================================
---- elfutils-0.155.orig/libelf/Makefile.in
-+++ elfutils-0.155/libelf/Makefile.in
-@@ -39,11 +39,12 @@ host_triplet = @host@
- DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \
- 	$(pkginclude_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog
+--- elfutils/libelf/Makefile.in
++++ elfutils/libelf/Makefile.in
+@@ -84,11 +84,12 @@ DIST_COMMON = $(top_srcdir)/config/eu.am
+ 	$(srcdir)/Makefile.am $(top_srcdir)/config/depcomp \
+ 	$(include_HEADERS) $(noinst_HEADERS) $(pkginclude_HEADERS) \
+ 	ChangeLog
 -@MUDFLAP_TRUE@am__append_1 = -fmudflap
 -@BUILD_STATIC_TRUE@am__append_2 = -fpic
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
@@ -1190,7 +1130,7 @@ Index: elfutils-0.155/libelf/Makefile.in
  subdir = libelf
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-@@ -195,6 +196,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -288,6 +289,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -1198,7 +1138,7 @@ Index: elfutils-0.155/libelf/Makefile.in
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -224,6 +226,7 @@ SHELL = @SHELL@
+@@ -317,6 +319,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = 1
@@ -1206,9 +1146,9 @@ Index: elfutils-0.155/libelf/Makefile.in
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -284,10 +287,9 @@ top_srcdir = @top_srcdir@
+@@ -377,10 +380,9 @@ top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
- INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
+ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
  AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
 -	$($(*F)_no_Werror),,-Werror) $(if \
 -	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
@@ -1219,7 +1159,7 @@ Index: elfutils-0.155/libelf/Makefile.in
  @MUDFLAP_FALSE@libmudflap = 
  @MUDFLAP_TRUE@libmudflap = -lmudflap
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-@@ -352,7 +354,7 @@ libelf_a_SOURCES = elf_version.c elf_has
+@@ -445,7 +447,7 @@ libelf_a_SOURCES = elf_version.c elf_has
  
  @MUDFLAP_FALSE@libelf_pic_a_SOURCES = 
  @MUDFLAP_FALSE@am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os)
@@ -1228,11 +1168,9 @@ Index: elfutils-0.155/libelf/Makefile.in
  @MUDFLAP_FALSE@libelf_so_SOURCES = 
  noinst_HEADERS = elf.h abstract.h common.h exttypes.h gelf_xlate.h libelfP.h \
  		 version_xlate.h gnuhash_xlate.h note_xlate.h dl-hash.h
-Index: elfutils-0.155/m4/Makefile.in
-===================================================================
---- elfutils-0.155.orig/m4/Makefile.in
-+++ elfutils-0.155/m4/Makefile.in
-@@ -75,6 +75,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+--- elfutils/m4/Makefile.in
++++ elfutils/m4/Makefile.in
+@@ -139,6 +139,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -1240,7 +1178,7 @@ Index: elfutils-0.155/m4/Makefile.in
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -104,6 +105,7 @@ SHELL = @SHELL@
+@@ -168,6 +169,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -1248,11 +1186,9 @@ Index: elfutils-0.155/m4/Makefile.in
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-Index: elfutils-0.155/Makefile.in
-===================================================================
---- elfutils-0.155.orig/Makefile.in
-+++ elfutils-0.155/Makefile.in
-@@ -165,6 +165,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+--- elfutils/Makefile.in
++++ elfutils/Makefile.in
+@@ -256,6 +256,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -1260,7 +1196,7 @@ Index: elfutils-0.155/Makefile.in
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -194,6 +195,7 @@ SHELL = @SHELL@
+@@ -285,6 +286,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -1268,11 +1204,9 @@ Index: elfutils-0.155/Makefile.in
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-Index: elfutils-0.155/src/addr2line.c
-===================================================================
---- elfutils-0.155.orig/src/addr2line.c
-+++ elfutils-0.155/src/addr2line.c
-@@ -447,10 +447,10 @@ handle_address (const char *string, Dwfl
+--- elfutils/src/addr2line.c
++++ elfutils/src/addr2line.c
+@@ -448,10 +448,10 @@ handle_address (const char *string, Dwfl
        bool parsed = false;
        int i, j;
        char *name = NULL;
@@ -1285,11 +1219,9 @@ Index: elfutils-0.155/src/addr2line.c
  	{
  	default:
  	  break;
-Index: elfutils-0.155/src/ChangeLog
-===================================================================
---- elfutils-0.155.orig/src/ChangeLog
-+++ elfutils-0.155/src/ChangeLog
-@@ -606,8 +606,16 @@
+--- elfutils/src/ChangeLog
++++ elfutils/src/ChangeLog
+@@ -766,8 +766,16 @@
  	* readelf.c (attr_callback): Use print_block only when we don't use
  	print_ops.
  
@@ -1306,7 +1238,7 @@ Index: elfutils-0.155/src/ChangeLog
  	* ar.c (do_oper_extract): Use pathconf instead of statfs.
  
  2009-08-01  Ulrich Drepper  <drepper@redhat.com>
-@@ -771,6 +779,8 @@
+@@ -931,6 +939,8 @@
  	* readelf.c (print_debug_frame_section): Use t instead of j formats
  	for ptrdiff_t OFFSET.
  
@@ -1315,7 +1247,7 @@ Index: elfutils-0.155/src/ChangeLog
  2009-01-21  Ulrich Drepper  <drepper@redhat.com>
  
  	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
-@@ -954,6 +964,11 @@
+@@ -1114,6 +1124,11 @@
  	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
  	is valid in RELRO.
  
@@ -1327,7 +1259,7 @@ Index: elfutils-0.155/src/ChangeLog
  2008-02-29  Roland McGrath  <roland@redhat.com>
  
  	* readelf.c (print_attributes): Add a cast.
-@@ -1205,6 +1220,8 @@
+@@ -1365,6 +1380,8 @@
  
  	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
  
@@ -1336,7 +1268,7 @@ Index: elfutils-0.155/src/ChangeLog
  2007-10-15  Roland McGrath  <roland@redhat.com>
  
  	* make-debug-archive.in: New file.
-@@ -1644,6 +1661,10 @@
+@@ -1804,6 +1821,10 @@
  	* elflint.c (valid_e_machine): Add EM_ALPHA.
  	Reported by Christian Aichinger <Greek0@gmx.net>.
  
@@ -1347,7 +1279,7 @@ Index: elfutils-0.155/src/ChangeLog
  2006-08-08  Ulrich Drepper  <drepper@redhat.com>
  
  	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -1720,6 +1741,10 @@
+@@ -1880,6 +1901,10 @@
  	* Makefile.am: Add hacks to create dependency files for non-generic
  	linker.
  
@@ -1358,7 +1290,7 @@ Index: elfutils-0.155/src/ChangeLog
  2006-06-12  Ulrich Drepper  <drepper@redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -2068,6 +2093,11 @@
+@@ -2228,6 +2253,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -1370,10 +1302,8 @@ Index: elfutils-0.155/src/ChangeLog
  2005-05-30  Roland McGrath  <roland@redhat.com>
  
  	* readelf.c (print_debug_line_section): Print section offset of each
-Index: elfutils-0.155/src/findtextrel.c
-===================================================================
---- elfutils-0.155.orig/src/findtextrel.c
-+++ elfutils-0.155/src/findtextrel.c
+--- elfutils/src/findtextrel.c
++++ elfutils/src/findtextrel.c
 @@ -496,7 +496,11 @@ ptrcompare (const void *p1, const void *
  
  
@@ -1387,10 +1317,8 @@ Index: elfutils-0.155/src/findtextrel.c
  	   GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw,
  	   const char *fname, bool more_than_one, void **knownsrcs)
  {
-Index: elfutils-0.155/src/ld.h
-===================================================================
---- elfutils-0.155.orig/src/ld.h
-+++ elfutils-0.155/src/ld.h
+--- elfutils/src/ld.h
++++ elfutils/src/ld.h
 @@ -1114,6 +1114,7 @@ extern bool dynamically_linked_p (void);
  
  /* Checked whether the symbol is undefined and referenced from a DSO.  */
@@ -1406,10 +1334,8 @@ Index: elfutils-0.155/src/ld.h
 +#endif	/* Optimizing and not GCC 4.2.  */
  
  #endif	/* ld.h */
-Index: elfutils-0.155/src/Makefile.am
-===================================================================
---- elfutils-0.155.orig/src/Makefile.am
-+++ elfutils-0.155/src/Makefile.am
+--- elfutils/src/Makefile.am
++++ elfutils/src/Makefile.am
 @@ -95,6 +95,9 @@ addr2line_no_Wformat = yes
  # XXX While the file is not finished, don't warn about this
  ldgeneric_no_Wunused = yes
@@ -1420,21 +1346,19 @@ Index: elfutils-0.155/src/Makefile.am
  readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
  nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
  	   $(demanglelib)
-Index: elfutils-0.155/src/Makefile.in
-===================================================================
---- elfutils-0.155.orig/src/Makefile.in
-+++ elfutils-0.155/src/Makefile.in
-@@ -40,7 +40,8 @@ host_triplet = @host@
- DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(top_srcdir)/config/eu.am ChangeLog \
- 	ldlex.c ldscript.c
+--- elfutils/src/Makefile.in
++++ elfutils/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
 -@MUDFLAP_TRUE@am__append_1 = -fmudflap
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
 +@MUDFLAP_TRUE@am__append_2 = -fmudflap
  bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEEXT) size$(EXEEXT) \
  	strip$(EXEEXT) ld$(EXEEXT) elflint$(EXEEXT) \
  	findtextrel$(EXEEXT) addr2line$(EXEEXT) elfcmp$(EXEEXT) \
-@@ -49,9 +50,9 @@ bin_PROGRAMS = readelf$(EXEEXT) nm$(EXEE
+@@ -94,9 +95,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.
@@ -1446,7 +1370,7 @@ Index: elfutils-0.155/src/Makefile.in
  @NATIVE_LD_TRUE@am_libld_elf_i386_pic_a_OBJECTS =
  subdir = src
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -115,7 +116,7 @@ am_ld_OBJECTS = ld.$(OBJEXT) ldgeneric.$
+@@ -164,7 +165,7 @@ am_ld_OBJECTS = ld.$(OBJEXT) ldgeneric.$
  	versionhash.$(OBJEXT)
  ld_OBJECTS = $(am_ld_OBJECTS)
  ld_DEPENDENCIES = $(libebl) $(libelf) $(libeu) $(am__DEPENDENCIES_1) \
@@ -1455,7 +1379,7 @@ Index: elfutils-0.155/src/Makefile.in
  ld_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ld_LDFLAGS) $(LDFLAGS) -o \
  	$@
  am_libld_elf_i386_so_OBJECTS =
-@@ -235,6 +236,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -338,6 +339,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -1463,7 +1387,7 @@ Index: elfutils-0.155/src/Makefile.in
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -264,6 +266,7 @@ SHELL = @SHELL@
+@@ -367,6 +369,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -1471,7 +1395,7 @@ Index: elfutils-0.155/src/Makefile.in
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -327,10 +330,9 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
+@@ -430,10 +433,9 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
  	-I$(srcdir)/../libdw -I$(srcdir)/../libdwfl \
  	-I$(srcdir)/../libasm
  AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
@@ -1484,7 +1408,7 @@ Index: elfutils-0.155/src/Makefile.in
  @MUDFLAP_FALSE@libmudflap = 
  @MUDFLAP_TRUE@libmudflap = -lmudflap
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-@@ -346,8 +348,8 @@ AM_LFLAGS = -Pld -olex.yy.c
+@@ -449,8 +451,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) \
@@ -1495,7 +1419,7 @@ Index: elfutils-0.155/src/Makefile.in
  @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 \
-@@ -376,6 +378,9 @@ strings_no_Wformat = yes
+@@ -479,6 +481,9 @@ strings_no_Wformat = yes
  addr2line_no_Wformat = yes
  # XXX While the file is not finished, don't warn about this
  ldgeneric_no_Wunused = yes
@@ -1505,7 +1429,7 @@ Index: elfutils-0.155/src/Makefile.in
  readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
  nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
  	   $(demanglelib)
-@@ -383,7 +388,7 @@ nm_LDADD = $(libdw) $(libebl) $(libelf)
+@@ -486,7 +491,7 @@ nm_LDADD = $(libdw) $(libebl) $(libelf)
  size_LDADD = $(libelf) $(libeu) $(libmudflap)
  strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
  ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
@@ -1514,15 +1438,20 @@ Index: elfutils-0.155/src/Makefile.in
  ld_LDFLAGS = -rdynamic
  elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
  findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap)
-Index: elfutils-0.155/src/readelf.c
-===================================================================
---- elfutils-0.155.orig/src/readelf.c
-+++ elfutils-0.155/src/readelf.c
-@@ -3949,10 +3949,11 @@ struct listptr
+--- elfutils/src/readelf.c
++++ elfutils/src/readelf.c
+@@ -4150,6 +4150,8 @@ struct listptr
  #define listptr_offset_size(p)	((p)->dwarf64 ? 8 : 4)
  #define listptr_address_size(p)	((p)->addr64 ? 8 : 4)
  
 +static const char *listptr_name;
++
+ static Dwarf_Addr
+ listptr_base (struct listptr *p)
+ {
+@@ -4171,9 +4173,9 @@ listptr_base (struct listptr *p)
+ }
+ 
  static int
 -compare_listptr (const void *a, const void *b, void *arg)
 +compare_listptr (const void *a, const void *b)
@@ -1532,7 +1461,7 @@ Index: elfutils-0.155/src/readelf.c
    struct listptr *p1 = (void *) a;
    struct listptr *p2 = (void *) b;
  
-@@ -4033,8 +4034,11 @@ static void
+@@ -4262,8 +4264,11 @@ static void
  sort_listptr (struct listptr_table *table, const char *name)
  {
    if (table->n > 0)
@@ -1546,7 +1475,7 @@ Index: elfutils-0.155/src/readelf.c
  }
  
  static bool
-@@ -8442,7 +8446,7 @@ dump_archive_index (Elf *elf, const char
+@@ -8986,7 +8991,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))
@@ -1555,10 +1484,8 @@ Index: elfutils-0.155/src/readelf.c
  	    while (1)
  #endif
  	      error (EXIT_FAILURE, 0,
-Index: elfutils-0.155/src/strings.c
-===================================================================
---- elfutils-0.155.orig/src/strings.c
-+++ elfutils-0.155/src/strings.c
+--- elfutils/src/strings.c
++++ elfutils/src/strings.c
 @@ -43,6 +43,10 @@
  
  #include <system.h>
@@ -1596,10 +1523,8 @@ Index: elfutils-0.155/src/strings.c
      }
  
    if (unlikely (elfmap == MAP_FAILED))
-Index: elfutils-0.155/src/strip.c
-===================================================================
---- elfutils-0.155.orig/src/strip.c
-+++ elfutils-0.155/src/strip.c
+--- elfutils/src/strip.c
++++ elfutils/src/strip.c
 @@ -45,6 +45,12 @@
  #include <libebl.h>
  #include <system.h>
@@ -1632,7 +1557,7 @@ Index: elfutils-0.155/src/strip.c
      }
  
    /* Open the file.  */
-@@ -2055,7 +2071,7 @@ while computing checksum for debug infor
+@@ -2060,7 +2076,7 @@ while computing checksum for debug infor
    /* If requested, preserve the timestamp.  */
    if (tvp != NULL)
      {
@@ -1641,7 +1566,7 @@ Index: elfutils-0.155/src/strip.c
  	{
  	  error (0, errno, gettext ("\
  cannot set access and modification date of '%s'"),
-@@ -2112,7 +2128,7 @@ handle_ar (int fd, Elf *elf, const char
+@@ -2117,7 +2133,7 @@ handle_ar (int fd, Elf *elf, const char
  
    if (tvp != NULL)
      {
@@ -1650,11 +1575,9 @@ Index: elfutils-0.155/src/strip.c
  	{
  	  error (0, errno, gettext ("\
  cannot set access and modification date of '%s'"), fname);
-Index: elfutils-0.155/tests/ChangeLog
-===================================================================
---- elfutils-0.155.orig/tests/ChangeLog
-+++ elfutils-0.155/tests/ChangeLog
-@@ -439,6 +439,8 @@
+--- elfutils/tests/ChangeLog
++++ elfutils/tests/ChangeLog
+@@ -647,6 +647,8 @@
  
  2008-01-21  Roland McGrath  <roland@redhat.com>
  
@@ -1663,7 +1586,7 @@ Index: elfutils-0.155/tests/ChangeLog
  	* testfile45.S.bz2: Add tests for cltq, cqto.
  	* testfile45.expect.bz2: Adjust.
  
-@@ -1147,6 +1149,11 @@
+@@ -1355,6 +1357,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  
@@ -1675,10 +1598,8 @@ Index: elfutils-0.155/tests/ChangeLog
  2005-05-24  Ulrich Drepper  <drepper@redhat.com>
  
  	* get-files.c (main): Use correct format specifier.
-Index: elfutils-0.155/tests/line2addr.c
-===================================================================
---- elfutils-0.155.orig/tests/line2addr.c
-+++ elfutils-0.155/tests/line2addr.c
+--- elfutils/tests/line2addr.c
++++ elfutils/tests/line2addr.c
 @@ -124,7 +124,7 @@ main (int argc, char *argv[])
      {
        struct args a = { .arg = argv[cnt] };
@@ -1688,14 +1609,12 @@ Index: elfutils-0.155/tests/line2addr.c
  	{
  	default:
  	case 0:
-Index: elfutils-0.155/tests/Makefile.in
-===================================================================
---- elfutils-0.155.orig/tests/Makefile.in
-+++ elfutils-0.155/tests/Makefile.in
-@@ -35,14 +35,15 @@ build_triplet = @build@
- host_triplet = @host@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(top_srcdir)/config/eu.am ChangeLog
+--- elfutils/tests/Makefile.in
++++ elfutils/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
 -@MUDFLAP_TRUE@am__append_1 = -fmudflap
 -@STANDALONE_FALSE@am__append_2 = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \
 +@BUILD_WERROR_TRUE@am__append_1 = $(if $($(*F)_no_Werror),,-Werror)
@@ -1712,20 +1631,26 @@ Index: elfutils-0.155/tests/Makefile.in
  check_PROGRAMS = arextract$(EXEEXT) arsymtest$(EXEEXT) \
  	newfile$(EXEEXT) saridx$(EXEEXT) scnnames$(EXEEXT) \
  	sectiondump$(EXEEXT) showptable$(EXEEXT) update1$(EXEEXT) \
-@@ -93,10 +94,10 @@ TESTS = run-arextract.sh run-arsymtest.s
- 	run-macro-test.sh run-elf_cntl_gelf_getshdr.sh \
- 	run-test-archive64.sh $(am__EXEEXT_1) $(am__EXEEXT_3) \
- 	$(am__append_9)
+@@ -142,13 +143,13 @@
+ 	run-readelf-mixed-corenote.sh run-dwfllines.sh \
+ 	run-dwfl-report-elf-align.sh run-addr2line-test.sh \
+ 	run-addr2line-i-test.sh run-varlocs.sh $(am__EXEEXT_1) \
+-	$(am__append_7) $(am__EXEEXT_3) $(am__append_10)
 -@STANDALONE_FALSE@am__append_5 = msg_tst md5-sha1-test
++	$(am__append_8) $(am__EXEEXT_3) $(am__append_11)
  @STANDALONE_FALSE@am__append_6 = msg_tst md5-sha1-test
--@HAVE_LIBASM_TRUE@am__append_7 = $(asm_TESTS)
+-@LZMA_TRUE@am__append_7 = run-readelf-s.sh run-dwflsyms.sh
+-@HAVE_LIBASM_TRUE@am__append_8 = $(asm_TESTS)
 +@STANDALONE_FALSE@am__append_7 = msg_tst md5-sha1-test
- @HAVE_LIBASM_TRUE@am__append_8 = $(asm_TESTS)
-+@HAVE_LIBASM_TRUE@am__append_9 = $(asm_TESTS)
- @ENABLE_DWZ_TRUE@am__append_9 = run-readelf-dwz-multi.sh
++@LZMA_TRUE@am__append_8 = run-readelf-s.sh run-dwflsyms.sh
+ @HAVE_LIBASM_TRUE@am__append_9 = $(asm_TESTS)
+-@ENABLE_DWZ_TRUE@am__append_10 = run-readelf-dwz-multi.sh
++@HAVE_LIBASM_TRUE@am__append_10 = $(asm_TESTS)
++@ENABLE_DWZ_TRUE@am__append_11 = run-readelf-dwz-multi.sh
  subdir = tests
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -412,6 +413,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+@@ -722,6 +723,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
@@ -1733,7 +1658,7 @@ Index: elfutils-0.155/tests/Makefile.in
  LEX = @LEX@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -441,6 +443,7 @@ SHELL = @SHELL@
+@@ -751,6 +753,7 @@ SHELL = @SHELL@
  STRIP = @STRIP@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
@@ -1741,12 +1666,12 @@ Index: elfutils-0.155/tests/Makefile.in
  XGETTEXT = @XGETTEXT@
  XGETTEXT_015 = @XGETTEXT_015@
  XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -499,12 +502,11 @@ top_build_prefix = @top_build_prefix@
+@@ -809,12 +812,11 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zip_LIBS = @zip_LIBS@
--INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_2)
-+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_3)
+-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_2)
++AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_3)
  AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
 -	$($(*F)_no_Werror),,-Werror) $(if \
 -	$($(*F)_no_Wunused),,-Wunused -Wextra) $(if \
@@ -1757,7 +1682,7 @@ Index: elfutils-0.155/tests/Makefile.in
  @MUDFLAP_FALSE@libmudflap = 
  @MUDFLAP_TRUE@libmudflap = -lmudflap
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-@@ -514,7 +516,7 @@ CLEANFILES = *.gcno *.gcda
+@@ -824,7 +826,7 @@ CLEANFILES = *.gcno *.gcda
  textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
  @MUDFLAP_FALSE@BUILD_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf
  @MUDFLAP_TRUE@BUILD_RPATH = \$$ORIGIN/../backends
diff --git a/elfutils-robustify.patch b/elfutils-robustify.patch
index 0a783c2..56ccda8 100644
--- a/elfutils-robustify.patch
+++ b/elfutils-robustify.patch
@@ -1,8 +1,6 @@
-Index: elfutils-0.155/libdwfl/ChangeLog
-===================================================================
---- elfutils-0.155.orig/libdwfl/ChangeLog
-+++ elfutils-0.155/libdwfl/ChangeLog
-@@ -52,6 +52,11 @@
+--- elfutils/libdwfl/ChangeLog
++++ elfutils/libdwfl/ChangeLog
+@@ -256,6 +256,11 @@
  	* dwfl_module_getdwarf.c (open_elf): Clear errno before CBFAIL.
  	Reported by Kurt Roeckx <kurt@roeckx.be>.
  
@@ -14,10 +12,8 @@ Index: elfutils-0.155/libdwfl/ChangeLog
  2011-02-11  Roland McGrath  <roland@redhat.com>
  
  	* linux-kernel-modules.c (try_kernel_name): Try .gz, .bz2, .xz
-Index: elfutils-0.155/libdwfl/relocate.c
-===================================================================
---- elfutils-0.155.orig/libdwfl/relocate.c
-+++ elfutils-0.155/libdwfl/relocate.c
+--- elfutils/libdwfl/relocate.c
++++ elfutils/libdwfl/relocate.c
 @@ -1,5 +1,5 @@
  /* Relocate debug information.
 -   Copyright (C) 2005-2010 Red Hat, Inc.
@@ -25,7 +21,7 @@ Index: elfutils-0.155/libdwfl/relocate.c
     This file is part of elfutils.
  
     This file is free software; you can redistribute it and/or modify
-@@ -457,7 +457,10 @@ relocate_section (Dwfl_Module *mod, Elf
+@@ -456,7 +456,10 @@ relocate_section (Dwfl_Module *mod, Elf
        }
    }
  
@@ -37,7 +33,7 @@ Index: elfutils-0.155/libdwfl/relocate.c
    size_t complete = 0;
    if (shdr->sh_type == SHT_REL)
      for (size_t relidx = 0; !result && relidx < nrels; ++relidx)
-@@ -559,7 +562,7 @@ relocate_section (Dwfl_Module *mod, Elf
+@@ -558,7 +561,7 @@ relocate_section (Dwfl_Module *mod, Elf
  	  nrels = next;
  	}
  
@@ -46,11 +42,9 @@ Index: elfutils-0.155/libdwfl/relocate.c
        gelf_update_shdr (scn, shdr);
      }
  
-Index: elfutils-0.155/libelf/ChangeLog
-===================================================================
---- elfutils-0.155.orig/libelf/ChangeLog
-+++ elfutils-0.155/libelf/ChangeLog
-@@ -708,10 +708,53 @@
+--- elfutils/libelf/ChangeLog
++++ elfutils/libelf/ChangeLog
+@@ -715,10 +715,53 @@
  	If section content hasn't been read yet, do it before looking for the
  	block size.  If no section data present, infer size of section header.
  
@@ -104,10 +98,8 @@ Index: elfutils-0.155/libelf/ChangeLog
  2005-05-09  Ulrich Drepper  <drepper@redhat.com>
  
  	* elf.h: Update from glibc.
-Index: elfutils-0.155/libelf/elf32_getphdr.c
-===================================================================
---- elfutils-0.155.orig/libelf/elf32_getphdr.c
-+++ elfutils-0.155/libelf/elf32_getphdr.c
+--- elfutils/libelf/elf32_getphdr.c
++++ elfutils/libelf/elf32_getphdr.c
 @@ -93,6 +93,16 @@ __elfw2(LIBELFBITS,getphdr_wrlock) (elf)
  
        if (elf->map_address != NULL)
@@ -125,10 +117,8 @@ Index: elfutils-0.155/libelf/elf32_getphdr.c
  	  /* All the data is already mapped.  Use it.  */
  	  void *file_phdr = ((char *) elf->map_address
  			     + elf->start_offset + ehdr->e_phoff);
-Index: elfutils-0.155/libelf/elf32_getshdr.c
-===================================================================
---- elfutils-0.155.orig/libelf/elf32_getshdr.c
-+++ elfutils-0.155/libelf/elf32_getshdr.c
+--- elfutils/libelf/elf32_getshdr.c
++++ elfutils/libelf/elf32_getshdr.c
 @@ -60,7 +60,8 @@ load_shdr_wrlock (Elf_Scn *scn)
      goto out;
  
@@ -156,10 +146,8 @@ Index: elfutils-0.155/libelf/elf32_getshdr.c
        ElfW2(LIBELFBITS,Shdr) *notcvt;
  
        /* All the data is already mapped.  If we could use it
-Index: elfutils-0.155/libelf/elf32_newphdr.c
-===================================================================
---- elfutils-0.155.orig/libelf/elf32_newphdr.c
-+++ elfutils-0.155/libelf/elf32_newphdr.c
+--- elfutils/libelf/elf32_newphdr.c
++++ elfutils/libelf/elf32_newphdr.c
 @@ -114,6 +114,12 @@ elfw2(LIBELFBITS,newphdr) (elf, count)
  	   || count == PN_XNUM
  	   || elf->state.ELFW(elf,LIBELFBITS).phdr == NULL)
@@ -173,10 +161,8 @@ Index: elfutils-0.155/libelf/elf32_newphdr.c
        /* Allocate a new program header with the appropriate number of
  	 elements.  */
        result = (ElfW2(LIBELFBITS,Phdr) *)
-Index: elfutils-0.155/libelf/elf32_updatefile.c
-===================================================================
---- elfutils-0.155.orig/libelf/elf32_updatefile.c
-+++ elfutils-0.155/libelf/elf32_updatefile.c
+--- elfutils/libelf/elf32_updatefile.c
++++ elfutils/libelf/elf32_updatefile.c
 @@ -202,6 +202,9 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf
    /* Write all the sections.  Well, only those which are modified.  */
    if (shnum > 0)
@@ -198,10 +184,8 @@ Index: elfutils-0.155/libelf/elf32_updatefile.c
        off_t shdr_offset = elf->start_offset + ehdr->e_shoff;
  #if EV_NUM != 2
        xfct_t shdr_fctp = __elf_xfctstom[__libelf_version - 1][EV_CURRENT - 1][ELFW(ELFCLASS, LIBELFBITS) - 1][ELF_T_SHDR];
-Index: elfutils-0.155/libelf/elf_begin.c
-===================================================================
---- elfutils-0.155.orig/libelf/elf_begin.c
-+++ elfutils-0.155/libelf/elf_begin.c
+--- elfutils/libelf/elf_begin.c
++++ elfutils/libelf/elf_begin.c
 @@ -144,7 +144,8 @@ get_shnum (void *map_address, unsigned c
  
        if (unlikely (result == 0) && ehdr.e32->e_shoff != 0)
@@ -267,10 +251,20 @@ Index: elfutils-0.155/libelf/elf_begin.c
  	  elf->state.elf64.shdr
  	    = (Elf64_Shdr *) ((char *) ehdr + ehdr->e_shoff);
  
-Index: elfutils-0.155/libelf/elf_getshdrstrndx.c
-===================================================================
---- elfutils-0.155.orig/libelf/elf_getshdrstrndx.c
-+++ elfutils-0.155/libelf/elf_getshdrstrndx.c
+--- elfutils/libelf/elf_getarsym.c
++++ elfutils/libelf/elf_getarsym.c
+@@ -183,6 +183,9 @@ elf_getarsym (elf, ptr)
+       size_t index_size = atol (tmpbuf);
+ 
+       if (SARMAG + sizeof (struct ar_hdr) + index_size > elf->maximum_size
++#if SIZE_MAX <= 4294967295U
++	  || n >= SIZE_MAX / sizeof (Elf_Arsym)
++#endif
+ 	  || n * w > index_size)
+ 	{
+ 	  /* This index table cannot be right since it does not fit into
+--- elfutils/libelf/elf_getshdrstrndx.c
++++ elfutils/libelf/elf_getshdrstrndx.c
 @@ -104,10 +104,25 @@ elf_getshdrstrndx (elf, dst)
  	      if (elf->map_address != NULL
  		  && elf->state.elf32.ehdr->e_ident[EI_DATA] == MY_ELFDATA
@@ -329,10 +323,8 @@ Index: elfutils-0.155/libelf/elf_getshdrstrndx.c
  	      else
  		{
  		  /* We avoid reading in all the section headers.  Just read
-Index: elfutils-0.155/libelf/elf_newscn.c
-===================================================================
---- elfutils-0.155.orig/libelf/elf_newscn.c
-+++ elfutils-0.155/libelf/elf_newscn.c
+--- elfutils/libelf/elf_newscn.c
++++ elfutils/libelf/elf_newscn.c
 @@ -83,10 +83,18 @@ elf_newscn (elf)
    else
      {
@@ -353,10 +345,8 @@ Index: elfutils-0.155/libelf/elf_newscn.c
        newp = (Elf_ScnList *) calloc (sizeof (Elf_ScnList)
  				     + ((elf->state.elf.scnincr *= 2)
  					* sizeof (Elf_Scn)), 1);
-Index: elfutils-0.155/libelf/gelf_getdyn.c
-===================================================================
---- elfutils-0.155.orig/libelf/gelf_getdyn.c
-+++ elfutils-0.155/libelf/gelf_getdyn.c
+--- elfutils/libelf/gelf_getdyn.c
++++ elfutils/libelf/gelf_getdyn.c
 @@ -1,5 +1,5 @@
  /* Get information from dynamic table at the given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
@@ -382,10 +372,8 @@ Index: elfutils-0.155/libelf/gelf_getdyn.c
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-Index: elfutils-0.155/libelf/gelf_getlib.c
-===================================================================
---- elfutils-0.155.orig/libelf/gelf_getlib.c
-+++ elfutils-0.155/libelf/gelf_getlib.c
+--- elfutils/libelf/gelf_getlib.c
++++ elfutils/libelf/gelf_getlib.c
 @@ -1,5 +1,5 @@
  /* Get library from table at the given index.
 -   Copyright (C) 2004 Red Hat, Inc.
@@ -402,10 +390,8 @@ Index: elfutils-0.155/libelf/gelf_getlib.c
      __libelf_seterrno (ELF_E_INVALID_INDEX);
    else
      {
-Index: elfutils-0.155/libelf/gelf_getmove.c
-===================================================================
---- elfutils-0.155.orig/libelf/gelf_getmove.c
-+++ elfutils-0.155/libelf/gelf_getmove.c
+--- elfutils/libelf/gelf_getmove.c
++++ elfutils/libelf/gelf_getmove.c
 @@ -1,5 +1,5 @@
  /* Get move structure at the given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
@@ -422,10 +408,8 @@ Index: elfutils-0.155/libelf/gelf_getmove.c
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
-Index: elfutils-0.155/libelf/gelf_getrela.c
-===================================================================
---- elfutils-0.155.orig/libelf/gelf_getrela.c
-+++ elfutils-0.155/libelf/gelf_getrela.c
+--- elfutils/libelf/gelf_getrela.c
++++ elfutils/libelf/gelf_getrela.c
 @@ -1,5 +1,5 @@
  /* Get RELA relocation information at given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
@@ -464,10 +448,8 @@ Index: elfutils-0.155/libelf/gelf_getrela.c
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
-Index: elfutils-0.155/libelf/gelf_getrel.c
-===================================================================
---- elfutils-0.155.orig/libelf/gelf_getrel.c
-+++ elfutils-0.155/libelf/gelf_getrel.c
+--- elfutils/libelf/gelf_getrel.c
++++ elfutils/libelf/gelf_getrel.c
 @@ -1,5 +1,5 @@
  /* Get REL relocation information at given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
@@ -506,10 +488,8 @@ Index: elfutils-0.155/libelf/gelf_getrel.c
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  result = NULL;
-Index: elfutils-0.155/libelf/gelf_getsym.c
-===================================================================
---- elfutils-0.155.orig/libelf/gelf_getsym.c
-+++ elfutils-0.155/libelf/gelf_getsym.c
+--- elfutils/libelf/gelf_getsym.c
++++ elfutils/libelf/gelf_getsym.c
 @@ -1,5 +1,5 @@
  /* Get symbol information from symbol table at the given index.
 -   Copyright (C) 1999, 2000, 2001, 2002 Red Hat, Inc.
@@ -535,10 +515,8 @@ Index: elfutils-0.155/libelf/gelf_getsym.c
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-Index: elfutils-0.155/libelf/gelf_getsyminfo.c
-===================================================================
---- elfutils-0.155.orig/libelf/gelf_getsyminfo.c
-+++ elfutils-0.155/libelf/gelf_getsyminfo.c
+--- elfutils/libelf/gelf_getsyminfo.c
++++ elfutils/libelf/gelf_getsyminfo.c
 @@ -1,5 +1,5 @@
  /* Get additional symbol information from symbol table at the given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
@@ -555,10 +533,8 @@ Index: elfutils-0.155/libelf/gelf_getsyminfo.c
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
-Index: elfutils-0.155/libelf/gelf_getsymshndx.c
-===================================================================
---- elfutils-0.155.orig/libelf/gelf_getsymshndx.c
-+++ elfutils-0.155/libelf/gelf_getsymshndx.c
+--- elfutils/libelf/gelf_getsymshndx.c
++++ elfutils/libelf/gelf_getsymshndx.c
 @@ -1,6 +1,6 @@
  /* Get symbol information and separate section index from symbol table
     at the given index.
@@ -594,10 +570,8 @@ Index: elfutils-0.155/libelf/gelf_getsymshndx.c
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-Index: elfutils-0.155/libelf/gelf_getversym.c
-===================================================================
---- elfutils-0.155.orig/libelf/gelf_getversym.c
-+++ elfutils-0.155/libelf/gelf_getversym.c
+--- elfutils/libelf/gelf_getversym.c
++++ elfutils/libelf/gelf_getversym.c
 @@ -1,5 +1,5 @@
  /* Get symbol version information at the given index.
 -   Copyright (C) 1999, 2000, 2001, 2002 Red Hat, Inc.
@@ -614,10 +588,8 @@ Index: elfutils-0.155/libelf/gelf_getversym.c
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        result = NULL;
-Index: elfutils-0.155/libelf/gelf_update_dyn.c
-===================================================================
---- elfutils-0.155.orig/libelf/gelf_update_dyn.c
-+++ elfutils-0.155/libelf/gelf_update_dyn.c
+--- elfutils/libelf/gelf_update_dyn.c
++++ elfutils/libelf/gelf_update_dyn.c
 @@ -1,5 +1,5 @@
  /* Update information in dynamic table at the given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
@@ -656,10 +628,8 @@ Index: elfutils-0.155/libelf/gelf_update_dyn.c
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-Index: elfutils-0.155/libelf/gelf_update_lib.c
-===================================================================
---- elfutils-0.155.orig/libelf/gelf_update_lib.c
-+++ elfutils-0.155/libelf/gelf_update_lib.c
+--- elfutils/libelf/gelf_update_lib.c
++++ elfutils/libelf/gelf_update_lib.c
 @@ -1,5 +1,5 @@
  /* Update library in table at the given index.
 -   Copyright (C) 2004 Red Hat, Inc.
@@ -689,10 +659,8 @@ Index: elfutils-0.155/libelf/gelf_update_lib.c
      __libelf_seterrno (ELF_E_INVALID_INDEX);
    else
      {
-Index: elfutils-0.155/libelf/gelf_update_move.c
-===================================================================
---- elfutils-0.155.orig/libelf/gelf_update_move.c
-+++ elfutils-0.155/libelf/gelf_update_move.c
+--- elfutils/libelf/gelf_update_move.c
++++ elfutils/libelf/gelf_update_move.c
 @@ -1,5 +1,5 @@
  /* Update move structure at the given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
@@ -710,10 +678,8 @@ Index: elfutils-0.155/libelf/gelf_update_move.c
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        return 0;
-Index: elfutils-0.155/libelf/gelf_update_rela.c
-===================================================================
---- elfutils-0.155.orig/libelf/gelf_update_rela.c
-+++ elfutils-0.155/libelf/gelf_update_rela.c
+--- elfutils/libelf/gelf_update_rela.c
++++ elfutils/libelf/gelf_update_rela.c
 @@ -1,5 +1,5 @@
  /* Update RELA relocation information at given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
@@ -752,10 +718,8 @@ Index: elfutils-0.155/libelf/gelf_update_rela.c
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-Index: elfutils-0.155/libelf/gelf_update_rel.c
-===================================================================
---- elfutils-0.155.orig/libelf/gelf_update_rel.c
-+++ elfutils-0.155/libelf/gelf_update_rel.c
+--- elfutils/libelf/gelf_update_rel.c
++++ elfutils/libelf/gelf_update_rel.c
 @@ -1,5 +1,5 @@
  /* Update REL relocation information at given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
@@ -794,10 +758,8 @@ Index: elfutils-0.155/libelf/gelf_update_rel.c
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-Index: elfutils-0.155/libelf/gelf_update_sym.c
-===================================================================
---- elfutils-0.155.orig/libelf/gelf_update_sym.c
-+++ elfutils-0.155/libelf/gelf_update_sym.c
+--- elfutils/libelf/gelf_update_sym.c
++++ elfutils/libelf/gelf_update_sym.c
 @@ -1,5 +1,5 @@
  /* Update symbol information in symbol table at the given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
@@ -836,10 +798,8 @@ Index: elfutils-0.155/libelf/gelf_update_sym.c
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-Index: elfutils-0.155/libelf/gelf_update_syminfo.c
-===================================================================
---- elfutils-0.155.orig/libelf/gelf_update_syminfo.c
-+++ elfutils-0.155/libelf/gelf_update_syminfo.c
+--- elfutils/libelf/gelf_update_syminfo.c
++++ elfutils/libelf/gelf_update_syminfo.c
 @@ -1,5 +1,5 @@
  /* Update additional symbol information in symbol table at the given index.
 -   Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
@@ -869,10 +829,8 @@ Index: elfutils-0.155/libelf/gelf_update_syminfo.c
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        goto out;
-Index: elfutils-0.155/libelf/gelf_update_symshndx.c
-===================================================================
---- elfutils-0.155.orig/libelf/gelf_update_symshndx.c
-+++ elfutils-0.155/libelf/gelf_update_symshndx.c
+--- elfutils/libelf/gelf_update_symshndx.c
++++ elfutils/libelf/gelf_update_symshndx.c
 @@ -1,6 +1,6 @@
  /* Update symbol information and section index in symbol table at the
     given index.
@@ -912,10 +870,8 @@ Index: elfutils-0.155/libelf/gelf_update_symshndx.c
  	{
  	  __libelf_seterrno (ELF_E_INVALID_INDEX);
  	  goto out;
-Index: elfutils-0.155/libelf/gelf_update_versym.c
-===================================================================
---- elfutils-0.155.orig/libelf/gelf_update_versym.c
-+++ elfutils-0.155/libelf/gelf_update_versym.c
+--- elfutils/libelf/gelf_update_versym.c
++++ elfutils/libelf/gelf_update_versym.c
 @@ -1,5 +1,5 @@
  /* Update symbol version information.
 -   Copyright (C) 2001, 2002 Red Hat, Inc.
@@ -933,10 +889,8 @@ Index: elfutils-0.155/libelf/gelf_update_versym.c
      {
        __libelf_seterrno (ELF_E_INVALID_INDEX);
        return 0;
-Index: elfutils-0.155/libelf/libelfP.h
-===================================================================
---- elfutils-0.155.orig/libelf/libelfP.h
-+++ elfutils-0.155/libelf/libelfP.h
+--- elfutils/libelf/libelfP.h
++++ elfutils/libelf/libelfP.h
 @@ -587,4 +587,8 @@ extern uint32_t __libelf_crc32 (uint32_t
  /* Align offset to 4 bytes as needed for note name and descriptor data.  */
  #define NOTE_ALIGN(n)	(((n) + 3) & -4U)
@@ -946,11 +900,9 @@ Index: elfutils-0.155/libelf/libelfP.h
 +  unlikely ((data)->d_size / sizeof (type) <= (unsigned int) (ndx))
 +
  #endif  /* libelfP.h */
-Index: elfutils-0.155/src/ChangeLog
-===================================================================
---- elfutils-0.155.orig/src/ChangeLog
-+++ elfutils-0.155/src/ChangeLog
-@@ -344,6 +344,12 @@
+--- elfutils/src/ChangeLog
++++ elfutils/src/ChangeLog
+@@ -504,6 +504,12 @@
  
  	* readelf.c (dwarf_attr_string): Grok DW_AT_GNU_odr_signature.
  
@@ -963,7 +915,7 @@ Index: elfutils-0.155/src/ChangeLog
  2011-02-11  Roland McGrath  <roland@redhat.com>
  
  	* elfcmp.c (verbose): New variable.
-@@ -2081,6 +2087,16 @@
+@@ -2216,6 +2222,16 @@
  	object symbols or symbols with unknown type.
  	(check_rel): Likewise.
  
@@ -980,7 +932,7 @@ Index: elfutils-0.155/src/ChangeLog
  2005-06-08  Roland McGrath  <roland@redhat.com>
  
  	* readelf.c (print_ops): Add consts.
-@@ -2131,6 +2147,19 @@
+@@ -2261,6 +2277,19 @@
  
  	* readelf.c (dwarf_tag_string): Add new tags.
  
@@ -1000,10 +952,8 @@ Index: elfutils-0.155/src/ChangeLog
  2005-05-08  Roland McGrath  <roland@redhat.com>
  
  	* strip.c (handle_elf): Don't translate hash and versym data formats,
-Index: elfutils-0.155/src/elflint.c
-===================================================================
---- elfutils-0.155.orig/src/elflint.c
-+++ elfutils-0.155/src/elflint.c
+--- elfutils/src/elflint.c
++++ elfutils/src/elflint.c
 @@ -123,6 +123,10 @@ static uint32_t shstrndx;
  /* Array to count references in section groups.  */
  static int *scnref;
@@ -1077,7 +1027,7 @@ Index: elfutils-0.155/src/elflint.c
  	}
  
        if (sym->st_shndx == SHN_XINDEX)
-@@ -1032,9 +1042,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
+@@ -1040,9 +1050,11 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
      {
        GElf_Shdr rcshdr_mem;
        const GElf_Shdr *rcshdr = gelf_getshdr (scn, &rcshdr_mem);
@@ -1091,7 +1041,7 @@ Index: elfutils-0.155/src/elflint.c
  	{
  	  /* Found the dynamic section.  Look through it.  */
  	  Elf_Data *d = elf_getdata (scn, NULL);
-@@ -1044,7 +1056,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
+@@ -1052,7 +1064,9 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
  	    {
  	      GElf_Dyn dyn_mem;
  	      GElf_Dyn *dyn = gelf_getdyn (d, cnt, &dyn_mem);
@@ -1102,7 +1052,7 @@ Index: elfutils-0.155/src/elflint.c
  
  	      if (dyn->d_tag == DT_RELCOUNT)
  		{
-@@ -1058,7 +1072,9 @@ section [%2d] '%s': DT_RELCOUNT used for
+@@ -1066,7 +1080,9 @@ section [%2d] '%s': DT_RELCOUNT used for
  		      /* Does the number specified number of relative
  			 relocations exceed the total number of
  			 relocations?  */
@@ -1113,7 +1063,7 @@ Index: elfutils-0.155/src/elflint.c
  			ERROR (gettext ("\
  section [%2d] '%s': DT_RELCOUNT value %d too high for this section\n"),
  			       idx, section_name (ebl, idx),
-@@ -1218,7 +1234,8 @@ section [%2d] '%s': no relocations for m
+@@ -1226,7 +1242,8 @@ section [%2d] '%s': no relocations for m
  	}
      }
  
@@ -1123,7 +1073,7 @@ Index: elfutils-0.155/src/elflint.c
      ERROR (gettext (reltype == ELF_T_RELA ? "\
  section [%2d] '%s': section entry size does not match ElfXX_Rela\n" : "\
  section [%2d] '%s': section entry size does not match ElfXX_Rel\n"),
-@@ -1441,7 +1458,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G
+@@ -1449,7 +1466,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G
    Elf_Data *symdata = elf_getdata (symscn, NULL);
    enum load_state state = state_undecided;
  
@@ -1133,7 +1083,7 @@ Index: elfutils-0.155/src/elflint.c
      {
        GElf_Rela rela_mem;
        GElf_Rela *rela = gelf_getrela (data, cnt, &rela_mem);
-@@ -1491,7 +1509,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE
+@@ -1499,7 +1517,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE
    Elf_Data *symdata = elf_getdata (symscn, NULL);
    enum load_state state = state_undecided;
  
@@ -1143,7 +1093,7 @@ Index: elfutils-0.155/src/elflint.c
      {
        GElf_Rel rel_mem;
        GElf_Rel *rel = gelf_getrel (data, cnt, &rel_mem);
-@@ -1590,7 +1609,8 @@ section [%2d] '%s': referenced as string
+@@ -1598,7 +1617,8 @@ section [%2d] '%s': referenced as string
  	   shdr->sh_link, section_name (ebl, shdr->sh_link),
  	   idx, section_name (ebl, idx));
  
@@ -1153,7 +1103,7 @@ Index: elfutils-0.155/src/elflint.c
      ERROR (gettext ("\
  section [%2d] '%s': section entry size does not match ElfXX_Dyn\n"),
  	   idx, section_name (ebl, idx));
-@@ -1600,7 +1620,7 @@ section [%2d] '%s': section entry size d
+@@ -1608,7 +1628,7 @@ section [%2d] '%s': section entry size d
  	   idx, section_name (ebl, idx));
  
    bool non_null_warned = false;
@@ -1162,7 +1112,7 @@ Index: elfutils-0.155/src/elflint.c
      {
        GElf_Dyn dyn_mem;
        GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dyn_mem);
-@@ -1872,6 +1892,8 @@ section [%2d] '%s': entry size does not
+@@ -1880,6 +1900,8 @@ section [%2d] '%s': entry size does not
  	   idx, section_name (ebl, idx));
  
    if (symshdr != NULL
@@ -1171,7 +1121,7 @@ Index: elfutils-0.155/src/elflint.c
        && (shdr->sh_size / shdr->sh_entsize
  	  < symshdr->sh_size / symshdr->sh_entsize))
      ERROR (gettext ("\
-@@ -1898,6 +1920,12 @@ section [%2d] '%s': extended section ind
+@@ -1906,6 +1928,12 @@ section [%2d] '%s': extended section ind
      }
  
    Elf_Data *data = elf_getdata (elf_getscn (ebl->elf, idx), NULL);
@@ -1184,7 +1134,7 @@ Index: elfutils-0.155/src/elflint.c
  
    if (*((Elf32_Word *) data->d_buf) != 0)
      ERROR (gettext ("symbol 0 should have zero extended section index\n"));
-@@ -1940,7 +1968,7 @@ section [%2d] '%s': hash table section i
+@@ -1948,7 +1976,7 @@ section [%2d] '%s': hash table section i
  
    size_t maxidx = nchain;
  
@@ -1193,7 +1143,7 @@ Index: elfutils-0.155/src/elflint.c
      {
        size_t symsize = symshdr->sh_size / symshdr->sh_entsize;
  
-@@ -1951,18 +1979,28 @@ section [%2d] '%s': hash table section i
+@@ -1959,18 +1987,28 @@ section [%2d] '%s': hash table section i
        maxidx = symsize;
      }
  
@@ -1224,7 +1174,7 @@ Index: elfutils-0.155/src/elflint.c
  }
  
  
-@@ -1992,18 +2030,28 @@ section [%2d] '%s': hash table section i
+@@ -2000,18 +2038,28 @@ section [%2d] '%s': hash table section i
        maxidx = symsize;
      }
  
@@ -1256,7 +1206,7 @@ Index: elfutils-0.155/src/elflint.c
  }
  
  
-@@ -2028,7 +2076,7 @@ section [%2d] '%s': bitmask size not pow
+@@ -2036,7 +2084,7 @@ section [%2d] '%s': bitmask size not pow
    if (shdr->sh_size < (4 + bitmask_words + nbuckets) * sizeof (Elf32_Word))
      {
        ERROR (gettext ("\
@@ -1265,7 +1215,7 @@ Index: elfutils-0.155/src/elflint.c
  	     idx, section_name (ebl, idx), (long int) shdr->sh_size,
  	     (long int) ((4 + bitmask_words + nbuckets) * sizeof (Elf32_Word)));
        return;
-@@ -2700,8 +2748,9 @@ section [%2d] '%s' refers in sh_link to
+@@ -2708,8 +2756,9 @@ section [%2d] '%s' refers in sh_link to
  
    /* The number of elements in the version symbol table must be the
       same as the number of symbols.  */
@@ -1277,11 +1227,9 @@ Index: elfutils-0.155/src/elflint.c
      ERROR (gettext ("\
  section [%2d] '%s' has different number of entries than symbol table [%2d] '%s'\n"),
  	   idx, section_name (ebl, idx),
-Index: elfutils-0.155/src/readelf.c
-===================================================================
---- elfutils-0.155.orig/src/readelf.c
-+++ elfutils-0.155/src/readelf.c
-@@ -1189,6 +1189,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
+--- elfutils/src/readelf.c
++++ elfutils/src/readelf.c
+@@ -1363,6 +1363,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
    Elf32_Word *grpref = (Elf32_Word *) data->d_buf;
  
    GElf_Sym sym_mem;
@@ -1290,7 +1238,7 @@ Index: elfutils-0.155/src/readelf.c
    printf ((grpref[0] & GRP_COMDAT)
  	  ? ngettext ("\
  \nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n",
-@@ -1201,8 +1203,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
+@@ -1375,8 +1377,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
  		      data->d_size / sizeof (Elf32_Word) - 1),
  	  elf_ndxscn (scn),
  	  elf_strptr (ebl->elf, shstrndx, shdr->sh_name),
@@ -1301,7 +1249,7 @@ Index: elfutils-0.155/src/readelf.c
  	  ?: gettext ("<INVALID SYMBOL>"),
  	  data->d_size / sizeof (Elf32_Word) - 1);
  
-@@ -1353,10 +1355,12 @@ static void
+@@ -1527,10 +1529,12 @@ static void
  handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr)
  {
    int class = gelf_getclass (ebl->elf);
@@ -1315,7 +1263,7 @@ Index: elfutils-0.155/src/readelf.c
  
    /* Get the data of the section.  */
    data = elf_getdata (scn, NULL);
-@@ -1368,21 +1372,26 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn,
+@@ -1542,21 +1546,26 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn,
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1348,7 +1296,7 @@ Index: elfutils-0.155/src/readelf.c
      {
        GElf_Dyn dynmem;
        GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dynmem);
-@@ -1531,7 +1540,8 @@ static void
+@@ -1705,7 +1714,8 @@ static void
  handle_relocs_rel (Ebl *ebl, GElf_Ehdr *ehdr, Elf_Scn *scn, GElf_Shdr *shdr)
  {
    int class = gelf_getclass (ebl->elf);
@@ -1358,7 +1306,7 @@ Index: elfutils-0.155/src/readelf.c
  
    /* Get the data of the section.  */
    Elf_Data *data = elf_getdata (scn, NULL);
-@@ -1717,7 +1727,8 @@ static void
+@@ -1891,7 +1901,8 @@ static void
  handle_relocs_rela (Ebl *ebl, GElf_Ehdr *ehdr, Elf_Scn *scn, GElf_Shdr *shdr)
  {
    int class = gelf_getclass (ebl->elf);
@@ -1368,7 +1316,7 @@ Index: elfutils-0.155/src/readelf.c
  
    /* Get the data of the section.  */
    Elf_Data *data = elf_getdata (scn, NULL);
-@@ -1964,6 +1975,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
+@@ -2138,6 +2149,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1382,7 +1330,7 @@ Index: elfutils-0.155/src/readelf.c
    /* Now we can compute the number of entries in the section.  */
    unsigned int nsyms = data->d_size / (class == ELFCLASS32
  				       ? sizeof (Elf32_Sym)
-@@ -1974,15 +1992,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
+@@ -2148,15 +2166,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
  		    nsyms),
  	  (unsigned int) elf_ndxscn (scn),
  	  elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms);
@@ -1399,7 +1347,7 @@ Index: elfutils-0.155/src/readelf.c
  
    fputs_unlocked (class == ELFCLASS32
  		  ? gettext ("\
-@@ -2218,7 +2233,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn,
+@@ -2392,7 +2407,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn,
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1414,7 +1362,7 @@ Index: elfutils-0.155/src/readelf.c
    printf (ngettext ("\
  \nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -2229,9 +2250,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn,
+@@ -2403,9 +2424,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn,
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1425,7 +1373,7 @@ Index: elfutils-0.155/src/readelf.c
  
    unsigned int offset = 0;
    for (int cnt = shdr->sh_info; --cnt >= 0; )
-@@ -2284,8 +2303,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
+@@ -2458,8 +2477,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
      error (EXIT_FAILURE, 0,
  	   gettext ("cannot get section header string table index"));
  
@@ -1441,7 +1389,7 @@ Index: elfutils-0.155/src/readelf.c
    printf (ngettext ("\
  \nVersion definition section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -2297,9 +2322,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
+@@ -2471,9 +2496,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
  	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1452,7 +1400,7 @@ Index: elfutils-0.155/src/readelf.c
  
    unsigned int offset = 0;
    for (int cnt = shdr->sh_info; --cnt >= 0; )
-@@ -2561,25 +2584,30 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
+@@ -2735,25 +2758,30 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
        filename = NULL;
      }
  
@@ -1490,7 +1438,7 @@ Index: elfutils-0.155/src/readelf.c
      {
        if (cnt % 2 == 0)
  	printf ("\n %4d:", cnt);
-@@ -2628,7 +2656,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
+@@ -2802,7 +2830,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
    for (Elf32_Word cnt = 0; cnt < nbucket; ++cnt)
      ++counts[lengths[cnt]];
  
@@ -1509,7 +1457,7 @@ Index: elfutils-0.155/src/readelf.c
    printf (ngettext ("\
  \nHistogram for bucket list length in section [%2u] '%s' (total of %d bucket):\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
  		    "\
-@@ -2641,9 +2679,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
+@@ -2815,9 +2853,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
  	  shdr->sh_addr,
  	  shdr->sh_offset,
  	  (unsigned int) shdr->sh_link,
@@ -1520,7 +1468,7 @@ Index: elfutils-0.155/src/readelf.c
  
    if (extrastr != NULL)
      fputs (extrastr, stdout);
-@@ -2903,7 +2939,8 @@ print_liblist (Ebl *ebl)
+@@ -3077,7 +3113,8 @@ print_liblist (Ebl *ebl)
  
        if (shdr != NULL && shdr->sh_type == SHT_GNU_LIBLIST)
  	{
@@ -1530,7 +1478,7 @@ Index: elfutils-0.155/src/readelf.c
  	  printf (ngettext ("\
  \nLibrary list section [%2zu] '%s' at offset %#0" PRIx64 " contains %d entry:\n",
  			    "\
-@@ -4168,6 +4205,16 @@ print_debug_aranges_section (Dwfl_Module
+@@ -4397,6 +4434,16 @@ print_decoded_aranges_section (Ebl *ebl,
        return;
      }
  
@@ -1547,11 +1495,9 @@ Index: elfutils-0.155/src/readelf.c
    printf (ngettext ("\
  \nDWARF section [%2zu] '%s' at offset %#" PRIx64 " contains %zu entry:\n",
  		    "\
-Index: elfutils-0.155/src/strip.c
-===================================================================
---- elfutils-0.155.orig/src/strip.c
-+++ elfutils-0.155/src/strip.c
-@@ -580,6 +580,11 @@ handle_elf (int fd, Elf *elf, const char
+--- elfutils/src/strip.c
++++ elfutils/src/strip.c
+@@ -565,6 +565,11 @@ handle_elf (int fd, Elf *elf, const char
        goto fail_close;
      }
  
@@ -1563,7 +1509,7 @@ Index: elfutils-0.155/src/strip.c
    /* Storage for section information.  We leave room for two more
       entries since we unconditionally create a section header string
       table.  Maybe some weird tool created an ELF file without one.
-@@ -601,7 +606,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -586,7 +591,7 @@ handle_elf (int fd, Elf *elf, const char
      {
        /* This should always be true (i.e., there should not be any
  	 holes in the numbering).  */
@@ -1572,7 +1518,7 @@ Index: elfutils-0.155/src/strip.c
  
        shdr_info[cnt].scn = scn;
  
-@@ -614,6 +619,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -599,6 +604,7 @@ handle_elf (int fd, Elf *elf, const char
  					shdr_info[cnt].shdr.sh_name);
        if (shdr_info[cnt].name == NULL)
  	{
@@ -1580,7 +1526,7 @@ Index: elfutils-0.155/src/strip.c
  	  error (0, 0, gettext ("illformed file '%s'"), fname);
  	  goto fail_close;
  	}
-@@ -623,6 +629,8 @@ handle_elf (int fd, Elf *elf, const char
+@@ -608,6 +614,8 @@ handle_elf (int fd, Elf *elf, const char
  
        /* Remember the shdr.sh_link value.  */
        shdr_info[cnt].old_sh_link = shdr_info[cnt].shdr.sh_link;
@@ -1589,7 +1535,7 @@ Index: elfutils-0.155/src/strip.c
  
        /* Sections in files other than relocatable object files which
  	 are not loaded can be freely moved by us.  In relocatable
-@@ -635,7 +643,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -620,7 +628,7 @@ handle_elf (int fd, Elf *elf, const char
  	 appropriate reference.  */
        if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_SYMTAB_SHNDX))
  	{
@@ -1598,7 +1544,7 @@ Index: elfutils-0.155/src/strip.c
  	  shdr_info[shdr_info[cnt].shdr.sh_link].symtab_idx = cnt;
  	}
        else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GROUP))
-@@ -652,7 +660,12 @@ handle_elf (int fd, Elf *elf, const char
+@@ -637,7 +645,12 @@ handle_elf (int fd, Elf *elf, const char
  	  for (inner = 1;
  	       inner < shdr_info[cnt].data->d_size / sizeof (Elf32_Word);
  	       ++inner)
@@ -1611,7 +1557,7 @@ Index: elfutils-0.155/src/strip.c
  
  	  if (inner == 1 || (inner == 2 && (grpref[0] & GRP_COMDAT) == 0))
  	    /* If the section group contains only one element and this
-@@ -663,7 +676,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -648,7 +661,7 @@ handle_elf (int fd, Elf *elf, const char
  	}
        else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GNU_versym))
  	{
@@ -1620,7 +1566,7 @@ Index: elfutils-0.155/src/strip.c
  	  shdr_info[shdr_info[cnt].shdr.sh_link].version_idx = cnt;
  	}
  
-@@ -671,7 +684,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -656,7 +669,7 @@ handle_elf (int fd, Elf *elf, const char
  	 discarded right away.  */
        if ((shdr_info[cnt].shdr.sh_flags & SHF_GROUP) != 0)
  	{
@@ -1629,7 +1575,7 @@ Index: elfutils-0.155/src/strip.c
  
  	  if (shdr_info[shdr_info[cnt].group_idx].idx == 0)
  	    {
-@@ -747,10 +760,14 @@ handle_elf (int fd, Elf *elf, const char
+@@ -732,10 +745,14 @@ handle_elf (int fd, Elf *elf, const char
  	    {
  	      /* If a relocation section is marked as being removed make
  		 sure the section it is relocating is removed, too.  */
@@ -1647,7 +1593,7 @@ Index: elfutils-0.155/src/strip.c
  
  	      /* If a group section is marked as being removed make
  		 sure all the sections it contains are being removed, too.  */
-@@ -794,7 +811,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -779,7 +796,7 @@ handle_elf (int fd, Elf *elf, const char
  		  if (shdr_info[cnt].symtab_idx != 0
  		      && shdr_info[shdr_info[cnt].symtab_idx].data == NULL)
  		    {
@@ -1656,7 +1602,7 @@ Index: elfutils-0.155/src/strip.c
  
  		      shdr_info[shdr_info[cnt].symtab_idx].data
  			= elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,
-@@ -834,6 +851,9 @@ handle_elf (int fd, Elf *elf, const char
+@@ -819,6 +836,9 @@ handle_elf (int fd, Elf *elf, const char
  		      else if (scnidx == SHN_XINDEX)
  			scnidx = xndx;
  
@@ -1666,7 +1612,7 @@ Index: elfutils-0.155/src/strip.c
  		      if (shdr_info[scnidx].idx == 0)
  			/* This symbol table has a real symbol in
  			   a discarded section.  So preserve the
-@@ -864,12 +884,16 @@ handle_elf (int fd, Elf *elf, const char
+@@ -849,12 +869,16 @@ handle_elf (int fd, Elf *elf, const char
  		}
  
  	      /* Handle references through sh_info.  */
@@ -1685,7 +1631,7 @@ Index: elfutils-0.155/src/strip.c
  
  	      /* Mark the section as investigated.  */
  	      shdr_info[cnt].idx = 2;
-@@ -1010,7 +1034,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -995,7 +1019,7 @@ handle_elf (int fd, Elf *elf, const char
  	  error (EXIT_FAILURE, 0, gettext ("while generating output file: %s"),
  		 elf_errmsg (-1));
  
@@ -1694,7 +1640,7 @@ Index: elfutils-0.155/src/strip.c
  
  	/* Add this name to the section header string table.  */
  	shdr_info[cnt].se = ebl_strtabadd (shst, shdr_info[cnt].name, 0);
-@@ -1047,7 +1071,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1032,7 +1056,7 @@ handle_elf (int fd, Elf *elf, const char
  	error (EXIT_FAILURE, 0,
  	       gettext ("while create section header section: %s"),
  	       elf_errmsg (-1));
@@ -1703,7 +1649,7 @@ Index: elfutils-0.155/src/strip.c
  
        shdr_info[cnt].data = elf_newdata (shdr_info[cnt].newscn);
        if (shdr_info[cnt].data == NULL)
-@@ -1103,7 +1127,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1089,7 +1113,7 @@ handle_elf (int fd, Elf *elf, const char
      error (EXIT_FAILURE, 0,
  	   gettext ("while create section header section: %s"),
  	   elf_errmsg (-1));
@@ -1712,7 +1658,7 @@ Index: elfutils-0.155/src/strip.c
  
    /* Finalize the string table and fill in the correct indices in the
       section headers.  */
-@@ -1193,20 +1217,20 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1179,20 +1203,20 @@ handle_elf (int fd, Elf *elf, const char
  		    shndxdata = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,
  					     NULL);
  
@@ -1736,7 +1682,7 @@ Index: elfutils-0.155/src/strip.c
  			    >= shdr_info[cnt].data->d_size / elsize);
  		  }
  
-@@ -1261,7 +1285,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1247,7 +1271,7 @@ handle_elf (int fd, Elf *elf, const char
  		      sec = shdr_info[sym->st_shndx].idx;
  		    else
  		      {
@@ -1745,7 +1691,7 @@ Index: elfutils-0.155/src/strip.c
  
  			sec = shdr_info[xshndx].idx;
  		      }
-@@ -1282,7 +1306,7 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1268,7 +1292,7 @@ handle_elf (int fd, Elf *elf, const char
  			    nxshndx = sec;
  			  }
  
@@ -1754,7 +1700,7 @@ Index: elfutils-0.155/src/strip.c
  
  			if ((inner != destidx || nshndx != sym->st_shndx
  			     || (shndxdata != NULL && nxshndx != xshndx))
-@@ -1309,9 +1333,11 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1295,9 +1319,11 @@ handle_elf (int fd, Elf *elf, const char
  		      {
  			size_t sidx = (sym->st_shndx != SHN_XINDEX
  					? sym->st_shndx : xshndx);
@@ -1769,7 +1715,7 @@ Index: elfutils-0.155/src/strip.c
  		      }
  		  }
  
-@@ -1499,11 +1525,11 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1485,11 +1511,11 @@ handle_elf (int fd, Elf *elf, const char
  		  {
  		    GElf_Sym sym_mem;
  		    GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);
@@ -1783,7 +1729,7 @@ Index: elfutils-0.155/src/strip.c
  		    size_t hidx = elf_hash (name) % nbucket;
  
  		    if (bucket[hidx] == 0)
-@@ -1522,8 +1548,8 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1508,8 +1534,8 @@ handle_elf (int fd, Elf *elf, const char
  	    else
  	      {
  		/* Alpha and S390 64-bit use 64-bit SHT_HASH entries.  */
@@ -1794,7 +1740,7 @@ Index: elfutils-0.155/src/strip.c
  
  		Elf64_Xword *bucket = (Elf64_Xword *) hashd->d_buf;
  
-@@ -1553,11 +1579,11 @@ handle_elf (int fd, Elf *elf, const char
+@@ -1539,11 +1565,11 @@ handle_elf (int fd, Elf *elf, const char
  		  {
  		    GElf_Sym sym_mem;
  		    GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);
diff --git a/elfutils-sizeof-pointer-memaccess.patch b/elfutils-sizeof-pointer-memaccess.patch
deleted file mode 100644
index 0e88313..0000000
--- a/elfutils-sizeof-pointer-memaccess.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: elfutils-0.155/src/ar.c
-===================================================================
---- elfutils-0.155.orig/src/ar.c
-+++ elfutils-0.155/src/ar.c
-@@ -461,7 +461,7 @@ do_oper_extract (int oper, const char *a
- 		 long int instance)
- {
-   bool found[argc];
--  memset (found, '\0', sizeof (found));
-+  memset (found, '\0', sizeof (bool) * argc);
- 
-   size_t name_max = 0;
-   inline bool should_truncate_fname (void)
-@@ -919,7 +919,7 @@ do_oper_delete (const char *arfname, cha
- 		long int instance)
- {
-   bool *found = alloca (sizeof (bool) * argc);
--  memset (found, '\0', sizeof (found));
-+  memset (found, '\0', sizeof (bool) * argc);
- 
-   /* List of the files we keep.  */
-   struct armem *to_copy = NULL;
-Index: elfutils-0.155/src/nm.c
-===================================================================
---- elfutils-0.155.orig/src/nm.c
-+++ elfutils-0.155/src/nm.c
-@@ -769,8 +769,9 @@ show_symbols_sysv (Ebl *ebl, GElf_Word s
- 			       gelf_getshdr (scn, &shdr_mem)->sh_name);
-       if (unlikely (name == NULL))
- 	{
--	  name = alloca (sizeof "[invalid sh_name 0x12345678]");
--	  snprintf (name, sizeof name, "[invalid sh_name %#" PRIx32 "]",
-+	  size_t len = sizeof "[invalid sh_name 0x12345678]";
-+	  name = alloca (len);
-+	  snprintf (name, len, "[invalid sh_name %#" PRIx32 "]",
- 		    gelf_getshdr (scn, &shdr_mem)->sh_name);
- 	}
-       scnnames[elf_ndxscn (scn)] = name;
diff --git a/elfutils.changes b/elfutils.changes
index 3e133b2..7a54764 100644
--- a/elfutils.changes
+++ b/elfutils.changes
@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Wed Nov 13 12:12:20 UTC 2013 - sweet_f_a@gmx.de
+
+- update to 0.157:
+  libdw: Add new functions dwarf_getlocations, dwarf_getlocation_attr
+           and dwarf_getlocation_die.
+  readelf: Show contents of NT_SIGINFO and NT_FILE core notes.
+  addr2line: Support -i, --inlines output option.
+  backends: abi_cfi hook for arm, ppc and s390.
+- update to 0.156:
+  lib: New macro COMPAT_VERSION_NEWPROTO.
+  libdw: Handle GNU extension opcodes in dwarf_getlocation.
+  libdwfl: Fix STB_GLOBAL over STB_WEAK preference in dwfl_module_addrsym.
+           Add minisymtab support.
+           Add parameter add_p_vaddr to dwfl_report_elf.
+           Use DT_DEBUG library search first.
+  libebl: Handle new core note types in EBL.
+  backends: Interpret NT_ARM_VFP.
+            Implement core file registers parsing for s390/s390x.
+  readelf: Add --elf-section input option to inspect an embedded ELF file.
+           Add -U, --unresolved-address-offsets output control.
+           Add --debug-dump=decodedline support.
+           Accept version 8 .gdb_index section format.
+           Adjust output formatting width.
+           When highpc is in constant form print it also as address.
+           Display raw .debug_aranges. Use libdw only for decodedaranges.
+  elflint: Add __bss_start__ to the list of allowed symbols.
+  tests: Add configure --enable-valgrind option to run all tests under valgrind.
+         Enable automake parallel-tests for make check.
+  translations: Updated Polish translation.
+  Updates for Automake 1.13.
+- remove elfutils-aarch64.patch and elfutils-sizeof-pointer-memaccess.patch
+  (fixed by upstream)
+- rebase elfutils-robustify.patch and elfutils-portability.patch, they are
+  provided by ustream
+
 -------------------------------------------------------------------
 Tue Jun 18 16:05:13 UTC 2013 - schwab@suse.de
 
diff --git a/elfutils.spec b/elfutils.spec
index 10401cd..4604dc9 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -17,7 +17,7 @@
 
 
 Name:           elfutils
-Version:        0.155
+Version:        0.157
 Release:        0
 Summary:        Higher-level library to access ELF
 License:        SUSE-GPL-2.0-with-OSI-exception
@@ -26,16 +26,14 @@ Url:            http://elfutils.fedorahosted.org
 Source:         https://fedorahosted.org/releases/e/l/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Source1:        README-BEFORE-ADDING-PATCHES
 Source2:        baselibs.conf
-Patch1:         elfutils-portability.patch
-Patch2:         elfutils-robustify.patch
+Patch1:         https://fedorahosted.org/releases/e/l/%{name}/%{version}/elfutils-portability.patch
+Patch2:         https://fedorahosted.org/releases/e/l/%{name}/%{version}/elfutils-robustify.patch
 Patch3:         elfutils-no-po-test-build.diff
 Patch4:         libebl-prototype-fix.diff
 Patch5:         elfutils-uninitialized.diff
 Patch6:         elfutils-0.137-dwarf-header-check-fix.diff
 Patch7:         elfutils-0.148-dont-crash.diff
 Patch8:         elfutils-revert-portability-scanf.patch
-Patch9:         elfutils-aarch64.patch
-Patch10:        elfutils-sizeof-pointer-memaccess.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  flex
@@ -146,8 +144,6 @@ to develop applications that require these.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1 -R
-%patch9 -p1
-%patch10 -p1
 
 %build
 # Change DATE/TIME macros to use last change time of elfutils.changes