From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id A66D63858D1E for ; Fri, 23 Dec 2022 02:24:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A66D63858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 52C343413E3; Fri, 23 Dec 2022 02:24:04 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: mips: merge mips64* with existing multi-run build Date: Thu, 22 Dec 2022 21:23:57 -0500 Message-Id: <20221223022357.20163-1-vapier@gentoo.org> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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. --- sim/mips/configure | 7 ++----- sim/mips/configure.ac | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/sim/mips/configure b/sim/mips/configure index 7975665d1ca3..36c9bfd18cae 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 56b7a91a6b60..96a57f3ba241 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" -- 2.39.0