Update to 0.158.

2014-01-06 10:06:14 +01:00 · 2014-01-06 10:06:14 +01:00 · fde59360e2
parent 39b038f4f8
commit fde59360e2
10 changed files with 289 additions and 3164 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,3 +3,4 @@
 /funcretval_test_aarch64.bz2
 /hello_aarch64.ko.bz2
 /testfile_aarch64_core.bz2
 /elfutils-0.158.tar.bz2
--- a/elfutils-0.157-aarch64-configury.patch
+++ b/elfutils-0.157-aarch64-configury.patch
@ -1,227 +0,0 @@
 Только в elfutils-0.157: autom4te.cache
 diff -urp elfutils-0.157~/backends/Makefile.in elfutils-0.157/backends/Makefile.in
 --- elfutils-0.157~/backends/Makefile.in	2013-09-30 14:37:52.000000000 +0200
 +++ elfutils-0.157/backends/Makefile.in	2013-12-02 23:54:45.094831256 +0100
@@ -102,72 +102,78 @@ AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
 am__v_AR_0 = @echo "  AR      " $@;
 am__v_AR_1 = 
 +libebl_aarch64_pic_a_AR = $(AR) $(ARFLAGS)
 +libebl_aarch64_pic_a_LIBADD =
 +am__objects_1 = aarch64_init.$(OBJEXT) aarch64_regs.$(OBJEXT) \
 +	aarch64_symbol.$(OBJEXT) aarch64_corenote.$(OBJEXT) \
 +	aarch64_retval.$(OBJEXT)
 +libebl_aarch64_pic_a_OBJECTS = $(am_libebl_aarch64_pic_a_OBJECTS)
 libebl_alpha_pic_a_AR = $(AR) $(ARFLAGS)
 libebl_alpha_pic_a_LIBADD =
 -am__objects_1 = alpha_init.$(OBJEXT) alpha_symbol.$(OBJEXT) \
 +am__objects_2 = alpha_init.$(OBJEXT) alpha_symbol.$(OBJEXT) \
 	alpha_retval.$(OBJEXT) alpha_regs.$(OBJEXT) \
 	alpha_corenote.$(OBJEXT) alpha_auxv.$(OBJEXT)
 libebl_alpha_pic_a_OBJECTS = $(am_libebl_alpha_pic_a_OBJECTS)
 libebl_arm_pic_a_AR = $(AR) $(ARFLAGS)
 libebl_arm_pic_a_LIBADD =
 -am__objects_2 = arm_init.$(OBJEXT) arm_symbol.$(OBJEXT) \
 +am__objects_3 = arm_init.$(OBJEXT) arm_symbol.$(OBJEXT) \
 	arm_regs.$(OBJEXT) arm_corenote.$(OBJEXT) arm_auxv.$(OBJEXT) \
 	arm_attrs.$(OBJEXT) arm_retval.$(OBJEXT) arm_cfi.$(OBJEXT)
 libebl_arm_pic_a_OBJECTS = $(am_libebl_arm_pic_a_OBJECTS)
 libebl_i386_pic_a_AR = $(AR) $(ARFLAGS)
 libebl_i386_pic_a_LIBADD =
 -am__objects_3 = i386_init.$(OBJEXT) i386_symbol.$(OBJEXT) \
 +am__objects_4 = i386_init.$(OBJEXT) i386_symbol.$(OBJEXT) \
 	i386_corenote.$(OBJEXT) i386_cfi.$(OBJEXT) \
 	i386_retval.$(OBJEXT) i386_regs.$(OBJEXT) i386_auxv.$(OBJEXT) \
 	i386_syscall.$(OBJEXT)
 libebl_i386_pic_a_OBJECTS = $(am_libebl_i386_pic_a_OBJECTS)
 libebl_ia64_pic_a_AR = $(AR) $(ARFLAGS)
 libebl_ia64_pic_a_LIBADD =
 -am__objects_4 = ia64_init.$(OBJEXT) ia64_symbol.$(OBJEXT) \
 +am__objects_5 = ia64_init.$(OBJEXT) ia64_symbol.$(OBJEXT) \
 	ia64_regs.$(OBJEXT) ia64_retval.$(OBJEXT)
 libebl_ia64_pic_a_OBJECTS = $(am_libebl_ia64_pic_a_OBJECTS)
 libebl_ppc64_pic_a_AR = $(AR) $(ARFLAGS)
 libebl_ppc64_pic_a_LIBADD =
 -am__objects_5 = ppc64_init.$(OBJEXT) ppc64_symbol.$(OBJEXT) \
 +am__objects_6 = ppc64_init.$(OBJEXT) ppc64_symbol.$(OBJEXT) \
 	ppc64_retval.$(OBJEXT) ppc64_corenote.$(OBJEXT) \
 	ppc_regs.$(OBJEXT) ppc_auxv.$(OBJEXT) ppc_attrs.$(OBJEXT) \
 	ppc_syscall.$(OBJEXT) ppc_cfi.$(OBJEXT)
 libebl_ppc64_pic_a_OBJECTS = $(am_libebl_ppc64_pic_a_OBJECTS)
 libebl_ppc_pic_a_AR = $(AR) $(ARFLAGS)
 libebl_ppc_pic_a_LIBADD =
 -am__objects_6 = ppc_init.$(OBJEXT) ppc_symbol.$(OBJEXT) \
 +am__objects_7 = ppc_init.$(OBJEXT) ppc_symbol.$(OBJEXT) \
 	ppc_retval.$(OBJEXT) ppc_regs.$(OBJEXT) ppc_corenote.$(OBJEXT) \
 	ppc_auxv.$(OBJEXT) ppc_attrs.$(OBJEXT) ppc_syscall.$(OBJEXT) \
 	ppc_cfi.$(OBJEXT)
 libebl_ppc_pic_a_OBJECTS = $(am_libebl_ppc_pic_a_OBJECTS)
 libebl_s390_pic_a_AR = $(AR) $(ARFLAGS)
 libebl_s390_pic_a_LIBADD =
 -am__objects_7 = s390_init.$(OBJEXT) s390_symbol.$(OBJEXT) \
 +am__objects_8 = s390_init.$(OBJEXT) s390_symbol.$(OBJEXT) \
 	s390_regs.$(OBJEXT) s390_retval.$(OBJEXT) \
 	s390_corenote.$(OBJEXT) s390x_corenote.$(OBJEXT) \
 	s390_cfi.$(OBJEXT)
 libebl_s390_pic_a_OBJECTS = $(am_libebl_s390_pic_a_OBJECTS)
 libebl_sh_pic_a_AR = $(AR) $(ARFLAGS)
 libebl_sh_pic_a_LIBADD =
 -am__objects_8 = sh_init.$(OBJEXT) sh_symbol.$(OBJEXT) \
 +am__objects_9 = sh_init.$(OBJEXT) sh_symbol.$(OBJEXT) \
 	sh_corenote.$(OBJEXT) sh_regs.$(OBJEXT) sh_retval.$(OBJEXT)
 libebl_sh_pic_a_OBJECTS = $(am_libebl_sh_pic_a_OBJECTS)
 libebl_sparc_pic_a_AR = $(AR) $(ARFLAGS)
 libebl_sparc_pic_a_LIBADD =
 -am__objects_9 = sparc_init.$(OBJEXT) sparc_symbol.$(OBJEXT) \
 +am__objects_10 = sparc_init.$(OBJEXT) sparc_symbol.$(OBJEXT) \
 	sparc_regs.$(OBJEXT) sparc_retval.$(OBJEXT) \
 	sparc_corenote.$(OBJEXT) sparc64_corenote.$(OBJEXT) \
 	sparc_auxv.$(OBJEXT)
 libebl_sparc_pic_a_OBJECTS = $(am_libebl_sparc_pic_a_OBJECTS)
 libebl_tilegx_pic_a_AR = $(AR) $(ARFLAGS)
 libebl_tilegx_pic_a_LIBADD =
 -am__objects_10 = tilegx_init.$(OBJEXT) tilegx_symbol.$(OBJEXT) \
 +am__objects_11 = tilegx_init.$(OBJEXT) tilegx_symbol.$(OBJEXT) \
 	tilegx_regs.$(OBJEXT) tilegx_retval.$(OBJEXT) \
 	tilegx_corenote.$(OBJEXT)
 libebl_tilegx_pic_a_OBJECTS = $(am_libebl_tilegx_pic_a_OBJECTS)
 libebl_x86_64_pic_a_AR = $(AR) $(ARFLAGS)
 libebl_x86_64_pic_a_LIBADD =
 -am__objects_11 = x86_64_init.$(OBJEXT) x86_64_symbol.$(OBJEXT) \
 +am__objects_12 = x86_64_init.$(OBJEXT) x86_64_symbol.$(OBJEXT) \
 	x86_64_corenote.$(OBJEXT) x86_64_cfi.$(OBJEXT) \
 	x86_64_retval.$(OBJEXT) x86_64_regs.$(OBJEXT) \
 	i386_auxv.$(OBJEXT) x86_64_syscall.$(OBJEXT)
