| Andrew Geissler | 84ad7c5 | 2020-06-27 00:00:16 -0500 | [diff] [blame^] | 1 | From e7f43c3afe90faa42c09f368671972c26c2b7b38 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 2 | From: Mahesh Bodapati <mbodapat@xilinx.com> |
| 3 | Date: Tue, 26 Feb 2019 17:31:41 +0530 |
| Andrew Geissler | 84ad7c5 | 2020-06-27 00:00:16 -0500 | [diff] [blame^] | 4 | Subject: [PATCH 26/43] [Patch,Microblaze] : changes of "PR22458, failure to |
| 5 | choose a matching ELF target" is causing "Multiple Prevailing definition |
| 6 | errors",added check for best_match elf. |
| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 7 | |
| 8 | --- |
| 9 | bfd/format.c | 5 +++++ |
| 10 | 1 file changed, 5 insertions(+) |
| 11 | |
| 12 | diff --git a/bfd/format.c b/bfd/format.c |
| Andrew Geissler | 84ad7c5 | 2020-06-27 00:00:16 -0500 | [diff] [blame^] | 13 | index 97a92291a8..3a74cc49d2 100644 |
| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 14 | --- a/bfd/format.c |
| 15 | +++ b/bfd/format.c |
| 16 | @@ -292,7 +292,12 @@ bfd_check_format_matches (bfd *abfd, bfd_format format, char ***matching) |
| 17 | |
| 18 | /* Don't check the default target twice. */ |
| 19 | if (*target == &binary_vec |
| 20 | +#if !BFD_SUPPORTS_PLUGINS |
| 21 | || (!abfd->target_defaulted && *target == save_targ)) |
| 22 | +#else |
| 23 | + || (!abfd->target_defaulted && *target == save_targ) |
| 24 | + || (*target)->match_priority > best_match) |
| 25 | +#endif |
| 26 | continue; |
| 27 | |
| 28 | /* If we already tried a match, the bfd is modified and may |
| Andrew Geissler | 84ad7c5 | 2020-06-27 00:00:16 -0500 | [diff] [blame^] | 29 | -- |
| 30 | 2.17.1 |
| 31 | |