* elfxx-mips.c (_bfd_mips_elf_merge_private_bfd_data): Allow

	linking of objects for compatible machine types.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f23d35b85eb81b21d9e5060587645e59993b4d33..3d76b52d5d584b43f03c984acf4d63872ee24f04 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -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>
 
        * elfxx-mips.c (mips_elf_next_relocation): Tighten check to test

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 5a65d42461e0ce52d004c1d05c7d85a357f70e52..5239938822a5e7d7a268262952e9a0175bfe190f 100644 (file)
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -10854,7 +10854,9 @@ _bfd_mips_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
        = elf_elfheader (ibfd)->e_ident[EI_CLASS];
 
       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),
                                   bfd_get_mach (ibfd)))