2003-10-08 Dave Brolley <brolley@redhat.com>

        On behalf of Michael Snyder  <msnyder@redhat.com>

        * archures.c: Add FRV fr550 machine.
        * cpu-frv.c: Ditto.
        * elf32-frv.c: Ditto.
        * bfd-in2.h: Regenerate.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index cd1afeb488d25fbdf273420ba50c89dba2578909..d8fa41a3260353b69bb32a37dc27115fce6b6c8a 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2003-10-08  Dave Brolley  <brolley@redhat.com>
+       On behalf of Michael Snyder  <msnyder@redhat.com>
+
+       * archures.c: Add FRV fr550 machine.
+       * cpu-frv.c: Ditto.
+       * elf32-frv.c: Ditto.
+       * bfd-in2.h: Regenerate.
+
 2003-10-08  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
 
        * elfxx-mips.c (STUB_MOVE,STUB_LI16): Fix stub code

diff --git a/bfd/archures.c b/bfd/archures.c
index c79e925bb38c94ddc8a57299edd890c9b96c1e6e..271b031f49e8a72781dc462301716dd8fc212295 100644 (file)
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -281,6 +281,7 @@ DESCRIPTION
 .#define bfd_mach_fr400                400
 .#define bfd_mach_frvtomcat    499     {* fr500 prototype *}
 .#define bfd_mach_fr500                500
+.#define bfd_mach_fr550                550
 .  bfd_arch_mcore,
 .  bfd_arch_ia64,      {* HP/Intel ia64 *}
 .#define bfd_mach_ia64_elf64   64

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index d74fc1c48e0480aca48db9c22fb3372c70b11256..fcbe98afaaa28d2317160218633fc00940f251bb 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1710,6 +1710,7 @@ enum bfd_architecture
 #define bfd_mach_fr400         400
 #define bfd_mach_frvtomcat     499     /* fr500 prototype */
 #define bfd_mach_fr500         500
+#define bfd_mach_fr550         550
   bfd_arch_mcore,
   bfd_arch_ia64,      /* HP/Intel ia64 */
 #define bfd_mach_ia64_elf64    64

diff --git a/bfd/cpu-frv.c b/bfd/cpu-frv.c
index 858914470b72e4f2d06380182b188faa49544ea8..7c8081e864a4c714df2da4cd0beea084a4a10f03 100644 (file)
--- a/bfd/cpu-frv.c
+++ b/bfd/cpu-frv.c
@@ -46,8 +46,11 @@ static const bfd_arch_info_type arch_info_400
 static const bfd_arch_info_type arch_info_500
   = FRV_ARCH (bfd_mach_fr500, "fr500", FALSE, &arch_info_400);
 
+static const bfd_arch_info_type arch_info_550
+  = FRV_ARCH (bfd_mach_fr550, "fr550", FALSE, &arch_info_500);
+
 static const bfd_arch_info_type arch_info_simple
-  = FRV_ARCH (bfd_mach_frvsimple, "simple", FALSE, &arch_info_500);
+  = FRV_ARCH (bfd_mach_frvsimple, "simple", FALSE, &arch_info_550);
 
 static const bfd_arch_info_type arch_info_tomcat
   = FRV_ARCH (bfd_mach_frvtomcat, "tomcat", FALSE, &arch_info_simple);

diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c
index f408b59076ac157a74c68edcf808ab4e70ea188d..582b0dea954f5d725f383e6c724f64c10f08264b 100644 (file)
--- a/bfd/elf32-frv.c
+++ b/bfd/elf32-frv.c
@@ -997,6 +997,7 @@ elf32_frv_machine (abfd)
   switch (elf_elfheader (abfd)->e_flags & EF_FRV_CPU_MASK)
     {
     default:               break;
+    case EF_FRV_CPU_FR550:  return bfd_mach_fr550;
     case EF_FRV_CPU_FR500:  return bfd_mach_fr500;
     case EF_FRV_CPU_FR400:  return bfd_mach_fr400;
     case EF_FRV_CPU_FR300:  return bfd_mach_fr300;
@@ -1245,6 +1246,7 @@ frv_elf_merge_private_bfd_data (ibfd, obfd)
            default:                 strcat (new_opt, " -mcpu=?");      break;
            case EF_FRV_CPU_GENERIC: strcat (new_opt, " -mcpu=frv");    break;
            case EF_FRV_CPU_SIMPLE:  strcat (new_opt, " -mcpu=simple"); break;
+           case EF_FRV_CPU_FR550:   strcat (new_opt, " -mcpu=fr550");  break;
            case EF_FRV_CPU_FR500:   strcat (new_opt, " -mcpu=fr500");  break;
            case EF_FRV_CPU_FR400:   strcat (new_opt, " -mcpu=fr400");  break;
            case EF_FRV_CPU_FR300:   strcat (new_opt, " -mcpu=fr300");  break;
@@ -1256,6 +1258,7 @@ frv_elf_merge_private_bfd_data (ibfd, obfd)
            default:                 strcat (old_opt, " -mcpu=?");      break;
            case EF_FRV_CPU_GENERIC: strcat (old_opt, " -mcpu=frv");    break;
            case EF_FRV_CPU_SIMPLE:  strcat (old_opt, " -mcpu=simple"); break;
+           case EF_FRV_CPU_FR550:   strcat (old_opt, " -mcpu=fr550");  break;
            case EF_FRV_CPU_FR500:   strcat (old_opt, " -mcpu=fr500");  break;
            case EF_FRV_CPU_FR400:   strcat (old_opt, " -mcpu=fr400");  break;
            case EF_FRV_CPU_FR300:   strcat (old_opt, " -mcpu=fr300");  break;
@@ -1322,6 +1325,7 @@ frv_elf_print_private_bfd_data (abfd, ptr)
     {
     default:                                                   break;
     case EF_FRV_CPU_SIMPLE: fprintf (file, " -mcpu=simple");   break;
+    case EF_FRV_CPU_FR550:  fprintf (file, " -mcpu=fr550");    break;
     case EF_FRV_CPU_FR500:  fprintf (file, " -mcpu=fr500");    break;
     case EF_FRV_CPU_FR400:  fprintf (file, " -mcpu=fr400");    break;
     case EF_FRV_CPU_FR300:  fprintf (file, " -mcpu=fr300");    break;