From 09d4e6bb2fe97ea03e881405c5e8960cd5fd3263 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 19 Dec 2023 19:54:13 -0500 Subject: [PATCH] sim: cgen: unify the genmloop logic a bit Pull out the common parts of the genmloop invocation into the common code. This will make it easier to add more, and make the per-port differences a little more obvious. --- sim/Makefile.in | 68 +++++++++++++++++++++++++---------------------------- sim/common/local.mk | 5 ++++ sim/cris/local.mk | 14 +++++------ sim/frv/local.mk | 7 +++--- sim/iq2000/local.mk | 7 +++--- sim/lm32/local.mk | 7 +++--- sim/m32r/local.mk | 21 +++++++---------- sim/or1k/local.mk | 7 +++--- 8 files changed, 64 insertions(+), 72 deletions(-) diff --git a/sim/Makefile.in b/sim/Makefile.in index b07641f..29ab8da 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -1925,6 +1925,11 @@ CGEN_GEN_CPU_DESC = \ $(@D) "$$FLAGS" $$cpu "$$isa" $$mach "$$SUFFIX" \ $(CGEN_ARCHFILE) ignored $$opcfile +CGEN_GEN_MLOOP = \ + $(SHELL) $(srccom)/genmloop.sh \ + -shell $(SHELL) \ + -infile $< -outfile-prefix $(@D)/ + # igen leaks memory, and therefore makes AddressSanitizer unhappy. Disable # leak detection while running it. @@ -4998,21 +5003,19 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @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 -@SIM_ENABLE_ARCH_cris_TRUE@cris/stamp-mloop-v10f: $(srccom)/genmloop.sh cris/mloop.in -@SIM_ENABLE_ARCH_cris_TRUE@ $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ +@SIM_ENABLE_ARCH_cris_TRUE@cris/stamp-mloop-v10f: cris/mloop.in $(srccom)/genmloop.sh +@SIM_ENABLE_ARCH_cris_TRUE@ $(AM_V_GEN)$(CGEN_GEN_MLOOP) \ @SIM_ENABLE_ARCH_cris_TRUE@ -mono -no-fast -pbb -switch semcrisv10f-switch.c \ -@SIM_ENABLE_ARCH_cris_TRUE@ -cpu crisv10f \ -@SIM_ENABLE_ARCH_cris_TRUE@ -infile $(srcdir)/cris/mloop.in -outfile-prefix cris/ -outfile-suffix -v10f +@SIM_ENABLE_ARCH_cris_TRUE@ -cpu crisv10f -outfile-suffix -v10f @SIM_ENABLE_ARCH_cris_TRUE@ $(AM_V_at)$(SHELL) $(srcroot)/move-if-change cris/eng-v10f.hin cris/engv10.h @SIM_ENABLE_ARCH_cris_TRUE@ $(AM_V_at)$(SHELL) $(srcroot)/move-if-change cris/mloop-v10f.cin cris/mloopv10f.c @SIM_ENABLE_ARCH_cris_TRUE@ $(AM_V_at)touch $@ @SIM_ENABLE_ARCH_cris_TRUE@cris/mloopv32f.c cris/engv32.h: cris/stamp-mloop-v32f ; @true -@SIM_ENABLE_ARCH_cris_TRUE@cris/stamp-mloop-v32f: $(srccom)/genmloop.sh cris/mloop.in -@SIM_ENABLE_ARCH_cris_TRUE@ $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ +@SIM_ENABLE_ARCH_cris_TRUE@cris/stamp-mloop-v32f: cris/mloop.in $(srccom)/genmloop.sh +@SIM_ENABLE_ARCH_cris_TRUE@ $(AM_V_GEN)$(CGEN_GEN_MLOOP) \ @SIM_ENABLE_ARCH_cris_TRUE@ -mono -no-fast -pbb -switch semcrisv32f-switch.c \ -@SIM_ENABLE_ARCH_cris_TRUE@ -cpu crisv32f \ -@SIM_ENABLE_ARCH_cris_TRUE@ -infile $(srcdir)/cris/mloop.in -outfile-prefix cris/ -outfile-suffix -v32f +@SIM_ENABLE_ARCH_cris_TRUE@ -cpu crisv32f -outfile-suffix -v32f @SIM_ENABLE_ARCH_cris_TRUE@ $(AM_V_at)$(SHELL) $(srcroot)/move-if-change cris/eng-v32f.hin cris/engv32.h @SIM_ENABLE_ARCH_cris_TRUE@ $(AM_V_at)$(SHELL) $(srcroot)/move-if-change cris/mloop-v32f.cin cris/mloopv32f.c @SIM_ENABLE_ARCH_cris_TRUE@ $(AM_V_at)touch $@ @@ -5087,11 +5090,10 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @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 -@SIM_ENABLE_ARCH_frv_TRUE@frv/stamp-mloop: $(srccom)/genmloop.sh frv/mloop.in -@SIM_ENABLE_ARCH_frv_TRUE@ $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ +@SIM_ENABLE_ARCH_frv_TRUE@frv/stamp-mloop: frv/mloop.in $(srccom)/genmloop.sh +@SIM_ENABLE_ARCH_frv_TRUE@ $(AM_V_GEN)$(CGEN_GEN_MLOOP) \ @SIM_ENABLE_ARCH_frv_TRUE@ -mono -scache -parallel-generic-write -parallel-only \ -@SIM_ENABLE_ARCH_frv_TRUE@ -cpu frvbf \ -@SIM_ENABLE_ARCH_frv_TRUE@ -infile $(srcdir)/frv/mloop.in -outfile-prefix frv/ +@SIM_ENABLE_ARCH_frv_TRUE@ -cpu frvbf @SIM_ENABLE_ARCH_frv_TRUE@ $(AM_V_at)$(SHELL) $(srcroot)/move-if-change frv/eng.hin frv/eng.h @SIM_ENABLE_ARCH_frv_TRUE@ $(AM_V_at)$(SHELL) $(srcroot)/move-if-change frv/mloop.cin frv/mloop.c @SIM_ENABLE_ARCH_frv_TRUE@ $(AM_V_at)touch $@ @@ -5127,11 +5129,10 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @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 -@SIM_ENABLE_ARCH_iq2000_TRUE@iq2000/stamp-mloop: $(srccom)/genmloop.sh iq2000/mloop.in -@SIM_ENABLE_ARCH_iq2000_TRUE@ $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ +@SIM_ENABLE_ARCH_iq2000_TRUE@iq2000/stamp-mloop: iq2000/mloop.in $(srccom)/genmloop.sh +@SIM_ENABLE_ARCH_iq2000_TRUE@ $(AM_V_GEN)$(CGEN_GEN_MLOOP) \ @SIM_ENABLE_ARCH_iq2000_TRUE@ -mono -fast -pbb -switch sem-switch.c \ -@SIM_ENABLE_ARCH_iq2000_TRUE@ -cpu iq2000bf \ -@SIM_ENABLE_ARCH_iq2000_TRUE@ -infile $(srcdir)/iq2000/mloop.in -outfile-prefix iq2000/ +@SIM_ENABLE_ARCH_iq2000_TRUE@ -cpu iq2000bf @SIM_ENABLE_ARCH_iq2000_TRUE@ $(AM_V_at)$(SHELL) $(srcroot)/move-if-change iq2000/eng.hin iq2000/eng.h @SIM_ENABLE_ARCH_iq2000_TRUE@ $(AM_V_at)$(SHELL) $(srcroot)/move-if-change iq2000/mloop.cin iq2000/mloop.c @SIM_ENABLE_ARCH_iq2000_TRUE@ $(AM_V_at)touch $@ @@ -5155,11 +5156,10 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @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 -@SIM_ENABLE_ARCH_lm32_TRUE@lm32/stamp-mloop: $(srccom)/genmloop.sh lm32/mloop.in -@SIM_ENABLE_ARCH_lm32_TRUE@ $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ +@SIM_ENABLE_ARCH_lm32_TRUE@lm32/stamp-mloop: lm32/mloop.in $(srccom)/genmloop.sh +@SIM_ENABLE_ARCH_lm32_TRUE@ $(AM_V_GEN)$(CGEN_GEN_MLOOP) \ @SIM_ENABLE_ARCH_lm32_TRUE@ -mono -fast -pbb -switch sem-switch.c \ -@SIM_ENABLE_ARCH_lm32_TRUE@ -cpu lm32bf \ -@SIM_ENABLE_ARCH_lm32_TRUE@ -infile $(srcdir)/lm32/mloop.in -outfile-prefix lm32/ +@SIM_ENABLE_ARCH_lm32_TRUE@ -cpu lm32bf @SIM_ENABLE_ARCH_lm32_TRUE@ $(AM_V_at)$(SHELL) $(srcroot)/move-if-change lm32/eng.hin lm32/eng.h @SIM_ENABLE_ARCH_lm32_TRUE@ $(AM_V_at)$(SHELL) $(srcroot)/move-if-change lm32/mloop.cin lm32/mloop.c @SIM_ENABLE_ARCH_lm32_TRUE@ $(AM_V_at)touch $@ @@ -5207,31 +5207,28 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @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 -@SIM_ENABLE_ARCH_m32r_TRUE@m32r/stamp-mloop: $(srccom)/genmloop.sh m32r/mloop.in -@SIM_ENABLE_ARCH_m32r_TRUE@ $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ +@SIM_ENABLE_ARCH_m32r_TRUE@m32r/stamp-mloop: m32r/mloop.in $(srccom)/genmloop.sh +@SIM_ENABLE_ARCH_m32r_TRUE@ $(AM_V_GEN)$(CGEN_GEN_MLOOP) \ @SIM_ENABLE_ARCH_m32r_TRUE@ -mono -fast -pbb -switch sem-switch.c \ -@SIM_ENABLE_ARCH_m32r_TRUE@ -cpu m32rbf \ -@SIM_ENABLE_ARCH_m32r_TRUE@ -infile $(srcdir)/m32r/mloop.in -outfile-prefix m32r/ +@SIM_ENABLE_ARCH_m32r_TRUE@ -cpu m32rbf @SIM_ENABLE_ARCH_m32r_TRUE@ $(AM_V_at)$(SHELL) $(srcroot)/move-if-change m32r/eng.hin m32r/eng.h @SIM_ENABLE_ARCH_m32r_TRUE@ $(AM_V_at)$(SHELL) $(srcroot)/move-if-change m32r/mloop.cin m32r/mloop.c @SIM_ENABLE_ARCH_m32r_TRUE@ $(AM_V_at)touch $@ @SIM_ENABLE_ARCH_m32r_TRUE@m32r/mloopx.c m32r/engx.h: m32r/stamp-mloop-x ; @true -@SIM_ENABLE_ARCH_m32r_TRUE@m32r/stamp-mloop-x: $(srccom)/genmloop.sh m32r/mloopx.in -@SIM_ENABLE_ARCH_m32r_TRUE@ $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ +@SIM_ENABLE_ARCH_m32r_TRUE@m32r/stamp-mloop-x: m32r/mloopx.in $(srccom)/genmloop.sh +@SIM_ENABLE_ARCH_m32r_TRUE@ $(AM_V_GEN)$(CGEN_GEN_MLOOP) \ @SIM_ENABLE_ARCH_m32r_TRUE@ -mono -no-fast -pbb -parallel-write -switch semx-switch.c \ -@SIM_ENABLE_ARCH_m32r_TRUE@ -cpu m32rxf \ -@SIM_ENABLE_ARCH_m32r_TRUE@ -infile $(srcdir)/m32r/mloopx.in -outfile-prefix m32r/ -outfile-suffix x +@SIM_ENABLE_ARCH_m32r_TRUE@ -cpu m32rxf -outfile-suffix x @SIM_ENABLE_ARCH_m32r_TRUE@ $(AM_V_at)$(SHELL) $(srcroot)/move-if-change m32r/engx.hin m32r/engx.h @SIM_ENABLE_ARCH_m32r_TRUE@ $(AM_V_at)$(SHELL) $(srcroot)/move-if-change m32r/mloopx.cin m32r/mloopx.c @SIM_ENABLE_ARCH_m32r_TRUE@ $(AM_V_at)touch $@ @SIM_ENABLE_ARCH_m32r_TRUE@m32r/mloop2.c m32r/eng2.h: m32r/stamp-mloop-2 ; @true -@SIM_ENABLE_ARCH_m32r_TRUE@m32r/stamp-mloop-2: $(srccom)/genmloop.sh m32r/mloop2.in -@SIM_ENABLE_ARCH_m32r_TRUE@ $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ +@SIM_ENABLE_ARCH_m32r_TRUE@m32r/stamp-mloop-2: m32r/mloop2.in $(srccom)/genmloop.sh +@SIM_ENABLE_ARCH_m32r_TRUE@ $(AM_V_GEN)$(CGEN_GEN_MLOOP) \ @SIM_ENABLE_ARCH_m32r_TRUE@ -mono -no-fast -pbb -parallel-write -switch sem2-switch.c \ -@SIM_ENABLE_ARCH_m32r_TRUE@ -cpu m32r2f \ -@SIM_ENABLE_ARCH_m32r_TRUE@ -infile $(srcdir)/m32r/mloop2.in -outfile-prefix m32r/ -outfile-suffix 2 +@SIM_ENABLE_ARCH_m32r_TRUE@ -cpu m32r2f -outfile-suffix 2 @SIM_ENABLE_ARCH_m32r_TRUE@ $(AM_V_at)$(SHELL) $(srcroot)/move-if-change m32r/eng2.hin m32r/eng2.h @SIM_ENABLE_ARCH_m32r_TRUE@ $(AM_V_at)$(SHELL) $(srcroot)/move-if-change m32r/mloop2.cin m32r/mloop2.c @SIM_ENABLE_ARCH_m32r_TRUE@ $(AM_V_at)touch $@ @@ -5563,11 +5560,10 @@ testsuite/common/bits64m63.c: testsuite/common/bits-gen$(EXEEXT) testsuite/commo @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 -@SIM_ENABLE_ARCH_or1k_TRUE@or1k/stamp-mloop: $(srccom)/genmloop.sh or1k/mloop.in -@SIM_ENABLE_ARCH_or1k_TRUE@ $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ +@SIM_ENABLE_ARCH_or1k_TRUE@or1k/stamp-mloop: or1k/mloop.in $(srccom)/genmloop.sh +@SIM_ENABLE_ARCH_or1k_TRUE@ $(AM_V_GEN)$(CGEN_GEN_MLOOP) \ @SIM_ENABLE_ARCH_or1k_TRUE@ -mono -fast -pbb -switch sem-switch.c \ -@SIM_ENABLE_ARCH_or1k_TRUE@ -cpu or1k32bf \ -@SIM_ENABLE_ARCH_or1k_TRUE@ -infile $(srcdir)/or1k/mloop.in -outfile-prefix or1k/ +@SIM_ENABLE_ARCH_or1k_TRUE@ -cpu or1k32bf @SIM_ENABLE_ARCH_or1k_TRUE@ $(AM_V_at)$(SHELL) $(srcroot)/move-if-change or1k/eng.hin or1k/eng.h @SIM_ENABLE_ARCH_or1k_TRUE@ $(AM_V_at)$(SHELL) $(srcroot)/move-if-change or1k/mloop.cin or1k/mloop.c @SIM_ENABLE_ARCH_or1k_TRUE@ $(AM_V_at)touch $@ diff --git a/sim/common/local.mk b/sim/common/local.mk index 08da227..8124910 100644 --- a/sim/common/local.mk +++ b/sim/common/local.mk @@ -232,3 +232,8 @@ CGEN_GEN_CPU_DESC = \ $(CGEN) $(cgendir) "$(CGENFLAGS)" \ $(@D) "$$FLAGS" $$cpu "$$isa" $$mach "$$SUFFIX" \ $(CGEN_ARCHFILE) ignored $$opcfile + +CGEN_GEN_MLOOP = \ + $(SHELL) $(srccom)/genmloop.sh \ + -shell $(SHELL) \ + -infile $< -outfile-prefix $(@D)/ diff --git a/sim/cris/local.mk b/sim/cris/local.mk index 66ebc99..011f802 100644 --- a/sim/cris/local.mk +++ b/sim/cris/local.mk @@ -91,11 +91,10 @@ BUILT_SOURCES += \ ## FIXME: What is mono and what does "Use of `mono' is wip" mean (other ## than the apparent; some "mono" feature is work in progress)? %D%/mloopv10f.c %D%/engv10.h: %D%/stamp-mloop-v10f ; @true -%D%/stamp-mloop-v10f: $(srccom)/genmloop.sh %D%/mloop.in - $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ +%D%/stamp-mloop-v10f: %D%/mloop.in $(srccom)/genmloop.sh + $(AM_V_GEN)$(CGEN_GEN_MLOOP) \ -mono -no-fast -pbb -switch semcrisv10f-switch.c \ - -cpu crisv10f \ - -infile $(srcdir)/%D%/mloop.in -outfile-prefix %D%/ -outfile-suffix -v10f + -cpu crisv10f -outfile-suffix -v10f $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/eng-v10f.hin %D%/engv10.h $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/mloop-v10f.cin %D%/mloopv10f.c $(AM_V_at)touch $@ @@ -103,11 +102,10 @@ BUILT_SOURCES += \ ## FIXME: What is mono and what does "Use of `mono' is wip" mean (other ## than the apparent; some "mono" feature is work in progress)? %D%/mloopv32f.c %D%/engv32.h: %D%/stamp-mloop-v32f ; @true -%D%/stamp-mloop-v32f: $(srccom)/genmloop.sh %D%/mloop.in - $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ +%D%/stamp-mloop-v32f: %D%/mloop.in $(srccom)/genmloop.sh + $(AM_V_GEN)$(CGEN_GEN_MLOOP) \ -mono -no-fast -pbb -switch semcrisv32f-switch.c \ - -cpu crisv32f \ - -infile $(srcdir)/%D%/mloop.in -outfile-prefix %D%/ -outfile-suffix -v32f + -cpu crisv32f -outfile-suffix -v32f $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/eng-v32f.hin %D%/engv32.h $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/mloop-v32f.cin %D%/mloopv32f.c $(AM_V_at)touch $@ diff --git a/sim/frv/local.mk b/sim/frv/local.mk index e494039..287633b 100644 --- a/sim/frv/local.mk +++ b/sim/frv/local.mk @@ -91,11 +91,10 @@ BUILT_SOURCES += %D%/eng.h ## FIXME: Use of `mono' is wip. %D%/mloop.c %D%/eng.h: %D%/stamp-mloop ; @true -%D%/stamp-mloop: $(srccom)/genmloop.sh %D%/mloop.in - $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ +%D%/stamp-mloop: %D%/mloop.in $(srccom)/genmloop.sh + $(AM_V_GEN)$(CGEN_GEN_MLOOP) \ -mono -scache -parallel-generic-write -parallel-only \ - -cpu frvbf \ - -infile $(srcdir)/%D%/mloop.in -outfile-prefix %D%/ + -cpu frvbf $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/eng.hin %D%/eng.h $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/mloop.cin %D%/mloop.c $(AM_V_at)touch $@ diff --git a/sim/iq2000/local.mk b/sim/iq2000/local.mk index 99649ec..9ed30f3 100644 --- a/sim/iq2000/local.mk +++ b/sim/iq2000/local.mk @@ -67,11 +67,10 @@ BUILT_SOURCES += %D%/eng.h ## FIXME: Use of `mono' is wip. %D%/mloop.c %D%/eng.h: %D%/stamp-mloop ; @true -%D%/stamp-mloop: $(srccom)/genmloop.sh %D%/mloop.in - $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ +%D%/stamp-mloop: %D%/mloop.in $(srccom)/genmloop.sh + $(AM_V_GEN)$(CGEN_GEN_MLOOP) \ -mono -fast -pbb -switch sem-switch.c \ - -cpu iq2000bf \ - -infile $(srcdir)/%D%/mloop.in -outfile-prefix %D%/ + -cpu iq2000bf $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/eng.hin %D%/eng.h $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/mloop.cin %D%/mloop.c $(AM_V_at)touch $@ diff --git a/sim/lm32/local.mk b/sim/lm32/local.mk index 917e6bb..11c6b10 100644 --- a/sim/lm32/local.mk +++ b/sim/lm32/local.mk @@ -72,11 +72,10 @@ BUILT_SOURCES += %D%/eng.h ## FIXME: Use of `mono' is wip. %D%/mloop.c %D%/eng.h: %D%/stamp-mloop ; @true -%D%/stamp-mloop: $(srccom)/genmloop.sh %D%/mloop.in - $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ +%D%/stamp-mloop: %D%/mloop.in $(srccom)/genmloop.sh + $(AM_V_GEN)$(CGEN_GEN_MLOOP) \ -mono -fast -pbb -switch sem-switch.c \ - -cpu lm32bf \ - -infile $(srcdir)/%D%/mloop.in -outfile-prefix %D%/ + -cpu lm32bf $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/eng.hin %D%/eng.h $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/mloop.cin %D%/mloop.c $(AM_V_at)touch $@ diff --git a/sim/m32r/local.mk b/sim/m32r/local.mk index 13f6ea5..3bec547 100644 --- a/sim/m32r/local.mk +++ b/sim/m32r/local.mk @@ -94,33 +94,30 @@ BUILT_SOURCES += \ ## FIXME: Use of `mono' is wip. %D%/mloop.c %D%/eng.h: %D%/stamp-mloop ; @true -%D%/stamp-mloop: $(srccom)/genmloop.sh %D%/mloop.in - $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ +%D%/stamp-mloop: %D%/mloop.in $(srccom)/genmloop.sh + $(AM_V_GEN)$(CGEN_GEN_MLOOP) \ -mono -fast -pbb -switch sem-switch.c \ - -cpu m32rbf \ - -infile $(srcdir)/%D%/mloop.in -outfile-prefix %D%/ + -cpu m32rbf $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/eng.hin %D%/eng.h $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/mloop.cin %D%/mloop.c $(AM_V_at)touch $@ ## FIXME: Use of `mono' is wip. %D%/mloopx.c %D%/engx.h: %D%/stamp-mloop-x ; @true -%D%/stamp-mloop-x: $(srccom)/genmloop.sh %D%/mloopx.in - $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ +%D%/stamp-mloop-x: %D%/mloopx.in $(srccom)/genmloop.sh + $(AM_V_GEN)$(CGEN_GEN_MLOOP) \ -mono -no-fast -pbb -parallel-write -switch semx-switch.c \ - -cpu m32rxf \ - -infile $(srcdir)/%D%/mloopx.in -outfile-prefix %D%/ -outfile-suffix x + -cpu m32rxf -outfile-suffix x $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/engx.hin %D%/engx.h $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/mloopx.cin %D%/mloopx.c $(AM_V_at)touch $@ ## FIXME: Use of `mono' is wip. %D%/mloop2.c %D%/eng2.h: %D%/stamp-mloop-2 ; @true -%D%/stamp-mloop-2: $(srccom)/genmloop.sh %D%/mloop2.in - $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ +%D%/stamp-mloop-2: %D%/mloop2.in $(srccom)/genmloop.sh + $(AM_V_GEN)$(CGEN_GEN_MLOOP) \ -mono -no-fast -pbb -parallel-write -switch sem2-switch.c \ - -cpu m32r2f \ - -infile $(srcdir)/%D%/mloop2.in -outfile-prefix %D%/ -outfile-suffix 2 + -cpu m32r2f -outfile-suffix 2 $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/eng2.hin %D%/eng2.h $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/mloop2.cin %D%/mloop2.c $(AM_V_at)touch $@ diff --git a/sim/or1k/local.mk b/sim/or1k/local.mk index cb48f82..979e0e3 100644 --- a/sim/or1k/local.mk +++ b/sim/or1k/local.mk @@ -74,11 +74,10 @@ BUILT_SOURCES += %D%/eng.h ## FIXME: Use of `mono' is wip. %D%/mloop.c %D%/eng.h: %D%/stamp-mloop ; @true -%D%/stamp-mloop: $(srccom)/genmloop.sh %D%/mloop.in - $(AM_V_GEN)$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ +%D%/stamp-mloop: %D%/mloop.in $(srccom)/genmloop.sh + $(AM_V_GEN)$(CGEN_GEN_MLOOP) \ -mono -fast -pbb -switch sem-switch.c \ - -cpu or1k32bf \ - -infile $(srcdir)/%D%/mloop.in -outfile-prefix %D%/ + -cpu or1k32bf $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/eng.hin %D%/eng.h $(AM_V_at)$(SHELL) $(srcroot)/move-if-change %D%/mloop.cin %D%/mloop.c $(AM_V_at)touch $@ -- 2.7.4