public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] sim: frv: move arch-specific file compilation to top-level
@ 2023-01-10 6:26 Michael Frysinger
0 siblings, 0 replies; only message in thread
From: Michael Frysinger @ 2023-01-10 6:26 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5ea1eaea7a1620b08f0d23b7faaab9f70bcb031c
commit 5ea1eaea7a1620b08f0d23b7faaab9f70bcb031c
Author: Mike Frysinger <vapier@gentoo.org>
Date: Sun Jan 1 13:43:06 2023 -0500
sim: frv: move arch-specific file compilation to top-level
The arch-specific flags are only used by the arch-specific modules,
not the common/ files, so we can delete them too.
Diff:
---
sim/Makefile.in | 6 +++---
sim/frv/Makefile.in | 6 ------
sim/frv/local.mk | 9 ++++++---
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/sim/Makefile.in b/sim/Makefile.in
index 3eebde764c9..1ea1ddb3308 100644
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -2274,6 +2274,9 @@ testsuite_common_CPPFLAGS = \
@SIM_ENABLE_ARCH_examples_TRUE@ example-synacor/libsim.a \
@SIM_ENABLE_ARCH_examples_TRUE@ $(SIM_COMMON_LIBS)
+@SIM_ENABLE_ARCH_frv_TRUE@AM_CPPFLAGS_frv = $(SIM_FRV_TRAPDUMP_FLAGS)
+@SIM_ENABLE_ARCH_frv_TRUE@AM_CFLAGS_frv_memory.o = -Wno-error
+@SIM_ENABLE_ARCH_frv_TRUE@AM_CFLAGS_frv_sem.o = -Wno-error
@SIM_ENABLE_ARCH_frv_TRUE@frv_libsim_a_SOURCES =
@SIM_ENABLE_ARCH_frv_TRUE@frv_libsim_a_LIBADD = \
@SIM_ENABLE_ARCH_frv_TRUE@ $(common_libcommon_a_OBJECTS) \
@@ -4883,9 +4886,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo
@SIM_ENABLE_ARCH_examples_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
@SIM_ENABLE_ARCH_frv_TRUE@$(frv_libsim_a_OBJECTS) $(frv_libsim_a_LIBADD): frv/hw-config.h
-@SIM_ENABLE_ARCH_frv_TRUE@frv/%.o: frv/%.c
-@SIM_ENABLE_ARCH_frv_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
-
@SIM_ENABLE_ARCH_frv_TRUE@frv/%.o: common/%.c
@SIM_ENABLE_ARCH_frv_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
@SIM_ENABLE_ARCH_frv_TRUE@frv/modules.c: | $(frv_BUILD_OUTPUTS)
diff --git a/sim/frv/Makefile.in b/sim/frv/Makefile.in
index f577873c057..d898bcbc249 100644
--- a/sim/frv/Makefile.in
+++ b/sim/frv/Makefile.in
@@ -16,12 +16,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
## COMMON_PRE_CONFIG_FRAG
-
-SIM_EXTRA_CFLAGS = @SIM_FRV_TRAPDUMP_FLAGS@
-
-# Some modules don't build cleanly yet.
-memory.o sem.o: SIM_WERROR_CFLAGS =
-
## COMMON_POST_CONFIG_FRAG
arch = frv
diff --git a/sim/frv/local.mk b/sim/frv/local.mk
index 2451235d238..a060a46ffa8 100644
--- a/sim/frv/local.mk
+++ b/sim/frv/local.mk
@@ -16,6 +16,12 @@
## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
+AM_CPPFLAGS_%C% = $(SIM_FRV_TRAPDUMP_FLAGS)
+
+## Some modules don't build cleanly yet.
+AM_CFLAGS_%C%_memory.o = -Wno-error
+AM_CFLAGS_%C%_sem.o = -Wno-error
+
%C%_libsim_a_SOURCES =
%C%_libsim_a_LIBADD = \
$(common_libcommon_a_OBJECTS) \
@@ -57,9 +63,6 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h
noinst_LIBRARIES += %D%/libsim.a
-%D%/%.o: %D%/%.c
- $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
-
%D%/%.o: common/%.c
$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-01-10 6:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-10 6:26 [binutils-gdb] sim: frv: move arch-specific file compilation to top-level Michael Frysinger
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).