Add MIPS V and MIPS 64 machine numbers

7 files changed, 106 insertions, 51 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4c5b4cf..f14ff61 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -23,6 +23,19 @@
         (_bfd_mips_elf_print_private_bfd_data): Print ISA name for
         MIPS32.
 
+        * aoutx.h (NAME(aout,machine_type)): Add cases for
+        bfd_mach_mips5 and bfd_mach_mips64.
+        * archures.c (bfd_mach_mips5, bfd_mach_mips64): New constants.
+        * bfd-in2.h (bfd_mach_mips5, bfd_mach_mips64): Likewise.
+        * cpu_mips.c (I_mips5, I_mips64): New definitions.
+        (arch_info_struct): Add entries for bfd_mach_mips5 and
+        bfd_mach_mips64.
+        * elf32-mips.c (elf_mips_isa, elf_mips_mach,
+        _bfd_mips_elf_print_private_bfd_data): Add cases for
+        E_MIPS_ARCH_5 and E_MIPS_ARCH_64.
+        (_bfd_mips_elf_final_write_processing): Add cases for
+        bfd_mach_mips5 and bfd_mach_mips64.
+
 2000-12-01      Joel Sherrill <joel@OARcorp.com>
 
 	* config.bfd (arm-*-rtems*, a29k-*rtems*): New targets.
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index 388e8d7..246742f 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -778,6 +778,8 @@ NAME(aout,machine_type) (arch, machine, unknown)
     case bfd_mach_mips16:
     case bfd_mach_mips32:
     case bfd_mach_mips32_4k:
+    case bfd_mach_mips5:
+    case bfd_mach_mips64:
       /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc.  */
       arch_flags = M_MIPS2;
       break;
diff --git a/bfd/archures.c b/bfd/archures.c
index 5bb4ff7..1361be9 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -133,6 +133,8 @@ DESCRIPTION
 .#define bfd_mach_mips16		16
 .#define bfd_mach_mips32                32
 .#define bfd_mach_mips32_4k             3204113 {* 32, 04, octal 'K' *}
+.#define bfd_mach_mips5                 5
+.#define bfd_mach_mips64                64
 .  bfd_arch_i386,      {* Intel 386 *}
 .#define bfd_mach_i386_i386 0
 .#define bfd_mach_i386_i8086 1
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 0280f12..021e762 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1401,6 +1401,8 @@ enum bfd_architecture
 #define bfd_mach_mips16                16
 #define bfd_mach_mips32                32
 #define bfd_mach_mips32_4k             3204113 /* 32, 04, octal 'K' */
+#define bfd_mach_mips5                 5
+#define bfd_mach_mips64                64
   bfd_arch_i386,      /* Intel 386 */
 #define bfd_mach_i386_i386 0
 #define bfd_mach_i386_i8086 1
diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c
index 0ac23cb..e2417a1 100644
--- a/bfd/cpu-mips.c
+++ b/bfd/cpu-mips.c
@@ -57,29 +57,33 @@ enum
   I_mips16,
   I_mips32,
   I_mips32_4k,
