diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2008-01-21 18:44:55 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2008-01-21 18:44:55 +0000 |
| commit | fbc708da81a35ca8e01f1aca7bd356da718d3c62 (patch) | |
| tree | ee292e01ffaa77c1ad602043a7b09b96eb1c7664 | |
| parent | 51b3032ea91e5f7e39ff2a60e26ec06e9a17cbfe (diff) | |
Revert last change to readelf.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/readelf.c | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b58102e2..006b0582 100644 --- 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 e0352443..2eba7e9d 100644 --- 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); |