From a54eee6db647fd52431543d3b2a26266ea31444d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 11 Nov 2022 23:52:59 +0700 Subject: [PATCH] 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. --- 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 bc762fc04f8..7975665d1ca 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 a09e9a14c79..56b7a91a6b6 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.30.2