From 49078ece048d0871508218203744f95e68ba5b4a Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 6 Jan 2020 19:51:22 +1030 Subject: [PATCH] bfd_check_format: ignore errors from coff_real_object_p Since 1993-11-05 git commit c188b0bec3b, bfd_check_format has failed if any of the target object_p functions returns false with any error but bfd_error_wrong_format. That's just weird. There is really no reason why coff_real_object_p should be fixed to only return that error instead of numerous other possible errors. Even an out of memory condition for one target doesn't necessarily mean other targets can't match, assuming the failing target nicely returns all memory it might have used. * format.c (bfd_check_format_matches): Ignore bfd_error on target match failures. Don't init to bfd_error_wrong_format before calling _bfd_check_format. --- bfd/ChangeLog | 6 ++++++ bfd/format.c | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 4fc13450368..97c9309616d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2020-01-06 Alan Modra + + * format.c (bfd_check_format_matches): Ignore bfd_error on target + match failures. Don't init to bfd_error_wrong_format before + calling _bfd_check_format. + 2020-01-06 Alan Modra * vms-alpha.c (_bfd_vms_push, _bfd_vms_pop): Return pass/fail diff --git a/bfd/format.c b/bfd/format.c index e53955eb458..a80a175b8ae 100644 --- a/bfd/format.c +++ b/bfd/format.c @@ -325,12 +325,6 @@ bfd_check_format_matches (bfd *abfd, bfd_format format, char ***matching) if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) goto err_ret; - /* If _bfd_check_format neglects to set bfd_error, assume - bfd_error_wrong_format. We didn't used to even pay any - attention to bfd_error, so I suspect that some - _bfd_check_format might have this problem. */ - bfd_set_error (bfd_error_wrong_format); - temp = BFD_SEND_FMT (abfd, _bfd_check_format, (abfd)); if (temp) { @@ -389,8 +383,6 @@ bfd_check_format_matches (bfd *abfd, bfd_format format, char ***matching) goto err_ret; } } - else if (bfd_get_error () != bfd_error_wrong_format) - goto err_ret; } if (best_count == 1) -- 2.30.2