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 58CDE3857BB3 for ; Wed, 21 Dec 2022 05:13:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 58CDE3857BB3 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 EA2243414CB; Wed, 21 Dec 2022 05:13:31 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 4/5] sim: mips: move fpu bitsize defines to top-level configure Date: Wed, 21 Dec 2022 00:13:21 -0500 Message-Id: <20221221051322.4163-4-vapier@gentoo.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221221051322.4163-1-vapier@gentoo.org> References: <20221221051322.4163-1-vapier@gentoo.org> 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: This drops support for the --enable-sim-float configure option, but it's not clear anyone ever actually used that. Eventually we'll want this to be a runtime option anyways. --- sim/Makefile.in | 1 + sim/arch-subdir.mk.in | 1 + sim/configure | 28 ++++++++++++++++++-- sim/mips/Makefile.in | 1 + sim/mips/acinclude-top.m4 | 13 ++++++++++ sim/mips/aclocal.m4 | 1 - sim/mips/configure | 54 ++------------------------------------- sim/mips/configure.ac | 16 ------------ 8 files changed, 44 insertions(+), 71 deletions(-) diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in index 38a18a378fd7..6ac9ab8beb52 100644 --- a/sim/arch-subdir.mk.in +++ b/sim/arch-subdir.mk.in @@ -78,3 +78,4 @@ SIM_HW_OBJS = $(SIM_COMMON_HW_OBJS) $(SIM_HW_DEVICES:%=dv-%.o) $(SIM_HW_SOCKSER) # This can be removed once mips/configure is gone. SIM_MIPS_SUBTARGET = @SIM_MIPS_SUBTARGET@ SIM_MIPS_BITSIZE = -DWITH_TARGET_WORD_BITSIZE=@SIM_MIPS_BITSIZE@ -DWITH_TARGET_WORD_MSB=WITH_TARGET_WORD_BITSIZE-1 +SIM_MIPS_FPU_BITSIZE = @SIM_MIPS_FPU_BITSIZE@ diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in index aa872883ec70..ff9763b720b1 100644 --- a/sim/mips/Makefile.in +++ b/sim/mips/Makefile.in @@ -70,6 +70,7 @@ SIM_EXTRA_HW_DEVICES = tx3904cpu tx3904irc tx3904tmr tx3904sio SIM_EXTRA_CFLAGS = $(SIM_MIPS_SUBTARGET) SIM_BITSIZE = $(SIM_MIPS_BITSIZE) +SIM_FLOAT = -DWITH_FLOATING_POINT=HARD_FLOATING_POINT -DWITH_TARGET_FLOATING_POINT_BITSIZE=$(SIM_MIPS_FPU_BITSIZE) SIM_EXTRA_CLEAN = clean-extra SIM_EXTRA_DISTCLEAN = distclean-extra diff --git a/sim/mips/acinclude-top.m4 b/sim/mips/acinclude-top.m4 index 2d53bee13576..612aa92a2b80 100644 --- a/sim/mips/acinclude-top.m4 +++ b/sim/mips/acinclude-top.m4 @@ -46,3 +46,16 @@ AS_CASE([${target}], [mips*-*-*], [SIM_MIPS_BITSIZE=32]) AC_MSG_RESULT([$SIM_MIPS_BITSIZE]) AC_SUBST(SIM_MIPS_BITSIZE) + +dnl Select the floating hardware support of the target. +AC_MSG_CHECKING([mips fpu bitsize]) +SIM_MIPS_FPU_BITSIZE=64 +AS_CASE([${target}], + [mips*tx39*], [SIM_MIPS_FPU_BITSIZE=32], + [mips*-sde-elf*], [SIM_MIPS_FPU_BITSIZE=64], + [mips*-mti-elf*], [SIM_MIPS_FPU_BITSIZE=64], + [mipsisa32*-*-*], [SIM_MIPS_FPU_BITSIZE=64], + [mipsisa64*-*-*], [SIM_MIPS_FPU_BITSIZE=64], + [mips*-*-*], [SIM_MIPS_FPU_BITSIZE=32]) +AC_MSG_RESULT([$SIM_MIPS_FPU_BITSIZE]) +AC_SUBST(SIM_MIPS_FPU_BITSIZE) diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac index d820b816fe01..6d158d7b0559 100644 --- a/sim/mips/configure.ac +++ b/sim/mips/configure.ac @@ -6,22 +6,6 @@ dnl The sim shouldn't be checking $target and changing behavior. But it is, dnl and until we clean that up, we need to expand --target for use below. AC_CANONICAL_SYSTEM -# -# Select the floating hardware support of the target -# -mips_fpu_bitsize= -case "${target}" in - mips*tx39*) mips_fpu_bitsize=32 ;; - mips*-sde-elf*) mips_fpu_bitsize=64 ;; - mips*-mti-elf*) mips_fpu_bitsize=64 ;; - mipsisa32*-*-*) mips_fpu_bitsize=64 ;; - mipsisa64*-*-*) mips_fpu_bitsize=64 ;; - mips*-*-*) mips_fpu_bitsize=32 ;; -esac -SIM_AC_OPTION_FLOAT(HARD_FLOATING_POINT,$mips_fpu_bitsize) - - - # # Select the IGEN architecture # -- 2.39.0