espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-20 01:50:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Improve

Browse Source 
error message for mixing different-endian files.  Check for ABI
compatibility of input files with the selected emulation.
This commit is contained in:
Alexandre Oliva
2003-05-07 05:09:25 +00:00
parent 21b99e2658
commit aa701218b7
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -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> 2003-05-05 Alan Modra <amodra@bigpond.net.au>
* elf32-i386.c (allocate_dynrelocs): For undef weak syms with * elf32-i386.c (allocate_dynrelocs): For undef weak syms with

13
bfd/elfxx-mips.c
View File

@ -9174,12 +9174,25 @@ _bfd_mips_elf_merge_private_bfd_data (ibfd, obfd)
/* Check if we have the same endianess */ /* Check if we have the same endianess */
if (! _bfd_generic_verify_endian_match (ibfd, obfd)) if (! _bfd_generic_verify_endian_match (ibfd, obfd))
{
(*_bfd_error_handler)
(_("%s: endianness incompatible with that of the selected emulation"),
bfd_archive_filename (ibfd));
return FALSE; return FALSE;
}
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) || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
return TRUE; 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; new_flags = elf_elfheader (ibfd)->e_flags;
elf_elfheader (obfd)->e_flags |= new_flags & EF_MIPS_NOREORDER; elf_elfheader (obfd)->e_flags |= new_flags & EF_MIPS_NOREORDER;
old_flags = elf_elfheader (obfd)->e_flags; old_flags = elf_elfheader (obfd)->e_flags;