diff options
| author | Nick Clifton <nickc@redhat.com> | 2019-05-08 14:51:32 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2019-05-08 14:51:32 +0100 |
| commit | 79299211a1a9a701f146620d419da6ee0175798c (patch) | |
| tree | 22b604676a9334618f001aefc2fbabbd727bceae /bfd/elf32-m68k.c | |
| parent | 762172a4dc4c1a7c25b3ef18f32b6e378cac6487 (diff) | |
Do not force the m68k-elf linker to fail if it encoutners a non-ELF format file.
PR 24523
* elf32-m68k.c (elf32_m68k_merge_private_bfd_data): Return TRUE
rather than FALSE if encountering a non-ELF file.
Diffstat (limited to 'bfd/elf32-m68k.c')
| -rw-r--r-- | bfd/elf32-m68k.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c index 0fe546661f..e8d9ed5ce1 100644 --- a/bfd/elf32-m68k.c +++ b/bfd/elf32-m68k.c @@ -1132,9 +1132,11 @@ elf32_m68k_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) flagword in_isa; const bfd_arch_info_type *arch_info; - if ( bfd_get_flavour (ibfd) != bfd_target_elf_flavour + if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour || bfd_get_flavour (obfd) != bfd_target_elf_flavour) - return FALSE; + /* PR 24523: For non-ELF files do not try to merge any private + data, but also do not prevent the link from succeeding. */ + return TRUE; /* Get the merged machine. This checks for incompatibility between Coldfire & non-Coldfire flags, incompability between different |