diff --git a/.elfutils.metadata b/.elfutils.metadata
index 5beebf3..35f88d3 100644
--- a/.elfutils.metadata
+++ b/.elfutils.metadata
@@ -1 +1 @@
-5e3767206c7f1b3bcfe33bce99fe09686ef165d2 SOURCES/elfutils-0.157.tar.bz2
+09adbbf0f3a35bb1bcb77c2eaa40de8d3443af4d SOURCES/elfutils-0.158.tar.bz2
diff --git a/SOURCES/elfutils-0.158-mod-e_type.patch b/SOURCES/elfutils-0.158-mod-e_type.patch
new file mode 100644
index 0000000..5e2918f
--- /dev/null
+++ b/SOURCES/elfutils-0.158-mod-e_type.patch
@@ -0,0 +1,62 @@
+commit 65cefbd0793c0f9e90a326d7bebf0a47c93294ad
+Author: Josh Stone <jistone@redhat.com>
+Date: Tue Mar 11 10:19:28 2014 -0700
+
+ libdwfl: dwfl_module_getdwarf.c (open_elf) only (re)set mod->e_type once.
+
+ As noted in https://sourceware.org/bugzilla/show_bug.cgi?id=16676#c2 for
+ systemtap, the heuristic used by open_elf to set the kernel Dwfl_Module
+ type to ET_DYN, even if the underlying ELF file e_type was set to
+ ET_EXEC, could trigger erroneously for non-kernel/non-main (debug or
+ aux) files. Make sure we only set the e_type of the module once when
+ processing the main file (when the phdrs can be trusted).
+
+diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c
+index c4bd739..f8de80b 100644
+--- a/libdwfl/dwfl_module_getdwarf.c
++++ b/libdwfl/dwfl_module_getdwarf.c
+@@ -1,5 +1,5 @@
+ /* Find debugging and symbol information for a module in libdwfl.
+- Copyright (C) 2005-2012 Red Hat, Inc.
++ Copyright (C) 2005-2012, 2014 Red Hat, Inc.
+ This file is part of elfutils.
+
+ This file is free software; you can redistribute it and/or modify
+@@ -77,7 +77,7 @@ open_elf (Dwfl_Module *mod, struct dwfl_file *file)
+ return DWFL_E (LIBELF, elf_errno ());
+ }
+
+- if (mod->e_type != ET_REL)
++ if (ehdr->e_type != ET_REL)
+ {
+ /* In any non-ET_REL file, we compute the "synchronization address".
+
+@@ -131,11 +131,24 @@ open_elf (Dwfl_Module *mod, struct dwfl_file *file)
+ }
+ }
+
+- mod->e_type = ehdr->e_type;
++ /* We only want to set the module e_type explictly once, derived from
++ the main ELF file. (It might be changed for the kernel, because
++ that is special - see below.) open_elf is always called first for
++ the main ELF file, because both find_dw and find_symtab call
++ __libdwfl_getelf first to open the main file. So don't let debug
++ or aux files override the module e_type. The kernel heuristic
++ below could otherwise trigger for non-kernel/non-main files, since
++ their phdrs might not match the actual load addresses. */
++ if (file == &mod->main)
++ {
++ mod->e_type = ehdr->e_type;
+
+- /* Relocatable Linux kernels are ET_EXEC but act like ET_DYN. */
+- if (mod->e_type == ET_EXEC && file->vaddr != mod->low_addr)
+- mod->e_type = ET_DYN;
++ /* Relocatable Linux kernels are ET_EXEC but act like ET_DYN. */
++ if (mod->e_type == ET_EXEC && file->vaddr != mod->low_addr)
++ mod->e_type = ET_DYN;
++ }
++ else
++ assert (mod->main.elf != NULL);
+
+ return DWFL_E_NOERROR;
+ }
diff --git a/SOURCES/elfutils-portability.patch b/SOURCES/elfutils-portability.patch
index 434baac..a34ba29 100644
--- a/SOURCES/elfutils-portability.patch
+++ b/SOURCES/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 \
-@@ -266,6 +267,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
+@@ -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. */
- #undef LIBEBL_SUBDIR
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #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
- LEX_OUTPUT_ROOT
- LEX
-@@ -755,6 +759,7 @@ enable_debugpred
+ NM
+ READELF
+ ac_ct_AR
+@@ -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
- # This file is a shell script that caches the results of configure
-@@ -5353,6 +5505,10 @@ if test -z "${BUILD_STATIC_TRUE}" && tes
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -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 \
-@@ -193,6 +194,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
+@@ -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 \
-@@ -245,6 +246,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
+@@ -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
- dwfl_module_getsym.c dwfl_module_addrname.c \
- dwfl_module_addrsym.c dwfl_module_return_value_location.c \
+@@ -417,8 +419,8 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en
dwfl_module_register_names.c dwfl_segment_report_module.c \
-- link_map.c core-file.c open.c image-header.c $(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 \
-@@ -242,6 +243,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
+@@ -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 \
-@@ -288,6 +289,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
+@@ -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
- #define listptr_offset_size(p) ((p)->dwarf64 ? 8 : 4)
- #define listptr_address_size(p) ((p)->addr64 ? 8 : 4)
+@@ -4171,10 +4171,12 @@ listptr_base (struct listptr *p)
+ return base;
+ }
+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 @@
- 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
--@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
-+@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
+@@ -111,7 +112,7 @@ check_PROGRAMS = arextract$(EXEEXT) arsy
+ varlocs$(EXEEXT) backtrace$(EXEEXT) backtrace-child$(EXEEXT) \
+ backtrace-data$(EXEEXT) backtrace-dwarf$(EXEEXT) \
+ $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_4)
+-@BIARCH_TRUE@am__append_5 = backtrace-child-biarch
++@BIARCH_TRUE@am__append_6 = backtrace-child-biarch
+ TESTS = run-arextract.sh run-arsymtest.sh newfile$(EXEEXT) \
+ test-nlist$(EXEEXT) update1$(EXEEXT) update2$(EXEEXT) \
+ update3$(EXEEXT) update4$(EXEEXT) run-show-die-info.sh \
+@@ -151,14 +152,14 @@ TESTS = run-arextract.sh run-arsymtest.s
+ run-backtrace-native-core-biarch.sh \
+ run-backtrace-core-x86_64.sh run-backtrace-core-i386.sh \
+ run-backtrace-core-ppc.sh run-backtrace-core-s390x.sh \
+- run-backtrace-core-s390.sh $(am__EXEEXT_2) $(am__append_8) \
+- $(am__EXEEXT_4) $(am__append_11)
+-@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 \
-@@ -722,6 +723,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ am__aclocal_m4_deps = $(top_srcdir)/m4/biarch.m4 \
+@@ -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
- textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
+@@ -885,7 +887,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
-AM_LDFLAGS = $(am__append_3) $(am__append_4)
diff --git a/SOURCES/elfutils-robustify.patch b/SOURCES/elfutils-robustify.patch
index 8359a9b..f358a85 100644
--- a/SOURCES/elfutils-robustify.patch
+++ b/SOURCES/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;
}
diff --git a/SPECS/elfutils.spec b/SPECS/elfutils.spec
index 54e11a0..591e1aa 100644
--- a/SPECS/elfutils.spec
+++ b/SPECS/elfutils.spec
@@ -1,7 +1,7 @@
Name: elfutils
Summary: A collection of utilities and DSOs to handle compiled objects
-Version: 0.157
-%global baserelease 2
+Version: 0.158
+%global baserelease 3
URL: https://fedorahosted.org/elfutils/
%global source_url http://fedorahosted.org/releases/e/l/elfutils/%{version}/
License: GPLv3+ and (GPLv2+ or LGPLv3+)
@@ -46,10 +46,12 @@ Source: %{?source_url}%{name}-%{version}.tar.bz2
Patch1: %{?source_url}elfutils-robustify.patch
Patch2: %{?source_url}elfutils-portability.patch
+Patch3: elfutils-0.158-mod-e_type.patch
+
%if !%{compat}
Release: %{baserelease}%{?dist}
%else
-Release: 0.%{baserelease}
+Release: 2.%{baserelease}
%endif
Requires: elfutils-libelf%{depsuffix} = %{version}-%{release}
@@ -209,6 +211,8 @@ sed -i.scanf-m -e 's/%m/%a/g' src/addr2line.c tests/line2addr.c
%endif
%endif
+%patch3 -p1 -b .e_type
+
find . -name \*.sh ! -perm -0100 -print | xargs chmod +x
%build
@@ -272,6 +276,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
@@ -323,6 +328,18 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/libelf.a
%changelog
+* Tue Mar 11 2014 Mark Wielaard <mjw@redhat.com> - 0.158-3
+- Add elfutils-0.158-mod-e_type.patch.
+
+* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 0.158-2
+- Mass rebuild 2014-01-24
+
+* Tue Jan 7 2014 Petr Machata <pmachata@redhat.com> - 0.158-1
+- Update to 0.158. Add eu-stack.
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 0.157-3
+- Mass rebuild 2013-12-27
+
* Wed Oct 9 2013 Mark Wielaard <mjw@redhat.com> 0.157-2
- Show tests/test-suite.log in build.log when make check fails.