From ac9b6df28f585128b711c7c9450266ed969cc0c0 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 31 Oct 2021 00:55:50 -0400
Subject: [PATCH] sim: igen: tighten up build output

Add a new stamp helper for quiet builds, and don't dump the command
line options when it runs.  That isn't standard tool behavior, and
doesn't really seem necessary in any way.
---
 sim/common/Make-common.in |  1 +
 sim/igen/igen.c           |  2 ++
 sim/mips/Makefile.in      | 18 +++++++++---------
 sim/mn10300/Makefile.in   |  2 +-
 sim/v850/Makefile.in      |  2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 706531e8fa1..92e57f56167 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -47,6 +47,7 @@ include $(srcroot)/gdb/silent-rules.mk
 
 ifeq ($(V),0)
 ECHO_STAMP = @echo "  GEN   "
+ECHO_IGEN  = @echo "  IGEN  $(<F)";
 else
 ECHO_STAMP = @:
 endif
diff --git a/sim/igen/igen.c b/sim/igen/igen.c
index e649f853c3d..952f8e9d4f3 100644
--- a/sim/igen/igen.c
+++ b/sim/igen/igen.c
@@ -1166,10 +1166,12 @@ main (int argc, char **argv, char **envp)
 		       "B:D:F:G:H:I:M:N:P:T:W:o:k:i:n:hc:d:e:m:r:s:t:f:x"))
 	 != -1)
     {
+#if 0  /* For debugging.  */
       fprintf (stderr, "  -%c ", ch);
       if (optarg)
 	fprintf (stderr, "%s ", optarg);
       fprintf (stderr, "\\\n");
+#endif
 
       switch (ch)
 	{
diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in
index 3c56c34e0bf..632cc20f3a8 100644
--- a/sim/mips/Makefile.in
+++ b/sim/mips/Makefile.in
@@ -136,7 +136,7 @@ BUILT_SRC_FROM_IGEN = \
 $(BUILT_SRC_FROM_IGEN): tmp-igen
 
 tmp-igen: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE)
-	$(IGEN_RUN) \
+	$(ECHO_IGEN) $(IGEN_RUN) \
 		$(IGEN_TRACE) \
 		-I $(srcdir) \
 		-Werror \
@@ -207,7 +207,7 @@ BUILT_SRC_FROM_M16 = \
 $(BUILT_SRC_FROM_M16): tmp-m16
 
 tmp-m16: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE)
-	$(IGEN_RUN) \
+	$(ECHO_IGEN) $(IGEN_RUN) \
 		$(IGEN_TRACE) \
 		-I $(srcdir) \
 		-Werror \
@@ -242,7 +242,7 @@ tmp-m16: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE)
 	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.c m16_model.c
 	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.h m16_support.h
 	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.c m16_support.c
-	$(IGEN_RUN) \
+	$(ECHO_IGEN) $(IGEN_RUN) \
 		$(IGEN_TRACE) \
 		-I $(srcdir) \
 		-Werror \
@@ -277,7 +277,7 @@ tmp-m16: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE)
 	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.c m32_model.c
 	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.h m32_support.h
 	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.c m32_support.c
-	$(IGEN_RUN) \
+	$(ECHO_IGEN) $(IGEN_RUN) \
 		$(IGEN_TRACE) \
 		-I $(srcdir) \
 		-Werror \
@@ -331,7 +331,7 @@ BUILT_SRC_FROM_MICROMIPS = \
 $(BUILT_SRC_FROM_MICROMIPS): tmp-micromips
 
 tmp-micromips: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE)
-	$(IGEN_RUN) \
+	$(ECHO_IGEN) $(IGEN_RUN) \
 		$(IGEN_TRACE) \
 		-I $(srcdir) \
 		-Werror \
@@ -366,7 +366,7 @@ tmp-micromips: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE)
 	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.c micromips16_model.c
 	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.h micromips16_support.h
 	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.c micromips16_support.c
-	$(IGEN_RUN) \
+	$(ECHO_IGEN) $(IGEN_RUN) \
 		$(IGEN_TRACE) \
 		-I $(srcdir) \
 		-Werror \
@@ -401,7 +401,7 @@ tmp-micromips: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE)
 	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.c micromips32_model.c
 	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.h micromips32_support.h
 	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.c micromips32_support.c
-	$(IGEN_RUN) \
+	$(ECHO_IGEN) $(IGEN_RUN) \
 		$(IGEN_TRACE) \
 		-I $(srcdir) \
 		-Werror \
@@ -436,7 +436,7 @@ tmp-micromips: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE)
 	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-model.c micromips_m32_model.c
 	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.h micromips_m32_support.h
 	$(SILENCE) $(SHELL) $(srcroot)/move-if-change tmp-support.c micromips_m32_support.c
-	$(IGEN_RUN) \
+	$(ECHO_IGEN) $(IGEN_RUN) \
 		$(IGEN_TRACE) \
 		-I $(srcdir) \
 		-Werror \
@@ -529,7 +529,7 @@ tmp-mach-multi: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE)
 	done
 	$(SILENCE) touch $@
 tmp-itable-multi: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE)
-	$(IGEN_RUN) \
+	$(ECHO_IGEN) $(IGEN_RUN) \
 		$(IGEN_TRACE) \
 		-I $(srcdir) \
 		-Werror \
diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in
index 7475234350f..a68dd43f1a6 100644
--- a/sim/mn10300/Makefile.in
+++ b/sim/mn10300/Makefile.in
@@ -65,7 +65,7 @@ IGEN_INSN=$(srcdir)/mn10300.igen
 IGEN_INSN_INC=$(srcdir)/am33.igen $(srcdir)/am33-2.igen
 IGEN_DC=$(srcdir)/mn10300.dc
 tmp-igen: $(IGEN_INSN) $(IGEN_INSN_INC) $(IGEN_DC) $(IGEN)
-	$(IGEN_RUN) \
+	$(ECHO_IGEN) $(IGEN_RUN) \
 		$(IGEN_TRACE) \
 		-G gen-direct-access \
                 -M mn10300,am33 -G gen-multi-sim=am33 \
diff --git a/sim/v850/Makefile.in b/sim/v850/Makefile.in
index 37b65b3ebf6..2c0c5df7c24 100644
--- a/sim/v850/Makefile.in
+++ b/sim/v850/Makefile.in
@@ -65,7 +65,7 @@ IGEN_TRACE= # -G omit-line-numbers # -G trace-rule-selection -G trace-rule-rejec
 IGEN_INSN=$(srcdir)/v850.igen
 IGEN_DC=$(srcdir)/v850-dc
 tmp-igen: $(IGEN_INSN) $(IGEN_DC) $(IGEN)
-	$(IGEN_RUN) \
+	$(ECHO_IGEN) $(IGEN_RUN) \
 		$(IGEN_TRACE) \
 		-G gen-direct-access \
 		-G gen-zero-r0 \
-- 
2.30.2