From cd7aa21771c75387148d52e6bbc6adfd911db10e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 1 Jan 2023 14:12:55 -0500 Subject: sim: m32c: 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/m32c/Makefile.in | 3 --- sim/m32c/local.mk | 5 ++--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 51e5423..7f35e2a 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -2425,6 +2425,7 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_lm32_TRUE@ lm32/mloop.c \ @SIM_ENABLE_ARCH_lm32_TRUE@ lm32/stamp-mloop +@SIM_ENABLE_ARCH_m32c_TRUE@AM_CPPFLAGS_m32c = -DTIMER_A @SIM_ENABLE_ARCH_m32c_TRUE@m32c_libsim_a_SOURCES = @SIM_ENABLE_ARCH_m32c_TRUE@m32c_libsim_a_LIBADD = \ @SIM_ENABLE_ARCH_m32c_TRUE@ $(common_libcommon_a_OBJECTS) \ @@ -4969,9 +4970,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_lm32_TRUE@lm32/cpu.h lm32/sem.c lm32/sem-switch.c lm32/model.c lm32/decode.c lm32/decode.h: @CGEN_MAINT@ lm32/cgen-cpu-decode @SIM_ENABLE_ARCH_m32c_TRUE@$(m32c_libsim_a_OBJECTS) $(m32c_libsim_a_LIBADD): m32c/hw-config.h -@SIM_ENABLE_ARCH_m32c_TRUE@m32c/%.o: m32c/%.c -@SIM_ENABLE_ARCH_m32c_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) - @SIM_ENABLE_ARCH_m32c_TRUE@m32c/%.o: common/%.c @SIM_ENABLE_ARCH_m32c_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) @SIM_ENABLE_ARCH_m32c_TRUE@m32c/modules.c: | $(m32c_BUILD_OUTPUTS) diff --git a/sim/m32c/Makefile.in b/sim/m32c/Makefile.in index 4c91e57..02d2043 100644 --- a/sim/m32c/Makefile.in +++ b/sim/m32c/Makefile.in @@ -19,7 +19,4 @@ ### along with this program. If not, see . ## COMMON_PRE_CONFIG_FRAG - -SIM_EXTRA_CFLAGS = -DTIMER_A - ## COMMON_POST_CONFIG_FRAG diff --git a/sim/m32c/local.mk b/sim/m32c/local.mk index 5633240..e992b01 100644 --- a/sim/m32c/local.mk +++ b/sim/m32c/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% = -DTIMER_A + %C%_libsim_a_SOURCES = %C%_libsim_a_LIBADD = \ $(common_libcommon_a_OBJECTS) \ @@ -35,9 +37,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) -- cgit v1.1