@@ -200,18 +206,20 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 -SOURCES = $(libebl_alpha_pic_a_SOURCES) $(libebl_arm_pic_a_SOURCES) \
 +SOURCES = $(libebl_aarch64_pic_a_SOURCES) \
 +	$(libebl_alpha_pic_a_SOURCES) $(libebl_arm_pic_a_SOURCES) \
 +	$(libebl_i386_pic_a_SOURCES) $(libebl_ia64_pic_a_SOURCES) \
 +	$(libebl_ppc64_pic_a_SOURCES) $(libebl_ppc_pic_a_SOURCES) \
 +	$(libebl_s390_pic_a_SOURCES) $(libebl_sh_pic_a_SOURCES) \
 +	$(libebl_sparc_pic_a_SOURCES) $(libebl_tilegx_pic_a_SOURCES) \
 +	$(libebl_x86_64_pic_a_SOURCES)
 +DIST_SOURCES = $(libebl_aarch64_pic_a_SOURCES) \
 +	$(libebl_alpha_pic_a_SOURCES) $(libebl_arm_pic_a_SOURCES) \
 	$(libebl_i386_pic_a_SOURCES) $(libebl_ia64_pic_a_SOURCES) \
 	$(libebl_ppc64_pic_a_SOURCES) $(libebl_ppc_pic_a_SOURCES) \
 	$(libebl_s390_pic_a_SOURCES) $(libebl_sh_pic_a_SOURCES) \
 	$(libebl_sparc_pic_a_SOURCES) $(libebl_tilegx_pic_a_SOURCES) \
 	$(libebl_x86_64_pic_a_SOURCES)
 -DIST_SOURCES = $(libebl_alpha_pic_a_SOURCES) \
 -	$(libebl_arm_pic_a_SOURCES) $(libebl_i386_pic_a_SOURCES) \
 -	$(libebl_ia64_pic_a_SOURCES) $(libebl_ppc64_pic_a_SOURCES) \
 -	$(libebl_ppc_pic_a_SOURCES) $(libebl_s390_pic_a_SOURCES) \
 -	$(libebl_sh_pic_a_SOURCES) $(libebl_sparc_pic_a_SOURCES) \
 -	$(libebl_tilegx_pic_a_SOURCES) $(libebl_x86_64_pic_a_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -371,11 +379,13 @@ COMPILE.os = $(filter-out -fprofile-arcs
 CLEANFILES = *.gcno *.gcda $(foreach m,$(modules), libebl_$(m).map \
 	libebl_$(m).so $(am_libebl_$(m)_pic_a_OBJECTS))
 textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
 -modules = i386 sh x86_64 ia64 alpha arm sparc ppc ppc64 s390 tilegx
 -libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \
 -	     libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \
 -	     libebl_sparc_pic.a libebl_ppc_pic.a libebl_ppc64_pic.a \
 -	     libebl_s390_pic.a libebl_tilegx_pic.a
 +modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \
 +	  tilegx
 +
 +libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a    \
 +	     libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a    \
 +	     libebl_aarch64_pic.a libebl_sparc_pic.a libebl_ppc_pic.a \
 +	     libebl_ppc64_pic.a libebl_s390_pic.a libebl_tilegx_pic.a
 noinst_LIBRARIES = $(libebl_pic)
 noinst_DATA = $(libebl_pic:_pic.a=.so)
@@ -411,6 +421,12 @@ arm_SRCS = arm_init.c arm_symbol.c arm_r
 libebl_arm_pic_a_SOURCES = $(arm_SRCS)
 am_libebl_arm_pic_a_OBJECTS = $(arm_SRCS:.c=.os)
 +aarch64_SRCS = aarch64_init.c aarch64_regs.c aarch64_symbol.c	\
 +	       aarch64_corenote.c aarch64_retval.c
 +
 +libebl_aarch64_pic_a_SOURCES = $(aarch64_SRCS)
 +am_libebl_aarch64_pic_a_OBJECTS = $(aarch64_SRCS:.c=.os)
 +aarch64_regs_no_Wformat = yes
 sparc_SRCS = sparc_init.c sparc_symbol.c sparc_regs.c sparc_retval.c \
 	     sparc_corenote.c sparc64_corenote.c sparc_auxv.c
@@ -479,6 +495,11 @@ $(am__aclocal_m4_deps):
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 +libebl_aarch64_pic.a: $(libebl_aarch64_pic_a_OBJECTS) $(libebl_aarch64_pic_a_DEPENDENCIES) $(EXTRA_libebl_aarch64_pic_a_DEPENDENCIES) 
 +	$(AM_V_at)-rm -f libebl_aarch64_pic.a
 +	$(AM_V_AR)$(libebl_aarch64_pic_a_AR) libebl_aarch64_pic.a $(libebl_aarch64_pic_a_OBJECTS) $(libebl_aarch64_pic_a_LIBADD)
 +	$(AM_V_at)$(RANLIB) libebl_aarch64_pic.a
 +
 libebl_alpha_pic.a: $(libebl_alpha_pic_a_OBJECTS) $(libebl_alpha_pic_a_DEPENDENCIES) $(EXTRA_libebl_alpha_pic_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libebl_alpha_pic.a
 	$(AM_V_AR)$(libebl_alpha_pic_a_AR) libebl_alpha_pic.a $(libebl_alpha_pic_a_OBJECTS) $(libebl_alpha_pic_a_LIBADD)
@@ -540,6 +561,11 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aarch64_corenote.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aarch64_init.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aarch64_regs.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aarch64_retval.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aarch64_symbol.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alpha_auxv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alpha_corenote.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alpha_init.Po@am__quote@
 diff -urp elfutils-0.157~/tests/Makefile.in elfutils-0.157/tests/Makefile.in
 --- elfutils-0.157~/tests/Makefile.in	2013-09-30 14:37:52.000000000 +0200
 +++ elfutils-0.157/tests/Makefile.in	2013-12-02 23:54:46.286838921 +0100
@@ -141,8 +141,9 @@ TESTS = run-arextract.sh run-arsymtest.s
 	run-test-archive64.sh run-readelf-vmcoreinfo.sh \
 	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)
 +	run-addr2line-i-test.sh run-varlocs.sh run-funcretval.sh \
 +	$(am__EXEEXT_1) $(am__append_7) $(am__EXEEXT_3) \
 +	$(am__append_10)
 @STANDALONE_FALSE@am__append_5 = msg_tst md5-sha1-test
 @STANDALONE_FALSE@am__append_6 = msg_tst md5-sha1-test
 @LZMA_TRUE@am__append_7 = run-readelf-s.sh run-dwflsyms.sh
@@ -849,7 +850,7 @@ EXTRA_DIST = run-arextract.sh run-arsymt
 	     run-strip-test4.sh run-strip-test5.sh run-strip-test6.sh \
 	     run-strip-test7.sh run-strip-test8.sh run-strip-groups.sh \
 	     run-strip-reloc.sh hello_i386.ko.bz2 hello_x86_64.ko.bz2 \
 -	     hello_ppc64.ko.bz2 hello_s390.ko.bz2 \
 +	     hello_ppc64.ko.bz2 hello_s390.ko.bz2 hello_aarch64.ko.bz2 \
 	     run-unstrip-test.sh run-unstrip-test2.sh \
 	     run-elflint-self.sh run-ranlib-test.sh run-ranlib-test2.sh \
 	     run-ranlib-test3.sh run-ranlib-test4.sh \
@@ -937,7 +938,9 @@ EXTRA_DIST = run-arextract.sh run-arsymt
 	     testfile_implicit_pointer.c testfile_implicit_pointer.bz2 \
 	     testfile_parameter_ref.c testfile_parameter_ref.bz2 \
 	     testfile_entry_value.c testfile_entry_value.bz2 \
 -	     testfile_implicit_value.c testfile_implicit_value.bz2
 +	     testfile_implicit_value.c testfile_implicit_value.bz2 \
 +	     testfile_aarch64_core.bz2 \
 +	     funcretval_test.c funcretval_test_aarch64.bz2
 @USE_VALGRIND_TRUE@valgrind_cmd = 'valgrind -q --trace-children=yes --error-exitcode=1 --run-libc-freeres=no'
 installed_TESTS_ENVIRONMENT = libdir=$(DESTDIR)$(libdir); \
@@ -2210,6 +2213,13 @@ run-varlocs.sh.log: run-varlocs.sh
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 +	"$$tst" $(AM_TESTS_FD_REDIRECT)
 +run-funcretval.sh.log: run-funcretval.sh
 +	@p='run-funcretval.sh'; \
 +	b='run-funcretval.sh'; \
 +	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 +	--log-file $$b.log --trs-file $$b.trs \
 +	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 msg_tst.log: msg_tst$(EXEEXT)
 	@p='msg_tst$(EXEEXT)'; \
--- a/elfutils-0.157-aarch64-elf.h.patch
+++ b/elfutils-0.157-aarch64-elf.h.patch
@ -1,241 +0,0 @@
 From acf126799e73e10f571da6c9be487b84a0a46f23 Mon Sep 17 00:00:00 2001
 Message-Id: <acf126799e73e10f571da6c9be487b84a0a46f23.1386021910.git.pmachata@redhat.com>
 From: Petr Machata <pmachata@redhat.com>
 Date: Tue, 1 Oct 2013 16:29:41 +0200
 Subject: [PATCH] Update elf.h from glibc
 Gcc: nnimap+mail.corp.redhat.com:Sent
 To: elfutils-devel@lists.fedorahosted.org
 Signed-off-by: Petr Machata <pmachata@redhat.com>
 ---
 libelf/ChangeLog |    4 ++
 libelf/elf.h     |  152 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 154 insertions(+), 2 deletions(-)
 diff --git a/libelf/ChangeLog b/libelf/ChangeLog
 index 6628994..d9d6421 100644
 --- a/libelf/ChangeLog
 +++ b/libelf/ChangeLog
@@ -1,3 +1,7 @@
 +2013-10-01  Petr Machata  <pmachata@redhat.com>
 +
 +	* elf.h: Update from glibc.
 +
 2013-06-17  Petr Machata  <pmachata@redhat.com>
 	* elf.h: Update from glibc.
 diff --git a/libelf/elf.h b/libelf/elf.h
 index d096a97..a05ea3b 100644
 --- a/libelf/elf.h
 +++ b/libelf/elf.h
@@ -251,6 +251,7 @@ typedef struct
 #define EM_XTENSA	94		/* Tensilica Xtensa Architecture */
 #define EM_AARCH64	183		/* ARM AARCH64 */
 #define EM_TILEPRO	188		/* Tilera TILEPro */
 +#define EM_MICROBLAZE	189		/* Xilinx MicroBlaze */
 #define EM_TILEGX	191		/* Tilera TILE-Gx */
 #define EM_NUM		192
@@ -810,7 +811,7 @@ typedef struct
 #define	DF_1_EDITED	0x00200000	/* Object is modified after built.  */
 #define	DF_1_NORELOC	0x00400000
 #define	DF_1_SYMINTPOSE	0x00800000	/* Object has individual interposers.  */
 -#define	DF_1_GLOBAUDIT	0x01000000	/* Global auditin required.  */
 +#define	DF_1_GLOBAUDIT	0x01000000	/* Global auditing required.  */
 #define	DF_1_SINGLETON	0x02000000	/* Singleton symbols are used.  */
 /* Flags for the feature selection in DT_FEATURE_1.  */
@@ -992,7 +993,7 @@ typedef struct
 /* Some more special a_type values describing the hardware.  */
 #define AT_PLATFORM	15		/* String identifying platform.  */
 -#define AT_HWCAP	16		/* Machine dependent hints about
 +#define AT_HWCAP	16		/* Machine-dependent hints about
 					   processor capabilities.  */
 /* This entry gives some information about the FPU initialization
@@ -1014,6 +1015,9 @@ typedef struct
 #define AT_RANDOM	25		/* Address of 16 random bytes.  */
 +#define AT_HWCAP2	26		/* More machine-dependent hints about
 +					   processor capabilities.  */
 +
 #define AT_EXECFN	31		/* Filename of executable.  */
 /* Pointer to the global system page used for system calls and other
@@ -1379,6 +1383,7 @@ typedef struct
 #define EF_MIPS_64BIT_WHIRL	16
 #define EF_MIPS_ABI2		32
 #define EF_MIPS_ABI_ON32	64
 +#define EF_MIPS_NAN2008	1024  /* Uses IEEE 754-2008 NaN encoding.  */
 #define EF_MIPS_ARCH		0xf0000000 /* MIPS architecture level.  */
 /* Legal values for MIPS architecture level.  */
@@ -2331,6 +2336,117 @@ typedef Elf32_Addr Elf32_Conflict;
 #define R_AARCH64_NONE            0	/* No relocation.  */
 #define R_AARCH64_ABS64         257	/* Direct 64 bit. */
 #define R_AARCH64_ABS32         258	/* Direct 32 bit.  */
 +#define R_AARCH64_ABS16		259	/* Direct 16-bit.  */
 +#define R_AARCH64_PREL64	260	/* PC-relative 64-bit.	*/
 +#define R_AARCH64_PREL32	261	/* PC-relative 32-bit.	*/
 +#define R_AARCH64_PREL16	262	/* PC-relative 16-bit.	*/
 +#define R_AARCH64_MOVW_UABS_G0	263	/* Dir. MOVZ imm. from bits 15:0.  */
 +#define R_AARCH64_MOVW_UABS_G0_NC 264	/* Likewise for MOVK; no check.  */
 +#define R_AARCH64_MOVW_UABS_G1	265	/* Dir. MOVZ imm. from bits 31:16.  */
 +#define R_AARCH64_MOVW_UABS_G1_NC 266	/* Likewise for MOVK; no check.  */
 +#define R_AARCH64_MOVW_UABS_G2	267	/* Dir. MOVZ imm. from bits 47:32.  */
 +#define R_AARCH64_MOVW_UABS_G2_NC 268	/* Likewise for MOVK; no check.  */
 +#define R_AARCH64_MOVW_UABS_G3	269	/* Dir. MOV{K,Z} imm. from 63:48.  */
 +#define R_AARCH64_MOVW_SABS_G0	270	/* Dir. MOV{N,Z} imm. from 15:0.  */
 +#define R_AARCH64_MOVW_SABS_G1	271	/* Dir. MOV{N,Z} imm. from 31:16.  */
 +#define R_AARCH64_MOVW_SABS_G2	272	/* Dir. MOV{N,Z} imm. from 47:32.  */
 +#define R_AARCH64_LD_PREL_LO19	273	/* PC-rel. LD imm. from bits 20:2.  */
 +#define R_AARCH64_ADR_PREL_LO21	274	/* PC-rel. ADR imm. from bits 20:0.  */
 +#define R_AARCH64_ADR_PREL_PG_HI21 275	/* Page-rel. ADRP imm. from 32:12.  */
 +#define R_AARCH64_ADR_PREL_PG_HI21_NC 276 /* Likewise; no overflow check.  */
 +#define R_AARCH64_ADD_ABS_LO12_NC 277	/* Dir. ADD imm. from bits 11:0.  */
 +#define R_AARCH64_LDST8_ABS_LO12_NC 278	/* Likewise for LD/ST; no check. */
 +#define R_AARCH64_TSTBR14	279	/* PC-rel. TBZ/TBNZ imm. from 15:2.  */
 +#define R_AARCH64_CONDBR19	280	/* PC-rel. cond. br. imm. from 20:2. */
 +#define R_AARCH64_JUMP26	282	/* PC-rel. B imm. from bits 27:2.  */
 +#define R_AARCH64_CALL26	283	/* Likewise for CALL.  */
 +#define R_AARCH64_LDST16_ABS_LO12_NC 284 /* Dir. ADD imm. from bits 11:1.  */
 +#define R_AARCH64_LDST32_ABS_LO12_NC 285 /* Likewise for bits 11:2.  */
 +#define R_AARCH64_LDST64_ABS_LO12_NC 286 /* Likewise for bits 11:3.  */
 +#define R_AARCH64_MOVW_PREL_G0	287	/* PC-rel. MOV{N,Z} imm. from 15:0.  */
 +#define R_AARCH64_MOVW_PREL_G0_NC 288	/* Likewise for MOVK; no check.  */
 +#define R_AARCH64_MOVW_PREL_G1	289	/* PC-rel. MOV{N,Z} imm. from 31:16. */
 +#define R_AARCH64_MOVW_PREL_G1_NC 290	/* Likewise for MOVK; no check.  */
 +#define R_AARCH64_MOVW_PREL_G2	291	/* PC-rel. MOV{N,Z} imm. from 47:32. */
 +#define R_AARCH64_MOVW_PREL_G2_NC 292	/* Likewise for MOVK; no check.  */
 +#define R_AARCH64_MOVW_PREL_G3	293	/* PC-rel. MOV{N,Z} imm. from 63:48. */
 +#define R_AARCH64_LDST128_ABS_LO12_NC 299 /* Dir. ADD imm. from bits 11:4.  */
 +#define R_AARCH64_MOVW_GOTOFF_G0 300	/* GOT-rel. off. MOV{N,Z} imm. 15:0. */
 +#define R_AARCH64_MOVW_GOTOFF_G0_NC 301	/* Likewise for MOVK; no check.  */
 +#define R_AARCH64_MOVW_GOTOFF_G1 302	/* GOT-rel. o. MOV{N,Z} imm. 31:16.  */
 +#define R_AARCH64_MOVW_GOTOFF_G1_NC 303	/* Likewise for MOVK; no check.  */
 +#define R_AARCH64_MOVW_GOTOFF_G2 304	/* GOT-rel. o. MOV{N,Z} imm. 47:32.  */
 +#define R_AARCH64_MOVW_GOTOFF_G2_NC 305	/* Likewise for MOVK; no check.  */
 +#define R_AARCH64_MOVW_GOTOFF_G3 306	/* GOT-rel. o. MOV{N,Z} imm. 63:48.  */
 +#define R_AARCH64_GOTREL64	307	/* GOT-relative 64-bit.  */
 +#define R_AARCH64_GOTREL32	308	/* GOT-relative 32-bit.  */
 +#define R_AARCH64_GOT_LD_PREL19	309	/* PC-rel. GOT off. load imm. 20:2.  */
 +#define R_AARCH64_LD64_GOTOFF_LO15 310	/* GOT-rel. off. LD/ST imm. 14:3.  */
 +#define R_AARCH64_ADR_GOT_PAGE	311	/* P-page-rel. GOT off. ADRP 32:12.  */
 +#define R_AARCH64_LD64_GOT_LO12_NC 312	/* Dir. GOT off. LD/ST imm. 11:3.  */
 +#define R_AARCH64_LD64_GOTPAGE_LO15 313	/* GOT-page-rel. GOT off. LD/ST 14:3 */
 +#define R_AARCH64_TLSGD_ADR_PREL21 512	/* PC-relative ADR imm. 20:0.  */
 +#define R_AARCH64_TLSGD_ADR_PAGE21 513	/* page-rel. ADRP imm. 32:12.  */
 +#define R_AARCH64_TLSGD_ADD_LO12_NC 514	/* direct ADD imm. from 11:0.  */
 +#define R_AARCH64_TLSGD_MOVW_G1	515	/* GOT-rel. MOV{N,Z} 31:16.  */
 +#define R_AARCH64_TLSGD_MOVW_G0_NC 516	/* GOT-rel. MOVK imm. 15:0.  */
 +#define R_AARCH64_TLSLD_ADR_PREL21 517	/* Like 512; local dynamic model.  */
 +#define R_AARCH64_TLSLD_ADR_PAGE21 518	/* Like 513; local dynamic model.  */
 +#define R_AARCH64_TLSLD_ADD_LO12_NC 519	/* Like 514; local dynamic model.  */
 +#define R_AARCH64_TLSLD_MOVW_G1	520	/* Like 515; local dynamic model.  */
 +#define R_AARCH64_TLSLD_MOVW_G0_NC 521	/* Like 516; local dynamic model.  */
 +#define R_AARCH64_TLSLD_LD_PREL19 522	/* TLS PC-rel. load imm. 20:2.  */
 +#define R_AARCH64_TLSLD_MOVW_DTPREL_G2 523 /* TLS DTP-rel. MOV{N,Z} 47:32.  */
 +#define R_AARCH64_TLSLD_MOVW_DTPREL_G1 524 /* TLS DTP-rel. MOV{N,Z} 31:16.  */
 +#define R_AARCH64_TLSLD_MOVW_DTPREL_G1_NC 525 /* Likewise; MOVK; no check.  */
 +#define R_AARCH64_TLSLD_MOVW_DTPREL_G0 526 /* TLS DTP-rel. MOV{N,Z} 15:0.  */
 +#define R_AARCH64_TLSLD_MOVW_DTPREL_G0_NC 527 /* Likewise; MOVK; no check.  */
 +#define R_AARCH64_TLSLD_ADD_DTPREL_HI12 528 /* DTP-rel. ADD imm. from 23:12. */
 +#define R_AARCH64_TLSLD_ADD_DTPREL_LO12 529 /* DTP-rel. ADD imm. from 11:0.  */
 +#define R_AARCH64_TLSLD_ADD_DTPREL_LO12_NC 530 /* Likewise; no ovfl. check.  */
 +#define R_AARCH64_TLSLD_LDST8_DTPREL_LO12 531 /* DTP-rel. LD/ST imm. 11:0.  */
 +#define R_AARCH64_TLSLD_LDST8_DTPREL_LO12_NC 532 /* Likewise; no check.  */
 +#define R_AARCH64_TLSLD_LDST16_DTPREL_LO12 533 /* DTP-rel. LD/ST imm. 11:1.  */
 +#define R_AARCH64_TLSLD_LDST16_DTPREL_LO12_NC 534 /* Likewise; no check.  */
 +#define R_AARCH64_TLSLD_LDST32_DTPREL_LO12 535 /* DTP-rel. LD/ST imm. 11:2.  */
 +#define R_AARCH64_TLSLD_LDST32_DTPREL_LO12_NC 536 /* Likewise; no check.  */
 +#define R_AARCH64_TLSLD_LDST64_DTPREL_LO12 537 /* DTP-rel. LD/ST imm. 11:3.  */
 +#define R_AARCH64_TLSLD_LDST64_DTPREL_LO12_NC 538 /* Likewise; no check.  */
 +#define R_AARCH64_TLSIE_MOVW_GOTTPREL_G1 539 /* GOT-rel. MOV{N,Z} 31:16.  */
 +#define R_AARCH64_TLSIE_MOVW_GOTTPREL_G0_NC 540 /* GOT-rel. MOVK 15:0.  */
 +#define R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21 541 /* Page-rel. ADRP 32:12.  */
 +#define R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC 542 /* Direct LD off. 11:3.  */
 +#define R_AARCH64_TLSIE_LD_GOTTPREL_PREL19 543 /* PC-rel. load imm. 20:2.  */
 +#define R_AARCH64_TLSLE_MOVW_TPREL_G2 544 /* TLS TP-rel. MOV{N,Z} 47:32.  */
 +#define R_AARCH64_TLSLE_MOVW_TPREL_G1 545 /* TLS TP-rel. MOV{N,Z} 31:16.  */
 +#define R_AARCH64_TLSLE_MOVW_TPREL_G1_NC 546 /* Likewise; MOVK; no check.  */
 +#define R_AARCH64_TLSLE_MOVW_TPREL_G0 547 /* TLS TP-rel. MOV{N,Z} 15:0.  */
 +#define R_AARCH64_TLSLE_MOVW_TPREL_G0_NC 548 /* Likewise; MOVK; no check.  */
 +#define R_AARCH64_TLSLE_ADD_TPREL_HI12 549 /* TP-rel. ADD imm. 23:12.  */
 +#define R_AARCH64_TLSLE_ADD_TPREL_LO12 550 /* TP-rel. ADD imm. 11:0.  */
 +#define R_AARCH64_TLSLE_ADD_TPREL_LO12_NC 551 /* Likewise; no ovfl. check.  */
 +#define R_AARCH64_TLSLE_LDST8_TPREL_LO12 552 /* TP-rel. LD/ST off. 11:0.  */
 +#define R_AARCH64_TLSLE_LDST8_TPREL_LO12_NC 553 /* Likewise; no ovfl. check. */
 +#define R_AARCH64_TLSLE_LDST16_TPREL_LO12 554 /* TP-rel. LD/ST off. 11:1.  */
 +#define R_AARCH64_TLSLE_LDST16_TPREL_LO12_NC 555 /* Likewise; no check.  */
 +#define R_AARCH64_TLSLE_LDST32_TPREL_LO12 556 /* TP-rel. LD/ST off. 11:2.  */
 +#define R_AARCH64_TLSLE_LDST32_TPREL_LO12_NC 557 /* Likewise; no check.  */
 +#define R_AARCH64_TLSLE_LDST64_TPREL_LO12 558 /* TP-rel. LD/ST off. 11:3.  */
 +#define R_AARCH64_TLSLE_LDST64_TPREL_LO12_NC 559 /* Likewise; no check.  */
 +#define R_AARCH64_TLSDESC_LD_PREL19 560	/* PC-rel. load immediate 20:2.  */
 +#define R_AARCH64_TLSDESC_ADR_PREL21 561 /* PC-rel. ADR immediate 20:0.  */
 +#define R_AARCH64_TLSDESC_ADR_PAGE21 562 /* Page-rel. ADRP imm. 32:12.  */
 +#define R_AARCH64_TLSDESC_LD64_LO12 563	/* Direct LD off. from 11:3.  */
 +#define R_AARCH64_TLSDESC_ADD_LO12 564	/* Direct ADD imm. from 11:0.  */
 +#define R_AARCH64_TLSDESC_OFF_G1 565	/* GOT-rel. MOV{N,Z} imm. 31:16.  */
 +#define R_AARCH64_TLSDESC_OFF_G0_NC 566	/* GOT-rel. MOVK imm. 15:0; no ck.  */
 +#define R_AARCH64_TLSDESC_LDR	567	/* Relax LDR.  */
 +#define R_AARCH64_TLSDESC_ADD	568	/* Relax ADD.  */
 +#define R_AARCH64_TLSDESC_CALL	569	/* Relax BLR.  */
 +#define R_AARCH64_TLSLE_LDST128_TPREL_LO12 570 /* TP-rel. LD/ST off. 11:4.  */
 +#define R_AARCH64_TLSLE_LDST128_TPREL_LO12_NC 571 /* Likewise; no check.  */
 +#define R_AARCH64_TLSLD_LDST128_DTPREL_LO12 572 /* DTP-rel. LD/ST imm. 11:4. */
 +#define R_AARCH64_TLSLD_LDST128_DTPREL_LO12_NC 573 /* Likewise; no check.  */
 #define R_AARCH64_COPY         1024	/* Copy symbol at runtime.  */
 #define R_AARCH64_GLOB_DAT     1025	/* Create GOT entry.  */
 #define R_AARCH64_JUMP_SLOT    1026	/* Create PLT entry.  */
@@ -2339,6 +2455,7 @@ typedef Elf32_Addr Elf32_Conflict;
 #define R_AARCH64_TLS_DTPREL64 1029	/* Module-relative offset, 64 bit.  */
 #define R_AARCH64_TLS_TPREL64  1030	/* TP-relative offset, 64 bit.  */
 #define R_AARCH64_TLSDESC      1031	/* TLS Descriptor.  */
 +#define R_AARCH64_IRELATIVE	1032	/* STT_GNU_IFUNC relocation.  */
 /* ARM relocs.  */
@@ -2955,6 +3072,37 @@ typedef Elf32_Addr Elf32_Conflict;
 #define R_M32R_GOTOFF_LO	64	/* Low 16 bit offset to GOT */
 #define R_M32R_NUM		256	/* Keep this the last entry. */
 +/* MicroBlaze relocations */
 +#define R_MICROBLAZE_NONE		0	/* No reloc. */
 +#define R_MICROBLAZE_32 		1	/* Direct 32 bit. */
 +#define R_MICROBLAZE_32_PCREL		2	/* PC relative 32 bit. */
 +#define R_MICROBLAZE_64_PCREL		3	/* PC relative 64 bit. */
 +#define R_MICROBLAZE_32_PCREL_LO	4	/* Low 16 bits of PCREL32. */
 +#define R_MICROBLAZE_64 		5	/* Direct 64 bit. */
 +#define R_MICROBLAZE_32_LO		6	/* Low 16 bit. */
 +#define R_MICROBLAZE_SRO32		7	/* Read-only small data area. */
 +#define R_MICROBLAZE_SRW32		8	/* Read-write small data area. */
 +#define R_MICROBLAZE_64_NONE		9	/* No reloc. */
 +#define R_MICROBLAZE_32_SYM_OP_SYM	10	/* Symbol Op Symbol relocation. */
 +#define R_MICROBLAZE_GNU_VTINHERIT	11	/* GNU C++ vtable hierarchy. */
 +#define R_MICROBLAZE_GNU_VTENTRY	12	/* GNU C++ vtable member usage. */
 +#define R_MICROBLAZE_GOTPC_64		13	/* PC-relative GOT offset.  */
 +#define R_MICROBLAZE_GOT_64		14	/* GOT entry offset.  */
 +#define R_MICROBLAZE_PLT_64		15	/* PLT offset (PC-relative).  */
 +#define R_MICROBLAZE_REL		16	/* Adjust by program base.  */
 +#define R_MICROBLAZE_JUMP_SLOT		17	/* Create PLT entry.  */
 +#define R_MICROBLAZE_GLOB_DAT		18	/* Create GOT entry.  */
 +#define R_MICROBLAZE_GOTOFF_64		19	/* 64 bit offset to GOT. */
 +#define R_MICROBLAZE_GOTOFF_32		20	/* 32 bit offset to GOT. */
 +#define R_MICROBLAZE_COPY		21	/* Runtime copy.  */
 +#define R_MICROBLAZE_TLS		22	/* TLS Reloc. */
 +#define R_MICROBLAZE_TLSGD		23	/* TLS General Dynamic. */
 +#define R_MICROBLAZE_TLSLD		24	/* TLS Local Dynamic. */
 +#define R_MICROBLAZE_TLSDTPMOD32	25	/* TLS Module ID. */
 +#define R_MICROBLAZE_TLSDTPREL32	26	/* TLS Offset Within TLS Block. */
 +#define R_MICROBLAZE_TLSDTPREL64	27	/* TLS Offset Within TLS Block. */
 +#define R_MICROBLAZE_TLSGOTTPREL32	28	/* TLS Offset From Thread Pointer. */
 +#define R_MICROBLAZE_TLSTPREL32 	29	/* TLS Offset From Thread Pointer. */
 /* TILEPro relocations.  */
 #define R_TILEPRO_NONE		0	/* No reloc */
 -- 
 1.7.6.5
--- a/elfutils-0.157-aarch64-got-special-symbol.patch
+++ b/elfutils-0.157-aarch64-got-special-symbol.patch
@ -1,70 +0,0 @@
 commit 96d3b0aeddbb8c5557fdc5769e4d73eac81d74fd
 Author: Mark Wielaard <mjw@redhat.com>
 Date:   Thu Dec 19 16:11:19 2013 +0100
    backends: aarch64 always has _GLOBAL_OFFSET_TABLE_ point to .got[0].
    Like some other architectures aarch64 has a special rule for the
    _GLOBAL_OFFSET_TABLE_ symbol. Even if there is a .plt.got section the symbol
    value still points to the start of the .got section. This is also what the
    dynamic linker expects.
    See https://sourceware.org/ml/libc-ports/2013-06/msg00057.html
    Signed-off-by: Mark Wielaard <mjw@redhat.com>
 diff --git a/backends/aarch64_init.c b/backends/aarch64_init.c
 index 749af2a..d663d40 100644
 --- a/backends/aarch64_init.c
 +++ b/backends/aarch64_init.c
@@ -56,6 +56,7 @@ aarch64_init (elf, machine, eh, ehlen)
   HOOK (eh, core_note);
   HOOK (eh, reloc_simple_type);
   HOOK (eh, return_value_location);
 +  HOOK (eh, check_special_symbol);
   return MODVERSION;
 }
 diff --git a/backends/aarch64_symbol.c b/backends/aarch64_symbol.c
 index b0f3377..4e1dbd8 100644
 --- a/backends/aarch64_symbol.c
 +++ b/backends/aarch64_symbol.c
@@ -32,6 +32,7 @@
 #include <elf.h>
 #include <stddef.h>
 +#include <string.h>
 #define BACKEND		aarch64_
 #include "libebl_CPU.h"
@@ -54,3 +55,30 @@ aarch64_reloc_simple_type (Ebl *ebl __attribute__ ((unused)), int type)
       return ELF_T_NUM;
     }
 }
 +
 +/* If this is the _GLOBAL_OFFSET_TABLE_ symbol, then it should point to
 +   .got[0] even if there is a .got.plt section.  */
 +bool
 +aarch64_check_special_symbol (Elf *elf, GElf_Ehdr *ehdr, const GElf_Sym *sym,
 +                              const char *name, const GElf_Shdr *destshdr)
 +{
 +  if (name != NULL
 +      && strcmp (name, "_GLOBAL_OFFSET_TABLE_") == 0)
 +    {
 +      const char *sname = elf_strptr (elf, ehdr->e_shstrndx, destshdr->sh_name);
 +      if (sname != NULL && strcmp (sname, ".got.plt") == 0)
 +	{
 +	  Elf_Scn *scn = NULL;
 +	  while ((scn = elf_nextscn (elf, scn)) != NULL)
 +	    {
 +	      GElf_Shdr shdr_mem;
 +	      GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem);
 +	      sname = elf_strptr (elf, ehdr->e_shstrndx, shdr->sh_name);
 +	      if (name != NULL && strcmp (sname, ".got") == 0)
 +		return sym->st_value == shdr->sh_addr;
 +	    }
 +	}
 +    }
 +
 +  return false;
 +}
