From 4f2b181ecbcf53b75e0fb4dedaaf28499e0befb3 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 31 Oct 2021 00:28:44 -0400 Subject: [PATCH] sim: standardize move-if-change rules Use the srcroot path and make them all silent. --- sim/bpf/Makefile.in | 8 +- sim/common/Make-common.in | 8 +- sim/cris/Makefile.in | 12 +-- sim/frv/Makefile.in | 4 +- sim/iq2000/Makefile.in | 4 +- sim/lm32/Makefile.in | 4 +- sim/m32r/Makefile.in | 12 +-- sim/mips/Makefile.in | 174 ++++++++++++++++---------------------- sim/mn10300/Makefile.in | 30 +++---- sim/or1k/Makefile.in | 4 +- sim/ppc/Makefile.in | 56 ++++++------ sim/v850/Makefile.in | 30 +++---- 12 files changed, 158 insertions(+), 188 deletions(-) diff --git a/sim/bpf/Makefile.in b/sim/bpf/Makefile.in index 3188ab1b0c2..c33096b232e 100644 --- a/sim/bpf/Makefile.in +++ b/sim/bpf/Makefile.in @@ -169,8 +169,8 @@ stamp-mloop-le: $(srcdir)/../common/genmloop.sh mloop.in Makefile $(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ -mono -scache -prefix bpfbf_ebpfle -cpu bpfbf \ -infile $(srcdir)/mloop.in -outfile-suffix -le - $(SHELL) $(srcroot)/move-if-change eng-le.hin eng-le.h - $(SHELL) $(srcroot)/move-if-change mloop-le.cin mloop-le.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change eng-le.hin eng-le.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change mloop-le.cin mloop-le.c touch $@ mloop-le.c eng-le.h: stamp-mloop-le @true @@ -179,8 +179,8 @@ stamp-mloop-be: $(srcdir)/../common/genmloop.sh mloop.in Makefile $(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ -mono -scache -prefix bpfbf_ebpfbe -cpu bpfbf \ -infile $(srcdir)/mloop.in -outfile-suffix -be - $(SHELL) $(srcroot)/move-if-change eng-be.hin eng-be.h - $(SHELL) $(srcroot)/move-if-change mloop-be.cin mloop-be.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change eng-be.hin eng-be.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change mloop-be.cin mloop-be.c touch $@ mloop-be.c eng-be.h: stamp-mloop-be @true diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index c9ea08f3ccb..a9bddb6e680 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -263,9 +263,9 @@ targ-vals.h targ-map.c: stamp-tvals stamp-tvals: gentmap rm -f tmp-tvals.h tmp-tmap.c ./gentmap -h >tmp-tvals.h - $(SHELL) $(srcroot)/move-if-change tmp-tvals.h targ-vals.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-tvals.h targ-vals.h ./gentmap -c >tmp-tmap.c - $(SHELL) $(srcroot)/move-if-change tmp-tmap.c targ-map.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-tmap.c targ-map.c touch stamp-tvals # @@ -424,7 +424,7 @@ stamp-hw: Makefile.in $(srccom)/Make-common.in $(config.status) Makefile done >> tmp-hw.h echo " NULL," >> tmp-hw.h echo "};" >> tmp-hw.h - $(SHELL) $(srcroot)/move-if-change tmp-hw.h hw-config.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-hw.h hw-config.h @echo stamp > stamp-hw test-hw-events: $(srccom)/hw-events.c libsim.a @@ -449,7 +449,7 @@ stamp-modules: Makefile $(SIM_OBJS:.o=.c) echo '};'; \ echo 'const int sim_modules_detected_len = ARRAY_SIZE (sim_modules_detected);'; \ ) >$@.tmp - $(SHELL) $(srcroot)/move-if-change $@.tmp modules.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change $@.tmp modules.c @rm -f $@.l-tmp $@.tmp touch $@ diff --git a/sim/cris/Makefile.in b/sim/cris/Makefile.in index 5bf07693007..c6e134b5616 100644 --- a/sim/cris/Makefile.in +++ b/sim/cris/Makefile.in @@ -73,8 +73,8 @@ stamp-v10fmloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile $(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ -mono -no-fast -pbb -switch semcrisv10f-switch.c \ -cpu crisv10f -infile $(srcdir)/mloop.in - $(SHELL) $(srcroot)/move-if-change eng.hin engv10.h - $(SHELL) $(srcroot)/move-if-change mloop.cin mloopv10f.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change eng.hin engv10.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change mloop.cin mloopv10f.c touch stamp-v10fmloop # CRISV32 objs @@ -92,8 +92,8 @@ stamp-v32fmloop: stamp-v10fmloop $(srcdir)/../common/genmloop.sh mloop.in Makefi $(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ -mono -no-fast -pbb -switch semcrisv32f-switch.c \ -cpu crisv32f -infile $(srcdir)/mloop.in - $(SHELL) $(srcroot)/move-if-change eng.hin engv32.h - $(SHELL) $(srcroot)/move-if-change mloop.cin mloopv32f.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change eng.hin engv32.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change mloop.cin mloopv32f.c touch stamp-v32fmloop cris-clean: @@ -119,7 +119,7 @@ stamp-v10fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/cr $(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \ archfile=$(CPU_DIR)/cris.cpu \ cpu=crisv10f mach=crisv10 SUFFIX=v10 FLAGS="with-scache with-profile=fn" EXTRAFILES="$(CGEN_CPU_SEMSW)" - $(SHELL) $(srcroot)/move-if-change $(srcdir)/semv10-switch.c $(srcdir)/semcrisv10f-switch.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change $(srcdir)/semv10-switch.c $(srcdir)/semcrisv10f-switch.c touch stamp-v10fcpu cpuv10.h cpuv10.c semcrisv10f-switch.c modelv10.c decodev10.c decodev10.h: $(CGEN_MAINT) stamp-v10fcpu @@ -127,6 +127,6 @@ stamp-v32fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/cr $(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \ archfile=$(CPU_DIR)/cris.cpu \ cpu=crisv32f mach=crisv32 SUFFIX=v32 FLAGS="with-scache with-profile=fn" EXTRAFILES="$(CGEN_CPU_SEMSW)" - $(SHELL) $(srcroot)/move-if-change $(srcdir)/semv32-switch.c $(srcdir)/semcrisv32f-switch.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change $(srcdir)/semv32-switch.c $(srcdir)/semcrisv32f-switch.c touch stamp-v32fcpu cpuv32.h cpuv32.c semcrisv32f-switch.c modelv32.c decodev32.c decodev32.h: $(CGEN_MAINT) stamp-v32fcpu diff --git a/sim/frv/Makefile.in b/sim/frv/Makefile.in index 3a1bbab4e9a..fd8df139940 100644 --- a/sim/frv/Makefile.in +++ b/sim/frv/Makefile.in @@ -60,8 +60,8 @@ stamp-mloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile $(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ -mono -scache -parallel-generic-write -parallel-only \ -cpu frvbf -infile $(srcdir)/mloop.in - $(SHELL) $(srcroot)/move-if-change eng.hin eng.h - $(SHELL) $(srcroot)/move-if-change mloop.cin mloop.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change eng.hin eng.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change mloop.cin mloop.c touch stamp-mloop frv-clean: diff --git a/sim/iq2000/Makefile.in b/sim/iq2000/Makefile.in index 557db484b62..af0b918b118 100644 --- a/sim/iq2000/Makefile.in +++ b/sim/iq2000/Makefile.in @@ -60,8 +60,8 @@ stamp-mloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile $(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ -mono -fast -pbb -switch sem-switch.c \ -cpu iq2000bf -infile $(srcdir)/mloop.in - $(SHELL) $(srcroot)/move-if-change eng.hin eng.h - $(SHELL) $(srcroot)/move-if-change mloop.cin mloop.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change eng.hin eng.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change mloop.cin mloop.c touch stamp-mloop iq2000-clean: diff --git a/sim/lm32/Makefile.in b/sim/lm32/Makefile.in index bac9861ec53..465c7fe7870 100644 --- a/sim/lm32/Makefile.in +++ b/sim/lm32/Makefile.in @@ -41,8 +41,8 @@ stamp-mloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile $(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ -mono -fast -pbb -switch sem-switch.c \ -cpu lm32bf -infile $(srcdir)/mloop.in - $(SHELL) $(srcroot)/move-if-change eng.hin eng.h - $(SHELL) $(srcroot)/move-if-change mloop.cin mloop.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change eng.hin eng.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change mloop.cin mloop.c touch stamp-mloop lm32-clean: diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in index 8877edcf4ae..340c94636e0 100644 --- a/sim/m32r/Makefile.in +++ b/sim/m32r/Makefile.in @@ -62,8 +62,8 @@ stamp-mloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile $(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ -mono -fast -pbb -switch sem-switch.c \ -cpu m32rbf -infile $(srcdir)/mloop.in - $(SHELL) $(srcroot)/move-if-change eng.hin eng.h - $(SHELL) $(srcroot)/move-if-change mloop.cin mloop.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change eng.hin eng.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change mloop.cin mloop.c touch stamp-mloop # M32RX objs @@ -79,8 +79,8 @@ stamp-xmloop: $(srcdir)/../common/genmloop.sh mloopx.in Makefile -mono -no-fast -pbb -parallel-write -switch semx-switch.c \ -cpu m32rxf -infile $(srcdir)/mloopx.in \ -outfile-suffix x - $(SHELL) $(srcroot)/move-if-change engx.hin engx.h - $(SHELL) $(srcroot)/move-if-change mloopx.cin mloopx.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change engx.hin engx.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change mloopx.cin mloopx.c touch stamp-xmloop # M32R2 objs @@ -96,8 +96,8 @@ stamp-2mloop: $(srcdir)/../common/genmloop.sh mloop2.in Makefile -mono -no-fast -pbb -parallel-write -switch sem2-switch.c \ -cpu m32r2f -infile $(srcdir)/mloop2.in \ -outfile-suffix 2 - $(SHELL) $(srcroot)/move-if-change eng2.hin eng2.h - $(SHELL) $(srcroot)/move-if-change mloop2.cin mloop2.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change eng2.hin eng2.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change mloop2.cin mloop2.c touch stamp-2mloop m32r-clean: diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in index 11af6661842..0846f5b44d6 100644 --- a/sim/mips/Makefile.in +++ b/sim/mips/Makefile.in @@ -164,21 +164,21 @@ tmp-igen: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE) -n engine.h -he tmp-engine.h \ -n engine.c -e tmp-engine.c \ -n irun.c -r tmp-irun.c - $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h icache.h - $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c icache.c - $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h idecode.h - $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c idecode.c - $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h semantics.h - $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c semantics.c - $(SHELL) $(srcdir)/../../move-if-change tmp-model.h model.h - $(SHELL) $(srcdir)/../../move-if-change tmp-model.c model.c - $(SHELL) $(srcdir)/../../move-if-change tmp-support.h support.h - $(SHELL) $(srcdir)/../../move-if-change tmp-support.c support.c - $(SHELL) $(srcdir)/../../move-if-change tmp-itable.h itable.h - $(SHELL) $(srcdir)/../../move-if-change tmp-itable.c itable.c - $(SHELL) $(srcdir)/../../move-if-change tmp-engine.h engine.h - $(SHELL) $(srcdir)/../../move-if-change tmp-engine.c engine.c - $(SHELL) $(srcdir)/../../move-if-change tmp-irun.c irun.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.h icache.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.c icache.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.h idecode.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.c idecode.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.h semantics.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.c semantics.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.h model.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.c model.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.h support.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.c support.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-itable.h itable.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-itable.c itable.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-engine.h engine.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-engine.c engine.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-irun.c irun.c touch tmp-igen BUILT_SRC_FROM_M16 = \ @@ -232,16 +232,16 @@ tmp-m16: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE) -n m16_support.h -hf tmp-support.h \ -n m16_support.c -f tmp-support.c \ # - $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h m16_icache.h - $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c m16_icache.c - $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h m16_idecode.h - $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c m16_idecode.c - $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h m16_semantics.h - $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c m16_semantics.c - $(SHELL) $(srcdir)/../../move-if-change tmp-model.h m16_model.h - $(SHELL) $(srcdir)/../../move-if-change tmp-model.c m16_model.c - $(SHELL) $(srcdir)/../../move-if-change tmp-support.h m16_support.h - $(SHELL) $(srcdir)/../../move-if-change tmp-support.c m16_support.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.h m16_icache.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.c m16_icache.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.h m16_idecode.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.c m16_idecode.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.h m16_semantics.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.c m16_semantics.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.h m16_model.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.c m16_model.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.h m16_support.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.c m16_support.c $(IGEN_RUN) \ $(IGEN_TRACE) \ -I $(srcdir) \ @@ -267,18 +267,16 @@ tmp-m16: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE) -n m32_support.h -hf tmp-support.h \ -n m32_support.c -f tmp-support.c \ # - $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h m32_icache.h - $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c m32_icache.c - $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h m32_idecode.h - $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c m32_idecode.c - $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h \ - m32_semantics.h - $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c \ - m32_semantics.c - $(SHELL) $(srcdir)/../../move-if-change tmp-model.h m32_model.h - $(SHELL) $(srcdir)/../../move-if-change tmp-model.c m32_model.c - $(SHELL) $(srcdir)/../../move-if-change tmp-support.h m32_support.h - $(SHELL) $(srcdir)/../../move-if-change tmp-support.c m32_support.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.h m32_icache.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.c m32_icache.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.h m32_idecode.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.c m32_idecode.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.h m32_semantics.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.c m32_semantics.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.h m32_model.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.c m32_model.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.h m32_support.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.c m32_support.c $(IGEN_RUN) \ $(IGEN_TRACE) \ -I $(srcdir) \ @@ -292,8 +290,8 @@ tmp-m16: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE) -n itable.h -ht tmp-itable.h \ -n itable.c -t tmp-itable.c \ # - $(SHELL) $(srcdir)/../../move-if-change tmp-itable.h itable.h - $(SHELL) $(srcdir)/../../move-if-change tmp-itable.c itable.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-itable.h itable.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-itable.c itable.c touch tmp-m16 BUILT_SRC_FROM_MICROMIPS = \ @@ -358,26 +356,16 @@ tmp-micromips: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE) -n micromips16_support.h -hf tmp-support.h \ -n micromips16_support.c -f tmp-support.c \ # - $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h \ - micromips16_icache.h - $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c \ - micromips16_icache.c - $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h \ - micromips16_idecode.h - $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c \ - micromips16_idecode.c - $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h \ - micromips16_semantics.h - $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c \ - micromips16_semantics.c - $(SHELL) $(srcdir)/../../move-if-change tmp-model.h \ - micromips16_model.h - $(SHELL) $(srcdir)/../../move-if-change tmp-model.c \ - micromips16_model.c - $(SHELL) $(srcdir)/../../move-if-change tmp-support.h \ - micromips16_support.h - $(SHELL) $(srcdir)/../../move-if-change tmp-support.c \ - micromips16_support.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.h micromips16_icache.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.c micromips16_icache.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.h micromips16_idecode.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.c micromips16_idecode.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.h micromips16_semantics.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.c micromips16_semantics.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.h micromips16_model.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.c micromips16_model.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.h micromips16_support.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.c micromips16_support.c $(IGEN_RUN) \ $(IGEN_TRACE) \ -I $(srcdir) \ @@ -403,26 +391,16 @@ tmp-micromips: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE) -n micromips32_support.h -hf tmp-support.h \ -n micromips32_support.c -f tmp-support.c \ # - $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h \ - micromips32_icache.h - $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c \ - micromips32_icache.c - $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h \ - micromips32_idecode.h - $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c \ - micromips32_idecode.c - $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h \ - micromips32_semantics.h - $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c \ - micromips32_semantics.c - $(SHELL) $(srcdir)/../../move-if-change tmp-model.h \ - micromips32_model.h - $(SHELL) $(srcdir)/../../move-if-change tmp-model.c \ - micromips32_model.c - $(SHELL) $(srcdir)/../../move-if-change tmp-support.h \ - micromips32_support.h - $(SHELL) $(srcdir)/../../move-if-change tmp-support.c \ - micromips32_support.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.h micromips32_icache.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.c micromips32_icache.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.h micromips32_idecode.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.c micromips32_idecode.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.h micromips32_semantics.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.c micromips32_semantics.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.h micromips32_model.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.c micromips32_model.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.h micromips32_support.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.c micromips32_support.c $(IGEN_RUN) \ $(IGEN_TRACE) \ -I $(srcdir) \ @@ -448,26 +426,16 @@ tmp-micromips: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE) -n micromips_m32_support.h -hf tmp-support.h \ -n micromips_m32_support.c -f tmp-support.c \ # - $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h \ - micromips_m32_icache.h - $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c \ - micromips_m32_icache.c - $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h \ - micromips_m32_idecode.h - $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c \ - micromips_m32_idecode.c - $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h \ - micromips_m32_semantics.h - $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c \ - micromips_m32_semantics.c - $(SHELL) $(srcdir)/../../move-if-change tmp-model.h \ - micromips_m32_model.h - $(SHELL) $(srcdir)/../../move-if-change tmp-model.c \ - micromips_m32_model.c - $(SHELL) $(srcdir)/../../move-if-change tmp-support.h \ - micromips_m32_support.h - $(SHELL) $(srcdir)/../../move-if-change tmp-support.c \ - micromips_m32_support.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.h micromips_m32_icache.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.c micromips_m32_icache.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.h micromips_m32_idecode.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.c micromips_m32_idecode.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.h micromips_m32_semantics.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.c micromips_m32_semantics.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.h micromips_m32_model.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.c micromips_m32_model.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.h micromips_m32_support.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.c micromips_m32_support.c $(IGEN_RUN) \ $(IGEN_TRACE) \ -I $(srcdir) \ @@ -481,8 +449,8 @@ tmp-micromips: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE) -n itable.h -ht tmp-itable.h \ -n itable.c -t tmp-itable.c \ # - $(SHELL) $(srcdir)/../../move-if-change tmp-itable.h itable.h - $(SHELL) $(srcdir)/../../move-if-change tmp-itable.c itable.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-itable.h itable.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-itable.c itable.c touch tmp-micromips BUILT_SRC_FROM_MULTI = @sim_multi_src@ @@ -575,8 +543,8 @@ tmp-itable-multi: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE) -n itable.h -ht tmp-itable.h \ -n itable.c -t tmp-itable.c \ # - $(SHELL) $(srcdir)/../../move-if-change tmp-itable.h itable.h - $(SHELL) $(srcdir)/../../move-if-change tmp-itable.c itable.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-itable.h itable.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-itable.c itable.c touch tmp-itable-multi tmp-run-multi: $(srcdir)/m16run.c $(srcdir)/micromipsrun.c for t in $(SIM_MULTI_IGEN_CONFIGS); do \ diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in index 968378cafe6..5e75601a8ec 100644 --- a/sim/mn10300/Makefile.in +++ b/sim/mn10300/Makefile.in @@ -89,19 +89,19 @@ tmp-igen: $(IGEN_INSN) $(IGEN_INSN_INC) $(IGEN_DC) $(IGEN) -n engine.h -he tmp-engine.h \ -n engine.c -e tmp-engine.c \ -n irun.c -r tmp-irun.c - $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h icache.h - $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c icache.c - $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h idecode.h - $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c idecode.c - $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h semantics.h - $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c semantics.c - $(SHELL) $(srcdir)/../../move-if-change tmp-model.h model.h - $(SHELL) $(srcdir)/../../move-if-change tmp-model.c model.c - $(SHELL) $(srcdir)/../../move-if-change tmp-support.h support.h - $(SHELL) $(srcdir)/../../move-if-change tmp-support.c support.c - $(SHELL) $(srcdir)/../../move-if-change tmp-itable.h itable.h - $(SHELL) $(srcdir)/../../move-if-change tmp-itable.c itable.c - $(SHELL) $(srcdir)/../../move-if-change tmp-engine.h engine.h - $(SHELL) $(srcdir)/../../move-if-change tmp-engine.c engine.c - $(SHELL) $(srcdir)/../../move-if-change tmp-irun.c irun.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.h icache.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.c icache.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.h idecode.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.c idecode.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.h semantics.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.c semantics.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.h model.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.c model.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.h support.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.c support.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-itable.h itable.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-itable.c itable.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-engine.h engine.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-engine.c engine.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-irun.c irun.c touch tmp-igen diff --git a/sim/or1k/Makefile.in b/sim/or1k/Makefile.in index 499b3508cef..6d399de53fc 100644 --- a/sim/or1k/Makefile.in +++ b/sim/or1k/Makefile.in @@ -75,8 +75,8 @@ stamp-mloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile $(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ -mono -fast -pbb -switch sem-switch.c \ -cpu or1k32bf -infile $(srcdir)/mloop.in - $(SHELL) $(srcroot)/move-if-change eng.hin eng.h - $(SHELL) $(srcroot)/move-if-change mloop.cin mloop.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change eng.hin eng.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change mloop.cin mloop.c touch stamp-mloop or1k.o: or1k.c $(OR1K32BF_INCLUDE_DEPS) $(COMPILE) $< diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index c230f29d688..4cc0916fbad 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -25,6 +25,8 @@ srccom = $(srcdir)/../common srcroot = $(srcdir)/../.. srcsim = $(srcdir)/.. +include $(srcroot)/gdb/silent-rules.mk + # Helper code from gnulib. GNULIB_PARENT_DIR = ../.. include $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc @@ -602,20 +604,20 @@ gentmap: $(srcdir)/../common/gentmap.c Makefile targ-vals.def targ-vals.def: $(srcdir)/../common/nltvals.def rm -f targ-vals.def tmp-def cat $(srcdir)/../common/nltvals.def > tmp-vals.def - $(SHELL) $(srcdir)/../../move-if-change tmp-vals.def targ-vals.def + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-vals.def targ-vals.def targ-vals.h: stamp-vals ; @true -stamp-vals: Makefile gentmap $(srcdir)/../../move-if-change +stamp-vals: Makefile gentmap $(srcroot)/move-if-change rm -f tmp-vals.h ./gentmap -h > tmp-vals.h - $(SHELL) $(srcdir)/../../move-if-change tmp-vals.h targ-vals.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-vals.h targ-vals.h @echo stamp > stamp-vals targ-map.c: stamp-map; @true -stamp-map: Makefile gentmap $(srcdir)/../../move-if-change +stamp-map: Makefile gentmap $(srcroot)/move-if-change rm -f tmp-map.c ./gentmap -c > tmp-map.c - $(SHELL) $(srcdir)/../../move-if-change tmp-map.c targ-map.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-map.c targ-map.c @echo stamp > stamp-map callback.o: $(srcdir)/../common/callback.c $(TARG_VALS_H) $(CONFIG_H) @@ -633,23 +635,23 @@ options.o: options.c $(CPU_H) $(OPTIONS_H) $(DEFINES_H) $(BASICS_H) $(IDECODE_H) defines.h: tmp-defines; @true tmp-defines: config.h Makefile sed -n -e '/^#define HAVE_/s/ 1$$/",/' -e '/^#define HAVE_/s//"HAVE_/p' < config.h > tmp-defines.h - $(SHELL) $(srcdir)/../../move-if-change tmp-defines.h defines.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-defines.h defines.h touch tmp-defines # # Rules to create the built c source code files # -tmp-dgen: dgen ppc-spr-table $(srcdir)/../../move-if-change +tmp-dgen: dgen ppc-spr-table $(srcroot)/move-if-change $(DGEN) $(DGEN_FLAGS) \ -r $(srcdir)/ppc-spr-table \ -n spreg.h -hp tmp-spreg.h \ -n spreg.c -p tmp-spreg.c - $(SHELL) $(srcdir)/../../move-if-change tmp-spreg.h spreg.h - $(SHELL) $(srcdir)/../../move-if-change tmp-spreg.c spreg.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-spreg.h spreg.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-spreg.c spreg.c touch tmp-dgen -tmp-igen: igen $(srcdir)/ppc-instructions $(srcdir)/altivec.igen $(srcdir)/e500.igen $(IGEN_OPCODE_RULES) $(srcdir)/../../move-if-change tmp-ld-decode tmp-ld-cache tmp-ld-insn tmp-filter +tmp-igen: igen $(srcdir)/ppc-instructions $(srcdir)/altivec.igen $(srcdir)/e500.igen $(IGEN_OPCODE_RULES) $(srcroot)/move-if-change tmp-ld-decode tmp-ld-cache tmp-ld-insn tmp-filter $(IGEN) $(IGEN_FLAGS) \ -o $(srcdir)/$(IGEN_OPCODE_RULES) \ -I $(srcdir) -i $(srcdir)/ppc-instructions \ @@ -665,18 +667,18 @@ tmp-igen: igen $(srcdir)/ppc-instructions $(srcdir)/altivec.igen $(srcdir)/e500. -n model.c -m tmp-model.c \ -n support.h -hf tmp-support.h \ -n support.c -f tmp-support.c - $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h icache.h - $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c icache.c - $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h idecode.h - $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c idecode.c - $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h semantics.h - $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c semantics.c - $(SHELL) $(srcdir)/../../move-if-change tmp-itable.h itable.h - $(SHELL) $(srcdir)/../../move-if-change tmp-itable.c itable.c - $(SHELL) $(srcdir)/../../move-if-change tmp-model.h model.h - $(SHELL) $(srcdir)/../../move-if-change tmp-model.c model.c - $(SHELL) $(srcdir)/../../move-if-change tmp-support.h support.h - $(SHELL) $(srcdir)/../../move-if-change tmp-support.c support.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.h icache.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.c icache.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.h idecode.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.c idecode.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.h semantics.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.c semantics.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-itable.h itable.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-itable.c itable.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.h model.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.c model.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.h support.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.c support.c touch tmp-igen # NOTE: Some versions of make don't handle files created as side-effects @@ -755,7 +757,7 @@ misc.o: misc.c $(CONFIG_H) $(MISC_H) # real hardware hw.c hw.h: tmp-hw; @true -tmp-hw: Makefile $(HW_SRC) $(srcdir)/../../move-if-change +tmp-hw: Makefile $(HW_SRC) $(srcroot)/move-if-change # The first for loop is to remove duplicates. f=""; \ for i in $(HW_SRC) ; do \ @@ -781,8 +783,8 @@ tmp-hw: Makefile $(HW_SRC) $(srcdir)/../../move-if-change -e 's/^/ /' \ -e 's/$$/_device_descriptor,/' \ > tmp-hw.c - $(SHELL) $(srcdir)/../../move-if-change tmp-hw.h hw.h - $(SHELL) $(srcdir)/../../move-if-change tmp-hw.c hw.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-hw.h hw.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-hw.c hw.c touch tmp-hw hw_cpu.o: hw_cpu.c $(DEVICE_TABLE_H) $(HW_CPU_H) $(INTERRUPTS_H) $(CPU_H) @@ -811,7 +813,7 @@ hw_vm.o: hw_vm.c $(DEVICE_TABLE_H) $(CPU_H) # real packages pk.h: tmp-pk; @true -tmp-pk: Makefile $(PACKAGE_SRC) $(srcdir)/../../move-if-change +tmp-pk: Makefile $(PACKAGE_SRC) $(srcroot)/move-if-change # The first for loop is to remove duplicates. f=""; \ for i in $(PACKAGE_SRC) ; do \ @@ -825,7 +827,7 @@ tmp-pk: Makefile $(PACKAGE_SRC) $(srcdir)/../../move-if-change -e 's/^/extern package_create_instance_callback pk_/' \ -e 's/$$/_create_instance;/' \ > tmp-pk.h - $(SHELL) $(srcdir)/../../move-if-change tmp-pk.h pk.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-pk.h pk.h touch tmp-pk pk_disklabel.o: pk_disklabel.c $(DEVICE_TABLE_H) $(PK_H) diff --git a/sim/v850/Makefile.in b/sim/v850/Makefile.in index 2cee51fc4e5..b514430ef8b 100644 --- a/sim/v850/Makefile.in +++ b/sim/v850/Makefile.in @@ -87,21 +87,21 @@ tmp-igen: $(IGEN_INSN) $(IGEN_DC) $(IGEN) -n engine.h -he tmp-engine.h \ -n engine.c -e tmp-engine.c \ -n irun.c -r tmp-irun.c - $(SHELL) $(srcdir)/../../move-if-change tmp-icache.h icache.h - $(SHELL) $(srcdir)/../../move-if-change tmp-icache.c icache.c - $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.h idecode.h - $(SHELL) $(srcdir)/../../move-if-change tmp-idecode.c idecode.c - $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.h semantics.h - $(SHELL) $(srcdir)/../../move-if-change tmp-semantics.c semantics.c - $(SHELL) $(srcdir)/../../move-if-change tmp-model.h model.h - $(SHELL) $(srcdir)/../../move-if-change tmp-model.c model.c - $(SHELL) $(srcdir)/../../move-if-change tmp-support.h support.h - $(SHELL) $(srcdir)/../../move-if-change tmp-support.c support.c - $(SHELL) $(srcdir)/../../move-if-change tmp-itable.h itable.h - $(SHELL) $(srcdir)/../../move-if-change tmp-itable.c itable.c - $(SHELL) $(srcdir)/../../move-if-change tmp-engine.h engine.h - $(SHELL) $(srcdir)/../../move-if-change tmp-engine.c engine.c - $(SHELL) $(srcdir)/../../move-if-change tmp-irun.c irun.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.h icache.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-icache.c icache.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.h idecode.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-idecode.c idecode.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.h semantics.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-semantics.c semantics.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.h model.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.c model.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.h support.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.c support.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-itable.h itable.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-itable.c itable.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-engine.h engine.h + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-engine.c engine.c + $(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-irun.c irun.c touch tmp-igen clean-extra: clean-igen -- 2.30.2