diff options
| author | Tristan Gingold <gingold@adacore.com> | 2012-01-10 11:51:08 +0000 |
|---|---|---|
| committer | Tristan Gingold <gingold@adacore.com> | 2012-01-10 11:51:08 +0000 |
| commit | 820fa842eb511073bd54fb735d185296a0b15a0b (patch) | |
| tree | a2717262048a4076134c091b45531070bad9df17 /bfd/archive.c | |
| parent | 1188b0aacf3b411444bcdf5992fcb1cc23cf8709 (diff) | |
| download | binutils-redhat-820fa842eb511073bd54fb735d185296a0b15a0b.tar.gz | |
2012-01-10 Tristan Gingold <gingold@adacore.com>
* bfdio.c (bfd_tell): Handle nested archives.
(bfd_seek): Ditto.
* cache.c (bfd_cache_lookup_worker): Ditto.
* archive.c (_bfd_get_elt_at_filepos): Remove code dealing with
nested archives.
(bfd_generic_openr_next_archived_file): Likewise.
Diffstat (limited to 'bfd/archive.c')
| -rw-r--r-- | bfd/archive.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/bfd/archive.c b/bfd/archive.c index 3e333c7e89..ac2be3e00d 100644 --- a/bfd/archive.c +++ b/bfd/archive.c @@ -581,12 +581,6 @@ _bfd_get_elt_at_filepos (bfd *archive, file_ptr filepos) bfd *n_nfd; char *filename; - if (archive->my_archive) - { - filepos += archive->origin; - archive = archive->my_archive; - } - n_nfd = _bfd_look_for_bfd_in_cache (archive, filepos); if (n_nfd) return n_nfd; @@ -732,8 +726,6 @@ bfd_generic_openr_next_archived_file (bfd *archive, bfd *last_file) filestart = last_file->proxy_origin; if (! bfd_is_thin_archive (archive)) filestart += size; - if (archive->my_archive) - filestart -= archive->origin; /* Pad to an even boundary... Note that last_file->origin can be odd in the case of BSD-4.4-style element with a long odd size. */ |