--- a/elfutils-0.157-aarch64-hidden_format.patch
+++ b/elfutils-0.157-aarch64-hidden_format.patch
@ -1,31 +0,0 @@
 From a47a096e2b8105326c5c58d1f50afcaefff968a0 Mon Sep 17 00:00:00 2001
 Message-Id: <a47a096e2b8105326c5c58d1f50afcaefff968a0.1386021931.git.pmachata@redhat.com>
 From: Petr Machata <pmachata@redhat.com>
 Date: Thu, 14 Nov 2013 01:07:22 +0100
 Subject: [PATCH 1/2] Support new 'h' core note item format for hidden fields
 Gcc: nnimap+mail.corp.redhat.com:Sent
 To: elfutils-devel@lists.fedorahosted.org
 Signed-off-by: Petr Machata <pmachata@redhat.com>
 ---
 src/ChangeLog |    5 +++++
 src/readelf.c |    3 +++
 2 files changed, 8 insertions(+), 0 deletions(-)
 diff --git a/src/readelf.c b/src/readelf.c
 index ac2f2b0..7ed9f4a 100644
 --- a/src/readelf.c
 +++ b/src/readelf.c
@@ -8169,6 +8169,9 @@ handle_core_item (Elf *core, const Ebl_Core_Item *item, const void *desc,
       colno = WRAP_COLUMN;
       break;
 +    case 'h':
 +      break;
 +
     default:
       error (0, 0, "XXX not handling format '%c' for %s",
 	     item->format, item->name);
 -- 
 1.7.6.5
--- a/elfutils-0.157-aarch64-meat.patch
+++ b/elfutils-0.157-aarch64-meat.patch
--- a/elfutils-portability.patch
+++ b/elfutils-portability.patch
@ -1,6 +1,6 @@
 --- elfutils/backends/ChangeLog
 +++ elfutils/backends/ChangeLog
-@@ -188,6 +188,10 @@
+@@ -292,6 +292,10 @@
 	* ppc_attrs.c (ppc_check_object_attribute): Handle tag
 	GNU_Power_ABI_Struct_Return.
@ -11,7 +11,7 @@
 2008-10-04  Ulrich Drepper  <drepper@redhat.com>
 	* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
-@@ -515,6 +519,11 @@
+@@ -619,6 +623,11 @@
 	* sparc_init.c: Likewise.
 	* x86_64_init.c: Likewise.
@ -23,7 +23,7 @@
 2005-11-19  Roland McGrath  <roland@redhat.com>
 	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -537,6 +546,9 @@
+@@ -641,6 +650,9 @@
 	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
 	(CLEANFILES): Add libebl_$(m).so.
@ -35,7 +35,7 @@
 --- elfutils/backends/Makefile.am
 +++ elfutils/backends/Makefile.am
-@@ -112,7 +112,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
+@@ -124,7 +124,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) \
@ -55,8 +55,8 @@
 +@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 \
