aboutsummaryrefslogtreecommitdiff
path: root/bfd/archive.c
diff options
context:
space:
mode:
authorTristan Gingold <gingold@adacore.com>2012-01-10 11:51:09 +0000
committerTristan Gingold <gingold@adacore.com>2012-01-10 11:51:09 +0000
commit660722b0e2ddd2d0efcc01f7f9f9e4a3dd31326e (patch)
tree50ea9f03b1e26a2b2282cb5bc0ed804752b8caa0 /bfd/archive.c
parent158184ac9e4ab97b97c6a9bb840db46661901585 (diff)
downloadgdb-660722b0e2ddd2d0efcc01f7f9f9e4a3dd31326e.zip
gdb-660722b0e2ddd2d0efcc01f7f9f9e4a3dd31326e.tar.gz
gdb-660722b0e2ddd2d0efcc01f7f9f9e4a3dd31326e.tar.bz2
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.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/bfd/archive.c b/bfd/archive.c
index 3e333c7..ac2be3e 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. */