2001-08-31 Eric Christopher <echristo@redhat.com>

	    Jason Eckhardt  <jle@redhat.com>

	* bfd/archures.c: Add mipsisa32 and mipsisa64. Remove mips32,
	mips32_4k and mips64.
	* bfd/aoutx.h: Remove bfd_mach_mips32, bfd_mach_mips32_4k,
	bfd_mach_mips64.  Add bfd_mach_mipsisa32, bfd_mach_mipsisa64.
	* bfd/cpu-mips.c: Ditto.
	* bfd/elf32-mips.c (_bfd_mips_elf_final_write_processing): Ditto.
	* bfd/bfd-in2.h: Regenerate.

6 files changed, 32 insertions, 34 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 488f925a5b..8fe425034b 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,14 @@
+2001-08-31  Eric Christopher  <echristo@redhat.com>
+	    Jason Eckhardt  <jle@redhat.com>
+
+	* bfd/archures.c: Add mipsisa32 and mipsisa64. Remove mips32,
+	mips32_4k and mips64.
+	* bfd/aoutx.h: Remove bfd_mach_mips32, bfd_mach_mips32_4k,
+	bfd_mach_mips64.  Add bfd_mach_mipsisa32, bfd_mach_mipsisa64.
+	* bfd/cpu-mips.c: Ditto.
+	* bfd/elf32-mips.c (_bfd_mips_elf_final_write_processing): Ditto.
+	* bfd/bfd-in2.h: Regenerate.
+
 2001-08-31  Jakub Jelinek  <jakub@redhat.com>
 
 	* elf64-alpha.c (elf64_alpha_relocate_section): Duplicate memory
@@ -33,7 +44,7 @@
 
 2001-08-29  Joel Sherrill <joel@OARcorp.com>
 
-	* config.bfd (i[3456]86-*-rtems*, m68*-*-rtems*): Change 
+	* config.bfd (i[3456]86-*-rtems*, m68*-*-rtems*): Change
 	default from coff to elf.
 
 2001-08-29  Jeff Law <law@redhat.com>
@@ -61,7 +72,7 @@
 
 2001-08-29  Tom Rix <trix@redhat.com>
 
- 	* xcofflink.c (xcoff_link_add_symbols):  Fix XTY_LD symbol that 
+ 	* xcofflink.c (xcoff_link_add_symbols):  Fix XTY_LD symbol that
  	does not follow a XTY_SD.
 
 2001-08-29  Alan Modra  <amodra@bigpond.net.au>
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index 603cac7c86..e343f991a5 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -779,10 +779,9 @@ NAME(aout,machine_type) (arch, machine, unknown)
     case bfd_mach_mips10000:
     case bfd_mach_mips12000:
     case bfd_mach_mips16:
-    case bfd_mach_mips32:
-    case bfd_mach_mips32_4k:
+    case bfd_mach_mipsisa32:
     case bfd_mach_mips5:
-    case bfd_mach_mips64:
+    case bfd_mach_mipsisa64:
     case bfd_mach_mips_sb1:
       /* FIXME: These should be MIPS3, MIPS4, MIPS16, MIPS32, etc.  */
       arch_flags = M_MIPS2;
diff --git a/bfd/archures.c b/bfd/archures.c
index af5f50b723..49418b8825 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -137,11 +137,10 @@ DESCRIPTION
 .#define bfd_mach_mips10000		10000
 .#define bfd_mach_mips12000		12000
 .#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
 .#define bfd_mach_mips_sb1              12310201 {* octal 'SB', 01 *}
+.#define bfd_mach_mipsisa32             32
+.#define bfd_mach_mipsisa64             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 8a4c33432e..6467453eff 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1437,11 +1437,10 @@ enum bfd_architecture
 #define bfd_mach_mips10000             10000
 #define bfd_mach_mips12000             12000
 #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
 #define bfd_mach_mips_sb1              12310201 /* octal 'SB', 01 */
+#define bfd_mach_mipsisa32             32
+#define bfd_mach_mipsisa64             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 ee6574b242..888d863124 100644
--- a/bfd/cpu-mips.c
+++ b/bfd/cpu-mips.c
@@ -57,10 +57,9 @@ enum
   I_mips10000,
   I_mips12000,
   I_mips16,
-  I_mips32,
-  I_mips32_4k,
   I_mips5,
-  I_mips64,
+  I_mipsisa32,
+  I_mipsisa64,
   I_sb1,
 };
 
@@ -84,10 +83,9 @@ static const bfd_arch_info_type arch_info_struct[] =
   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)),
-  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, NN(I_mips64)),
+  N (32, 32, bfd_mach_mipsisa32,  "mips:isa32",   false, NN(I_mipsisa32)),
+  N (64, 64, bfd_mach_mipsisa64,  "mips:isa64",   false, NN(I_mipsisa64)),
   N (64, 64, bfd_mach_mips_sb1, "mips:sb1",       false, 0),
 };
 
diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index 6eecd5511d..a1d7205b98 100644
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -1886,9 +1886,6 @@ elf_mips_mach (flags)
     case E_MIPS_MACH_4650:
       return bfd_mach_mips4650;
 
-    case E_MIPS_MACH_MIPS32_4K:
-      return bfd_mach_mips32_4k;
-
     case E_MIPS_MACH_SB1:
       return bfd_mach_mips_sb1;
 
@@ -1917,11 +1914,11 @@ elf_mips_mach (flags)
 	  break;
 
 	case E_MIPS_ARCH_32:
-	  return bfd_mach_mips32;
+	  return bfd_mach_mipsisa32;
 	  break;
 
 	case E_MIPS_ARCH_64:
-	  return bfd_mach_mips64;
+	  return bfd_mach_mipsisa64;
 	  break;
 	}
     }
@@ -2412,25 +2409,20 @@ _bfd_mips_elf_final_write_processing (abfd, linker)
       val = E_MIPS_ARCH_4;
       break;
 
-    case bfd_mach_mips32:
-      val = E_MIPS_ARCH_32;
-      break;
-
-    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;
-
     case bfd_mach_mips_sb1:
       val = E_MIPS_ARCH_64 | E_MIPS_MACH_SB1;
       break;
+
+    case bfd_mach_mipsisa32:
+      val = E_MIPS_ARCH_32;
+      break;
+
+    case bfd_mach_mipsisa64:
+      val = E_MIPS_ARCH_64;
     }
 
   elf_elfheader (abfd)->e_flags &= ~(EF_MIPS_ARCH | EF_MIPS_MACH);