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

The existing mips64vr-* multi-run build already handles mips4300
targets, so reuse that for mips64vr43* 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 80963681d4ef5fbcd8799ed9c0e3dde4ceaa08e0..bc762fc04f842c7a377ba6d8bec0ab4c25001bd3 100755 (executable)
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -1847,9 +1847,6 @@ case "${target}" in
                        sim_igen_filter="32,f"
                        sim_igen_machine="-M r3900"
                        ;;
-  mips64vr43*)         sim_gen=IGEN
-                       sim_igen_machine="-M mipsIV"
-                       ;;
   mips64vr5*)          sim_gen=IGEN
                        sim_igen_machine="-M vr5000"
                        ;;
@@ -1859,7 +1856,7 @@ case "${target}" in
                        sim_igen_filter="32,64,f"
                        sim_m16_filter="16"
                         ;;
-  mips64vr-* | mips64vrel-*)
+  mips64vr43* | 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 bdea84e821cd8660e2a50ce37433ebb8779c2d0e..a09e9a14c7982a1dec4ae5c87716a8a4770126ec 100644 (file)
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -20,9 +20,6 @@ case "${target}" in
                        sim_igen_filter="32,f"
                        sim_igen_machine="-M r3900"
                        ;;
-  mips64vr43*)         sim_gen=IGEN
-                       sim_igen_machine="-M mipsIV"
-                       ;;
   mips64vr5*)          sim_gen=IGEN
                        sim_igen_machine="-M vr5000"
                        ;;
@@ -32,7 +29,7 @@ case "${target}" in
                        sim_igen_filter="32,64,f"
                        sim_m16_filter="16"
                         ;;
-  mips64vr-* | mips64vrel-*)
+  mips64vr43* | mips64vr-* | mips64vrel-*)
                        sim_gen=MULTI
                        sim_multi_configs="\
                          vr4100:mipsIII,mips16,vr4100:32,64:mips4100,mips4111\