From 8f5fc30fcf1482c9fe93eb1860e4bb4f2155c81d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 1 Jan 2023 14:25:08 -0500 Subject: [PATCH] sim: v850: move arch-specific file compilation to top-level The arch-specific compiler flags are duplicated, but they'll be cleaned up once we move all subdir compiles to the top-level. --- sim/Makefile.in | 4 +--- sim/v850/local.mk | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 77198ecd5ba..92ab8b1adae 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -2911,6 +2911,7 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_sh_TRUE@ sh/table.c @SIM_ENABLE_ARCH_sh_TRUE@sh_gencode_SOURCES = sh/gencode.c +@SIM_ENABLE_ARCH_v850_TRUE@AM_CPPFLAGS_v850 = -DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31 @SIM_ENABLE_ARCH_v850_TRUE@v850_libsim_a_SOURCES = @SIM_ENABLE_ARCH_v850_TRUE@v850_libsim_a_LIBADD = \ @SIM_ENABLE_ARCH_v850_TRUE@ $(common_libcommon_a_OBJECTS) \ @@ -5437,9 +5438,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_sh_TRUE@ $(AM_V_GEN)$< -s >$@ @SIM_ENABLE_ARCH_v850_TRUE@$(v850_libsim_a_OBJECTS) $(v850_libsim_a_LIBADD): v850/hw-config.h -@SIM_ENABLE_ARCH_v850_TRUE@v850/%.o: v850/%.c -@SIM_ENABLE_ARCH_v850_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) - @SIM_ENABLE_ARCH_v850_TRUE@v850/%.o: common/%.c @SIM_ENABLE_ARCH_v850_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) @SIM_ENABLE_ARCH_v850_TRUE@v850/modules.c: | $(v850_BUILD_OUTPUTS) diff --git a/sim/v850/local.mk b/sim/v850/local.mk index 769c6030d6e..b044db1638f 100644 --- a/sim/v850/local.mk +++ b/sim/v850/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% = -DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31 + %C%_libsim_a_SOURCES = %C%_libsim_a_LIBADD = \ $(common_libcommon_a_OBJECTS) \ @@ -36,9 +38,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