for bfd:

	* archures.c,bfd-in2.h (bfd_mach_mips4121): New.
	* cpu-mips.c: Added vr4121.
	* elf32-mips.c (elf_mips_mach): Same.
	(_bfd_mips_elf_final_write_processing): Same.

for gas:
	* config/tc-mips.c (mips_4121): New.
	(md_begin,mips_ip,md_longopts,md_parse_option): Add vr4121.

for gcc:
	* config/mips/mips.c (override_options): Add vr4121.
	* config/mips/t-vr4xxx (MULTILIB_MATCHES): Same.

for include/elf:
	* mips.h (E_MIPS_MACH_4121): New.

for include/opcode:
	* mips.h (INSN_4121): New.

for opcodes:
	* mips-dis.c (set_mips_isa_type): Add bfd_mach_mips4121.
	(_print_insn_mips): Same.
	* mips-opc.c: Add vr4121.

for sim/mips:
	* configure.in,mips.igen,vr.igen: Add vr4121.
	* configure: Rebuilt.

6 files changed, 68 insertions, 3 deletions

diff --git a/bfd/.Sanitize b/bfd/.Sanitize
index 814730e..cd40980 100644
--- a/bfd/.Sanitize
+++ b/bfd/.Sanitize
@@ -523,6 +523,34 @@ else
 	done
 fi
 
+vr4xxx_files="ChangeLog archures.c bfd-in2.h cpu-mips.c elf32-mips.c"
+if ( echo $* | grep keep\-vr4xxx > /dev/null ) ; then
+	for i in $vr4xxx_files ; do
+		if test ! -d $i && (grep sanitize-vr4xxx $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping vr4xxx stuff in $i
+			fi
+		fi
+	done
+else
+	for i in $vr4xxx_files ; do
+		if test ! -d $i && (grep sanitize-vr4xxx $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"vr4xxx\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-vr4xxx/,/end-\sanitize\-vr4xxx/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
 m32rx_files="ChangeLog ChangeLog-9697 archures.c bfd-in2.h elf32-m32r.c cpu-m32r.c"
 if ( echo $* | grep keep\-m32rx > /dev/null ) ; then
 	for i in $m32rx_files ; do
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2bb391a..4b4fabd 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,12 @@
+start-sanitize-vr4xxx
+1998-12-13  Gavin Romig-Koch  <gavin@cygnus.com>
+
+	* archures.c,bfd-in2.h (bfd_mach_mips4121): New.
+	* cpu-mips.c: Added vr4121.
+	* elf32-mips.c (elf_mips_mach): Same.
+	(_bfd_mips_elf_final_write_processing): Same.
+	
+start-sanitize-vr4xxx
 1998-12-12  Gavin Romig-Koch  <gavin@cygnus.com>
 
 	* elf32-mips.c (_bfd_mips_elf_final_write_processing): 
diff --git a/bfd/archures.c b/bfd/archures.c
index c3ac243..179f8d8 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -120,6 +120,9 @@ DESCRIPTION
 .#define bfd_mach_mips4000		4000
 .#define bfd_mach_mips4010		4010
 .#define bfd_mach_mips4100		4100
+. {* start-sanitize-vr4xxx *}
+.#define bfd_mach_mips4121		4121
+. {* end-sanitize-vr4xxx *}
 .#define bfd_mach_mips4300		4300
 .#define bfd_mach_mips4400		4400
 .#define bfd_mach_mips4600		4600
@@ -131,7 +134,7 @@ DESCRIPTION
 .#define bfd_mach_mips4900		4900
 . {* end-sanitize-tx49 *}
 .#define bfd_mach_mips5000		5000
-. {* start-sanitize-cygnus *} {* CYGNUS LOCAL vr5400/raeburn *}
+. {* start-sanitize-cygnus *}
 .#define bfd_mach_mips5400		5400
 . {* end-sanitize-cygnus *}
 . {* start-sanitize-r5900 *}
@@ -179,6 +182,9 @@ DESCRIPTION
 .#define bfd_mach_sh3e       0x3e
 .#define bfd_mach_sh4        0x40
 .  bfd_arch_alpha,     {* Dec Alpha *}
+.#define bfd_mach_alpha_ev4  0x10
+.#define bfd_mach_alpha_ev5  0x20
+.#define bfd_mach_alpha_ev6  0x30
 .  bfd_arch_arm,       {* Advanced Risc Machines ARM *}
 .#define bfd_mach_arm_2		1
 .#define bfd_mach_arm_2a		2
@@ -211,6 +217,8 @@ DESCRIPTION
 . {* start-sanitize-am33 *}
 .#define bfd_mach_am33		330
 . {* end-sanitize-am33 *}
+.  bfd_arch_fr30,
+.#define bfd_mach_fr30		0x46523330
 .  bfd_arch_last
 .  };
 
@@ -281,6 +289,7 @@ extern const bfd_arch_info_type bfd_z8k_arch;
 extern const bfd_arch_info_type bfd_ns32k_arch;
 extern const bfd_arch_info_type bfd_w65_arch;
 extern const bfd_arch_info_type bfd_v850_arch;
+extern const bfd_arch_info_type bfd_fr30_arch;
 
 static const bfd_arch_info_type * const bfd_archures_list[] =
 {
@@ -319,6 +328,7 @@ static const bfd_arch_info_type * const bfd_archures_list[] =
   &bfd_ns32k_arch,
   &bfd_w65_arch,
   &bfd_v850_arch,
+  & bfd_fr30_arch,
 #endif
   0
 };
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 3fa4b78..99f2d7e 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1257,6 +1257,9 @@ enum bfd_architecture
 #define bfd_mach_mips4000              4000
 #define bfd_mach_mips4010              4010
 #define bfd_mach_mips4100              4100
+  /* start-sanitize-vr4xxx */
+#define bfd_mach_mips4121              4121
+  /* end-sanitize-vr4xxx */
 #define bfd_mach_mips4300              4300
 #define bfd_mach_mips4400              4400
 #define bfd_mach_mips4600              4600
diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c
index db9c948..d5b1a50 100644
--- a/bfd/cpu-mips.c
+++ b/bfd/cpu-mips.c
@@ -44,6 +44,9 @@ I_mips3900,
 I_mips4000, 
 I_mips4010, 
 I_mips4100, 
+  /* start-sanitize-vr4xxx */
+I_mips4121,
+  /* end-sanitize-vr4xxx */
 I_mips4300, 
 I_mips4400, 
 I_mips4600, 
@@ -62,7 +65,6 @@ I_mips4320,
 I_mips4900,
   /* end-sanitize-tx49 */
   /* start-sanitize-cygnus */
-  /* CYGNUS LOCAL vr5400/raeburn */
 I_mips5400,
   /* end-sanitize-cygnus */
   /* start-sanitize-r5900 */
@@ -87,6 +89,9 @@ static const bfd_arch_info_type arch_info_struct[] =
   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)),
