From 1546cb45407f5228e8d4bdd948b7d0bc6c4d1b76 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 1 Jan 2023 14:16:58 -0500 Subject: [PATCH] sim: mips: 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 | 8 +++++--- sim/mips/local.mk | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index 0ef1950edf3..d26c8eb3def 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -2586,6 +2586,11 @@ testsuite_common_CPPFLAGS = \ @SIM_ENABLE_ARCH_microblaze_TRUE@ microblaze/libsim.a \ @SIM_ENABLE_ARCH_microblaze_TRUE@ $(SIM_COMMON_LIBS) +@SIM_ENABLE_ARCH_mips_TRUE@AM_CPPFLAGS_mips = \ +@SIM_ENABLE_ARCH_mips_TRUE@ @SIM_MIPS_SUBTARGET@ \ +@SIM_ENABLE_ARCH_mips_TRUE@ -DWITH_TARGET_WORD_BITSIZE=@SIM_MIPS_BITSIZE@ -DWITH_TARGET_WORD_MSB=WITH_TARGET_WORD_BITSIZE-1 \ +@SIM_ENABLE_ARCH_mips_TRUE@ -DWITH_FLOATING_POINT=HARD_FLOATING_POINT -DWITH_TARGET_FLOATING_POINT_BITSIZE=@SIM_MIPS_FPU_BITSIZE@ + @SIM_ENABLE_ARCH_mips_TRUE@mips_GEN_OBJ = $(am__append_88) \ @SIM_ENABLE_ARCH_mips_TRUE@ $(am__append_89) $(am__append_90) @SIM_ENABLE_ARCH_mips_TRUE@mips_libsim_a_SOURCES = @@ -5089,9 +5094,6 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_microblaze_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) @SIM_ENABLE_ARCH_mips_TRUE@$(mips_libsim_a_OBJECTS) $(mips_libsim_a_LIBADD): mips/hw-config.h -@SIM_ENABLE_ARCH_mips_TRUE@mips/%.o: mips/%.c -@SIM_ENABLE_ARCH_mips_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) - @SIM_ENABLE_ARCH_mips_TRUE@mips/%.o: common/%.c @SIM_ENABLE_ARCH_mips_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) @SIM_ENABLE_ARCH_mips_TRUE@mips/modules.c: | $(mips_BUILD_OUTPUTS) diff --git a/sim/mips/local.mk b/sim/mips/local.mk index f255ffca611..c25e50b1d65 100644 --- a/sim/mips/local.mk +++ b/sim/mips/local.mk @@ -16,6 +16,11 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . +AM_CPPFLAGS_%C% = \ + @SIM_MIPS_SUBTARGET@ \ + -DWITH_TARGET_WORD_BITSIZE=@SIM_MIPS_BITSIZE@ -DWITH_TARGET_WORD_MSB=WITH_TARGET_WORD_BITSIZE-1 \ + -DWITH_FLOATING_POINT=HARD_FLOATING_POINT -DWITH_TARGET_FLOATING_POINT_BITSIZE=@SIM_MIPS_FPU_BITSIZE@ + %C%_GEN_OBJ = if SIM_MIPS_GEN_MODE_SINGLE %C%_GEN_OBJ += \ @@ -69,9 +74,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