+ am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -266,6 +267,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -284,6 +285,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -64,7 +64,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -295,6 +297,7 @@ SHELL = @SHELL@
+@@ -315,6 +317,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@ -72,7 +72,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -357,10 +360,9 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
+@@ -378,10 +381,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 \
@ -85,7 +85,7 @@
 @MUDFLAP_FALSE@libmudflap = 
 @MUDFLAP_TRUE@libmudflap = -lmudflap
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-@@ -834,7 +836,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
+@@ -888,7 +890,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) \
@ -96,7 +96,7 @@
 libebl_i386.so: $(cpu_i386)
 --- elfutils/ChangeLog
 +++ elfutils/ChangeLog
-@@ -38,6 +38,8 @@
+@@ -118,6 +118,8 @@
 2012-01-24  Mark Wielaard  <mjw@redhat.com>
@ -105,7 +105,7 @@
 	* COPYING: Fix address. Updated version from gnulib.
 2012-01-23  Mark Wielaard  <mjw@redhat.com>
-@@ -56,6 +58,9 @@
+@@ -136,6 +138,9 @@
 2011-10-08  Mike Frysinger  <vapier@gentoo.org>
@ -115,7 +115,7 @@
 	* configure.ac: Fix use of AC_ARG_ENABLE to handle $enableval correctly.
 2011-10-02  Ulrich Drepper  <drepper@gmail.com>
