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 2B6553858425 for ; Fri, 23 Dec 2022 02:20:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2B6553858425 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 BE1423413E7; Fri, 23 Dec 2022 02:20:40 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: mips: merge mips64vr5000 with existing multi-run build Date: Thu, 22 Dec 2022 21:20:37 -0500 Message-Id: <20221223022037.16772-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: 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. --- sim/mips/configure | 5 +---- sim/mips/configure.ac | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sim/mips/configure b/sim/mips/configure index bc762fc04f84..7975665d1ca3 100755 --- 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 a09e9a14c798..56b7a91a6b60 100644 --- 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\ -- 2.39.0