diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2003-05-07 05:09:25 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@redhat.com> | 2003-05-07 05:09:25 +0000 |
| commit | ea0fec688433f675f0eb5cb82580f264a1b67216 (patch) | |
| tree | fe7d20f2bbbca583a3ec39f892e6be0eada94651 | |
| parent | 58beb3c3a0d46a73aa09ec18f7addfee247e5fbc (diff) | |
| download | gdb-ea0fec688433f675f0eb5cb82580f264a1b67216.tar.gz | |
* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Improve
error message for mixing different-endian files. Check for ABI
compatibility of input files with the selected emulation.
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elfxx-mips.c | 15 |
2 files changed, 20 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ca2a5d1f5ea..fbb0ad740c9 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2003-05-06 Alexandre Oliva <aoliva@redhat.com> + + * elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Improve + error message for mixing different-endian files. Check for ABI + compatibility of input files with the selected emulation. + 2003-05-05 Alan Modra <amodra@bigpond.net.au> * elf32-i386.c (allocate_dynrelocs): For undef weak syms with diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index 0c3a5d96fca..c889115d116 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -9174,12 +9174,25 @@ _bfd_mips_elf_merge_private_bfd_data (ibfd, obfd) /* Check if we have the same endianess */ if (! _bfd_generic_verify_endian_match (ibfd, obfd)) - return FALSE; + { + (*_bfd_error_handler) + (_("%s: endianness incompatible with that of the selected emulation"), + bfd_archive_filename (ibfd)); + return FALSE; + } if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour || bfd_get_flavour (obfd) != bfd_target_elf_flavour) return TRUE; + if (strcmp (bfd_get_target (ibfd), bfd_get_target (obfd)) != 0) + { + (*_bfd_error_handler) + (_("%s: ABI is incompatible with that of the selected emulation"), + bfd_archive_filename (ibfd)); + return FALSE; + } + new_flags = elf_elfheader (ibfd)->e_flags; elf_elfheader (obfd)->e_flags |= new_flags & EF_MIPS_NOREORDER; old_flags = elf_elfheader (obfd)->e_flags; |