Add support for parallel instructions.

[deliverable/binutils-gdb.git] / bfd / elf32-m32r.c

diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c
index 3da71e27bc1a061a71152dcc5c3d7a8564b6be32..39decd225c8949eb12a0a54ab2ad1ef68d6822ae 100644 (file)
--- a/bfd/elf32-m32r.c
+++ b/bfd/elf32-m32r.c
@@ -1837,12 +1837,20 @@ m32r_elf_merge_private_bfd_data (ibfd, obfd)
 
   if ((new_flags & EF_M32R_ARCH) != (old_flags & EF_M32R_ARCH))
     {
-      _bfd_error_handler ("%s: Instruction set mismatch with previous modules",
-            bfd_get_filename (ibfd));
+      if ((new_flags & EF_M32R_ARCH) == E_M32RX_ARCH)
+       {
+         _bfd_error_handler ("%s: Instruction set mismatch with previous modules",
+                             bfd_get_filename (ibfd));
 #if 1
-      bfd_set_error (bfd_error_bad_value);
-      return false;
+         bfd_set_error (bfd_error_bad_value);
+         return false;
 #endif
+       }
+      else
+       {
+         _bfd_error_handler ("%s: Merging M32R instructions with M32RX instructions",
+                             bfd_get_filename (ibfd));
+       }
     }
 
   return true;