-@@ -77,6 +82,10 @@
+@@ -157,6 +162,10 @@
 	* configure.ac (LOCALEDIR, DATADIRNAME): Removed.
@ -126,7 +126,7 @@
 2009-09-21  Ulrich Drepper  <drepper@redhat.com>
 	* configure.ac: Update for more modern autoconf.
-@@ -85,6 +94,10 @@
+@@ -165,6 +174,10 @@
 	* configure.ac (zip_LIBS): Check for liblzma too.
@ -137,7 +137,7 @@
 2009-04-19  Roland McGrath  <roland@redhat.com>
 	* configure.ac (eu_version): Round down here, not in version.h macros.
-@@ -96,6 +109,8 @@
+@@ -176,6 +189,8 @@
 2009-01-23  Roland McGrath  <roland@redhat.com>
@ -146,7 +146,7 @@
 	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
 	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
-@@ -176,6 +191,10 @@
+@@ -256,6 +271,10 @@
 	* configure.ac: Add dummy automake conditional to get dependencies
 	for non-generic linker right.  See src/Makefile.am.
@ -157,7 +157,7 @@
 2005-11-18  Roland McGrath  <roland@redhat.com>
 	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -223,6 +242,17 @@
+@@ -303,6 +322,17 @@
 	* Makefile.am (all_SUBDIRS): Add libdwfl.
 	* configure.ac: Write libdwfl/Makefile.
@ -177,7 +177,7 @@
 	* configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
 --- elfutils/config/ChangeLog
 +++ elfutils/config/ChangeLog
-@@ -23,6 +23,10 @@
+@@ -44,6 +44,10 @@
 	* known-dwarf.awk: Use gawk.
@ -223,7 +223,7 @@
 libmudflap = -lmudflap
 --- elfutils/config/Makefile.in
 +++ elfutils/config/Makefile.in
-@@ -140,6 +140,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -146,6 +146,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -231,7 +231,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -169,6 +170,7 @@ SHELL = @SHELL@
+@@ -177,6 +178,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@ -248,10 +248,10 @@
 +/* Have __builtin_popcount. */
 +#undef HAVE_BUILTIN_POPCOUNT
 +
- /* $libdir subdirectory containing libebl modules. */
+ /* Define to 1 if you have the <inttypes.h> header file. */
- #undef LIBEBL_SUBDIR
+ #undef HAVE_INTTYPES_H
-@@ -69,4 +72,7 @@
+@@ -102,4 +105,7 @@
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
@ -261,7 +261,7 @@
 #include <eu-config.h>
 --- elfutils/configure
 +++ elfutils/configure
-@@ -618,6 +618,8 @@ ZLIB_TRUE
+@@ -661,6 +661,8 @@ ZLIB_TRUE
 LIBEBL_SUBDIR
 TESTS_RPATH_FALSE
 TESTS_RPATH_TRUE
@ -270,16 +270,16 @@
 BUILD_STATIC_FALSE
 BUILD_STATIC_TRUE
 USE_VALGRIND_FALSE
-@@ -635,6 +637,8 @@ NEVER_TRUE
+@@ -678,6 +680,8 @@ NEVER_TRUE
 base_cpu
 NATIVE_LD_FALSE
 NATIVE_LD_TRUE
 +LD_AS_NEEDED
 +WEXTRA
- LEXLIB
+ NM
- LEX_OUTPUT_ROOT
+ READELF
- LEX
+ ac_ct_AR
-@@ -755,6 +759,7 @@ enable_debugpred
+@@ -802,6 +806,7 @@ enable_debugpred
 enable_gprof
 enable_gcov
 enable_valgrind
@ -287,7 +287,7 @@
 enable_tests_rpath
 enable_libebl_subdir
 with_zlib
-@@ -1412,6 +1417,7 @@ Optional Features:
+@@ -1461,6 +1466,7 @@ Optional Features:
   --enable-gprof          build binaries with gprof support
   --enable-gcov           build binaries with gcov support
   --enable-valgrind       run all tests under valgrind
@ -295,7 +295,7 @@
   --enable-tests-rpath    build $ORIGIN-using rpath into tests
   --enable-libebl-subdir=DIR
                           install libebl_CPU modules in $(libdir)/DIR
-@@ -4012,6 +4018,130 @@ if test "x$ac_cv_c99" != xyes; then :
+@@ -4709,6 +4715,130 @@ if test "x$ac_cv_c99" != xyes; then :
   as_fn_error $? "gcc with C99 support required" "$LINENO" 5
 fi
@ -426,7 +426,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread support" >&5
 $as_echo_n "checking for __thread support... " >&6; }
 if ${ac_cv_tls+:} false; then :
-@@ -4048,7 +4178,13 @@ fi
+@@ -4745,7 +4875,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 :
@ -441,7 +441,7 @@
 fi
 # Check whether --enable-largefile was given.
-@@ -4458,6 +4594,22 @@ else
+@@ -5155,6 +5291,22 @@ else
 fi
@ -464,16 +464,16 @@
 # Check whether --enable-tests-rpath was given.
 if test "${enable_tests_rpath+set}" = set; then :
   enableval=$enable_tests_rpath; tests_use_rpath=$enableval
-@@ -5178,7 +5330,7 @@ case "$eu_version" in
+@@ -5875,7 +6027,7 @@ case "$eu_version" in
 esac
 # Round up to the next release API (x.y) version.
 -eu_version=$(( (eu_version + 999) / 1000 ))
 +eu_version=`expr \( $eu_version + 999 \) / 1000`
- cat >confcache <<\_ACEOF
+ ac_ext=c
- # This file is a shell script that caches the results of configure
+ ac_cpp='$CPP $CPPFLAGS'
-@@ -5353,6 +5505,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes
+@@ -6613,6 +6765,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
@ -486,7 +486,7 @@
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 --- elfutils/configure.ac
 +++ elfutils/configure.ac
-@@ -90,6 +90,54 @@ CFLAGS="$old_CFLAGS"])
+@@ -99,6 +99,54 @@ CFLAGS="$old_CFLAGS"])
 AS_IF([test "x$ac_cv_c99" != xyes],
       AC_MSG_ERROR([gcc with C99 support required]))
@ -541,7 +541,7 @@
 AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl
 # Use the same flags that we use for our DSOs, so the test is representative.
 # Some old compiler/linker/libc combinations fail some ways and not others.
-@@ -105,7 +153,10 @@ static __thread int a; int foo (int b) {
+@@ -114,7 +162,10 @@ static __thread int a; int foo (int b) {
 CFLAGS="$save_CFLAGS"
 LDFLAGS="$save_LDFLAGS"])
 AS_IF([test "x$ac_cv_tls" != xyes],
@ -553,7 +553,7 @@
 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
-@@ -204,6 +255,11 @@ AM_CONDITIONAL(USE_VALGRIND, test "$use_
+@@ -213,6 +264,11 @@ AM_CONDITIONAL(USE_VALGRIND, test "$use_
 AM_CONDITIONAL(BUILD_STATIC, [dnl
 test "$use_mudflap" = yes -o "$use_gprof" = yes -o "$use_gcov" = yes])
@ -565,17 +565,18 @@
 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])
-@@ -315,6 +371,6 @@ case "$eu_version" in
+@@ -324,7 +380,7 @@ case "$eu_version" in
 esac
 # Round up to the next release API (x.y) version.
 -eu_version=$(( (eu_version + 999) / 1000 ))
 +eu_version=`expr \( $eu_version + 999 \) / 1000`
- AC_OUTPUT
+ AC_CHECK_SIZEOF(long)
 --- elfutils/lib/ChangeLog
 +++ elfutils/lib/ChangeLog
-@@ -57,6 +57,9 @@
+@@ -61,6 +61,9 @@
 2009-01-23  Roland McGrath  <roland@redhat.com>
@ -585,7 +586,7 @@
 	* eu-config.h: Add multiple inclusion protection.
 2009-01-17  Ulrich Drepper  <drepper@redhat.com>
-@@ -113,6 +116,11 @@
+@@ -117,6 +120,11 @@
 	* Makefile.am (libeu_a_SOURCES): Add it.
 	* system.h: Declare crc32_file.
@ -628,8 +629,8 @@
 +@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 \
+ am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -193,6 +194,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -198,6 +199,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -637,7 +638,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -222,6 +224,7 @@ SHELL = @SHELL@
+@@ -229,6 +231,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@ -645,7 +646,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -283,10 +286,9 @@ zip_LIBS = @zip_LIBS@
+@@ -291,10 +294,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 \
@ -687,8 +688,8 @@
 +@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_3 = -lpthread
 subdir = libasm
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -245,6 +246,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -250,6 +251,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -696,7 +697,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -274,6 +276,7 @@ SHELL = @SHELL@
+@@ -281,6 +283,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = 1
@ -704,7 +705,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -336,10 +339,9 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
+@@ -344,10 +347,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 \
@ -717,7 +718,7 @@
 @MUDFLAP_FALSE@libmudflap = 
 @MUDFLAP_TRUE@libmudflap = -lmudflap
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-@@ -368,7 +370,7 @@ libasm_a_SOURCES = asm_begin.c asm_abort
+@@ -376,7 +378,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)
@ -772,7 +773,7 @@
 @MAINTAINER_MODE_TRUE@noinst_PROGRAMS = i386_gendis$(EXEEXT)
 subdir = libcpu
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -220,6 +221,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -225,6 +226,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -780,7 +781,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = lex.$(<F:lex.l=)
-@@ -249,6 +251,7 @@ SHELL = @SHELL@
+@@ -256,6 +258,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@ -788,7 +789,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -311,10 +314,9 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
+@@ -319,10 +322,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 \
@ -803,7 +804,7 @@
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
 --- elfutils/libdw/ChangeLog
 +++ elfutils/libdw/ChangeLog
