From fbe8d1cf5b1b92e28be05b61edb3141261e02672 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 14 Jun 2021 19:54:04 -0400 Subject: [PATCH] sim: enable silent rules in common builds We only do the common code as automake simplifies the logic. --- sim/ChangeLog | 5 +++++ sim/Makefile.in | 30 +++++++++++++-------------- sim/common/ChangeLog | 4 ++++ sim/common/local.mk | 6 +++--- sim/configure | 39 +++++++++++++++++++++++++++++++++++ sim/configure.ac | 1 + sim/testsuite/ChangeLog | 5 +++++ sim/testsuite/common/local.mk | 24 ++++++++++----------- 8 files changed, 84 insertions(+), 30 deletions(-) diff --git a/sim/ChangeLog b/sim/ChangeLog index 063469c653e..8df4fde31aa 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,8 @@ +2021-06-14 Mike Frysinger + + * configure.ac: Call AM_SILENT_RULES. + * Makefile.in, configure: Regenerate. + 2021-06-12 Mike Frysinger * Makefile.in: Regenerate. diff --git a/sim/Makefile.in b/sim/Makefile.in index c710449d718..b5a2c2608db 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -1585,9 +1585,9 @@ nltvals: $(SHELL) $(srcroot)/move-if-change nltvals.def $(abs_srcdir)/common/nltvals.def common/version.c: $(srcroot)/gdb/version.in $(srcroot)/bfd/version.h $(srcdir)/common/create-version.sh - $(SHELL) $(srcdir)/common/create-version.sh $(srcroot)/gdb $@.tmp - $(SHELL) $(srcroot)/move-if-change $@.tmp $@ - touch $@ + $(AM_V_GEN)$(SHELL) $(srcdir)/common/create-version.sh $(srcroot)/gdb $@.tmp + $(AM_V_at)$(SHELL) $(srcroot)/move-if-change $@.tmp $@ + $(AM_V_at)touch $@ # Alias for developers. @SIM_ENABLE_IGEN_TRUE@igen: igen/igen$(EXEEXT) @@ -1638,33 +1638,33 @@ testsuite/common/bits32m0$(EXEEXT): $(testsuite_common_bits32m0_OBJECTS) $(tests $(AM_V_CCLD)$(LINK_FOR_BUILD) $(testsuite_common_bits32m0_OBJECTS) $(testsuite_common_bits32m0_LDADD) testsuite/common/bits32m0.c: testsuite/common/bits-gen testsuite/common/bits-tst.c - $< 32 0 big > $@.tmp - cat $(srcdir)/testsuite/common/bits-tst.c >> $@.tmp - mv $@.tmp $@ + $(AM_V_GEN)$< 32 0 big > $@.tmp + $(AM_V_at)cat $(srcdir)/testsuite/common/bits-tst.c >> $@.tmp + $(AM_V_at)mv $@.tmp $@ testsuite/common/bits32m31$(EXEEXT): $(testsuite_common_bits32m31_OBJECTS) $(testsuite_common_bits32m31_DEPENDENCIES) testsuite/common/$(am__dirstamp) $(AM_V_CCLD)$(LINK_FOR_BUILD) $(testsuite_common_bits32m31_OBJECTS) $(testsuite_common_bits32m31_LDADD) testsuite/common/bits32m31.c: testsuite/common/bits-gen testsuite/common/bits-tst.c - $< 32 31 little > $@.tmp - cat $(srcdir)/testsuite/common/bits-tst.c >> $@.tmp - mv $@.tmp $@ + $(AM_V_GEN)$< 32 31 little > $@.tmp + $(AM_V_at)cat $(srcdir)/testsuite/common/bits-tst.c >> $@.tmp + $(AM_V_at)mv $@.tmp $@ testsuite/common/bits64m0$(EXEEXT): $(testsuite_common_bits64m0_OBJECTS) $(testsuite_common_bits64m0_DEPENDENCIES) testsuite/common/$(am__dirstamp) $(AM_V_CCLD)$(LINK_FOR_BUILD) $(testsuite_common_bits64m0_OBJECTS) $(testsuite_common_bits64m0_LDADD) testsuite/common/bits64m0.c: testsuite/common/bits-gen testsuite/common/bits-tst.c - $< 64 0 big > $@.tmp - cat $(srcdir)/testsuite/common/bits-tst.c >> $@.tmp - mv $@.tmp $@ + $(AM_V_GEN)$< 64 0 big > $@.tmp + $(AM_V_at)cat $(srcdir)/testsuite/common/bits-tst.c >> $@.tmp + $(AM_V_at)mv $@.tmp $@ testsuite/common/bits64m63$(EXEEXT): $(testsuite_common_bits64m63_OBJECTS) $(testsuite_common_bits64m63_DEPENDENCIES) testsuite/common/$(am__dirstamp) $(AM_V_CCLD)$(LINK_FOR_BUILD) $(testsuite_common_bits64m63_OBJECTS) $(testsuite_common_bits64m63_LDADD) testsuite/common/bits64m63.c: testsuite/common/bits-gen testsuite/common/bits-tst.c - $< 64 63 little > $@.tmp - cat $(srcdir)/testsuite/common/bits-tst.c >> $@.tmp - mv $@.tmp $@ + $(AM_V_GEN)$< 64 63 little > $@.tmp + $(AM_V_at)cat $(srcdir)/testsuite/common/bits-tst.c >> $@.tmp + $(AM_V_at)mv $@.tmp $@ all-recursive: $(SIM_ALL_RECURSIVE_DEPS) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 5bf47a36849..14914dc0416 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,7 @@ +2021-06-14 Mike Frysinger + + * local.mk (%D%/version.c): Use AM_V_GEN & AM_V_at wrappers. + 2021-06-14 Mike Frysinger * Make-common.in (GNULIB_BUILDDIR): Rename to ... diff --git a/sim/common/local.mk b/sim/common/local.mk index 076335d0b42..fc1149789a3 100644 --- a/sim/common/local.mk +++ b/sim/common/local.mk @@ -39,6 +39,6 @@ noinst_LIBRARIES += %D%/libcommon.a %D%/version.c %D%/version.c: $(srcroot)/gdb/version.in $(srcroot)/bfd/version.h $(srcdir)/%D%/create-version.sh - $(SHELL) $(srcdir)/%D%/create-version.sh $(srcroot)/gdb $@.tmp - $(SHELL) $(srcroot)/move-if-change $@.tmp $@ - touch $@ + $(AM_V_GEN)$(SHELL) $(srcdir)/%D%/create-version.sh $(srcroot)/gdb $@.tmp + $(AM_V_at)$(SHELL) $(srcroot)/move-if-change $@.tmp $@ + $(AM_V_at)touch $@ diff --git a/sim/configure b/sim/configure index 2d4204fe526..5bfbd601fe5 100755 --- a/sim/configure +++ b/sim/configure @@ -6218,6 +6218,45 @@ END fi fi +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + # If a cpu ever has more than one simulator to choose from, use # --enable-sim=... to choose. diff --git a/sim/configure.ac b/sim/configure.ac index e7f3f535ef5..129e9421ec1 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -19,6 +19,7 @@ SIM_AC_PLATFORM AM_MAINTAINER_MODE AM_INIT_AUTOMAKE +AM_SILENT_RULES([yes]) # If a cpu ever has more than one simulator to choose from, use # --enable-sim=... to choose. diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog index 4234747c86e..7265ed83cd3 100644 --- a/sim/testsuite/ChangeLog +++ b/sim/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2021-06-14 Mike Frysinger + + * common/local.mk (%D%/bits32m0.c, %D%/bits32m31.c, %D%/bits64m0.c, + %D%/bits64m63.c): Use AM_V_GEN & AM_V_at wrappers. + 2021-05-07 Dimitar Dimitrov * local.mk (%C%_CPPFLAGS): Add ../bfd include path. diff --git a/sim/testsuite/common/local.mk b/sim/testsuite/common/local.mk index 4db7981d160..69f2d70eb5f 100644 --- a/sim/testsuite/common/local.mk +++ b/sim/testsuite/common/local.mk @@ -49,33 +49,33 @@ check_PROGRAMS += $(TESTS) $(AM_V_CCLD)$(LINK_FOR_BUILD) $(%C%_bits32m0_OBJECTS) $(%C%_bits32m0_LDADD) %D%/bits32m0.c: %D%/bits-gen %D%/bits-tst.c - $< 32 0 big > $@.tmp - cat $(srcdir)/%D%/bits-tst.c >> $@.tmp - mv $@.tmp $@ + $(AM_V_GEN)$< 32 0 big > $@.tmp + $(AM_V_at)cat $(srcdir)/%D%/bits-tst.c >> $@.tmp + $(AM_V_at)mv $@.tmp $@ %D%/bits32m31$(EXEEXT): $(%C%_bits32m31_OBJECTS) $(%C%_bits32m31_DEPENDENCIES) %D%/$(am__dirstamp) $(AM_V_CCLD)$(LINK_FOR_BUILD) $(%C%_bits32m31_OBJECTS) $(%C%_bits32m31_LDADD) %D%/bits32m31.c: %D%/bits-gen %D%/bits-tst.c - $< 32 31 little > $@.tmp - cat $(srcdir)/%D%/bits-tst.c >> $@.tmp - mv $@.tmp $@ + $(AM_V_GEN)$< 32 31 little > $@.tmp + $(AM_V_at)cat $(srcdir)/%D%/bits-tst.c >> $@.tmp + $(AM_V_at)mv $@.tmp $@ %D%/bits64m0$(EXEEXT): $(%C%_bits64m0_OBJECTS) $(%C%_bits64m0_DEPENDENCIES) %D%/$(am__dirstamp) $(AM_V_CCLD)$(LINK_FOR_BUILD) $(%C%_bits64m0_OBJECTS) $(%C%_bits64m0_LDADD) %D%/bits64m0.c: %D%/bits-gen %D%/bits-tst.c - $< 64 0 big > $@.tmp - cat $(srcdir)/%D%/bits-tst.c >> $@.tmp - mv $@.tmp $@ + $(AM_V_GEN)$< 64 0 big > $@.tmp + $(AM_V_at)cat $(srcdir)/%D%/bits-tst.c >> $@.tmp + $(AM_V_at)mv $@.tmp $@ %D%/bits64m63$(EXEEXT): $(%C%_bits64m63_OBJECTS) $(%C%_bits64m63_DEPENDENCIES) %D%/$(am__dirstamp) $(AM_V_CCLD)$(LINK_FOR_BUILD) $(%C%_bits64m63_OBJECTS) $(%C%_bits64m63_LDADD) %D%/bits64m63.c: %D%/bits-gen %D%/bits-tst.c - $< 64 63 little > $@.tmp - cat $(srcdir)/%D%/bits-tst.c >> $@.tmp - mv $@.tmp $@ + $(AM_V_GEN)$< 64 63 little > $@.tmp + $(AM_V_at)cat $(srcdir)/%D%/bits-tst.c >> $@.tmp + $(AM_V_at)mv $@.tmp $@ CLEANFILES += \ %D%/bits-gen \ -- 2.39.2