mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-02-17 13:10:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

sim: enable silent rules in common builds

Browse Source 
We only do the common code as automake simplifies the logic.
This commit is contained in:
Mike Frysinger 2021-06-14 19:54:04 -04:00
parent 1ff18ee652
commit fbe8d1cf5b
8 changed files with 84 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sim/ChangeLog
View File

@ -1,3 +1,8 @@
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Call AM_SILENT_RULES.
* Makefile.in, configure: Regenerate.
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* Makefile.in: Regenerate.

30
sim/Makefile.in
View File

@ -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)

4
sim/common/ChangeLog
View File

@ -1,3 +1,7 @@
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* local.mk (%D%/version.c): Use AM_V_GEN & AM_V_at wrappers.
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* Make-common.in (GNULIB_BUILDDIR): Rename to ...

6
sim/common/local.mk
View File

@ -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 $@

39
sim/configure vendored
View File

@ -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.

1
sim/configure.ac
View File

@ -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.

5
sim/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* 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 <dimitar@dinux.eu>
* local.mk (%C%_CPPFLAGS): Add ../bfd include path.

24
sim/testsuite/common/local.mk
View File

@ -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 \