-Rebase to 1.161
+Rebase to 1.162
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
- ChangeLog | 30 +++++++++++++++++++++++
- backends/ChangeLog | 12 +++++++++
- backends/Makefile.am | 2 +-
- config/ChangeLog | 4 +++
- config/eu.am | 14 ++++++++---
- configure.ac | 60 +++++++++++++++++++++++++++++++++++++++++++--
- lib/ChangeLog | 8 ++++++
- lib/eu-config.h | 11 +++++++++
- libasm/ChangeLog | 5 ++++
- libcpu/ChangeLog | 8 ++++++
- libcpu/i386_disasm.c | 1 +
- libdw/ChangeLog | 13 ++++++++++
- libdw/dwarf_begin_elf.c | 8 ++++++
- libdw/libdw.h | 2 +-
- libdwfl/ChangeLog | 20 +++++++++++++++
- libdwfl/linux-core-attach.c | 29 ++++++++++++++++++++++
- libdwfl/linux-pid-attach.c | 14 +++++++++++
- libebl/ChangeLog | 5 ++++
- libelf/ChangeLog | 10 ++++++++
- libelf/common.h | 4 +--
- libelf/gnuhash_xlate.h | 6 +++--
- src/ChangeLog | 30 +++++++++++++++++++++++
- src/Makefile.am | 5 ++++
- src/addr2line.c | 4 +--
- src/findtextrel.c | 6 ++++-
- src/ld.h | 2 ++
- src/readelf.c | 15 ++++++++----
- src/strings.c | 11 +++++++++
- src/strip.c | 20 +++++++++++++--
- tests/ChangeLog | 14 +++++++++++
- tests/Makefile.am | 1 +
- tests/backtrace.c | 1 +
- tests/line2addr.c | 2 +-
- 33 files changed, 355 insertions(+), 22 deletions(-)
+ ChangeLog | 30 +++++++++++++++++++++
+ backends/ChangeLog | 12 +++++++++
+ backends/Makefile.am | 2 +-
+ config/ChangeLog | 4 +++
+ config/eu.am | 14 +++++++---
+ configure.ac | 61 +++++++++++++++++++++++++++++++++++++++++--
+ lib/ChangeLog | 8 ++++++
+ lib/eu-config.h | 10 +++++++
+ libasm/ChangeLog | 5 ++++
+ libcpu/ChangeLog | 8 ++++++
+ libcpu/i386_disasm.c | 1 +
+ libdw/ChangeLog | 13 +++++++++
+ libdw/dwarf_begin_elf.c | 8 ++++++
+ libdw/libdw.h | 2 +-
+ libdwfl/ChangeLog | 20 ++++++++++++++
+ libdwfl/linux-core-attach.c | 29 ++++++++++++++++++++
+ libdwfl/linux-pid-attach.c | 14 ++++++++++
+ libebl/ChangeLog | 5 ++++
+ libelf/ChangeLog | 10 +++++++
+ libelf/common.h | 4 +--
+ libelf/gnuhash_xlate.h | 6 +++--
+ src/ChangeLog | 30 +++++++++++++++++++++
+ src/Makefile.am | 5 ++++
+ src/addr2line.c | 4 +--
+ src/findtextrel.c | 6 ++++-
+ src/ld.h | 2 ++
+ src/readelf.c | 15 +++++++----
+ src/strings.c | 11 ++++++++
+ src/strip.c | 6 +++++
+ tests/ChangeLog | 14 ++++++++++
+ tests/Makefile.am | 1 +
+ tests/backtrace.c | 1 +
+ tests/line2addr.c | 2 +-
+ 33 files changed, 343 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
-index f81b302..3f9eaf1 100644
+index d829783..89bfd24 100644
--- a/ChangeLog
+++ b/ChangeLog
-@@ -187,6 +187,8 @@
+@@ -253,6 +253,8 @@
2012-01-24 Mark Wielaard <mjw@redhat.com>
* COPYING: Fix address. Updated version from gnulib.
2012-01-23 Mark Wielaard <mjw@redhat.com>
-@@ -205,6 +207,9 @@
+@@ -271,6 +273,9 @@
2011-10-08 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Fix use of AC_ARG_ENABLE to handle $enableval correctly.
2011-10-02 Ulrich Drepper <drepper@gmail.com>
-@@ -226,6 +231,10 @@
+@@ -292,6 +297,10 @@
* configure.ac (LOCALEDIR, DATADIRNAME): Removed.
2009-09-21 Ulrich Drepper <drepper@redhat.com>
* configure.ac: Update for more modern autoconf.
-@@ -234,6 +243,10 @@
+@@ -300,6 +309,10 @@
* configure.ac (zip_LIBS): Check for liblzma too.
2009-04-19 Roland McGrath <roland@redhat.com>
* configure.ac (eu_version): Round down here, not in version.h macros.
-@@ -245,6 +258,8 @@
+@@ -311,6 +324,8 @@
2009-01-23 Roland McGrath <roland@redhat.com>
* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
-@@ -325,6 +340,10 @@
+@@ -391,6 +406,10 @@
* configure.ac: Add dummy automake conditional to get dependencies
for non-generic linker right. See src/Makefile.am.
2005-11-18 Roland McGrath <roland@redhat.com>
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -372,6 +391,17 @@
+@@ -438,6 +457,17 @@
* Makefile.am (all_SUBDIRS): Add libdwfl.
* configure.ac: Write libdwfl/Makefile.
* configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
diff --git a/backends/ChangeLog b/backends/ChangeLog
-index e800d16..6a86248 100644
+index fe61d9c..9599623 100644
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
-@@ -433,6 +433,10 @@
+@@ -498,6 +498,10 @@
* ppc_attrs.c (ppc_check_object_attribute): Handle tag
GNU_Power_ABI_Struct_Return.
2008-10-04 Ulrich Drepper <drepper@redhat.com>
* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
-@@ -760,6 +764,11 @@
+@@ -825,6 +829,11 @@
* sparc_init.c: Likewise.
* x86_64_init.c: Likewise.
2005-11-19 Roland McGrath <roland@redhat.com>
* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -782,6 +791,9 @@
+@@ -847,6 +856,9 @@
* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
(CLEANFILES): Add libebl_$(m).so.
* ppc64_reloc.def: Likewise.
diff --git a/backends/Makefile.am b/backends/Makefile.am
-index 4d15a5d..507c9df 100644
+index 21d7bd2..fe920c9 100644
--- a/backends/Makefile.am
+++ b/backends/Makefile.am
-@@ -131,7 +131,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw)
+@@ -119,7 +119,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw)
$(LINK) -shared -o $(@:.map=.so) \
-Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
-Wl,--version-script,$(@:.so=.map) \
libebl_i386.so: $(cpu_i386)
diff --git a/config/ChangeLog b/config/ChangeLog
-index 1b4e896..058dd88 100644
+index 64b58e1..63b3e90 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
-@@ -71,6 +71,10 @@
+@@ -106,6 +106,10 @@
* known-dwarf.awk: Use gawk.
* elfutils.spec.in: Add more BuildRequires.
diff --git a/config/eu.am b/config/eu.am
-index faf8add..6ca36a5 100644
+index 70d32de..65af085 100644
--- a/config/eu.am
+++ b/config/eu.am
@@ -1,6 +1,6 @@
##
## This file is part of elfutils.
##
-@@ -29,13 +29,21 @@
+@@ -29,6 +29,9 @@
## not, see <http://www.gnu.org/licenses/>.
##
+
DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'
AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
+
+@@ -38,12 +41,17 @@ STACK_USAGE_WARNING=-Wstack-usage=262144
+ else
+ STACK_USAGE_WARNING=
+ endif
-AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
+AM_CFLAGS = -std=gnu99 -Wall -Wshadow \
$(if $($(*F)_no_Werror),,-Werror) \
- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
+ $(if $($(*F)_no_Wunused),,-Wunused $(WEXTRA)) \
+ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) \
+ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
$($(*F)_CFLAGS)
+if BUILD_WERROR
+
COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
- %.os: %.c %.o
+ DEFS.os = -DPIC -DSHARED
diff --git a/configure.ac b/configure.ac
-index 0e67a79..a1ad6db 100644
+index bc9ff56..27a1ef3 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -89,6 +89,54 @@ CFLAGS="$old_CFLAGS"])
+@@ -106,6 +106,55 @@ CFLAGS="$old_CFLAGS"])
AS_IF([test "x$ac_cv_c99" != xyes],
- AC_MSG_ERROR([gcc with C99 support required]))
+ AC_MSG_ERROR([gcc with GNU99 support required]))
+AC_CACHE_CHECK([for -Wextra option to $CC], ac_cv_cc_wextra, [dnl
+old_CFLAGS="$CFLAGS"
+ ac_cv_popcount=yes, ac_cv_popcount=no)])
+AS_IF([test "x$ac_cv_popcount" = xyes],
+ [AC_DEFINE([HAVE_BUILTIN_POPCOUNT], [1], [Have __builtin_popcount.])])
++
+
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.
-@@ -104,7 +152,10 @@ static __thread int a; int foo (int b) { return a + b; }]],
+@@ -122,7 +171,10 @@ static __thread int a; int foo (int b) { return a + b; }]],
CFLAGS="$save_CFLAGS"
LDFLAGS="$save_LDFLAGS"])
AS_IF([test "x$ac_cv_tls" != xyes],
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
-@@ -183,6 +234,11 @@ AM_CONDITIONAL(USE_VALGRIND, test "$use_valgrind" = yes)
+@@ -224,6 +276,11 @@ AM_CONDITIONAL(USE_VALGRIND, test "$use_valgrind" = yes)
AM_CONDITIONAL(BUILD_STATIC, [dnl
test "$use_gprof" = yes -o "$use_gcov" = yes])
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])
-@@ -302,7 +358,7 @@ case "$eu_version" in
+@@ -388,7 +445,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_CHECK_SIZEOF(long)
-
+ dnl Unique ID for this build.
+ MODVERSION="Build for ${LIBEBL_SUBDIR} ${eu_version} ${ac_cv_build}"
diff --git a/lib/ChangeLog b/lib/ChangeLog
-index 4415213..4911cc1 100644
+index d04bf17..720c98d 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
-@@ -65,6 +65,9 @@
+@@ -73,6 +73,9 @@
2009-01-23 Roland McGrath <roland@redhat.com>
* eu-config.h: Add multiple inclusion protection.
2009-01-17 Ulrich Drepper <drepper@redhat.com>
-@@ -121,6 +124,11 @@
+@@ -129,6 +132,11 @@
* Makefile.am (libeu_a_SOURCES): Add it.
* system.h: Declare crc32_file.
* Makefile.am: Use -ffunction-sections for xmalloc.c.
diff --git a/lib/eu-config.h b/lib/eu-config.h
-index 3afff26..d89f3a8 100644
+index 400cdc6..872f6bc 100644
--- a/lib/eu-config.h
+++ b/lib/eu-config.h
-@@ -162,6 +162,17 @@ asm (".section predict_data, \"aw\"; .previous\n"
+@@ -163,6 +163,16 @@ asm (".section predict_data, \"aw\"; .previous\n"
/* This macro is used by the tests conditionalize for standalone building. */
#define ELFUTILS_HEADER(name) <lib##name.h>
+ return ((n + (n >> 3)) & 030707070707) % 63;
+}
+#endif /* HAVE_BUILTIN_POPCOUNT */
-+
- #ifdef SHARED
+ #ifdef SYMBOL_VERSIONING
# define OLD_VERSION(name, version) \
diff --git a/libasm/ChangeLog b/libasm/ChangeLog
index 9b25af9..32b9fd0 100644
}
else
diff --git a/libdw/ChangeLog b/libdw/ChangeLog
-index abc2d71..a9ee0b0 100644
+index 487e34a..06c737b 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
-@@ -717,6 +717,10 @@
+@@ -889,6 +889,10 @@
* Makefile.am (known-dwarf.h): Run gawk on config/known-dwarf.awk.
2011-07-14 Mark Wielaard <mjw@redhat.com>
* libdw.h (dwarf_offdie): Fix documentation to mention .debug_info.
-@@ -1076,6 +1080,10 @@
+@@ -1248,6 +1252,10 @@
* dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.
2009-08-10 Roland McGrath <roland@redhat.com>
* dwarf_getscopevar.c: Use dwarf_diename.
-@@ -1844,6 +1852,11 @@
+@@ -2016,6 +2024,11 @@
2005-05-31 Roland McGrath <roland@redhat.com>
formref offset.
diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c
-index 4c49ce2..7ea1430 100644
+index 4e0d590..a6616a1 100644
--- a/libdw/dwarf_begin_elf.c
+++ b/libdw/dwarf_begin_elf.c
@@ -47,6 +47,14 @@
# undef crc32
#endif
diff --git a/libdw/libdw.h b/libdw/libdw.h
-index b2b2282..722c589 100644
+index 473e1a2..5a511cd 100644
--- a/libdw/libdw.h
+++ b/libdw/libdw.h
-@@ -1003,7 +1003,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (Dwarf *dbg, Dwarf_OOM handler);
+@@ -1004,7 +1004,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (Dwarf *dbg, Dwarf_OOM handler);
/* Inline optimizations. */
__libdw_extern_inline unsigned int
dwarf_whatattr (Dwarf_Attribute *attr)
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
-index 69e59a6..15c2987 100644
+index a5253e2..59abfac 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
-@@ -571,6 +571,21 @@
+@@ -704,6 +704,21 @@
(dwfl_module_addrsym) (i_to_symfile): New function.
(dwfl_module_addrsym) (search_table): Use it.
2013-11-07 Jan Kratochvil <jan.kratochvil@redhat.com>
Mark Wielaard <mjw@redhat.com>
-@@ -2336,6 +2351,11 @@
+@@ -2469,6 +2484,11 @@
2005-07-21 Roland McGrath <roland@redhat.com>
#include "../libdw/memory-access.h"
diff --git a/libdwfl/linux-pid-attach.c b/libdwfl/linux-pid-attach.c
-index efbcf03..ae5af38 100644
+index ae71702..076b2c3 100644
--- a/libdwfl/linux-pid-attach.c
+++ b/libdwfl/linux-pid-attach.c
@@ -255,6 +255,11 @@ void
static void
diff --git a/libebl/ChangeLog b/libebl/ChangeLog
-index 5e635f2..998544f 100644
+index 51ae60f..aee0217 100644
--- a/libebl/ChangeLog
+++ b/libebl/ChangeLog
-@@ -765,6 +765,11 @@
+@@ -780,6 +780,11 @@
* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
tracking works right.
* libebl_x86_64.map: Add x86_64_core_note.
diff --git a/libelf/ChangeLog b/libelf/ChangeLog
-index 3b88d03..cb6cad5 100644
+index 30017cd..9ca9c73 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
-@@ -244,6 +244,11 @@
+@@ -398,6 +398,11 @@
* elf-knowledge.h (SECTION_STRIP_P): Remove < SHT_NUM check.
2011-02-26 Mark Wielaard <mjw@redhat.com>
* elf_end.c (elf_end): Call rwlock_unlock before rwlock_fini.
-@@ -921,6 +926,11 @@
+@@ -1075,6 +1080,11 @@
* elf.h: Update from glibc.
}
}
diff --git a/src/ChangeLog b/src/ChangeLog
-index 0ae863e..1162f6e 100644
+index 15e6fae..78535c8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
-@@ -1371,8 +1371,16 @@
+@@ -1598,8 +1598,16 @@
* readelf.c (attr_callback): Use print_block only when we don't use
print_ops.
* ar.c (do_oper_extract): Use pathconf instead of statfs.
2009-08-01 Ulrich Drepper <drepper@redhat.com>
-@@ -1536,6 +1544,8 @@
+@@ -1763,6 +1771,8 @@
* readelf.c (print_debug_frame_section): Use t instead of j formats
for ptrdiff_t OFFSET.
2009-01-21 Ulrich Drepper <drepper@redhat.com>
* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
-@@ -1719,6 +1729,11 @@
+@@ -1946,6 +1956,11 @@
that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really
is valid in RELRO.
2008-02-29 Roland McGrath <roland@redhat.com>
* readelf.c (print_attributes): Add a cast.
-@@ -1970,6 +1985,8 @@
+@@ -2197,6 +2212,8 @@
* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
2007-10-15 Roland McGrath <roland@redhat.com>
* make-debug-archive.in: New file.
-@@ -2409,6 +2426,10 @@
+@@ -2636,6 +2653,10 @@
* elflint.c (valid_e_machine): Add EM_ALPHA.
Reported by Christian Aichinger <Greek0@gmx.net>.
2006-08-08 Ulrich Drepper <drepper@redhat.com>
* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -2485,6 +2506,10 @@
+@@ -2712,6 +2733,10 @@
* Makefile.am: Add hacks to create dependency files for non-generic
linker.
2006-06-12 Ulrich Drepper <drepper@redhat.com>
* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -2833,6 +2858,11 @@
+@@ -3060,6 +3085,11 @@
* readelf.c (print_debug_loc_section): Fix indentation for larger
address size.
* readelf.c (print_debug_line_section): Print section offset of each
diff --git a/src/Makefile.am b/src/Makefile.am
-index 4f198da..a612cf6 100644
+index dbac3eb..9028aa1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -89,6 +89,11 @@ endif
- # XXX While the file is not finished, don't warn about this
+@@ -90,6 +90,11 @@ endif
ldgeneric_no_Wunused = yes
+ ldgeneric_no_Wstack_usage = yes
+# Buggy old compilers or libc headers.
+readelf_no_Werror = yes
+strings_no_Werror = yes
+addr2line_no_Wformat = yes
+
- readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl
- nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl \
- $(demanglelib)
+ # Bad, bad stack usage...
+ readelf_no_Wstack_usage = yes
+ nm_no_Wstack_usage = yes
diff --git a/src/addr2line.c b/src/addr2line.c
-index de80294..e982982 100644
+index 0ce854f..d2d0c8c 100644
--- a/src/addr2line.c
+++ b/src/addr2line.c
-@@ -540,10 +540,10 @@ handle_address (const char *string, Dwfl *dwfl)
+@@ -622,10 +622,10 @@ handle_address (const char *string, Dwfl *dwfl)
bool parsed = false;
int i, j;
char *name = NULL;
#endif /* ld.h */
diff --git a/src/readelf.c b/src/readelf.c
-index d49544f..15dbe62 100644
+index b4cb3a8..606d220 100644
--- a/src/readelf.c
+++ b/src/readelf.c
-@@ -4368,10 +4368,12 @@ listptr_base (struct listptr *p)
+@@ -4364,10 +4364,12 @@ listptr_base (struct listptr *p)
return base;
}
struct listptr *p1 = (void *) a;
struct listptr *p2 = (void *) b;
-@@ -4467,8 +4469,11 @@ static void
+@@ -4463,8 +4465,11 @@ static void
sort_listptr (struct listptr_table *table, const char *name)
{
if (table->n > 0)
}
static bool
-@@ -9540,7 +9545,7 @@ dump_archive_index (Elf *elf, const char *fname)
+@@ -9561,7 +9566,7 @@ dump_archive_index (Elf *elf, const char *fname)
if (unlikely (elf_rand (elf, as_off) == 0)
|| unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
== NULL))
#endif
error (EXIT_FAILURE, 0,
diff --git a/src/strings.c b/src/strings.c
-index f60e4b4..dae6ab2 100644
+index b2bce7b..fe0ab6c 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -43,6 +43,10 @@
if (unlikely (elfmap == MAP_FAILED))
diff --git a/src/strip.c b/src/strip.c
-index 2b21799..1b34eee 100644
+index 5e69334..8bd1790 100644
--- a/src/strip.c
+++ b/src/strip.c
-@@ -45,6 +45,12 @@
+@@ -44,6 +44,12 @@
#include <libebl.h>
#include <system.h>
typedef uint8_t GElf_Byte;
/* Name and version of program. */
-@@ -318,8 +324,18 @@ process_file (const char *fname)
-
- /* If we have to preserve the timestamp, we need it in the
- format utimes() understands. */
-+#ifdef HAVE_STRUCT_STAT_ST_ATIM
- TIMESPEC_TO_TIMEVAL (&tv[0], &pre_st.st_atim);
-+#else
-+ tv[0].tv_sec = pre_st.st_atime;
-+ tv[0].tv_usec = 0;
-+#endif
-+#ifdef HAVE_STRUCT_STAT_ST_MTIM
- TIMESPEC_TO_TIMEVAL (&tv[1], &pre_st.st_mtim);
-+#else
-+ tv[1].tv_sec = pre_st.st_atime;
-+ tv[1].tv_usec = 0;
-+#endif
- }
-
- /* Open the file. */
-@@ -2091,7 +2107,7 @@ while computing checksum for debug information"));
- /* If requested, preserve the timestamp. */
- if (tvp != NULL)
- {
-- if (futimes (fd, tvp) != 0)
-+ if (FUTIMES (fd, output_fname, tvp) != 0)
- {
- error (0, errno, gettext ("\
- cannot set access and modification date of '%s'"),
-@@ -2148,7 +2164,7 @@ handle_ar (int fd, Elf *elf, const char *prefix, const char *fname,
-
- if (tvp != NULL)
- {
-- if (unlikely (futimes (fd, tvp) != 0))
-+ if (unlikely (FUTIMES (fd, fname, tvp) != 0))
- {
- error (0, errno, gettext ("\
- cannot set access and modification date of '%s'"), fname);
diff --git a/tests/ChangeLog b/tests/ChangeLog
-index 59048f6..02eccfc 100644
+index 19878ac..6815028 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
-@@ -421,6 +421,13 @@
+@@ -609,6 +609,13 @@
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.
-@@ -1285,6 +1292,8 @@
+@@ -1473,6 +1480,8 @@
2008-01-21 Roland McGrath <roland@redhat.com>
* testfile45.S.bz2: Add tests for cltq, cqto.
* testfile45.expect.bz2: Adjust.
-@@ -1993,6 +2002,11 @@
+@@ -2181,6 +2190,11 @@
* Makefile.am (TESTS): Add run-elflint-test.sh.
(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
* get-files.c (main): Use correct format specifier.
diff --git a/tests/Makefile.am b/tests/Makefile.am
-index f32e4d0..2652fb8 100644
+index 425f8cd..69760a4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
-@@ -365,6 +365,7 @@ get_lines_LDADD = $(libdw) $(libelf)
+@@ -382,6 +382,7 @@ get_lines_LDADD = $(libdw) $(libelf)
get_files_LDADD = $(libdw) $(libelf)
get_aranges_LDADD = $(libdw) $(libelf)
allfcts_LDADD = $(libdw) $(libelf)
+line2addr_no_Wformat = yes
- line2addr_LDADD = $(libdw)
- addrscopes_LDADD = $(libdw)
- funcscopes_LDADD = $(libdw)
+ line2addr_LDADD = $(libdw) $(argp_LDADD)
+ addrscopes_LDADD = $(libdw) $(argp_LDADD)
+ funcscopes_LDADD = $(libdw) $(argp_LDADD)
diff --git a/tests/backtrace.c b/tests/backtrace.c
-index 331ba0f..46af9b5 100644
+index abd56ab..6a7c661 100644
--- a/tests/backtrace.c
+++ b/tests/backtrace.c
@@ -36,6 +36,7 @@
{
default:
case 0:
---
-1.9.1
-
