* common.h (EM_M32C_NEW): Rename to EM_M32C.

(EM_M32C): Rename to EM_M32C_OLD.

* elf32-m32c.c (ELF_MACHINE_ALT1): Define as EM_M32C_OLD.

* readelf.c (guess_is_rela): Add EM_M32C_OLD.
(dump_relocations): Likewise.
(process_section_headers): Likewise.
(is_32bit_abs_reloc): Likewise.
(is_16bit_abs_reloc): Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3167126c3b96d1084ff069a49995ef7d1cfb4f56..67534713ececc0bd75746e473e709104be5b91ae 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-12  DJ Delorie  <dj@redhat.com>
+
+       * elf32-m32c.c (ELF_MACHINE_ALT1): Define as EM_M32C_OLD.
+
 2008-06-09  Paul Brook  <paul@codesourcery.com>
 
        bfd/

diff --git a/bfd/elf32-m32c.c b/bfd/elf32-m32c.c
index dd4054118dfe1ee55d84c93ec4810df52083daf2..b18842654a63670e448c3f695eecf92930b91c0d 100644 (file)
--- a/bfd/elf32-m32c.c
+++ b/bfd/elf32-m32c.c
@@ -1998,6 +1998,7 @@ _bfd_m32c_elf_eh_frame_address_size (bfd *abfd, asection *sec ATTRIBUTE_UNUSED)
 
 #define ELF_ARCH               bfd_arch_m32c
 #define ELF_MACHINE_CODE       EM_M32C
+#define ELF_MACHINE_ALT1       EM_M32C_OLD
 #define ELF_MAXPAGESIZE                0x1000
 
 #if 0

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 4ba9c0a57aabaafc69c111b0d1d74298fa2e41d3..2c3aa5c0cc1775688defad290f6231d45bd69f0f 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-12  DJ Delorie  <dj@redhat.com>
+
+       * readelf.c (guess_is_rela): Add EM_M32C_OLD.
+       (dump_relocations): Likewise.
+       (process_section_headers): Likewise.
+       (is_32bit_abs_reloc): Likewise.
+       (is_16bit_abs_reloc): Likewise.
+
 2008-06-12  Nick Clifton  <nickc@redhat.com>
 
        PR binutils/6483

diff --git a/binutils/readelf.c b/binutils/readelf.c
index 3498b30ba64bb755d0b4be72d4914e484d562021..953350a7db80c396321ba83e67ccb07d574a6aca 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -717,6 +717,7 @@ guess_is_rela (unsigned int e_machine)
     case EM_IP2K:
     case EM_IP2K_OLD:
     case EM_IQ2000:
+    case EM_M32C_OLD:
     case EM_M32C:
     case EM_M32R:
     case EM_MCORE:
@@ -1280,6 +1281,7 @@ dump_relocations (FILE *file,
          rtype = elf_xtensa_reloc_type (type);
          break;
 
+       case EM_M32C_OLD:
        case EM_M32C:
          rtype = elf_m32c_reloc_type (type);
          break;
@@ -1914,6 +1916,7 @@ get_machine_name (unsigned e_machine)
     case EM_IQ2000:            return "Vitesse IQ2000";
     case EM_XTENSA_OLD:
     case EM_XTENSA:            return "Tensilica Xtensa Processor";
+    case EM_M32C_OLD:
     case EM_M32C:              return "Renesas M32c";
     case EM_MT:                 return "Morpho Techologies MT processor";
     case EM_BLACKFIN:          return "Analog Devices Blackfin";
@@ -4300,6 +4303,7 @@ process_section_headers (FILE *file)
        }
       break;
 
+    case EM_M32C_OLD:
     case EM_M32C:
       switch (elf_header.e_flags & EF_M32C_CPU_MASK)
        {
@@ -8152,6 +8156,7 @@ is_32bit_abs_reloc (unsigned int reloc_type)
       return reloc_type == 2; /* R_IP2K_32.  */
     case EM_IQ2000:
       return reloc_type == 2; /* R_IQ2000_32.  */
+    case EM_M32C_OLD:
     case EM_M32C:
       return reloc_type == 3; /* R_M32C_32.  */
     case EM_M32R:
@@ -8326,6 +8331,7 @@ is_16bit_abs_reloc (unsigned int reloc_type)
     case EM_IP2K_OLD:
     case EM_IP2K:
       return reloc_type == 1; /* R_IP2K_16.  */
+    case EM_M32C_OLD:
     case EM_M32C:
       return reloc_type == 1; /* R_M32C_16 */
     case EM_MSP430_OLD:

diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 507fd72eebe969424fdd381862d93e01032dc28d..377a1eb42906ac641348cb223f65d5d56337625e 100644 (file)
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-12  DJ Delorie  <dj@redhat.com>
+
+       * common.h (EM_M32C_NEW): Rename to EM_M32C.
+       (EM_M32C): Rename to EM_M32C_OLD.
+
 2008-06-12  Joseph Myers  <joseph@codesourcery.com>
 
        * common.h: Update e_machine table.

diff --git a/include/elf/common.h b/include/elf/common.h
index 53d57ac020ded4df7c97e06ddc84f836e9533f37..bd28ebd4d318e9808c0c3f9e17c5c27d9fd0aaed 100644 (file)
--- a/include/elf/common.h
+++ b/include/elf/common.h
@@ -205,7 +205,7 @@
 #define EM_M16C                117     /* Renesas M16C series microprocessors */
 #define EM_DSPIC30F    118     /* Microchip Technology dsPIC30F Digital Signal Controller */
 #define EM_CE          119     /* Freescale Communication Engine RISC core */
-#define EM_M32C_NEW    120     /* Renesas M32C series microprocessors */
+#define EM_M32C                120     /* Renesas M32C series microprocessors */
 
 #define EM_TSK3000     131     /* Altium TSK3000 core */
 #define EM_RS08                132     /* Freescale RS08 embedded processor */
@@ -323,7 +323,7 @@
 #define EM_CYGNUS_MN10200      0xdead
 
 /* Renesas M32C and M16C.  */
-#define EM_M32C                        0xFEB0
+#define EM_M32C_OLD            0xFEB0
 
 /* Vitesse IQ2000.  */
 #define EM_IQ2000              0xFEBA