From b36a89d135a85ee0c41620b1dd47625c7cbf26ab Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 1 Jan 2023 14:55:09 -0500 Subject: [PATCH] sim: move arch-specific file compilation of common/ files to top-level --- sim/Makefile.am | 8 +++ sim/Makefile.in | 129 ++++++++++++++++++----------------- sim/aarch64/local.mk | 4 +- sim/arm/local.mk | 4 +- sim/avr/local.mk | 4 +- sim/bfin/local.mk | 4 +- sim/bpf/local.mk | 4 +- sim/cr16/local.mk | 4 +- sim/cris/local.mk | 4 +- sim/d10v/local.mk | 4 +- sim/erc32/local.mk | 4 +- sim/example-synacor/local.mk | 4 +- sim/frv/local.mk | 4 +- sim/ft32/local.mk | 4 +- sim/h8300/local.mk | 4 +- sim/iq2000/local.mk | 4 +- sim/lm32/local.mk | 4 +- sim/m32c/local.mk | 4 +- sim/m32r/local.mk | 4 +- sim/m68hc11/local.mk | 4 +- sim/mcore/local.mk | 4 +- sim/microblaze/local.mk | 4 +- sim/mips/local.mk | 4 +- sim/mn10300/local.mk | 4 +- sim/moxie/local.mk | 4 +- sim/msp430/local.mk | 4 +- sim/or1k/local.mk | 4 +- sim/pru/local.mk | 4 +- sim/riscv/local.mk | 4 +- sim/rl78/local.mk | 4 +- sim/rx/local.mk | 4 +- sim/sh/local.mk | 4 +- sim/v850/local.mk | 4 +- 33 files changed, 137 insertions(+), 124 deletions(-) diff --git a/sim/Makefile.am b/sim/Makefile.am index 3c46925976f..fa646ab1b05 100644 --- a/sim/Makefile.am +++ b/sim/Makefile.am @@ -93,6 +93,14 @@ pkginclude_HEADERS += \ $(srcroot)/include/sim/sim.h endif +## Used for our custom rules to calculate the dependency output base name. +## This form aligns with Automake's default rules. +SIM_DEPBASE = $(@D)/$(DEPDIR)/$(@F:.o=) +## Actual full compile command like Automake's default rules. +SIM_COMPILE = \ + $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(SIM_DEPBASE).Tpo -c -o $@ $< && \ + $(am__mv) $(SIM_DEPBASE).Tpo $(SIM_DEPBASE).Po + include common/local.mk if SIM_ENABLE_IGEN include igen/local.mk diff --git a/sim/Makefile.in b/sim/Makefile.in index 92ab8b1adae..099bfd56b98 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -1825,6 +1825,11 @@ SIM_ALL_RECURSIVE_DEPS = common/libcommon.a \ SIM_INSTALL_DATA_LOCAL_DEPS = SIM_INSTALL_EXEC_LOCAL_DEPS = $(am__append_43) SIM_UNINSTALL_LOCAL_DEPS = $(am__append_44) +SIM_DEPBASE = $(@D)/$(DEPDIR)/$(@F:.o=) +SIM_COMPILE = \ + $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(SIM_DEPBASE).Tpo -c -o $@ $< && \ + $(am__mv) $(SIM_DEPBASE).Tpo $(SIM_DEPBASE).Po + AM_CPPFLAGS_common = -DSIM_COMMON_BUILD common_libcommon_a_SOURCES = \ common/callback.c \ @@ -4733,20 +4738,20 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo $(AM_V_at)mv $@.tmp $@ @SIM_ENABLE_ARCH_aarch64_TRUE@$(aarch64_libsim_a_OBJECTS) $(aarch64_libsim_a_LIBADD): aarch64/hw-config.h -@SIM_ENABLE_ARCH_aarch64_TRUE@aarch64/%.o: common/%.c -@SIM_ENABLE_ARCH_aarch64_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_aarch64_TRUE@aarch64/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_aarch64_TRUE@-@am__include@ aarch64/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_arm_TRUE@$(arm_libsim_a_OBJECTS) $(arm_libsim_a_LIBADD): arm/hw-config.h -@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_arm_TRUE@arm/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_arm_TRUE@-@am__include@ arm/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_avr_TRUE@$(avr_libsim_a_OBJECTS) $(avr_libsim_a_LIBADD): avr/hw-config.h -@SIM_ENABLE_ARCH_avr_TRUE@avr/%.o: common/%.c -@SIM_ENABLE_ARCH_avr_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_avr_TRUE@avr/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_avr_TRUE@-@am__include@ avr/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_bfin_TRUE@$(bfin_libsim_a_OBJECTS) $(bfin_libsim_a_LIBADD): bfin/hw-config.h -@SIM_ENABLE_ARCH_bfin_TRUE@bfin/%.o: common/%.c -@SIM_ENABLE_ARCH_bfin_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_bfin_TRUE@bfin/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_bfin_TRUE@-@am__include@ bfin/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_bfin_TRUE@bfin/linux-fixed-code.h: @MAINT@ $(srcdir)/bfin/linux-fixed-code.s bfin/local.mk bfin/$(am__dirstamp) @SIM_ENABLE_ARCH_bfin_TRUE@ $(AM_V_GEN)$(AS_FOR_TARGET_BFIN) $(srcdir)/bfin/linux-fixed-code.s -o bfin/linux-fixed-code.o @@ -4767,8 +4772,8 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_bfin_TRUE@ $(AM_V_at)touch $(srcdir)/bfin/linux-fixed-code.h @SIM_ENABLE_ARCH_bpf_TRUE@$(bpf_libsim_a_OBJECTS) $(bpf_libsim_a_LIBADD): bpf/hw-config.h -@SIM_ENABLE_ARCH_bpf_TRUE@bpf/%.o: common/%.c -@SIM_ENABLE_ARCH_bpf_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_bpf_TRUE@bpf/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_bpf_TRUE@-@am__include@ bpf/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_bpf_TRUE@bpf/modules.c: | $(bpf_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_bpf_TRUE@bpf/mloop-le.c bpf/eng-le.h: bpf/stamp-mloop-le ; @true @@ -4819,8 +4824,8 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_bpf_TRUE@bpf/sem-be.c bpf/decode-be.c bpf/decode-be.h: @CGEN_MAINT@ bpf/cgen-decode-be @SIM_ENABLE_ARCH_cr16_TRUE@$(cr16_libsim_a_OBJECTS) $(cr16_libsim_a_LIBADD): cr16/hw-config.h -@SIM_ENABLE_ARCH_cr16_TRUE@cr16/%.o: common/%.c -@SIM_ENABLE_ARCH_cr16_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_cr16_TRUE@cr16/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_cr16_TRUE@-@am__include@ cr16/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_cr16_TRUE@cr16/modules.c: | $(cr16_BUILD_OUTPUTS) # These rules are copied from automake, but tweaked to use FOR_BUILD variables. @@ -4840,8 +4845,8 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_cr16_TRUE@ $(AM_V_GEN)$< >$@ @SIM_ENABLE_ARCH_cris_TRUE@$(cris_libsim_a_OBJECTS) $(cris_libsim_a_LIBADD): cris/hw-config.h -@SIM_ENABLE_ARCH_cris_TRUE@cris/%.o: common/%.c -@SIM_ENABLE_ARCH_cris_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_cris_TRUE@cris/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_cris_TRUE@-@am__include@ cris/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_cris_TRUE@cris/modules.c: | $(cris_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_cris_TRUE@cris/mloopv10f.c cris/engv10.h: cris/stamp-mloop-v10f ; @true @@ -4881,8 +4886,8 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_cris_TRUE@cris/cpuv32.h cris/cpuv32.c cris/semcrisv32f-switch.c cris/modelv32.c cris/decodev32.c cris/decodev32.h: @CGEN_MAINT@ cris/cgen-cpu-decode-v32f @SIM_ENABLE_ARCH_d10v_TRUE@$(d10v_libsim_a_OBJECTS) $(d10v_libsim_a_LIBADD): d10v/hw-config.h -@SIM_ENABLE_ARCH_d10v_TRUE@d10v/%.o: common/%.c -@SIM_ENABLE_ARCH_d10v_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_d10v_TRUE@d10v/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_d10v_TRUE@-@am__include@ d10v/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_d10v_TRUE@d10v/modules.c: | $(d10v_BUILD_OUTPUTS) # These rules are copied from automake, but tweaked to use FOR_BUILD variables. @@ -4902,8 +4907,8 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_d10v_TRUE@ $(AM_V_GEN)$< >$@ @SIM_ENABLE_ARCH_erc32_TRUE@$(erc32_libsim_a_OBJECTS) $(erc32_libsim_a_LIBADD): erc32/hw-config.h -@SIM_ENABLE_ARCH_erc32_TRUE@erc32/%.o: common/%.c -@SIM_ENABLE_ARCH_erc32_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_erc32_TRUE@erc32/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_erc32_TRUE@-@am__include@ erc32/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_erc32_TRUE@erc32/sis$(EXEEXT): erc32/run$(EXEEXT) @SIM_ENABLE_ARCH_erc32_TRUE@ $(AM_V_GEN)ln $< $@ 2>/dev/null || $(LN_S) $< $@ 2>/dev/null || cp -p $< $@ @@ -4915,12 +4920,12 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_erc32_TRUE@ rm -f $(DESTDIR)$(bindir)/sis @SIM_ENABLE_ARCH_examples_TRUE@$(example_synacor_libsim_a_OBJECTS) $(example_synacor_libsim_a_LIBADD): example-synacor/hw-config.h -@SIM_ENABLE_ARCH_examples_TRUE@example-synacor/%.o: common/%.c -@SIM_ENABLE_ARCH_examples_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_examples_TRUE@example-synacor/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_examples_TRUE@-@am__include@ example-synacor/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_frv_TRUE@$(frv_libsim_a_OBJECTS) $(frv_libsim_a_LIBADD): frv/hw-config.h -@SIM_ENABLE_ARCH_frv_TRUE@frv/%.o: common/%.c -@SIM_ENABLE_ARCH_frv_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_frv_TRUE@frv/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_frv_TRUE@-@am__include@ frv/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_frv_TRUE@frv/modules.c: | $(frv_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_frv_TRUE@frv/mloop.c frv/eng.h: frv/stamp-mloop ; @true @@ -4944,16 +4949,16 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_frv_TRUE@frv/cpu.h frv/sem.c frv/model.c frv/decode.c frv/decode.h: @CGEN_MAINT@ frv/cgen-cpu-decode @SIM_ENABLE_ARCH_ft32_TRUE@$(ft32_libsim_a_OBJECTS) $(ft32_libsim_a_LIBADD): ft32/hw-config.h -@SIM_ENABLE_ARCH_ft32_TRUE@ft32/%.o: common/%.c -@SIM_ENABLE_ARCH_ft32_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_ft32_TRUE@ft32/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_ft32_TRUE@-@am__include@ ft32/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_h8300_TRUE@$(h8300_libsim_a_OBJECTS) $(h8300_libsim_a_LIBADD): h8300/hw-config.h -@SIM_ENABLE_ARCH_h8300_TRUE@h8300/%.o: common/%.c -@SIM_ENABLE_ARCH_h8300_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_h8300_TRUE@h8300/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_h8300_TRUE@-@am__include@ h8300/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_iq2000_TRUE@$(iq2000_libsim_a_OBJECTS) $(iq2000_libsim_a_LIBADD): iq2000/hw-config.h -@SIM_ENABLE_ARCH_iq2000_TRUE@iq2000/%.o: common/%.c -@SIM_ENABLE_ARCH_iq2000_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_iq2000_TRUE@iq2000/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_iq2000_TRUE@-@am__include@ iq2000/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_iq2000_TRUE@iq2000/modules.c: | $(iq2000_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_iq2000_TRUE@iq2000/mloop.c iq2000/eng.h: iq2000/stamp-mloop ; @true @@ -4977,8 +4982,8 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_iq2000_TRUE@iq2000/cpu.h iq2000/sem.c iq2000/sem-switch.c iq2000/model.c iq2000/decode.c iq2000/decode.h: @CGEN_MAINT@ iq2000/cgen-cpu-decode @SIM_ENABLE_ARCH_lm32_TRUE@$(lm32_libsim_a_OBJECTS) $(lm32_libsim_a_LIBADD): lm32/hw-config.h -@SIM_ENABLE_ARCH_lm32_TRUE@lm32/%.o: common/%.c -@SIM_ENABLE_ARCH_lm32_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_lm32_TRUE@lm32/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_lm32_TRUE@-@am__include@ lm32/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_lm32_TRUE@lm32/modules.c: | $(lm32_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_lm32_TRUE@lm32/mloop.c lm32/eng.h: lm32/stamp-mloop ; @true @@ -5002,8 +5007,8 @@ 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: common/%.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_COMPILE) +@SIM_ENABLE_ARCH_m32c_TRUE@-@am__include@ m32c/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_m32c_TRUE@m32c/modules.c: | $(m32c_BUILD_OUTPUTS) # These rules are copied from automake, but tweaked to use FOR_BUILD variables. @@ -5023,8 +5028,8 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_m32c_TRUE@ $(AM_V_at)mv $@.tmp $@ @SIM_ENABLE_ARCH_m32r_TRUE@$(m32r_libsim_a_OBJECTS) $(m32r_libsim_a_LIBADD): m32r/hw-config.h -@SIM_ENABLE_ARCH_m32r_TRUE@m32r/%.o: common/%.c -@SIM_ENABLE_ARCH_m32r_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_m32r_TRUE@m32r/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_m32r_TRUE@-@am__include@ m32r/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_m32r_TRUE@m32r/modules.c: | $(m32r_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_m32r_TRUE@m32r/mloop.c m32r/eng.h: m32r/stamp-mloop ; @true @@ -5076,8 +5081,8 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_m32r_TRUE@m32r/cpu2.h m32r/sem2-switch.c m32r/model2.c m32r/decode2.c m32r/decode2.h: @CGEN_MAINT@ m32r/cgen-cpu-decode-2 @SIM_ENABLE_ARCH_m68hc11_TRUE@$(m68hc11_libsim_a_OBJECTS) $(m68hc11_libsim_a_LIBADD): m68hc11/hw-config.h -@SIM_ENABLE_ARCH_m68hc11_TRUE@m68hc11/%.o: common/%.c -@SIM_ENABLE_ARCH_m68hc11_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_m68hc11_TRUE@m68hc11/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_m68hc11_TRUE@-@am__include@ m68hc11/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_m68hc11_TRUE@m68hc11/modules.c: | $(m68hc11_BUILD_OUTPUTS) # These rules are copied from automake, but tweaked to use FOR_BUILD variables. @@ -5095,16 +5100,16 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_m68hc11_TRUE@ $(AM_V_GEN)$< -m6812 >$@ @SIM_ENABLE_ARCH_mcore_TRUE@$(mcore_libsim_a_OBJECTS) $(mcore_libsim_a_LIBADD): mcore/hw-config.h -@SIM_ENABLE_ARCH_mcore_TRUE@mcore/%.o: common/%.c -@SIM_ENABLE_ARCH_mcore_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_mcore_TRUE@mcore/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_mcore_TRUE@-@am__include@ mcore/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_microblaze_TRUE@$(microblaze_libsim_a_OBJECTS) $(microblaze_libsim_a_LIBADD): microblaze/hw-config.h -@SIM_ENABLE_ARCH_microblaze_TRUE@microblaze/%.o: common/%.c -@SIM_ENABLE_ARCH_microblaze_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_microblaze_TRUE@microblaze/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_microblaze_TRUE@-@am__include@ microblaze/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_mips_TRUE@$(mips_libsim_a_OBJECTS) $(mips_libsim_a_LIBADD): mips/hw-config.h -@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/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_mips_TRUE@-@am__include@ mips/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_mips_TRUE@mips/modules.c: | $(mips_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_mips_TRUE@$(mips_BUILT_SRC_FROM_IGEN_ITABLE): mips/stamp-igen-itable @@ -5306,8 +5311,8 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_mips_TRUE@ $(AM_V_at)touch $@ @SIM_ENABLE_ARCH_mn10300_TRUE@$(mn10300_libsim_a_OBJECTS) $(mn10300_libsim_a_LIBADD): mn10300/hw-config.h -@SIM_ENABLE_ARCH_mn10300_TRUE@mn10300/%.o: common/%.c -@SIM_ENABLE_ARCH_mn10300_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_mn10300_TRUE@mn10300/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_mn10300_TRUE@-@am__include@ mn10300/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_mn10300_TRUE@mn10300/modules.c: | $(mn10300_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_mn10300_TRUE@$(mn10300_BUILT_SRC_FROM_IGEN): mn10300/stamp-igen @@ -5339,8 +5344,8 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_mn10300_TRUE@ $(AM_V_at)touch $@ @SIM_ENABLE_ARCH_moxie_TRUE@$(moxie_libsim_a_OBJECTS) $(moxie_libsim_a_LIBADD): moxie/hw-config.h -@SIM_ENABLE_ARCH_moxie_TRUE@moxie/%.o: common/%.c -@SIM_ENABLE_ARCH_moxie_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_moxie_TRUE@moxie/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_moxie_TRUE@-@am__include@ moxie/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_moxie_TRUE@moxie/moxie-gdb.dtb: @MAINT@ moxie/moxie-gdb.dts moxie/$(am__dirstamp) @SIM_ENABLE_ARCH_moxie_TRUE@ $(AM_V_GEN) \ @@ -5355,12 +5360,12 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_moxie_TRUE@ fi @SIM_ENABLE_ARCH_msp430_TRUE@$(msp430_libsim_a_OBJECTS) $(msp430_libsim_a_LIBADD): msp430/hw-config.h -@SIM_ENABLE_ARCH_msp430_TRUE@msp430/%.o: common/%.c -@SIM_ENABLE_ARCH_msp430_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_msp430_TRUE@msp430/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_msp430_TRUE@-@am__include@ msp430/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_or1k_TRUE@$(or1k_libsim_a_OBJECTS) $(or1k_libsim_a_LIBADD): or1k/hw-config.h -@SIM_ENABLE_ARCH_or1k_TRUE@or1k/%.o: common/%.c -@SIM_ENABLE_ARCH_or1k_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_or1k_TRUE@or1k/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_or1k_TRUE@-@am__include@ or1k/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_or1k_TRUE@or1k/modules.c: | $(or1k_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_or1k_TRUE@or1k/mloop.c or1k/eng.h: or1k/stamp-mloop ; @true @@ -5400,24 +5405,24 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @SIM_ENABLE_ARCH_ppc_TRUE@ $(AM_V_at)touch $(srcdir)/ppc/spreg.h @SIM_ENABLE_ARCH_pru_TRUE@$(pru_libsim_a_OBJECTS) $(pru_libsim_a_LIBADD): pru/hw-config.h -@SIM_ENABLE_ARCH_pru_TRUE@pru/%.o: common/%.c -@SIM_ENABLE_ARCH_pru_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_pru_TRUE@pru/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_pru_TRUE@-@am__include@ pru/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_riscv_TRUE@$(riscv_libsim_a_OBJECTS) $(riscv_libsim_a_LIBADD): riscv/hw-config.h -@SIM_ENABLE_ARCH_riscv_TRUE@riscv/%.o: common/%.c -@SIM_ENABLE_ARCH_riscv_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_riscv_TRUE@riscv/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_riscv_TRUE@-@am__include@ riscv/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_rl78_TRUE@$(rl78_libsim_a_OBJECTS) $(rl78_libsim_a_LIBADD): rl78/hw-config.h -@SIM_ENABLE_ARCH_rl78_TRUE@rl78/%.o: common/%.c -@SIM_ENABLE_ARCH_rl78_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_rl78_TRUE@rl78/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_rl78_TRUE@-@am__include@ rl78/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_rx_TRUE@$(rx_libsim_a_OBJECTS) $(rx_libsim_a_LIBADD): rx/hw-config.h -@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_rx_TRUE@rx/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_rx_TRUE@-@am__include@ rx/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_sh_TRUE@$(sh_libsim_a_OBJECTS) $(sh_libsim_a_LIBADD): sh/hw-config.h -@SIM_ENABLE_ARCH_sh_TRUE@sh/%.o: common/%.c -@SIM_ENABLE_ARCH_sh_TRUE@ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +@SIM_ENABLE_ARCH_sh_TRUE@sh/%.o: common/%.c ; $(SIM_COMPILE) +@SIM_ENABLE_ARCH_sh_TRUE@-@am__include@ sh/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_sh_TRUE@sh/modules.c: | $(sh_BUILD_OUTPUTS) # These rules are copied from automake, but tweaked to use FOR_BUILD variables. @@ -5438,8 +5443,8 @@ 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: common/%.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_COMPILE) +@SIM_ENABLE_ARCH_v850_TRUE@-@am__include@ v850/$(DEPDIR)/*.Po @SIM_ENABLE_ARCH_v850_TRUE@v850/modules.c: | $(v850_BUILD_OUTPUTS) @SIM_ENABLE_ARCH_v850_TRUE@$(v850_BUILT_SRC_FROM_IGEN): v850/stamp-igen diff --git a/sim/aarch64/local.mk b/sim/aarch64/local.mk index bbd832de19d..10e814b49f9 100644 --- a/sim/aarch64/local.mk +++ b/sim/aarch64/local.mk @@ -31,8 +31,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/arm/local.mk b/sim/arm/local.mk index 68a56e61692..c172b5f2682 100644 --- a/sim/arm/local.mk +++ b/sim/arm/local.mk @@ -33,8 +33,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/avr/local.mk b/sim/avr/local.mk index 327a87f0a76..3cae5bf8483 100644 --- a/sim/avr/local.mk +++ b/sim/avr/local.mk @@ -27,8 +27,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/bfin/local.mk b/sim/bfin/local.mk index d3c5b17a82b..90b697e9dcb 100644 --- a/sim/bfin/local.mk +++ b/sim/bfin/local.mk @@ -35,8 +35,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/bpf/local.mk b/sim/bpf/local.mk index 580f744520c..5f559c93a02 100644 --- a/sim/bpf/local.mk +++ b/sim/bpf/local.mk @@ -52,8 +52,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/cr16/local.mk b/sim/cr16/local.mk index 7cdfc3fe67f..8d8d27f82e6 100644 --- a/sim/cr16/local.mk +++ b/sim/cr16/local.mk @@ -30,8 +30,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/cris/local.mk b/sim/cris/local.mk index 3950baed7a1..78f40e03ec4 100644 --- a/sim/cris/local.mk +++ b/sim/cris/local.mk @@ -47,8 +47,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/d10v/local.mk b/sim/d10v/local.mk index eb769bc0d9b..04dd763f57c 100644 --- a/sim/d10v/local.mk +++ b/sim/d10v/local.mk @@ -31,8 +31,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/erc32/local.mk b/sim/erc32/local.mk index 12aced4bafa..2361cf2eafc 100644 --- a/sim/erc32/local.mk +++ b/sim/erc32/local.mk @@ -39,8 +39,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/example-synacor/local.mk b/sim/example-synacor/local.mk index f1d4974be2a..37999807ba3 100644 --- a/sim/example-synacor/local.mk +++ b/sim/example-synacor/local.mk @@ -29,8 +29,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/frv/local.mk b/sim/frv/local.mk index a060a46ffa8..8c2a6158842 100644 --- a/sim/frv/local.mk +++ b/sim/frv/local.mk @@ -63,8 +63,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/ft32/local.mk b/sim/ft32/local.mk index b3eca03be7b..36081effabe 100644 --- a/sim/ft32/local.mk +++ b/sim/ft32/local.mk @@ -28,8 +28,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/h8300/local.mk b/sim/h8300/local.mk index af4ecc197bf..dca8084763d 100644 --- a/sim/h8300/local.mk +++ b/sim/h8300/local.mk @@ -28,8 +28,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/iq2000/local.mk b/sim/iq2000/local.mk index abc8b31a8ab..34589dbad88 100644 --- a/sim/iq2000/local.mk +++ b/sim/iq2000/local.mk @@ -41,8 +41,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/lm32/local.mk b/sim/lm32/local.mk index d61566ecb4e..f3e0567d73b 100644 --- a/sim/lm32/local.mk +++ b/sim/lm32/local.mk @@ -44,8 +44,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/m32c/local.mk b/sim/m32c/local.mk index e992b01d306..ad047f17b78 100644 --- a/sim/m32c/local.mk +++ b/sim/m32c/local.mk @@ -37,8 +37,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/m32r/local.mk b/sim/m32r/local.mk index 3ccfce79b09..31178a3b034 100644 --- a/sim/m32r/local.mk +++ b/sim/m32r/local.mk @@ -70,8 +70,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/m68hc11/local.mk b/sim/m68hc11/local.mk index 79350c8fc27..da4c25913d8 100644 --- a/sim/m68hc11/local.mk +++ b/sim/m68hc11/local.mk @@ -45,8 +45,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/mcore/local.mk b/sim/mcore/local.mk index 69cb043df96..dff8a684ef4 100644 --- a/sim/mcore/local.mk +++ b/sim/mcore/local.mk @@ -28,8 +28,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/microblaze/local.mk b/sim/microblaze/local.mk index 69cb043df96..dff8a684ef4 100644 --- a/sim/microblaze/local.mk +++ b/sim/microblaze/local.mk @@ -28,8 +28,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/mips/local.mk b/sim/mips/local.mk index c25e50b1d65..136eebaacaf 100644 --- a/sim/mips/local.mk +++ b/sim/mips/local.mk @@ -74,8 +74,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/mn10300/local.mk b/sim/mn10300/local.mk index 527d580804e..61c7f9188ea 100644 --- a/sim/mn10300/local.mk +++ b/sim/mn10300/local.mk @@ -41,8 +41,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/moxie/local.mk b/sim/moxie/local.mk index b75f0a9a8e3..4b7d2984f16 100644 --- a/sim/moxie/local.mk +++ b/sim/moxie/local.mk @@ -30,8 +30,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/msp430/local.mk b/sim/msp430/local.mk index 0d9e8c2147f..bb7afd30470 100644 --- a/sim/msp430/local.mk +++ b/sim/msp430/local.mk @@ -28,8 +28,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/or1k/local.mk b/sim/or1k/local.mk index 1294986a6d8..2a3b129c9fb 100644 --- a/sim/or1k/local.mk +++ b/sim/or1k/local.mk @@ -45,8 +45,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/pru/local.mk b/sim/pru/local.mk index 75f842a4689..0048199f6d3 100644 --- a/sim/pru/local.mk +++ b/sim/pru/local.mk @@ -28,8 +28,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/riscv/local.mk b/sim/riscv/local.mk index a77f6f74317..a3f232eea5e 100644 --- a/sim/riscv/local.mk +++ b/sim/riscv/local.mk @@ -32,8 +32,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/rl78/local.mk b/sim/rl78/local.mk index 13962a9e302..56161eae25a 100644 --- a/sim/rl78/local.mk +++ b/sim/rl78/local.mk @@ -30,8 +30,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/rx/local.mk b/sim/rx/local.mk index 7115286a9b5..3b1e199e68b 100644 --- a/sim/rx/local.mk +++ b/sim/rx/local.mk @@ -36,8 +36,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/sh/local.mk b/sim/sh/local.mk index 8bfbc0fa283..558a747d266 100644 --- a/sim/sh/local.mk +++ b/sim/sh/local.mk @@ -28,8 +28,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ diff --git a/sim/v850/local.mk b/sim/v850/local.mk index b044db1638f..62d3e82ff76 100644 --- a/sim/v850/local.mk +++ b/sim/v850/local.mk @@ -38,8 +38,8 @@ $(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h noinst_LIBRARIES += %D%/libsim.a -%D%/%.o: common/%.c - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) +%D%/%.o: common/%.c ; $(SIM_COMPILE) +-@am__include@ %D%/$(DEPDIR)/*.Po %C%_run_SOURCES = %C%_run_LDADD = \ -- 2.30.2