-@@ -177,6 +177,10 @@
+@@ -346,6 +346,10 @@
 	* Makefile.am (known-dwarf.h): Run gawk on config/known-dwarf.awk.
@ -814,7 +815,7 @@
 2011-07-14  Mark Wielaard  <mjw@redhat.com>
 	* libdw.h (dwarf_offdie): Fix documentation to mention .debug_info.
-@@ -536,6 +540,10 @@
+@@ -705,6 +709,10 @@
 	* dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.
@ -825,7 +826,7 @@
 2009-08-10  Roland McGrath  <roland@redhat.com>
 	* dwarf_getscopevar.c: Use dwarf_diename.
-@@ -1304,6 +1312,11 @@
+@@ -1473,6 +1481,11 @@
 2005-05-31  Roland McGrath  <roland@redhat.com>
@ -856,7 +857,7 @@
 #endif
 --- elfutils/libdw/libdw.h
 +++ elfutils/libdw/libdw.h
-@@ -831,7 +831,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (
+@@ -879,7 +879,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (
 /* Inline optimizations.  */
@ -879,7 +880,7 @@
 @MUDFLAP_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
 @MUDFLAP_TRUE@am_libdw_pic_a_OBJECTS =
 subdir = libdw
-@@ -291,6 +292,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -295,6 +296,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -887,7 +888,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -320,6 +322,7 @@ SHELL = @SHELL@
+@@ -326,6 +328,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = 1
@ -895,7 +896,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -381,10 +384,9 @@ zip_LIBS = @zip_LIBS@
+@@ -388,10 +391,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 \
@ -910,7 +911,29 @@
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -1624,6 +1624,11 @@
+@@ -283,6 +283,21 @@
 	(dwfl_module_addrsym) (i_to_symfile): New function.
 	(dwfl_module_addrsym) (search_table): Use it.
 +2013-11-09  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +
 +	Older OS compatibility bits.
 +	* linux-core-attach.c (be64toh, le64toh, be32toh, le32toh): Provide
 +	fallbacks if not defined by system.
 +
 +2013-11-09  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +
 +	Handle T-stopped detach for old kernels.
 +	* linux-pid-attach.c (struct pid_arg): New field stopped.
 +	(ptrace_attach): New parameter stoppedp.  Set it appropriately.
 +	(pid_set_initial_registers): Pass the new field.
 +	(pid_thread_detach): Handle the case of STOPPED for old kernels.
 +	(__libdwfl_attach_state_for_pid): Initialize STOPPED.
 +
 2013-11-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
 	    Mark Wielaard  <mjw@redhat.com>
@@ -2048,6 +2063,11 @@
 2005-07-21  Roland McGrath  <roland@redhat.com>
@ -922,6 +945,75 @@
 	* Makefile.am (noinst_HEADERS): Add loc2c.c.
 	* test2.c (main): Check sscanf result to quiet warning.
 --- elfutils/libdwfl/linux-core-attach.c
 +++ elfutils/libdwfl/linux-core-attach.c
@@ -29,6 +29,35 @@
 #include "libdwflP.h"
 #include <fcntl.h>
 #include "system.h"
 +#include <endian.h>
 +#include <byteswap.h>
 +#if __BYTE_ORDER == __LITTLE_ENDIAN
 +# ifndef be64toh
 +#  define be64toh(x) bswap_64 (x)
 +# endif
 +# ifndef le64toh
 +#  define le64toh(x) (x)
 +# endif
 +# ifndef be32toh
 +#  define be32toh(x) bswap_32 (x)
 +# endif
 +# ifndef le32toh
 +#  define le32toh(x) (x)
 +# endif
 +#else
 +# ifndef be64toh
 +#  define be64toh(x) (x)
 +# endif
 +# ifndef le64toh
 +#  define le64toh(x) bswap_64 (x)
 +# endif
 +# ifndef be32toh
 +#  define be32toh(x) (x)
 +# endif
 +# ifndef le32toh
 +#  define le32toh(x) bswap_32 (x)
 +# endif
 +#endif
 #ifndef MIN
 # define MIN(a, b) ((a) < (b) ? (a) : (b))
 --- elfutils/libdwfl/linux-pid-attach.c
 +++ elfutils/libdwfl/linux-pid-attach.c
@@ -268,13 +268,24 @@ pid_thread_detach (Dwfl_Thread *thread,
   pid_arg->tid_attached = 0;
   if (! pid_arg->assume_ptrace_stopped)
     {
 +      // Older kernels (tested kernel-2.6.18-348.12.1.el5.x86_64) need special
 +      // handling of the detachment to keep the process State: T (stopped).
 +      if (pid_arg->tid_was_stopped)
 +	syscall (__NR_tkill, tid, SIGSTOP);
       /* This handling is needed only on older Linux kernels such as
 -         2.6.32-358.23.2.el6.ppc64.  Later kernels such as
 -         3.11.7-200.fc19.x86_64 remember the T (stopped) state
 -         themselves and no longer need to pass SIGSTOP during
 -         PTRACE_DETACH.  */
 +         2.6.32-358.23.2.el6.ppc64.  Later kernels such as 3.11.7-200.fc19.x86_64
 +         remember the T (stopped) state themselves and no longer need to pass
 +         SIGSTOP during PTRACE_DETACH.  */
       ptrace (PTRACE_DETACH, tid, NULL,
 	      (void *) (intptr_t) (pid_arg->tid_was_stopped ? SIGSTOP : 0));
 +      if (pid_arg->tid_was_stopped)
 +	{
 +	  // Wait till the SIGSTOP settles down.
 +	  int i;
 +	  for (i = 0; i < 100000; i++)
 +	    if (linux_proc_pid_is_stopped (tid))
 +	      break;
 +	}
     }
 }
 --- elfutils/libdwfl/Makefile.in
 +++ elfutils/libdwfl/Makefile.in
@@ -82,11 +82,12 @@ host_triplet = @host@
@ -942,7 +1034,7 @@
 @MUDFLAP_TRUE@am_libdwfl_pic_a_OBJECTS =
 subdir = libdwfl
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -280,6 +281,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -289,6 +290,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -950,7 +1042,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -309,6 +311,7 @@ SHELL = @SHELL@
+@@ -320,6 +322,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = 1
@ -958,7 +1050,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -371,10 +374,9 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
+@@ -383,10 +386,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 \
@ -971,29 +1063,29 @@
 @MUDFLAP_FALSE@libmudflap = 
 @MUDFLAP_TRUE@libmudflap = -lmudflap
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-@@ -382,7 +384,7 @@ COMPILE.os = $(filter-out -fprofile-arcs
+@@ -394,7 +396,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
+ textrel_check = if $(READELF) -d $@ | fgrep -q TEXTREL; then exit 1; fi
 -noinst_LIBRARIES = libdwfl.a $(am__append_2)
 +noinst_LIBRARIES = libdwfl.a $(am__append_3)
 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 \
-@@ -403,8 +405,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
+@@ -417,8 +419,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 \
-	link_map.c core-file.c open.c image-header.c $(am__append_3) \
+ 	link_map.c core-file.c open.c image-header.c dwfl_frame.c \
 	frame_unwind.c dwfl_frame_pc.c linux-pid-attach.c \
 -	linux-core-attach.c dwfl_frame_regs.c $(am__append_3) \
 -	$(am__append_4) $(am__append_5)
-+	link_map.c core-file.c open.c image-header.c $(am__append_4) \
+	linux-core-attach.c dwfl_frame_regs.c $(am__append_4) \
 +	$(am__append_5) $(am__append_6)
 @MUDFLAP_FALSE@libdwfl = $(libdw)
 @MUDFLAP_TRUE@libdwfl = libdwfl.a $(libdw) $(libebl) $(libelf) $(libeu)
 @MUDFLAP_FALSE@libdw = ../libdw/libdw.so
 --- elfutils/libebl/ChangeLog
 +++ elfutils/libebl/ChangeLog
-@@ -674,6 +674,11 @@
+@@ -738,6 +738,11 @@
 	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
 	tracking works right.
@ -1016,8 +1108,8 @@
 +@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 \
+ am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -242,6 +243,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -249,6 +250,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -1025,7 +1117,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -271,6 +273,7 @@ SHELL = @SHELL@
+@@ -280,6 +282,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = 1
@ -1033,7 +1125,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -333,10 +336,9 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
+@@ -343,10 +346,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 \
@ -1048,7 +1140,7 @@
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -46,6 +46,11 @@
+@@ -85,6 +85,11 @@
 	* elf-knowledge.h (SECTION_STRIP_P): Remove < SHT_NUM check.
@ -1060,7 +1152,7 @@
 2011-02-26  Mark Wielaard  <mjw@redhat.com>
 	* elf_end.c (elf_end): Call rwlock_unlock before rwlock_fini.
-@@ -723,6 +728,11 @@
+@@ -762,6 +767,11 @@
 	* elf.h: Update from glibc.
@ -1129,8 +1221,8 @@
 +@MUDFLAP_FALSE@@USE_LOCKS_TRUE@am__append_4 = -lpthread
 subdir = libelf
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -288,6 +289,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -293,6 +294,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -1138,7 +1230,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -317,6 +319,7 @@ SHELL = @SHELL@
+@@ -324,6 +326,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = 1
@ -1146,7 +1238,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -377,10 +380,9 @@ top_srcdir = @top_srcdir@
+@@ -385,10 +388,9 @@ top_srcdir = @top_srcdir@
 zip_LIBS = @zip_LIBS@
 AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
 AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
@ -1159,7 +1251,7 @@
 @MUDFLAP_FALSE@libmudflap = 
 @MUDFLAP_TRUE@libmudflap = -lmudflap
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-@@ -445,7 +447,7 @@ libelf_a_SOURCES = elf_version.c elf_has
+@@ -453,7 +455,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)
@ -1170,7 +1262,7 @@
 		 version_xlate.h gnuhash_xlate.h note_xlate.h dl-hash.h
 --- elfutils/m4/Makefile.in
 +++ elfutils/m4/Makefile.in
-@@ -139,6 +139,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -145,6 +145,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -1178,7 +1270,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -168,6 +169,7 @@ SHELL = @SHELL@
+@@ -176,6 +177,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@ -1188,7 +1280,7 @@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 --- elfutils/Makefile.in
 +++ elfutils/Makefile.in
-@@ -256,6 +256,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -263,6 +263,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -1196,7 +1288,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -285,6 +286,7 @@ SHELL = @SHELL@
+@@ -294,6 +295,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@ -1206,7 +1298,7 @@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 --- elfutils/src/addr2line.c
 +++ elfutils/src/addr2line.c
-@@ -448,10 +448,10 @@ handle_address (const char *string, Dwfl
+@@ -540,10 +540,10 @@ handle_address (const char *string, Dwfl
       bool parsed = false;
       int i, j;
       char *name = NULL;
@ -1221,7 +1313,7 @@
 	  break;
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -766,8 +766,16 @@
+@@ -964,8 +964,16 @@
 	* readelf.c (attr_callback): Use print_block only when we don't use
 	print_ops.
@ -1238,7 +1330,7 @@
 	* ar.c (do_oper_extract): Use pathconf instead of statfs.
 2009-08-01  Ulrich Drepper  <drepper@redhat.com>
-@@ -931,6 +939,8 @@
+@@ -1129,6 +1137,8 @@
 	* readelf.c (print_debug_frame_section): Use t instead of j formats
 	for ptrdiff_t OFFSET.
@ -1247,7 +1339,7 @@
 2009-01-21  Ulrich Drepper  <drepper@redhat.com>
 	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
-@@ -1114,6 +1124,11 @@
+@@ -1312,6 +1322,11 @@
 	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
 	is valid in RELRO.
@ -1259,7 +1351,7 @@
 2008-02-29  Roland McGrath  <roland@redhat.com>
 	* readelf.c (print_attributes): Add a cast.
-@@ -1365,6 +1380,8 @@
+@@ -1563,6 +1578,8 @@
 	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
@ -1268,7 +1360,7 @@
 2007-10-15  Roland McGrath  <roland@redhat.com>
 	* make-debug-archive.in: New file.
-@@ -1804,6 +1821,10 @@
+@@ -2002,6 +2019,10 @@
 	* elflint.c (valid_e_machine): Add EM_ALPHA.
 	Reported by Christian Aichinger <Greek0@gmx.net>.
@ -1279,7 +1371,7 @@
 2006-08-08  Ulrich Drepper  <drepper@redhat.com>
 	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -1880,6 +1901,10 @@
+@@ -2078,6 +2099,10 @@
 	* Makefile.am: Add hacks to create dependency files for non-generic
 	linker.
@ -1290,7 +1382,7 @@
 2006-06-12  Ulrich Drepper  <drepper@redhat.com>
 	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -2228,6 +2253,11 @@
+@@ -2426,6 +2451,11 @@
 	* readelf.c (print_debug_loc_section): Fix indentation for larger
 	address size.
@ -1379,7 +1471,7 @@
 ld_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ld_LDFLAGS) $(LDFLAGS) -o \
 	$@
 am_libld_elf_i386_so_OBJECTS =
-@@ -338,6 +339,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -347,6 +348,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -1387,7 +1479,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -367,6 +369,7 @@ SHELL = @SHELL@
+@@ -378,6 +380,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@ -1395,7 +1487,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -430,10 +433,9 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_sr
+@@ -442,10 +445,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 \
@ -1408,7 +1500,7 @@
 @MUDFLAP_FALSE@libmudflap = 
 @MUDFLAP_TRUE@libmudflap = -lmudflap
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-@@ -449,8 +451,8 @@ AM_LFLAGS = -Pld -olex.yy.c
+@@ -461,8 +463,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) \
@ -1419,7 +1511,7 @@
 @NATIVE_LD_TRUE@native_ld_cflags = -DBASE_ELF_NAME=elf_$(base_cpu)
 @NEVER_TRUE@libdummy_a_SOURCES = i386_ld.c
 ld_SOURCES = ld.c ldgeneric.c ldlex.l ldscript.y symbolhash.c sectionhash.c \
-@@ -479,6 +481,9 @@ strings_no_Wformat = yes
+@@ -491,6 +493,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
@ -1429,7 +1521,7 @@
 readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
 nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
 	   $(demanglelib)
-@@ -486,7 +491,7 @@ nm_LDADD = $(libdw) $(libebl) $(libelf)
+@@ -498,7 +503,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 \
@ -1440,18 +1532,12 @@
 findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap)
 --- elfutils/src/readelf.c
 +++ elfutils/src/readelf.c
-@@ -4150,6 +4150,8 @@ struct listptr
+@@ -4171,10 +4171,12 @@ listptr_base (struct listptr *p)
- #define listptr_offset_size(p)	((p)->dwarf64 ? 8 : 4)
+   return base;
- #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)
@ -1461,7 +1547,7 @@
   struct listptr *p1 = (void *) a;
   struct listptr *p2 = (void *) b;
-@@ -4262,8 +4264,11 @@ static void
+@@ -4263,8 +4265,11 @@ static void
 sort_listptr (struct listptr_table *table, const char *name)
 {
   if (table->n > 0)
@ -1475,7 +1561,7 @@
 }
 static bool
-@@ -8986,7 +8991,7 @@ dump_archive_index (Elf *elf, const char
+@@ -9151,7 +9156,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))
@ -1575,9 +1661,33 @@
 	{
 	  error (0, errno, gettext ("\
 cannot set access and modification date of '%s'"), fname);
 --- elfutils/tests/backtrace.c
 +++ elfutils/tests/backtrace.c
@@ -36,6 +36,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <argp.h>
 +#include <sys/syscall.h>
 #include ELFUTILS_HEADER(dwfl)
 static int
 --- elfutils/tests/ChangeLog
 +++ elfutils/tests/ChangeLog
-@@ -647,6 +647,8 @@
+@@ -123,6 +123,13 @@
 2013-12-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +	Handle T-stopped detach for old kernels.
 +	* backtrace.c: Include sys/syscall.h.
 +	(linux_proc_pid_is_stopped): New function.
 +	(ptrace_detach_stopped): Handle old kernels.
 +
 +2013-12-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
 +
 	* Makefile.am (check_PROGRAMS): Add backtrace, backtrace-child,
 	backtrace-data and backtrace-dwarf.
 	(BUILT_SOURCES, clean-local, backtrace-child-biarch): New.
@@ -987,6 +994,8 @@
 2008-01-21  Roland McGrath  <roland@redhat.com>
@ -1586,7 +1696,7 @@
 	* testfile45.S.bz2: Add tests for cltq, cqto.
 	* testfile45.expect.bz2: Adjust.
-@@ -1355,6 +1357,11 @@
+@@ -1695,6 +1704,11 @@
 	* Makefile.am (TESTS): Add run-elflint-test.sh.
 	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
@ -1631,26 +1741,37 @@
 check_PROGRAMS = arextract$(EXEEXT) arsymtest$(EXEEXT) \
 	newfile$(EXEEXT) saridx$(EXEEXT) scnnames$(EXEEXT) \
 	sectiondump$(EXEEXT) showptable$(EXEEXT) update1$(EXEEXT) \
-@@ -142,13 +143,13 @@
+@@ -111,7 +112,7 @@ check_PROGRAMS = arextract$(EXEEXT) arsy
- 	run-readelf-mixed-corenote.sh run-dwfllines.sh \
+ 	varlocs$(EXEEXT) backtrace$(EXEEXT) backtrace-child$(EXEEXT) \
- 	run-dwfl-report-elf-align.sh run-addr2line-test.sh \
+ 	backtrace-data$(EXEEXT) backtrace-dwarf$(EXEEXT) \
- 	run-addr2line-i-test.sh run-varlocs.sh $(am__EXEEXT_1) \
+ 	$(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_4)
-	$(am__append_7) $(am__EXEEXT_3) $(am__append_10)
+-@BIARCH_TRUE@am__append_5 = backtrace-child-biarch
-@STANDALONE_FALSE@am__append_5 = msg_tst md5-sha1-test
+@BIARCH_TRUE@am__append_6 = backtrace-child-biarch
-+	$(am__append_8) $(am__EXEEXT_3) $(am__append_11)
+ TESTS = run-arextract.sh run-arsymtest.sh newfile$(EXEEXT) \
- @STANDALONE_FALSE@am__append_6 = msg_tst md5-sha1-test
+ 	test-nlist$(EXEEXT) update1$(EXEEXT) update2$(EXEEXT) \
-@LZMA_TRUE@am__append_7 = run-readelf-s.sh run-dwflsyms.sh
+ 	update3$(EXEEXT) update4$(EXEEXT) run-show-die-info.sh \
-@HAVE_LIBASM_TRUE@am__append_8 = $(asm_TESTS)
+@@ -151,14 +152,14 @@ TESTS = run-arextract.sh run-arsymtest.s
-+@STANDALONE_FALSE@am__append_7 = msg_tst md5-sha1-test
+ 	run-backtrace-native-core-biarch.sh \
-+@LZMA_TRUE@am__append_8 = run-readelf-s.sh run-dwflsyms.sh
+ 	run-backtrace-core-x86_64.sh run-backtrace-core-i386.sh \
- @HAVE_LIBASM_TRUE@am__append_9 = $(asm_TESTS)
+ 	run-backtrace-core-ppc.sh run-backtrace-core-s390x.sh \
-@ENABLE_DWZ_TRUE@am__append_10 = run-readelf-dwz-multi.sh
+-	run-backtrace-core-s390.sh $(am__EXEEXT_2) $(am__append_8) \
-+@HAVE_LIBASM_TRUE@am__append_10 = $(asm_TESTS)
+-	$(am__EXEEXT_4) $(am__append_11)
-+@ENABLE_DWZ_TRUE@am__append_11 = run-readelf-dwz-multi.sh
+-@STANDALONE_FALSE@am__append_6 = msg_tst md5-sha1-test
 +	run-backtrace-core-s390.sh $(am__EXEEXT_2) $(am__append_9) \
 +	$(am__EXEEXT_4) $(am__append_12)
 @STANDALONE_FALSE@am__append_7 = msg_tst md5-sha1-test
 -@LZMA_TRUE@am__append_8 = run-readelf-s.sh run-dwflsyms.sh
 -@HAVE_LIBASM_TRUE@am__append_9 = $(asm_TESTS)
 +@STANDALONE_FALSE@am__append_8 = msg_tst md5-sha1-test
 +@LZMA_TRUE@am__append_9 = run-readelf-s.sh run-dwflsyms.sh
 @HAVE_LIBASM_TRUE@am__append_10 = $(asm_TESTS)
 -@ENABLE_DWZ_TRUE@am__append_11 = run-readelf-dwz-multi.sh run-allfcts-multi.sh
 +@HAVE_LIBASM_TRUE@am__append_11 = $(asm_TESTS)
 +@ENABLE_DWZ_TRUE@am__append_12 = run-readelf-dwz-multi.sh run-allfcts-multi.sh
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
-@@ -722,6 +723,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -780,6 +781,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
@ -1658,7 +1779,7 @@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-@@ -751,6 +753,7 @@ SHELL = @SHELL@
+@@ -811,6 +813,7 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@ -1666,7 +1787,7 @@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-@@ -809,12 +812,11 @@ top_build_prefix = @top_build_prefix@
+@@ -870,12 +873,11 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 zip_LIBS = @zip_LIBS@
@ -1682,8 +1803,8 @@
 @MUDFLAP_FALSE@libmudflap = 
 @MUDFLAP_TRUE@libmudflap = -lmudflap
 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\
-@@ -824,7 +826,7 @@ CLEANFILES = *.gcno *.gcda
+@@ -885,7 +887,7 @@ CLEANFILES = *.gcno *.gcda
- textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
+ 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
 -AM_LDFLAGS = $(am__append_3) $(am__append_4)
--- a/elfutils-robustify.patch
+++ b/elfutils-robustify.patch
@ -1,6 +1,6 @@
 --- elfutils/libdwfl/ChangeLog
 +++ elfutils/libdwfl/ChangeLog
-@@ -256,6 +256,11 @@
+@@ -680,6 +680,11 @@
 	* dwfl_module_getdwarf.c (open_elf): Clear errno before CBFAIL.
 	Reported by Kurt Roeckx <kurt@roeckx.be>.
@ -44,7 +44,7 @@
 --- elfutils/libelf/ChangeLog
 +++ elfutils/libelf/ChangeLog
-@@ -715,10 +715,53 @@
+@@ -754,10 +754,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.
@ -902,7 +902,7 @@
 #endif  /* libelfP.h */
 --- elfutils/src/ChangeLog
 +++ elfutils/src/ChangeLog
-@@ -504,6 +504,12 @@
+@@ -702,6 +702,12 @@
 	* readelf.c (dwarf_attr_string): Grok DW_AT_GNU_odr_signature.
@ -915,7 +915,7 @@
 2011-02-11  Roland McGrath  <roland@redhat.com>
 	* elfcmp.c (verbose): New variable.
-@@ -2216,6 +2222,16 @@
+@@ -2414,6 +2420,16 @@
 	object symbols or symbols with unknown type.
 	(check_rel): Likewise.
@ -932,7 +932,7 @@
 2005-06-08  Roland McGrath  <roland@redhat.com>
 	* readelf.c (print_ops): Add consts.
-@@ -2261,6 +2277,19 @@
+@@ -2459,6 +2475,19 @@
 	* readelf.c (dwarf_tag_string): Add new tags.
@ -1229,7 +1229,7 @@
 	   idx, section_name (ebl, idx),
 --- elfutils/src/readelf.c
 +++ elfutils/src/readelf.c
-@@ -1363,6 +1363,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
+@@ -1364,6 +1364,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
   Elf32_Word *grpref = (Elf32_Word *) data->d_buf;
   GElf_Sym sym_mem;
@ -1238,7 +1238,7 @@
   printf ((grpref[0] & GRP_COMDAT)
 	  ? ngettext ("\
 \nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n",
-@@ -1375,8 +1377,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
+@@ -1376,8 +1378,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),
@ -1249,7 +1249,7 @@
 	  ?: gettext ("<INVALID SYMBOL>"),
 	  data->d_size / sizeof (Elf32_Word) - 1);
-@@ -1527,10 +1529,12 @@ static void
+@@ -1528,10 +1530,12 @@ static void
 handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr)
 {
   int class = gelf_getclass (ebl->elf);
@ -1263,7 +1263,7 @@
   /* Get the data of the section.  */
   data = elf_getdata (scn, NULL);
-@@ -1542,21 +1546,26 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn,
+@@ -1543,21 +1547,26 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn,
     error (EXIT_FAILURE, 0,
 	   gettext ("cannot get section header string table index"));
@ -1296,7 +1296,7 @@
     {
       GElf_Dyn dynmem;
       GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dynmem);
-@@ -1705,7 +1714,8 @@ static void
+@@ -1706,7 +1715,8 @@ static void
 handle_relocs_rel (Ebl *ebl, GElf_Ehdr *ehdr, Elf_Scn *scn, GElf_Shdr *shdr)
 {
   int class = gelf_getclass (ebl->elf);
@ -1306,7 +1306,7 @@
   /* Get the data of the section.  */
   Elf_Data *data = elf_getdata (scn, NULL);
-@@ -1891,7 +1901,8 @@ static void
+@@ -1892,7 +1902,8 @@ static void
 handle_relocs_rela (Ebl *ebl, GElf_Ehdr *ehdr, Elf_Scn *scn, GElf_Shdr *shdr)
 {
   int class = gelf_getclass (ebl->elf);
@ -1316,7 +1316,7 @@
   /* Get the data of the section.  */
   Elf_Data *data = elf_getdata (scn, NULL);
-@@ -2138,6 +2149,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
+@@ -2139,6 +2150,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
     error (EXIT_FAILURE, 0,
 	   gettext ("cannot get section header string table index"));
@ -1330,7 +1330,7 @@
   /* Now we can compute the number of entries in the section.  */
   unsigned int nsyms = data->d_size / (class == ELFCLASS32
 				       ? sizeof (Elf32_Sym)
-@@ -2148,15 +2166,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
+@@ -2149,15 +2167,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
 		    nsyms),
 	  (unsigned int) elf_ndxscn (scn),
 	  elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms);
@ -1347,7 +1347,7 @@
   fputs_unlocked (class == ELFCLASS32
 		  ? gettext ("\
-@@ -2392,7 +2407,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn,
+@@ -2393,7 +2408,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn,
     error (EXIT_FAILURE, 0,
 	   gettext ("cannot get section header string table index"));
@ -1362,7 +1362,7 @@
   printf (ngettext ("\
 \nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
 		    "\
-@@ -2403,9 +2424,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn,
+@@ -2404,9 +2425,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn,
 	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
 	  shdr->sh_offset,
 	  (unsigned int) shdr->sh_link,
@ -1373,7 +1373,7 @@
   unsigned int offset = 0;
   for (int cnt = shdr->sh_info; --cnt >= 0; )
-@@ -2458,8 +2477,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
+@@ -2459,8 +2478,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
     error (EXIT_FAILURE, 0,
 	   gettext ("cannot get section header string table index"));
@ -1389,7 +1389,7 @@
   printf (ngettext ("\
 \nVersion definition section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 "  Offset: %#08" PRIx64 "  Link to section: [%2u] '%s'\n",
 		    "\
-@@ -2471,9 +2496,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
+@@ -2472,9 +2497,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
 	  class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
 	  shdr->sh_offset,
 	  (unsigned int) shdr->sh_link,
@ -1400,7 +1400,7 @@
   unsigned int offset = 0;
   for (int cnt = shdr->sh_info; --cnt >= 0; )
-@@ -2735,25 +2758,30 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
+@@ -2736,25 +2759,30 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
       filename = NULL;
     }
@ -1438,7 +1438,7 @@
     {
       if (cnt % 2 == 0)
 	printf ("\n %4d:", cnt);
-@@ -2802,7 +2830,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
+@@ -2803,7 +2831,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
   for (Elf32_Word cnt = 0; cnt < nbucket; ++cnt)
     ++counts[lengths[cnt]];
@ -1457,7 +1457,7 @@
   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",
 		    "\
-@@ -2815,9 +2853,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
+@@ -2816,9 +2854,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
 	  shdr->sh_addr,
 	  shdr->sh_offset,
 	  (unsigned int) shdr->sh_link,
@ -1468,7 +1468,7 @@
   if (extrastr != NULL)
     fputs (extrastr, stdout);
-@@ -3077,7 +3113,8 @@ print_liblist (Ebl *ebl)
+@@ -3078,7 +3114,8 @@ print_liblist (Ebl *ebl)
       if (shdr != NULL && shdr->sh_type == SHT_GNU_LIBLIST)
 	{
@ -1478,7 +1478,7 @@
 	  printf (ngettext ("\
 \nLibrary list section [%2zu] '%s' at offset %#0" PRIx64 " contains %d entry:\n",
 			    "\
-@@ -4397,6 +4434,16 @@ print_decoded_aranges_section (Ebl *ebl,
+@@ -4398,6 +4435,16 @@ print_decoded_aranges_section (Ebl *ebl,
       return;
     }
--- a/elfutils.spec
+++ b/elfutils.spec
@ -1,7 +1,7 @@
 Name: elfutils
 Summary: A collection of utilities and DSOs to handle compiled objects
-Version: 0.157
+Version: 0.158
-%global baserelease 4
+%global baserelease 1
 URL: https://fedorahosted.org/elfutils/
 %global source_url http://fedorahosted.org/releases/e/l/elfutils/%{version}/
 License: GPLv3+ and (GPLv2+ or LGPLv3+)
@ -43,17 +43,9 @@ Group: Development/Tools
 %global depsuffix %{?_isa}%{!?_isa:-%{_arch}}
 Source: %{?source_url}%{name}-%{version}.tar.bz2
 Source2: funcretval_test_aarch64.bz2
 Source3: hello_aarch64.ko.bz2
 Source4: testfile_aarch64_core.bz2
 Patch1: %{?source_url}elfutils-robustify.patch
 Patch2: %{?source_url}elfutils-portability.patch
 Patch3: elfutils-0.157-aarch64-elf.h.patch
 Patch4: elfutils-0.157-aarch64-hidden_format.patch
 Patch5: elfutils-0.157-aarch64-meat.patch
 Patch6: elfutils-0.157-aarch64-configury.patch
 Patch7: elfutils-0.157-aarch64-got-special-symbol.patch
 %if !%{compat}
 Release: %{baserelease}%{?dist}
@ -218,13 +210,6 @@ sed -i.scanf-m -e 's/%m/%a/g' src/addr2line.c tests/line2addr.c
 %endif
 %endif
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} tests/
 find . -name \*.sh ! -perm -0100 -print | xargs chmod +x
 %build
@ -292,6 +277,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/eu-ranlib
 %{_bindir}/eu-readelf
 %{_bindir}/eu-size
 %{_bindir}/eu-stack
 %{_bindir}/eu-strings
 %{_bindir}/eu-strip
 #%%{_bindir}/eu-ld
@ -343,6 +329,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libelf.a
 %changelog
 * Mon Jan  6 2014 Mark Wielaard <mjw@redhat.com> - 0.158-1
 - Update to 0.158. Remove all patches now upstream. Add eu-stack.
 * Thu Dec 19 2013 Mark Wielaard <mjw@redhat.com> - 0.157-4
 - Add elfutils-0.157-aarch64-got-special-symbol.patch.
 - Remove -Werror=format-security from RPM_OPT_FLAGS.
--- a/5
+++ b/5
@ -1,4 +1 @@
-0f6746a55f0bc26558f0c162fe137fa1  elfutils-0.157.tar.bz2
+050a4909e452d01ab4747fd69d4036e0  elfutils-0.158.tar.bz2
 cde23bccde69f1d3ee1ba8228cdfe40b  funcretval_test_aarch64.bz2
 8723bd0835675fd6531ae2df76235852  hello_aarch64.ko.bz2
 6b0f0d28bef1319f47d30a39d4f74f7c  testfile_aarch64_core.bz2