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 30316385B53C for ; Sun, 25 Dec 2022 03:16:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 30316385B53C 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 C495B340A98; Sun, 25 Dec 2022 03:16:16 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 3/3] sim: mips: clean up a bit after mips/configure removal Date: Sat, 24 Dec 2022 22:16:08 -0500 Message-Id: <20221225031608.2336-3-vapier@gentoo.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221225031608.2336-1-vapier@gentoo.org> References: <20221225031608.2336-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: Now that there is no subdir configure script, we can clean up some logic that was spread between the files. --- sim/Makefile.in | 3 +-- sim/arch-subdir.mk.in | 5 ----- sim/configure.ac | 2 +- sim/mips/Makefile.in | 6 +++--- sim/mips/{acinclude-top.m4 => acinclude.m4} | 2 -- 5 files changed, 5 insertions(+), 13 deletions(-) rename sim/mips/{acinclude-top.m4 => acinclude.m4} (99%) diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in index 8964b1d99329..cfde3f3fb785 100644 --- a/sim/arch-subdir.mk.in +++ b/sim/arch-subdir.mk.in @@ -73,8 +73,3 @@ SIM_INLINE = @SIM_INLINE@ SIM_HW_CFLAGS = @SIM_HW_CFLAGS@ SIM_HW_OBJS = $(SIM_HW_DEVICES:%=dv-%.o) @SIM_ENABLE_HW_FALSE@SIM_HW_OBJS = - -# 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/configure.ac b/sim/configure.ac index e17dd974303a..bfcd9e59d10e 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -203,7 +203,7 @@ AC_SUBST(sim_float) dnl Some arches have unique configure flags. m4_include([frv/acinclude.m4]) -m4_include([mips/acinclude-top.m4]) +m4_include([mips/acinclude.m4]) m4_include([riscv/acinclude.m4]) m4_include([rx/acinclude.m4]) diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in index 0e2f1057530d..c287a632ae73 100644 --- a/sim/mips/Makefile.in +++ b/sim/mips/Makefile.in @@ -77,10 +77,10 @@ SIM_OBJS = \ sim-resume.o \ # List of flags to always pass to $(CC). -SIM_EXTRA_CFLAGS = $(SIM_MIPS_SUBTARGET) +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_BITSIZE = -DWITH_TARGET_WORD_BITSIZE=@SIM_MIPS_BITSIZE@ -DWITH_TARGET_WORD_MSB=WITH_TARGET_WORD_BITSIZE-1 +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.m4 similarity index 99% rename from sim/mips/acinclude-top.m4 rename to sim/mips/acinclude.m4 index ca11a2784b36..0a8bf97ba854 100644 --- a/sim/mips/acinclude-top.m4 +++ b/sim/mips/acinclude.m4 @@ -1,5 +1,3 @@ -dnl TODO: Rename this to acinclude.m4 once mips/configure is removed. -dnl dnl Copyright (C) 2005-2022 Free Software Foundation, Inc. dnl dnl This program is free software; you can redistribute it and/or modify -- 2.39.0