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
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e841fda..2444773 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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
diff --git a/gdb/silent-rules.mk b/gdb/silent-rules.mk
index 772bd67..97d799b 100644
--- a/gdb/silent-rules.mk
+++ b/gdb/silent-rules.mk
@@ -4,6 +4,7 @@
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_SIGN = @echo " SIGN gdb";
ECHO_YACC = @echo " YACC $@";
ECHO_LEX = @echo " LEX $@";
+ECHO_AR = @echo " AR $@";
+ECHO_RANLIB = @echo " RANLIB $@";
SILENCE = @
endif
diff --git a/sim/ChangeLog b/sim/ChangeLog
index 8896c4c..109d5d8 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -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.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 54ac7f4..0ab9e79 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -40,6 +40,8 @@
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 @@
# 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 @@
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 @@
# 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