+  I_mips5,
+  I_mips64,
 };
 
 #define NN(index) (&arch_info_struct[(index) + 1])
 
 static const bfd_arch_info_type arch_info_struct[] =
 {
-  N (32, 32, bfd_mach_mips3000, "mips:3000", false, NN(I_mips3000)),
-  N (32, 32, bfd_mach_mips3900, "mips:3900", false, NN(I_mips3900)),
-  N (64, 64, bfd_mach_mips4000, "mips:4000", false, NN(I_mips4000)),
-  N (64, 64, bfd_mach_mips4010, "mips:4010", false, NN(I_mips4010)),
-  N (64, 64, bfd_mach_mips4100, "mips:4100", false, NN(I_mips4100)),
-  N (64, 64, bfd_mach_mips4111, "mips:4111", false, NN(I_mips4111)),
-  N (64, 64, bfd_mach_mips4300, "mips:4300", false, NN(I_mips4300)),
-  N (64, 64, bfd_mach_mips4400, "mips:4400", false, NN(I_mips4400)),
-  N (64, 64, bfd_mach_mips4600, "mips:4600", false, NN(I_mips4600)),
-  N (64, 64, bfd_mach_mips4650, "mips:4650", false, NN(I_mips4650)),
-  N (64, 64, bfd_mach_mips5000, "mips:5000", false, NN(I_mips5000)),
-  N (32, 32, bfd_mach_mips6000, "mips:6000", false, NN(I_mips6000)),
-  N (64, 64, bfd_mach_mips8000, "mips:8000", false, NN(I_mips8000)),
-  N (64, 64, bfd_mach_mips10000,"mips:10000",false, NN(I_mips10000)),
-  N (64, 64, bfd_mach_mips16,   "mips:16",   false, NN(I_mips16)),
-  N (32, 32, bfd_mach_mips32,   "mips:mips32", false, NN(I_mips32)),
-  N (32, 32, bfd_mach_mips32_4k,"mips:mips32-4k", false, 0),
+  N (32, 32, bfd_mach_mips3000, "mips:3000",      false, NN(I_mips3000)),
+  N (32, 32, bfd_mach_mips3900, "mips:3900",      false, NN(I_mips3900)),
+  N (64, 64, bfd_mach_mips4000, "mips:4000",      false, NN(I_mips4000)),
+  N (64, 64, bfd_mach_mips4010, "mips:4010",      false, NN(I_mips4010)),
+  N (64, 64, bfd_mach_mips4100, "mips:4100",      false, NN(I_mips4100)),
+  N (64, 64, bfd_mach_mips4111, "mips:4111",      false, NN(I_mips4111)),
+  N (64, 64, bfd_mach_mips4300, "mips:4300",      false, NN(I_mips4300)),
+  N (64, 64, bfd_mach_mips4400, "mips:4400",      false, NN(I_mips4400)),
+  N (64, 64, bfd_mach_mips4600, "mips:4600",      false, NN(I_mips4600)),
+  N (64, 64, bfd_mach_mips4650, "mips:4650",      false, NN(I_mips4650)),
+  N (64, 64, bfd_mach_mips5000, "mips:5000",      false, NN(I_mips5000)),
+  N (32, 32, bfd_mach_mips6000, "mips:6000",      false, NN(I_mips6000)),
+  N (64, 64, bfd_mach_mips8000, "mips:8000",      false, NN(I_mips8000)),
+  N (64, 64, bfd_mach_mips10000,"mips:10000",     false, NN(I_mips10000)),
+  N (64, 64, bfd_mach_mips16,   "mips:16",        false, NN(I_mips16)),
+  N (32, 32, bfd_mach_mips32,   "mips:mips32",    false, NN(I_mips32)),
+  N (32, 32, bfd_mach_mips32_4k,"mips:mips32-4k", false, NN(I_mips32_4k)),
+  N (64, 64, bfd_mach_mips5,    "mips:mips5",     false, NN(I_mips5)),
+  N (64, 64, bfd_mach_mips64,   "mips:mips64",    false, 0),
 };
 
 /* The default architecture is mips:3000, but with a machine number of
diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index b58eddf..4b0b641 100644
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -1810,8 +1810,12 @@ elf_mips_isa (flags)
       return 3;
     case E_MIPS_ARCH_4:
       return 4;
+    case E_MIPS_ARCH_5:
+      return 5;
     case E_MIPS_ARCH_32:
       return 32;
+    case E_MIPS_ARCH_64:
+      return 64;
     }
   return 4;
 }
@@ -1862,9 +1866,17 @@ elf_mips_mach (flags)
 	  return bfd_mach_mips8000;
 	  break;
 
+	case E_MIPS_ARCH_5:
+	  return bfd_mach_mips5;
+	  break;
+
 	case E_MIPS_ARCH_32:
 	  return bfd_mach_mips32;
 	  break;
+
+	case E_MIPS_ARCH_64:
+	  return bfd_mach_mips64;
+	  break;
 	}
     }
 
@@ -2349,6 +2361,14 @@ _bfd_mips_elf_final_write_processing (abfd, linker)
     case bfd_mach_mips32_4k:
       val = E_MIPS_ARCH_32 | E_MIPS_MACH_MIPS32_4K;
       break;
+
+    case bfd_mach_mips5:
+      val = E_MIPS_ARCH_5;
+      break;
+
+    case bfd_mach_mips64:
+      val = E_MIPS_ARCH_64;
+      break;
     }
 
   elf_elfheader (abfd)->e_flags &= ~(EF_MIPS_ARCH | EF_MIPS_MACH);
@@ -2656,8 +2676,12 @@ _bfd_mips_elf_print_private_bfd_data (abfd, ptr)
     fprintf (file, _(" [mips3]"));
   else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_4)
     fprintf (file, _(" [mips4]"));
+  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_5)
+    fprintf (file, _ (" [mips5]"));
   else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_32)
     fprintf (file, _ (" [mips32]"));
+  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_64)
+    fprintf (file, _ (" [mips64]"));
   else
     fprintf (file, _(" [unknown ISA]"));
 
diff --git a/bfd/po/bfd.pot b/bfd/po/bfd.pot
index 2534d97..0ea2b88 100644
--- a/bfd/po/bfd.pot
+++ b/bfd/po/bfd.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-01 13:12-0800\n"
+"POT-Creation-Date: 2000-12-01 16:44-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,22 +34,22 @@ msgstr ""
 msgid "%s: Bad relocation record imported: %d"
 msgstr ""
 
-#: aoutx.h:1256 aoutx.h:1670
+#: aoutx.h:1258 aoutx.h:1672
 #, c-format
 msgid "%s: can not represent section `%s' in a.out object file format"
 msgstr ""
 
-#: aoutx.h:1640
+#: aoutx.h:1642
 #, c-format
 msgid ""
 "%s: can not represent section for symbol `%s' in a.out object file format"
 msgstr ""
 
-#: aoutx.h:1642
+#: aoutx.h:1644
 msgid "*unknown*"
 msgstr ""
 
-#: aoutx.h:3681
+#: aoutx.h:3683
 #, c-format
 msgid "%s: relocateable link from %s to %s not supported"
 msgstr ""
@@ -660,7 +660,7 @@ msgstr ""
 
 #. Ignore init flag - it may not be set, despite the flags field
 #. containing valid data.
-#: elf32-arm.h:2195 elf32-cris.c:615 elf32-m68k.c:430 elf32-mips.c:2632
+#: elf32-arm.h:2195 elf32-cris.c:615 elf32-m68k.c:430 elf32-mips.c:2652
 #, c-format
 msgid "private flags = %lx:"
 msgstr ""
@@ -854,124 +854,132 @@ msgstr ""
 msgid "Linking mips16 objects into %s format is not supported"
 msgstr ""
 
-#: elf32-mips.c:2519
+#: elf32-mips.c:2539
 #, c-format
 msgid "%s: linking PIC files with non-PIC files"
 msgstr ""
 
-#: elf32-mips.c:2529
+#: elf32-mips.c:2549
 #, c-format
 msgid "%s: linking abicalls files with non-abicalls files"
 msgstr ""
 
-#: elf32-mips.c:2558
+#: elf32-mips.c:2578
 #, c-format
 msgid "%s: ISA mismatch (-mips%d) with previous modules (-mips%d)"
 msgstr ""
 
-#: elf32-mips.c:2567
+#: elf32-mips.c:2587
 #, c-format
 msgid "%s: ISA mismatch (%d) with previous modules (%d)"
 msgstr ""
 
-#: elf32-mips.c:2590
+#: elf32-mips.c:2610
 #, c-format
 msgid "%s: ABI mismatch: linking %s module with previous %s modules"
 msgstr ""
 
-#: elf32-mips.c:2604 elf32-ppc.c:1481 elf64-sparc.c:2974
+#: elf32-mips.c:2624 elf32-ppc.c:1481 elf64-sparc.c:2974
 #, c-format
 msgid "%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"
 msgstr ""
 
-#: elf32-mips.c:2635
+#: elf32-mips.c:2655
 msgid " [abi=O32]"
 msgstr ""
 
-#: elf32-mips.c:2637
+#: elf32-mips.c:2657
 msgid " [abi=O64]"
 msgstr ""
 
-#: elf32-mips.c:2639
+#: elf32-mips.c:2659
 msgid " [abi=EABI32]"
 msgstr ""
 
-#: elf32-mips.c:2641
+#: elf32-mips.c:2661
 msgid " [abi=EABI64]"
 msgstr ""
 
-#: elf32-mips.c:2643
+#: elf32-mips.c:2663
 msgid " [abi unknown]"
 msgstr ""
 
-#: elf32-mips.c:2645
+#: elf32-mips.c:2665
 msgid " [abi=N32]"
 msgstr ""
 
-#: elf32-mips.c:2647
+#: elf32-mips.c:2667
 msgid " [abi=64]"
 msgstr ""
 
-#: elf32-mips.c:2649
+#: elf32-mips.c:2669
 msgid " [no abi set]"
 msgstr ""
 
-#: elf32-mips.c:2652
+#: elf32-mips.c:2672
 msgid " [mips1]"
 msgstr ""
 
-#: elf32-mips.c:2654
+#: elf32-mips.c:2674
 msgid " [mips2]"
 msgstr ""
 
-#: elf32-mips.c:2656
+#: elf32-mips.c:2676
 msgid " [mips3]"
 msgstr ""
 
-#: elf32-mips.c:2658
+#: elf32-mips.c:2678
 msgid " [mips4]"
 msgstr ""
 
-#: elf32-mips.c:2660
+#: elf32-mips.c:2680
+msgid " [mips5]"
+msgstr ""
+
+#: elf32-mips.c:2682
 msgid " [mips32]"
 msgstr ""
 
-#: elf32-mips.c:2662
+#: elf32-mips.c:2684
+msgid " [mips64]"
+msgstr ""
+
+#: elf32-mips.c:2686
 msgid " [unknown ISA]"
 msgstr ""
 
-#: elf32-mips.c:2665
+#: elf32-mips.c:2689
 msgid " [32bitmode]"
 msgstr ""
 
-#: elf32-mips.c:2667
+#: elf32-mips.c:2691
 msgid " [not 32bitmode]"
 msgstr ""
 
-#: elf32-mips.c:4316
+#: elf32-mips.c:4340
 msgid "static procedure (no name)"
 msgstr ""
 
-#: elf32-mips.c:4931 elf64-alpha.c:4378
+#: elf32-mips.c:4955 elf64-alpha.c:4378
 #, c-format
 msgid "%s: illegal section name `%s'"
 msgstr ""
 
-#: elf32-mips.c:5495
+#: elf32-mips.c:5519
 msgid "not enough GOT space for local GOT entries"
 msgstr ""
 
-#: elf32-mips.c:6612
+#: elf32-mips.c:6636
 #, c-format
 msgid "%s: %s+0x%lx: jump to stub routine which is not jal"
 msgstr ""
 
-#: elf32-mips.c:7599
+#: elf32-mips.c:7623
 #, c-format
 msgid "Malformed reloc detected for section %s"
 msgstr ""
 
-#: elf32-mips.c:7676
+#: elf32-mips.c:7700
 #, c-format
 msgid "%s: CALL16 reloc at 0x%lx not against global symbol"
 msgstr ""