sim: mips: merge mips64vr5000 with existing multi-run build

The existing mips64vr-* multi-run build already handles mips5000
targets, so reuse that for mips64vr5* targets too.  This moves
more logic from build-time to runtime so we can have a single
binary that supports many targets.

diff --git a/sim/mips/configure b/sim/mips/configure
index bc762fc04f842c7a377ba6d8bec0ab4c25001bd3..7975665d1ca39da5a32ba4329bde37a28ffb393b 100755 (executable)
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -1847,16 +1847,13 @@ case "${target}" in
                        sim_igen_filter="32,f"
                        sim_igen_machine="-M r3900"
                        ;;
-  mips64vr5*)          sim_gen=IGEN
-                       sim_igen_machine="-M vr5000"
-                       ;;
   mips64vr41*)         sim_gen=M16
                        sim_igen_machine="-M vr4100"
                        sim_m16_machine="-M vr4100"
                        sim_igen_filter="32,64,f"
                        sim_m16_filter="16"
                         ;;
-  mips64vr43* | mips64vr-* | mips64vrel-*)
+  mips64vr43* | mips64vr5* | mips64vr-* | mips64vrel-*)
                        sim_gen=MULTI
                        sim_multi_configs="\
                          vr4100:mipsIII,mips16,vr4100:32,64:mips4100,mips4111\

diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index a09e9a14c7982a1dec4ae5c87716a8a4770126ec..56b7a91a6b606bca61a71ce3dec6bf275a3bc40c 100644 (file)
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -20,16 +20,13 @@ case "${target}" in
                        sim_igen_filter="32,f"
                        sim_igen_machine="-M r3900"
                        ;;
-  mips64vr5*)          sim_gen=IGEN
-                       sim_igen_machine="-M vr5000"
-                       ;;
   mips64vr41*)         sim_gen=M16
                        sim_igen_machine="-M vr4100"
                        sim_m16_machine="-M vr4100"
                        sim_igen_filter="32,64,f"
                        sim_m16_filter="16"
                         ;;
-  mips64vr43* | mips64vr-* | mips64vrel-*)
+  mips64vr43* | mips64vr5* | mips64vr-* | mips64vrel-*)
                        sim_gen=MULTI
                        sim_multi_configs="\
                          vr4100:mipsIII,mips16,vr4100:32,64:mips4100,mips4111\