Renamed v850eq -> v850ea

3 files changed, 38 insertions, 17 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 540b066..0289a23 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -611,7 +611,7 @@ start-sanitize-v850e
 Tue Sep  2 17:43:49 1997  Nick Clifton  <nickc@cygnus.com>
 
 	* elf.c (prep_headers): Remove V850E magic number.
-	* elf.c (prep_headers): Remove V850EQ magic number.
+	* elf.c (prep_headers): Remove V850EA magic number.
 end-sanitize-v850e
 
 Tue Sep  2 17:35:05 1997  Doug Evans  <dje@canuck.cygnus.com>
@@ -692,14 +692,14 @@ start-sanitize-v850e
 	
 	* elf.c (prep_headers): Add support for v850e machine number. 
 
-	* archures.c (bfd_mach_v850eq): Machine value for v850eq.
+	* archures.c (bfd_mach_v850ea): Machine value for v850ea.
 	
-	* bfd-in2.h (bfd_mach_v850eq): Machine value for v850eq.
+	* bfd-in2.h (bfd_mach_v850ea): Machine value for v850ea.
 	
-	* elf32-v850.c (ELF_MACHINE_CODE): Default to v850eq machine
+	* elf32-v850.c (ELF_MACHINE_CODE): Default to v850ea machine
 	number.
 	
-	* elf.c (prep_headers): Add support for v850eq machine number. 
+	* elf.c (prep_headers): Add support for v850ea machine number. 
 end-sanitize-v850e
 
 Mon Aug 25 14:07:33 1997  Ian Lance Taylor  <ian@cygnus.com>
@@ -777,15 +777,15 @@ Mon Aug 18 11:33:56 1997  Nick Clifton  <nickc@cygnus.com>
 
 Mon Aug 18 11:33:56 1997  Nick Clifton  <nickc@cygnus.com>
 
-	* cpu-v850eq: New file.
+	* cpu-v850ea: New file.
 	
-	* elf.c (prep_headers): Add support for v850eq target.
+	* elf.c (prep_headers): Add support for v850ea target.
 	
-	* bfd-in2.h (bfd_architecture): Add support for v850eq target. 
+	* bfd-in2.h (bfd_architecture): Add support for v850ea target. 
 	
-	* config.bfd: Add support for v850eq target.
+	* config.bfd: Add support for v850ea target.
 
-	* archures.c: Add support for v850eq target.
+	* archures.c: Add support for v850ea target.
 end-sanitize-v850e
 
 Fri Aug 15 12:01:28 1997  Ian Lance Taylor  <ian@cygnus.com>
diff --git a/bfd/archures.c b/bfd/archures.c
index db5e76c..08823ff 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -103,6 +103,15 @@ DESCRIPTION
 .#define bfd_mach_sparc_v9_p(mach) \
 .  ((mach) >= bfd_mach_sparc_v8plus && (mach) <= bfd_mach_sparc_v9a)
 .  bfd_arch_mips,      {* MIPS Rxxxx *}
+.#define bfd_mach_mips3000		3000
+.#define bfd_mach_mips6000		6000
+.#define bfd_mach_mips4000		4000
+.#define bfd_mach_mips8000		8000
+.#define bfd_mach_mips16		  16
+. {* start-sanitize-vr5400 *}
+.#define bfd_mach_vr5400		5400
+.#define bfd_mach_vr5000		5000
+. {* end-sanitize-vr5400 *}
 .  bfd_arch_i386,      {* Intel 386 *}
 .#define bfd_mach_i386_i386 0
 .#define bfd_mach_i386_i8086 1
@@ -153,10 +162,8 @@ DESCRIPTION
 .#define bfd_mach_v850          0
 . {* start-sanitize-v850e *}
 .#define bfd_mach_v850e 	'E'
+.#define bfd_mach_v850ea	'A'
 . {* end-sanitize-v850e *}
-. {* start-sanitize-v850eq *}
-.#define bfd_mach_v850eq	'Q'
-. {* end-sanitize-v850eq *}
 .  bfd_arch_arc,       {* Argonaut RISC Core *}
 .#define bfd_mach_arc_base 0
 .  bfd_arch_m32r,      {* Mitsubishi M32R/D *}
@@ -720,8 +727,8 @@ bfd_default_scan (info, string)
       ptr_src++;
     }
 
-  /* NOTE: The below is retained for compatibility only.  Please do
-     not add to this code. */
+  /* NOTE: The below is retained for compatibility only.
+     PLEASE DO NOT ADD TO THIS CODE. */
 
   switch (number) 
     {
@@ -740,8 +747,13 @@ bfd_default_scan (info, string)
       break;
 
     case 3000:
+      arch = bfd_arch_mips;
+      number = bfd_mach_mips3000;
+      break;
+
     case 4000:
       arch = bfd_arch_mips;
+      number = bfd_mach_mips4000;
       break;
 
     case 6000:
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index d398d82..b3c03fd 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1195,6 +1195,15 @@ enum bfd_architecture
 #define bfd_mach_sparc_v9_p(mach) \
   ((mach) >= bfd_mach_sparc_v8plus && (mach) <= bfd_mach_sparc_v9a)
   bfd_arch_mips,       /* MIPS Rxxxx */
+#define bfd_mach_mips3000		3000
+#define bfd_mach_mips6000		6000
+#define bfd_mach_mips4000		4000
+#define bfd_mach_mips8000		8000
+#define bfd_mach_mips16		  16
+  /* start-sanitize-vr5400 */
+#define bfd_mach_vr5400		5400
+#define bfd_mach_vr5000		5000
+  /* end-sanitize-vr5400 */
   bfd_arch_i386,       /* Intel 386 */
 #define bfd_mach_i386_i386 0
 #define bfd_mach_i386_i8086 1
@@ -1245,7 +1254,7 @@ enum bfd_architecture
 #define bfd_mach_v850          0
   /* start-sanitize-v850e */
 #define bfd_mach_v850e 	'E'
-#define bfd_mach_v850eq	'Q'
+#define bfd_mach_v850ea	'A'
   /* end-sanitize-v850e */
   bfd_arch_arc,        /* Argonaut RISC Core */
 #define bfd_mach_arc_base 0
@@ -1491,7 +1500,7 @@ bfd_check_overflow
  PARAMS ((enum complain_overflow how,
     unsigned int bitsize,
     unsigned int rightshift,
-    bfd_vma value));
+    bfd_vma relocation));
 
 bfd_reloc_status_type