* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Allow
linking of objects for compatible machine types.
This commit is contained in:
parent
c000e2621b
commit
2907b86184
@ -1,3 +1,8 @@
|
|||||||
|
2006-07-25 Thiemo Seufer <ths@networkno.de>
|
||||||
|
|
||||||
|
* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Allow
|
||||||
|
linking of objects for compatible machine types.
|
||||||
|
|
||||||
2006-07-25 Thiemo Seufer <ths@networkno.de>
|
2006-07-25 Thiemo Seufer <ths@networkno.de>
|
||||||
|
|
||||||
* elfxx-mips.c (mips_elf_next_relocation): Tighten check to test
|
* elfxx-mips.c (mips_elf_next_relocation): Tighten check to test
|
||||||
|
@ -10854,7 +10854,9 @@ _bfd_mips_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
|
|||||||
= elf_elfheader (ibfd)->e_ident[EI_CLASS];
|
= elf_elfheader (ibfd)->e_ident[EI_CLASS];
|
||||||
|
|
||||||
if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
|
if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
|
||||||
&& bfd_get_arch_info (obfd)->the_default)
|
&& (bfd_get_arch_info (obfd)->the_default
|
||||||
|
|| mips_mach_extends_p (bfd_get_mach (obfd),
|
||||||
|
bfd_get_mach (ibfd))))
|
||||||
{
|
{
|
||||||
if (! bfd_set_arch_mach (obfd, bfd_get_arch (ibfd),
|
if (! bfd_set_arch_mach (obfd, bfd_get_arch (ibfd),
|
||||||
bfd_get_mach (ibfd)))
|
bfd_get_mach (ibfd)))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user