From: Mike Frysinger <vapier@gentoo.org>
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 [thread overview]
Message-ID: <20221225031608.2336-3-vapier@gentoo.org> (raw)
In-Reply-To: <20221225031608.2336-1-vapier@gentoo.org>
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
prev parent reply other threads:[~2022-12-25 3:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-25 3:16 [PATCH 1/3] sim: mips: namespace igen configure vars Mike Frysinger
2022-12-25 3:16 ` [PATCH 2/3] sim: mips: move igen settings to top-level configure Mike Frysinger
2022-12-25 3:16 ` Mike Frysinger [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221225031608.2336-3-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).