sim: make some rules silent by default in Make-common.in

Use GDB's silent-rules.mk to make some rules silent by default.  These
rules cover most of what is built in sim/.

gdb/ChangeLog:

	* silent-rules.mk (ECHO_CCLD, ECHO_AR, ECHO_RANLIB): New.

sim/ChangeLog:

	* common/Make-common.in (COMPILE, libsim.a, run$(EXEEXT),
	gentmap.o, gentmap): Make rules silent.

Change-Id: Idf9ba5beaee10c7c614859ace5fbdcd1de0287db
This commit is contained in:
Simon Marchi 2021-06-16 11:55:53 -04:00
parent 3aabdfe15b
commit 7daf500de2
4 changed files with 20 additions and 6 deletions

View File

@ -1,3 +1,7 @@
2021-06-16 Simon Marchi <simon.marchi@polymtl.ca>
* silent-rules.mk (ECHO_CCLD, ECHO_AR, ECHO_RANLIB): New.
2021-06-16 Tom de Vries <tdevries@suse.de>
PR symtab/26327

View File

@ -4,6 +4,7 @@ ifeq ($(V),0)
ECHO_CXX = @echo " CXX $@";
ECHO_CC = @echo " CC $@";
ECHO_CXXLD = @echo " CXXLD $@";
ECHO_CCLD = @echo " CCLD $@";
ECHO_REGDAT = @echo " REGDAT $@";
ECHO_GEN = @echo " GEN $@";
ECHO_GEN_XML_BUILTIN = \
@ -14,5 +15,7 @@ ECHO_INIT_C = @echo " GEN init.c"
ECHO_SIGN = @echo " SIGN gdb";
ECHO_YACC = @echo " YACC $@";
ECHO_LEX = @echo " LEX $@";
ECHO_AR = @echo " AR $@";
ECHO_RANLIB = @echo " RANLIB $@";
SILENCE = @
endif

View File

@ -1,3 +1,8 @@
2021-06-16 Simon Marchi <simon.marchi@polymtl.ca>
* common/Make-common.in (COMPILE, libsim.a, run$(EXEEXT),
gentmap.o, gentmap): Make rules silent.
2021-06-16 Mike Frysinger <vapier@gentoo.org>
* m4/sim_ac_common.m4: Delete AC_EXEEXT call.

View File

@ -40,6 +40,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
@ -111,7 +113,7 @@ depcomp = $(SHELL) $(srcroot)/depcomp
# GNU make is used. The overrides implement dependency tracking.
COMPILE.pre = $(CC) $(C_DIALECT)
COMPILE.post = -c -o $@
COMPILE = $(COMPILE.pre) $(ALL_CFLAGS) $(COMPILE.post)
COMPILE = $(ECHO_CC) $(COMPILE.pre) $(ALL_CFLAGS) $(COMPILE.post)
POSTCOMPILE = @true
# igen leaks memory, and therefore makes AddressSanitizer unhappy. Disable
@ -273,11 +275,11 @@ all: libsim.a run$(EXEEXT) .gdbinit
libsim.a: $(LIB_OBJS)
rm -f libsim.a
$(AR) $(AR_FLAGS) libsim.a $(LIB_OBJS)
$(RANLIB) libsim.a
$(ECHO_AR) $(AR) $(AR_FLAGS) libsim.a $(LIB_OBJS)
$(ECHO_RANLIB) $(RANLIB) libsim.a
run$(EXEEXT): $(SIM_RUN_OBJS) libsim.a $(LIBDEPS)
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o run$(EXEEXT) \
$(ECHO_CCLD) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o run$(EXEEXT) \
$(SIM_RUN_OBJS) libsim.a $(EXTRA_LIBS)
# FIXME: Ideally, callback.o and friends live in a library outside of
@ -286,10 +288,10 @@ run$(EXEEXT): $(SIM_RUN_OBJS) libsim.a $(LIBDEPS)
# a library).
gentmap.o: Makefile $(srccom)/gentmap.c $(srccom)/nltvals.def
$(COMPILE_FOR_BUILD) -o $@ -c $(srccom)/gentmap.c $(NL_TARGET)
$(ECHO_CC) $(COMPILE_FOR_BUILD) -o $@ -c $(srccom)/gentmap.c $(NL_TARGET)
gentmap: gentmap.o
$(LINK_FOR_BUILD) $<
$(ECHO_CC) $(LINK_FOR_BUILD) $<
targ-vals.h targ-map.c: stamp-tvals
stamp-tvals: gentmap