From fbb3bb987c92182580d418b9bb824497912e891e Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 21 Jan 2008 04:56:47 +0000 Subject: PR 4453 * format.c (bfd_check_format_matches): Don't accept archives as fully matching unless they have a map. --- bfd/ChangeLog | 6 ++++++ bfd/format.c | 13 +++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'bfd') diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 62d485b..85d809a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,11 @@ 2008-01-21 Alan Modra + PR 4453 + * format.c (bfd_check_format_matches): Don't accept archives as + fully matching unless they have a map. + +2008-01-21 Alan Modra + * elflink.c (_bfd_elf_link_output_relocs): Correct error return. 2008-01-21 Alan Modra diff --git a/bfd/format.c b/bfd/format.c index cea9a23..966ff84 100644 --- a/bfd/format.c +++ b/bfd/format.c @@ -1,6 +1,6 @@ /* Generic BFD support for file formats. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2000, 2001, 2002, - 2003, 2005, 2007 Free Software Foundation, Inc. + 2003, 2005, 2007, 2008 Free Software Foundation, Inc. Written by Cygnus Support. This file is part of BFD, the Binary File Descriptor library. @@ -210,7 +210,7 @@ bfd_check_format_matches (bfd *abfd, bfd_format format, char ***matching) temp = BFD_SEND_FMT (abfd, _bfd_check_format, (abfd)); - if (temp) + if (temp && (abfd->format != bfd_archive || bfd_has_map (abfd))) { /* This format checks out as ok! */ right_targ = temp; @@ -228,12 +228,13 @@ bfd_check_format_matches (bfd *abfd, bfd_format format, char ***matching) matching_vector[match_count] = temp; match_count++; } - else if ((err = bfd_get_error ()) == bfd_error_wrong_object_format + else if (temp + || (err = bfd_get_error ()) == bfd_error_wrong_object_format || err == bfd_error_file_ambiguously_recognized) { - /* An archive with objects of the wrong type, or an - ambiguous match. We want this target to match if we get - no better matches. */ + /* An archive with no armap or objects of the wrong type, + or an ambiguous match. We want this target to match + if we get no better matches. */ if (ar_right_targ != bfd_default_vector[0]) ar_right_targ = *target; if (matching_vector) -- cgit v1.1