From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 11 Nov 2022 16:58:23 +0000 (+0700)
Subject: sim: mips: merge mips64* with existing multi-run build
X-Git-Tag: binutils-2_40~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=022e1fb26c9429d0b3d8ac1e0934650ec088c055;p=thirdparty%2Fbinutils-gdb.git

sim: mips: merge mips64* with existing multi-run build

Change the default (unhandled) mips64* targets to use the existing
mips64 multi-run build.  It already handles the formats, we just
have to list the mips8000 bfd for it.
---

diff --git a/sim/mips/configure b/sim/mips/configure
index 7975665d1ca..36c9bfd18ca 100755
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -1853,12 +1853,12 @@ case "${target}" in
 			sim_igen_filter="32,64,f"
 			sim_m16_filter="16"
                         ;;
-  mips64vr43* | mips64vr5* | mips64vr-* | mips64vrel-*)
+  mips64*)
 			sim_gen=MULTI
 			sim_multi_configs="\
 			  vr4100:mipsIII,mips16,vr4100:32,64:mips4100,mips4111\
 			  vr4120:mipsIII,mips16,vr4120:32,64:mips4120\
-			  vr5000:mipsIV:32,64,f:mips4300,mips5000\
+			  vr5000:mipsIV:32,64,f:mips4300,mips5000,mips8000\
 			  vr5400:mipsIV,vr5400:32,64,f:mips5400\
 			  vr5500:mipsIV,vr5500:32,64,f:mips5500"
 			sim_multi_default=mips5000
@@ -1871,9 +1871,6 @@ case "${target}" in
 			  mipsisa64r6:mips64r6:32,64,f:mipsisa32r6,mipsisa64r6"
 			sim_multi_default=mipsisa64r2
 			;;
-  mips64*)		sim_igen_filter="32,64,f"
-			sim_gen=IGEN
-			;;
   mips16*)		sim_gen=M16
 			sim_igen_filter="32,64,f"
 			sim_m16_filter="16"
diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index 56b7a91a6b6..96a57f3ba24 100644
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -26,12 +26,12 @@ case "${target}" in
 			sim_igen_filter="32,64,f"
 			sim_m16_filter="16"
                         ;;
-  mips64vr43* | mips64vr5* | mips64vr-* | mips64vrel-*)
+  mips64*)
 			sim_gen=MULTI
 			sim_multi_configs="\
 			  vr4100:mipsIII,mips16,vr4100:32,64:mips4100,mips4111\
 			  vr4120:mipsIII,mips16,vr4120:32,64:mips4120\
-			  vr5000:mipsIV:32,64,f:mips4300,mips5000\
+			  vr5000:mipsIV:32,64,f:mips4300,mips5000,mips8000\
 			  vr5400:mipsIV,vr5400:32,64,f:mips5400\
 			  vr5500:mipsIV,vr5500:32,64,f:mips5500"
 			sim_multi_default=mips5000
@@ -44,9 +44,6 @@ case "${target}" in
 			  mipsisa64r6:mips64r6:32,64,f:mipsisa32r6,mipsisa64r6"
 			sim_multi_default=mipsisa64r2
 			;;
-  mips64*)		sim_igen_filter="32,64,f"
-			sim_gen=IGEN
-			;;
   mips16*)		sim_gen=M16
 			sim_igen_filter="32,64,f"
 			sim_m16_filter="16"