From 3e3e7217b0dcdbd618816786bbcc7aa943e3999d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 1 Jan 2023 14:24:16 -0500 Subject: [PATCH] sim: rx: 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. --- sim/Makefile.in | 4 +--- sim/rx/Makefile.in | 3 --- sim/rx/local.mk | 5 ++--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index f19f245553b..6cae85c8038 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -2867,6 +2867,7 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_rl78_TRUE@ rl78/libsim.a \ @SIM_ENABLE_ARCH_rl78_TRUE@ $(SIM_COMMON_LIBS) +@SIM_ENABLE_ARCH_rx_TRUE@AM_CPPFLAGS_rx = $(SIM_RX_CYCLE_ACCURATE_FLAGS) @SIM_ENABLE_ARCH_rx_TRUE@rx_libsim_a_SOURCES = @SIM_ENABLE_ARCH_rx_TRUE@rx_libsim_a_LIBADD = \ @SIM_ENABLE_ARCH_rx_TRUE@ $(common_libcommon_a_OBJECTS) \ @@ -5410,9 +5411,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_rl78_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) @SIM_ENABLE_ARCH_rx_TRUE@$(rx_libsim_a_OBJECTS) $(rx_libsim_a_LIBADD): rx/hw-config.h -@SIM_ENABLE_ARCH_rx_TRUE@rx/%.o: rx/%.c -@SIM_ENABLE_ARCH_rx_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) - @SIM_ENABLE_ARCH_rx_TRUE@rx/%.o: common/%.c @SIM_ENABLE_ARCH_rx_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) @SIM_ENABLE_ARCH_sh_TRUE@$(sh_libsim_a_OBJECTS) $(sh_libsim_a_LIBADD): sh/hw-config.h diff --git a/sim/rx/Makefile.in b/sim/rx/Makefile.in index 0c4a1f6ab6b..da241390ab1 100644 --- a/sim/rx/Makefile.in +++ b/sim/rx/Makefile.in @@ -19,7 +19,4 @@ ### along with the GNU simulators; if not, see . ## COMMON_PRE_CONFIG_FRAG - -SIM_EXTRA_CFLAGS = @SIM_RX_CYCLE_ACCURATE_FLAGS@ - ## COMMON_POST_CONFIG_FRAG diff --git a/sim/rx/local.mk b/sim/rx/local.mk index c23ac4f8035..7115286a9b5 100644 --- a/sim/rx/local.mk +++ b/sim/rx/local.mk @@ -16,6 +16,8 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . +AM_CPPFLAGS_%C% = $(SIM_RX_CYCLE_ACCURATE_FLAGS) + %C%_libsim_a_SOURCES = %C%_libsim_a_LIBADD = \ $(common_libcommon_a_OBJECTS) \ @@ -34,9 +36,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) -- 2.30.2