bfd/ChangeLog

2003-12-02  Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>

        * archures.c (bfd_mach_m32r2): New machine types.
        * cpu-m32r.c : New machine types.
        * elf32-m32r.c (m32r_elf_object_p, m32r_elf_final_write_processing,
        m32r_elf_merge_private_bfd_data): New machine types.


Index: bfd/archures.c
===================================================================
RCS file: /cvs/src/src/bfd/archures.c,v
retrieving revision 1.87
diff -c -r1.87 archures.c
*** bfd/archures.c	24 Nov 2003 18:06:39 -0000	1.87
--- bfd/archures.c	2 Dec 2003 08:56:08 -0000
***************
*** 272,277 ****
--- 272,278 ----
  .  bfd_arch_m32r,      {* Renesas M32R (formerly Mitsubishi M32R/D) *}
  .#define bfd_mach_m32r		1 {* For backwards compatibility.  *}
  .#define bfd_mach_m32rx		'x'
+ .#define bfd_mach_m32r2		'2'
  .  bfd_arch_mn10200,   {* Matsushita MN10200 *}
  .  bfd_arch_mn10300,   {* Matsushita MN10300 *}
  .#define bfd_mach_mn10300		300
Index: bfd/cpu-m32r.c
===================================================================
RCS file: /cvs/src/src/bfd/cpu-m32r.c,v
retrieving revision 1.5
diff -c -r1.5 cpu-m32r.c
*** bfd/cpu-m32r.c	30 Nov 2002 08:39:36 -0000	1.5
--- bfd/cpu-m32r.c	2 Dec 2003 08:56:09 -0000
***************
*** 26,35 ****
       bfd_default_compatible, bfd_default_scan, next }
  
  #define NEXT NULL
  
  static const bfd_arch_info_type arch_info_struct[] =
  {
!   N (bfd_mach_m32rx, "m32rx", FALSE, NULL)
  };
  
  #undef NEXT
--- 26,37 ----
       bfd_default_compatible, bfd_default_scan, next }
  
  #define NEXT NULL
+ #define M32R2_NEXT &arch_info_struct[1]
  
  static const bfd_arch_info_type arch_info_struct[] =
  {
!   N (bfd_mach_m32rx, "m32rx", FALSE, M32R2_NEXT) ,
!   N (bfd_mach_m32r2, "m32r2", FALSE, NULL)
  };
  
  #undef NEXT
Index: bfd/elf32-m32r.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-m32r.c,v
retrieving revision 1.37
diff -c -r1.37 elf32-m32r.c
*** bfd/elf32-m32r.c	1 Dec 2003 06:28:23 -0000	1.37
--- bfd/elf32-m32r.c	2 Dec 2003 08:56:09 -0000
***************
*** 1863,1868 ****
--- 1863,1869 ----
      default:
      case E_M32R_ARCH:   (void) bfd_default_set_arch_mach (abfd, bfd_arch_m32r, bfd_mach_m32r);  break;
      case E_M32RX_ARCH:  (void) bfd_default_set_arch_mach (abfd, bfd_arch_m32r, bfd_mach_m32rx); break;
+     case E_M32R2_ARCH:  (void) bfd_default_set_arch_mach (abfd, bfd_arch_m32r, bfd_mach_m32r2); break;
      }
    return TRUE;
  }
***************
*** 1880,1885 ****
--- 1881,1887 ----
      default:
      case bfd_mach_m32r:  val = E_M32R_ARCH; break;
      case bfd_mach_m32rx: val = E_M32RX_ARCH; break;
+     case bfd_mach_m32r2: val = E_M32R2_ARCH; break;
      }
  
    elf_elfheader (abfd)->e_flags &=~ EF_M32R_ARCH;
***************
*** 1946,1952 ****
  
    if ((in_flags & EF_M32R_ARCH) != (out_flags & EF_M32R_ARCH))
      {
!       if ((in_flags & EF_M32R_ARCH) != E_M32R_ARCH)
  	{
  	  (*_bfd_error_handler)
  	    (_("%s: Instruction set mismatch with previous modules"),
--- 1948,1956 ----
  
    if ((in_flags & EF_M32R_ARCH) != (out_flags & EF_M32R_ARCH))
      {
!       if (((in_flags & EF_M32R_ARCH) != E_M32R_ARCH)
!           || ((out_flags & EF_M32R_ARCH) == E_M32R_ARCH)
!           || ((in_flags & EF_M32R_ARCH) == E_M32R2_ARCH))
  	{
  	  (*_bfd_error_handler)
  	    (_("%s: Instruction set mismatch with previous modules"),
***************
*** 1979,1984 ****
--- 1983,1989 ----
      default:
      case E_M32R_ARCH:  fprintf (file, _(": m32r instructions"));  break;
      case E_M32RX_ARCH: fprintf (file, _(": m32rx instructions")); break;
+     case E_M32R2_ARCH: fprintf (file, _(": m32r2 instructions")); break;
      }
  
    fputc ('\n', file);