* archures.c: Define bfd_mach_mips9000.

	* elfxx-mips.c (_bfd_elf_mips_mach): Handle E_MIPS_MACH_9000.
	(mips_set_isa_flags): Handle bfd_mach_mips9000.
	* cpu-mips.c (I_mips9000): Define.
	(arch_info_struct): Add case for bfd_mach_mips9000.
	* aoutx.h (NAME(aout,machine_type)): Handle bfd_mach_mips9000.
	* bfd-in2.h: Regenerate.

6 files changed, 23 insertions, 0 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 672f189605..5b40903e49 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,13 @@
+2004-12-09  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	* archures.c: Define bfd_mach_mips9000.
+	* elfxx-mips.c (_bfd_elf_mips_mach): Handle E_MIPS_MACH_9000.
+	(mips_set_isa_flags): Handle bfd_mach_mips9000.
+	* cpu-mips.c (I_mips9000): Define.
+	(arch_info_struct): Add case for bfd_mach_mips9000.
+	* aoutx.h (NAME(aout,machine_type)): Handle bfd_mach_mips9000.
+	* bfd-in2.h: Regenerate.
+
 2004-12-08  Ian Lance Taylor  <ian@wasabisystems.com>
 
 	* elfxx-mips.c (mips_elf_calculate_relocation): Test for R_MIPS_26
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index d629d80d46..34a2870175 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -793,6 +793,7 @@ NAME(aout,machine_type) (arch, machine, unknown)
 	case bfd_mach_mips4600:
 	case bfd_mach_mips4650:
 	case bfd_mach_mips8000:
+	case bfd_mach_mips9000:
 	case bfd_mach_mips10000:
 	case bfd_mach_mips12000:
 	case bfd_mach_mips16:
diff --git a/bfd/archures.c b/bfd/archures.c
index 9a83fa45c6..b7fa3bc658 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -149,6 +149,7 @@ DESCRIPTION
 .#define bfd_mach_mips6000		6000
 .#define bfd_mach_mips7000		7000
 .#define bfd_mach_mips8000		8000
+.#define bfd_mach_mips9000		9000
 .#define bfd_mach_mips10000		10000
 .#define bfd_mach_mips12000		12000
 .#define bfd_mach_mips16		16
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index b10883c310..f60382323b 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1600,6 +1600,7 @@ enum bfd_architecture
 #define bfd_mach_mips6000              6000
 #define bfd_mach_mips7000              7000
 #define bfd_mach_mips8000              8000
+#define bfd_mach_mips9000              9000
 #define bfd_mach_mips10000             10000
 #define bfd_mach_mips12000             12000
 #define bfd_mach_mips16                16
diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c
index 01ecc4e40d..c32dc0b4e2 100644
--- a/bfd/cpu-mips.c
+++ b/bfd/cpu-mips.c
@@ -76,6 +76,7 @@ enum
   I_mips6000,
   I_mips7000,
   I_mips8000,
+  I_mips9000,
   I_mips10000,
   I_mips12000,
   I_mips16,
@@ -108,6 +109,7 @@ static const bfd_arch_info_type arch_info_struct[] =
   N (32, 32, bfd_mach_mips6000, "mips:6000",      FALSE, NN(I_mips6000)),
   N (64, 64, bfd_mach_mips7000, "mips:7000",      FALSE, NN(I_mips7000)),
   N (64, 64, bfd_mach_mips8000, "mips:8000",      FALSE, NN(I_mips8000)),
+  N (64, 64, bfd_mach_mips9000, "mips:9000",      FALSE, NN(I_mips9000)),
   N (64, 64, bfd_mach_mips10000,"mips:10000",     FALSE, NN(I_mips10000)),
   N (64, 64, bfd_mach_mips12000,"mips:12000",     FALSE, NN(I_mips12000)),
   N (64, 64, bfd_mach_mips16,   "mips:16",        FALSE, NN(I_mips16)),
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index ae553b4cb4..d246d4184a 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -4023,6 +4023,9 @@ _bfd_elf_mips_mach (flagword flags)
     case E_MIPS_MACH_5500:
       return bfd_mach_mips5500;
 
+    case E_MIPS_MACH_9000:
+      return bfd_mach_mips9000;
+
     case E_MIPS_MACH_SB1:
       return bfd_mach_mips_sb1;
 
@@ -7073,6 +7076,10 @@ mips_set_isa_flags (bfd *abfd)
       val = E_MIPS_ARCH_4 | E_MIPS_MACH_5500;
       break;
 
+    case bfd_mach_mips9000:
+      val = E_MIPS_ARCH_4 | E_MIPS_MACH_9000;
+      break;
+
     case bfd_mach_mips5000:
     case bfd_mach_mips7000:
     case bfd_mach_mips8000:
@@ -8803,6 +8810,7 @@ static const struct mips_mach_extension mips_mach_extensions[] = {
   { bfd_mach_mips10000, bfd_mach_mips8000 },
   { bfd_mach_mips5000, bfd_mach_mips8000 },
   { bfd_mach_mips7000, bfd_mach_mips8000 },
+  { bfd_mach_mips9000, bfd_mach_mips8000 },
 
   /* VR4100 extensions.  */
   { bfd_mach_mips4120, bfd_mach_mips4100 },