From 688fba23d28aab026e0416d0758f395ad635da7a Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 1 Jan 2023 13:36:50 -0500 Subject: [PATCH] sim: arm: 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/arm/Makefile.in | 3 --- sim/arm/local.mk | 5 ++--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 69d085bc69c..34fff4a59f3 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -2011,6 +2011,7 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_aarch64_TRUE@ aarch64/libsim.a \ @SIM_ENABLE_ARCH_aarch64_TRUE@ $(SIM_COMMON_LIBS) +@SIM_ENABLE_ARCH_arm_TRUE@AM_CPPFLAGS_arm = -DMODET @SIM_ENABLE_ARCH_arm_TRUE@arm_libsim_a_SOURCES = @SIM_ENABLE_ARCH_arm_TRUE@arm_libsim_a_LIBADD = \ @SIM_ENABLE_ARCH_arm_TRUE@ $(common_libcommon_a_OBJECTS) \ @@ -4689,9 +4690,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_aarch64_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) @SIM_ENABLE_ARCH_arm_TRUE@$(arm_libsim_a_OBJECTS) $(arm_libsim_a_LIBADD): arm/hw-config.h -@SIM_ENABLE_ARCH_arm_TRUE@arm/%.o: arm/%.c -@SIM_ENABLE_ARCH_arm_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) - @SIM_ENABLE_ARCH_arm_TRUE@arm/%.o: common/%.c @SIM_ENABLE_ARCH_arm_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) @SIM_ENABLE_ARCH_avr_TRUE@$(avr_libsim_a_OBJECTS) $(avr_libsim_a_LIBADD): avr/hw-config.h diff --git a/sim/arm/Makefile.in b/sim/arm/Makefile.in index 24e1525d669..43d124d0ca6 100644 --- a/sim/arm/Makefile.in +++ b/sim/arm/Makefile.in @@ -16,7 +16,4 @@ # along with this program. If not, see . ## COMMON_PRE_CONFIG_FRAG - -SIM_EXTRA_CFLAGS = -DMODET - ## COMMON_POST_CONFIG_FRAG diff --git a/sim/arm/local.mk b/sim/arm/local.mk index e3ce50fc81a..68a56e61692 100644 --- a/sim/arm/local.mk +++ b/sim/arm/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% = -DMODET + %C%_libsim_a_SOURCES = %C%_libsim_a_LIBADD = \ $(common_libcommon_a_OBJECTS) \ @@ -31,9 +33,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