diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2013-01-28 07:58:15 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2013-01-28 07:58:15 +0000 |
| commit | 8751d6497794691d6741ef9976c735381f7795bd (patch) | |
| tree | 3bf244475d64b920294f609c27786d16a0ba688d /bfd/archive.c | |
| parent | 9ff79f2650a7527e3c73b532d87bbd43d05deb8d (diff) | |
| download | binutils-redhat-8751d6497794691d6741ef9976c735381f7795bd.tar.gz | |
* archive.c (bfd_generic_archive_p): Return target and keep
ardata on partial matches.
* format.c (bfd_check_format_matches): Adjust for above
change. Remove bfd_error_file_ambiguously_recognized dead
code.
Diffstat (limited to 'bfd/archive.c')
| -rw-r--r-- | bfd/archive.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/bfd/archive.c b/bfd/archive.c index be0f562693..e4183ea4da 100644 --- a/bfd/archive.c +++ b/bfd/archive.c @@ -852,11 +852,7 @@ bfd_generic_archive_p (bfd *abfd) first->target_defaulted = FALSE; if (bfd_check_format (first, bfd_object) && first->xvec != abfd->xvec) - { - bfd_set_error (bfd_error_wrong_object_format); - bfd_ardata (abfd) = tdata_hold; - return NULL; - } + bfd_set_error (bfd_error_wrong_object_format); /* And we ought to close `first' here too. */ } } |