diff options
| author | Alan Modra <amodra@gmail.com> | 2013-01-28 07:58:16 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2013-01-28 07:58:16 +0000 |
| commit | 89d7b8aa6b05d68d2303f6ca7582947b8ad8fb0e (patch) | |
| tree | 07f85854fa1e3147560dd75bfb2aeb9984a68106 /bfd/archive.c | |
| parent | 616e8b71634921d6ac5c425a59f9c33936147d65 (diff) | |
| download | gdb-89d7b8aa6b05d68d2303f6ca7582947b8ad8fb0e.zip gdb-89d7b8aa6b05d68d2303f6ca7582947b8ad8fb0e.tar.gz gdb-89d7b8aa6b05d68d2303f6ca7582947b8ad8fb0e.tar.bz2 | |
* 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 be0f562..e4183ea 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. */ } } |