+  /* start-sanitize-vr4xxx */
+  N (64, 64, bfd_mach_mips4121, "mips:4121", false, NN(I_mips4121)),
+  /* end-sanitize-vr4xxx */
   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)),
@@ -106,7 +111,6 @@ static const bfd_arch_info_type arch_info_struct[] =
   N (64, 64, bfd_mach_mips4900, "mips:4900", false, NN(I_mips4900)),
   /* end-sanitize-tx49 */
   /* start-sanitize-cygnus */
-  /* CYGNUS LOCAL vr5400/raeburn */
   N (64, 64, bfd_mach_mips5400, "mips:5400", false, NN(I_mips5400)),
   /* end-sanitize-cygnus */
   /* start-sanitize-r5900 */
diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index 08f71ab..70d12a9 100644
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -1662,6 +1662,11 @@ elf_mips_mach (flags)
 
     case E_MIPS_MACH_4100:
       return bfd_mach_mips4100;
+      /* start-sanitize-vr4xxx */
+
+    case E_MIPS_MACH_4121:
+      return bfd_mach_mips4121;
+      /* end-sanitize-vr4xxx */
       /* start-sanitize-vr4320 */
 
     case E_MIPS_MACH_4320:
@@ -2104,6 +2109,12 @@ _bfd_mips_elf_final_write_processing (abfd, linker)
     case bfd_mach_mips4100:
       val = E_MIPS_ARCH_3 | E_MIPS_MACH_4100;
       break;
+      /* start-sanitize-vr4xxx */
+
+    case bfd_mach_mips4121:
+      val = E_MIPS_ARCH_3 | E_MIPS_MACH_4121;
+      break;
+      /* end-sanitize-vr4xxx */
       /* start-sanitize-vr4320 */
 
     case bfd_mach_mips4320: