Revert last change to readelf.

diff --git a/src/ChangeLog b/src/ChangeLog
index b58102e26152ca50ef2061a89c6c4b61a0f58718..006b0582f4495a73cb1f5898b20e0c835a1bdb8b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -19,9 +19,6 @@
        *nextp.  Fix wrong logic in recognizing first iteration of group
        loop.  When clearing flags, also clear ld_state.group_start_archive.
 
-       * src/readelf.c (process_elf_file): When re-reading pure file,
-       don't first open the file and then map from the mapped archive.
-
 2008-01-11  Ulrich Drepper  <drepper@redhat.com>
 
        * objdump.c (show_disasm): Adjust disassembler format string for

diff --git a/src/readelf.c b/src/readelf.c
index e0352443f45ebab0d80fccd4efa3f2af56c258bd..2eba7e9de0d5841bee972c73c33569eee2004927 100644 (file)
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -602,6 +602,7 @@ process_elf_file (Dwfl_Module *dwflmod, int fd)
     {
       /* Read the file afresh.  */
       off64_t aroff = elf_getaroff (elf);
+      pure_elf = elf_begin (fd, ELF_C_READ_MMAP, NULL);
       if (aroff > 0)
        {
          /* Archive member.  */
@@ -610,8 +611,6 @@ process_elf_file (Dwfl_Module *dwflmod, int fd)
          elf_end (pure_elf);
          pure_elf = armem;
        }
-      else
-       pure_elf = elf_begin (fd, ELF_C_READ_MMAP, NULL);
       if (pure_elf == NULL)
        goto elf_error;
       pure_ebl = ebl_openbackend (pure_elf);