For bfd, add vr5400 and vr5000 mips machine variants to list of machines.

For sim/mips, enable multi-sim support when mips64vr5400-elf is target.
For sim/igen, allow specification of a default machine (will need
more work later).

4 files changed, 58 insertions, 11 deletions

diff --git a/bfd/.Sanitize b/bfd/.Sanitize
index c6f6745..288fc0b 100644
--- a/bfd/.Sanitize
+++ b/bfd/.Sanitize
@@ -457,6 +457,34 @@ else
 	done
 fi
 
+vr5400_files="ChangeLog archures.c bfd-in2.h bfd-in.h cpu-mips.c"
+if ( echo $* | grep keep\-vr5400 > /dev/null ) ; then
+	for i in $vr5400_files ; do
+		if test ! -d $i && (grep sanitize-vr5400 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping vr5400 stuff in $i
+			fi
+		fi
+	done
+else
+	for i in $vr5400_files ; do
+		if test ! -d $i && (grep sanitize-vr5400 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"vr5400\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-vr5400/,/end-\sanitize\-vr5400/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
+
 for i in * ; do
 	if test ! -d $i && (grep sanitize $i > /dev/null) ; then
 		echo '***' Some mentions of Sanitize are still left in $i! 1>&2
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6365a57..773af7e 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,16 @@
+Tue Dec  9 11:37:53 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* archures.c (bfd_mach_mips*): Define.
+	(start-sanitize-vr5400):
+	(vr5400, bfd_mach_vr5000): Define.
+	(end-sanitize-vr5400):
+	(bfd_default_scan): For 3000 and 4000 replace magic constant with
+ 	macro.
+
+	* cpu-mips.c (N): Define.
+	(bfd_mips_arch, arch_info_struct): Re-write using macro N, replace
+ 	numbers with bfd_mach_mips* macros.
+
 Fri Dec  5 11:13:46 1997  Nick Clifton  <nickc@cygnus.com>
 
 	* elf32-v850.c (v850_elf_reloc, v850_elf_store_addend_in_insn,
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index b0bb4be..7a09d16 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,10 @@
+start-sanitize-vr5400
+Tue Dec  9 12:02:12 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure.in (sim_igen_filter): Multi-sim vr5400 - vr5000 or
+ 	vr5400.
+
+end-sanitize-vr5400
 Thu Dec  4 09:21:05 1997  Doug Evans  <devans@canuck.cygnus.com>
 
 	* configure: Regenerated to track ../common/aclocal.m4 changes.
@@ -17,7 +24,7 @@ start-sanitize-vr5400
 	* mips.igen: Include mdmx.igen.
 	* Makefile.in (IGEN_INCLUDE): Add mdmx.igen.
 
-start-sanitize-vr5400
+end-sanitize-vr5400
 Sun Nov 23 01:45:20 1997  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* sim-main.h (sim-fpu.h): Include.
diff --git a/sim/mips/configure.in b/sim/mips/configure.in
index 1949aed..84e52e4 100644
--- a/sim/mips/configure.in
+++ b/sim/mips/configure.in
@@ -98,34 +98,33 @@ SIM_AC_OPTION_FLOAT($mips_fpu)
 # Select the IGEN architecture
 #
 sim_use_gen=NO
-sim_igen_machine="mipsIV"
-sim_m16_machine="mips16"
+sim_igen_machine="-M mipsIV"
+sim_m16_machine="-M mips16"
 sim_igen_filter="32,64,f"
 sim_m16_filter="16"
 
 case "${target}" in
 # start-sanitize-tx19
   mipstx19*-*-*)	sim_default_gen=M16
-			sim_igen_machine="tx19"
-			sim_m16_machine="tx19"
+			sim_igen_machine="-M tx19"
+			sim_m16_machine="-M tx19"
 			sim_igen_filter="32"
 			sim_m16_filter="16"
 			;;
 # end-sanitize-tx19
 # start-sanitize-r5900
   mips64r59*-*-*)	sim_default_gen=IGEN
-			sim_igen_machine="r5900"
+			sim_igen_machine="-M r5900"
 			;;
 # end-sanitize-r5900
 # start-sanitize-vr5400
   mips64vr54*-*-*)	sim_default_gen=IGEN
 			sim_use_gen=IGEN
-			sim_igen_machine="vr5400"
-			#sim_igen_machine="vr5000,vr5400 -G gen-muli-sim"
+			sim_igen_machine="-M vr5000,vr5400 -G gen-multi-sim=vr5400"
 			;;
 # end-sanitize-vr5400
   mips64vr5*-*-*)	sim_default_gen=IGEN
-			sim_igen_machine="vr5000"
+			sim_igen_machine="-M vr5000"
 			;;
   mips16*-*-*)		sim_default_gen=M16
 			;;
@@ -135,8 +134,8 @@ case "${target}" in
   *)                    sim_default_gen=IGEN
 			;;
 esac
-sim_igen_flags="-F ${sim_igen_filter} -M ${sim_igen_machine}"
-sim_m16_flags=" -F ${sim_m16_filter}  -M ${sim_m16_machine}"
+sim_igen_flags="-F ${sim_igen_filter} ${sim_igen_machine}"
+sim_m16_flags=" -F ${sim_m16_filter}  ${sim_m16_machine}"
 AC_SUBST(sim_igen_flags)
 AC_SUBST(sim_m16_flags)