diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2011-10-11 06:30:17 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2011-10-11 06:30:17 +0000 |
| commit | 0f0036cd2e52a51602492302ea26e72dc929fe0d (patch) | |
| tree | ac60df30efc36bd99ff7a6c07bc06d561b528784 /bfd/archive.c | |
| parent | 2084a50473015862b1be2473447517c996183cb3 (diff) | |
| download | gdb-0f0036cd2e52a51602492302ea26e72dc929fe0d.tar.gz | |
PR binutils/13257
* archive.c (_bfd_find_nested_archive, _bfd_get_elt_at_filepos): Open
thin archive element using container target if not defaulted.
Diffstat (limited to 'bfd/archive.c')
| -rw-r--r-- | bfd/archive.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/bfd/archive.c b/bfd/archive.c index 77f8829dc1f..44ac712388d 100644 --- a/bfd/archive.c +++ b/bfd/archive.c @@ -343,6 +343,7 @@ static bfd * _bfd_find_nested_archive (bfd *arch_bfd, const char *filename) { bfd *abfd; + const char *target; for (abfd = arch_bfd->nested_archives; abfd != NULL; @@ -351,7 +352,10 @@ _bfd_find_nested_archive (bfd *arch_bfd, const char *filename) if (filename_cmp (filename, abfd->filename) == 0) return abfd; } - abfd = bfd_openr (filename, NULL); + target = NULL; + if (!arch_bfd->target_defaulted) + target = arch_bfd->xvec->name; + abfd = bfd_openr (filename, target); if (abfd) { abfd->archive_next = arch_bfd->nested_archives; @@ -597,6 +601,8 @@ _bfd_get_elt_at_filepos (bfd *archive, file_ptr filepos) if (bfd_is_thin_archive (archive)) { + const char *target; + /* This is a proxy entry for an external file. */ if (! IS_ABSOLUTE_PATH (filename)) { @@ -628,7 +634,10 @@ _bfd_get_elt_at_filepos (bfd *archive, file_ptr filepos) } /* It's not an element of a nested archive; open the external file as a bfd. */ - n_nfd = bfd_openr (filename, NULL); + target = NULL; + if (!archive->target_defaulted) + target = archive->xvec->name; + n_nfd = bfd_openr (filename, target); if (n_nfd == NULL) bfd_set_error (bfd_error_malformed_archive); } |