improve support for m32rx processor.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f1b6464a98c3cb5b57cedb6822f036e71d2e4b55..d1a585cc7311a77783f0e841debc7af11f482557 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+Mon Dec 15 16:08:52 1997  Nick Clifton  <nickc@cygnus.com>
+
+       * elf32-m32r.c (m32r_elf_merge_private_bfd_data): Allow M32R
+       object files to be merged into a M32RX executable.
+
+       * archures.c: Add bfd_mach_m32r and bfd_mach_m32rx.
+
 Mon Dec 15 16:11:22 1997  Fred Fish  <fnf@cygnus.com>
 
        * coffcode.h (ALIGN_SECTIONS_IN_FILE): Define if I960 not defined.

diff --git a/bfd/archures.c b/bfd/archures.c
index 08823ffc861e2dff5386a928b4a975c666cf46c8..92f30a578f5bf2d2b9e91154358c3214a766d924 100644 (file)
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -167,6 +167,8 @@ DESCRIPTION
 .  bfd_arch_arc,       {* Argonaut RISC Core *}
 .#define bfd_mach_arc_base 0
 .  bfd_arch_m32r,      {* Mitsubishi M32R/D *}
+.#define bfd_mach_m32r         0 {* backwards compatibility *}
+.#define bfd_mach_m32rx                'x'
 .  bfd_arch_mn10200,   {* Matsushita MN10200 *}
 .  bfd_arch_mn10300,   {* Matsushita MN10300 *}
 .  bfd_arch_last

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;