[binutils-gdb] sim: igen: harmonize tool variables
Michael Frysinger
vapier@sourceware.org
Tue Jun 8 04:58:10 GMT 2021
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=a55b92be28bab98a2acae597cbd365eb53b5faf3
commit a55b92be28bab98a2acae597cbd365eb53b5faf3
Author: Mike Frysinger <vapier@gentoo.org>
Date: Sat May 29 13:34:38 2021 -0400
sim: igen: harmonize tool variables
Separate the name of the igen program from the options used to run it.
This allows us to avoid duplicating ../igen/igen in Makefiles and reuse
the existing setting in the common Makefile. This also allows us to
easily harmonize the use of EXEEXT between igen/local.mk and the common
makefiles when cross-compiling for e.g. Windows.
Diff:
---
sim/common/ChangeLog | 5 +++++
sim/common/Make-common.in | 3 ++-
sim/mips/ChangeLog | 5 +++++
sim/mips/Makefile.in | 30 +++++++++++++++---------------
sim/mn10300/ChangeLog | 5 +++++
sim/mn10300/Makefile.in | 4 ++--
sim/v850/ChangeLog | 5 +++++
sim/v850/Makefile.in | 4 ++--
8 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index ac348747803..576b02f3862 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-08 Mike Frysinger <vapier@gentoo.org>
+
+ * Make-common.in (IGEN_RUN): New variable.
+ (IGEN): Remove ASAN_OPTIONS.
+
2021-06-05 Mike Frysinger <vapier@gentoo.org>
* Make-common.in (COMMON_OBJS): Define.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index b17b2e0f453..f32026e179d 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -117,7 +117,8 @@ POSTCOMPILE = @true
# igen leaks memory, and therefore makes AddressSanitizer unhappy. Disable
# leak detection while running it.
-IGEN = ASAN_OPTIONS=detect_leaks=0 ../igen/igen
+IGEN = ../igen/igen$(EXEEXT)
+IGEN_RUN = ASAN_OPTIONS=detect_leaks=0 $(IGEN)
# Each simulator's Makefile.in defines one or more of these variables
# to override our settings as necessary. There is no need to define these
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index f8853911b97..624936a228f 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-08 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in: Replace $(IGEN) with $(IGEN_RUN) and ../igen/igen
+ with $(IGEN).
+
2021-05-29 Mike Frysinger <vapier@gentoo.org>
* interp.c [!HAVE_DV_SOCKSER] (sockser_addr): Define to NULL.
diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in
index d8eba877fb8..7e1356ca4f6 100644
--- a/sim/mips/Makefile.in
+++ b/sim/mips/Makefile.in
@@ -137,8 +137,8 @@ BUILT_SRC_FROM_IGEN = \
$(BUILT_SRC_FROM_IGEN): tmp-igen
-tmp-igen: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE)
- $(IGEN) \
+tmp-igen: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE)
+ $(IGEN_RUN) \
$(IGEN_TRACE) \
-I $(srcdir) \
-Werror \
@@ -208,8 +208,8 @@ BUILT_SRC_FROM_M16 = \
$(BUILT_SRC_FROM_M16): tmp-m16
-tmp-m16: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE)
- $(IGEN) \
+tmp-m16: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE)
+ $(IGEN_RUN) \
$(IGEN_TRACE) \
-I $(srcdir) \
-Werror \
@@ -244,7 +244,7 @@ tmp-m16: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE)
$(SHELL) $(srcdir)/../../move-if-change tmp-model.c m16_model.c
$(SHELL) $(srcdir)/../../move-if-change tmp-support.h m16_support.h
$(SHELL) $(srcdir)/../../move-if-change tmp-support.c m16_support.c
- $(IGEN) \
+ $(IGEN_RUN) \
$(IGEN_TRACE) \
-I $(srcdir) \
-Werror \
@@ -281,7 +281,7 @@ tmp-m16: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE)
$(SHELL) $(srcdir)/../../move-if-change tmp-model.c m32_model.c
$(SHELL) $(srcdir)/../../move-if-change tmp-support.h m32_support.h
$(SHELL) $(srcdir)/../../move-if-change tmp-support.c m32_support.c
- $(IGEN) \
+ $(IGEN_RUN) \
$(IGEN_TRACE) \
-I $(srcdir) \
-Werror \
@@ -334,8 +334,8 @@ BUILT_SRC_FROM_MICROMIPS = \
$(BUILT_SRC_FROM_MICROMIPS): tmp-micromips
-tmp-micromips: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE)
- $(IGEN) \
+tmp-micromips: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE)
+ $(IGEN_RUN) \
$(IGEN_TRACE) \
-I $(srcdir) \
-Werror \
@@ -380,7 +380,7 @@ tmp-micromips: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE)
micromips16_support.h
$(SHELL) $(srcdir)/../../move-if-change tmp-support.c \
micromips16_support.c
- $(IGEN) \
+ $(IGEN_RUN) \
$(IGEN_TRACE) \
-I $(srcdir) \
-Werror \
@@ -425,7 +425,7 @@ tmp-micromips: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE)
micromips32_support.h
$(SHELL) $(srcdir)/../../move-if-change tmp-support.c \
micromips32_support.c
- $(IGEN) \
+ $(IGEN_RUN) \
$(IGEN_TRACE) \
-I $(srcdir) \
-Werror \
@@ -470,7 +470,7 @@ tmp-micromips: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE)
micromips_m32_support.h
$(SHELL) $(srcdir)/../../move-if-change tmp-support.c \
micromips_m32_support.c
- $(IGEN) \
+ $(IGEN_RUN) \
$(IGEN_TRACE) \
-I $(srcdir) \
-Werror \
@@ -492,7 +492,7 @@ SIM_MULTI_IGEN_CONFIGS = @sim_multi_igen_configs@
$(BUILT_SRC_FROM_MULTI): tmp-multi
tmp-multi: tmp-mach-multi tmp-itable-multi tmp-run-multi targ-vals.h
-tmp-mach-multi: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE)
+tmp-mach-multi: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE)
for t in $(SIM_MULTI_IGEN_CONFIGS); do \
p=`echo $${t} | sed -e 's/:.*//'` ; \
m=`echo $${t} | sed -e 's/.*:\(.*\):.*/\1/'` ; \
@@ -510,7 +510,7 @@ tmp-mach-multi: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE)
m16*) e="-B 16 -H 15 -o $(M16_DC) -F 16" ;; \
*) e="-B 32 -H 31 -o $(IGEN_DC) -F $${f}" ;; \
esac; \
- $(IGEN) \
+ $(IGEN_RUN) \
$(IGEN_TRACE) \
$${e} \
-I $(srcdir) \
@@ -562,8 +562,8 @@ tmp-mach-multi: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE)
$${p}_engine.c ; \
done
touch tmp-mach-multi
-tmp-itable-multi: $(IGEN_INSN) $(IGEN_DC) ../igen/igen $(IGEN_INCLUDE)
- $(IGEN) \
+tmp-itable-multi: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE)
+ $(IGEN_RUN) \
$(IGEN_TRACE) \
-I $(srcdir) \
-Werror \
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 1f5753feaaf..a813e4e3b34 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-08 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in: Replace $(IGEN) with $(IGEN_RUN) and ../igen/igen
+ with $(IGEN).
+
2021-05-29 Mike Frysinger <vapier@gentoo.org>
* interp.c [!SIGTRAP] (SIGTRAP): Define to 5.
diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in
index 39faa30efc2..ba48273ba84 100644
--- a/sim/mn10300/Makefile.in
+++ b/sim/mn10300/Makefile.in
@@ -62,8 +62,8 @@ IGEN_TRACE= # -G omit-line-numbers # -G trace-rule-selection -G trace-rule-rejec
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
- $(IGEN) \
+tmp-igen: $(IGEN_INSN) $(IGEN_INSN_INC) $(IGEN_DC) $(IGEN)
+ $(IGEN_RUN) \
$(IGEN_TRACE) \
-G gen-direct-access \
-M mn10300,am33 -G gen-multi-sim=am33 \
diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index 8f0baa08204..268f44ed078 100644
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-08 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in: Replace $(IGEN) with $(IGEN_RUN) and ../igen/igen
+ with $(IGEN).
+
2021-06-08 Mike Frysinger <vapier@gentoo.org>
* configure.ac (AC_CHECK_FUNCS_ONCE): Remove chown.
diff --git a/sim/v850/Makefile.in b/sim/v850/Makefile.in
index 3e1b4054174..9d46211fb42 100644
--- a/sim/v850/Makefile.in
+++ b/sim/v850/Makefile.in
@@ -66,8 +66,8 @@ clean-igen:
IGEN_TRACE= # -G omit-line-numbers # -G trace-rule-selection -G trace-rule-rejection -G trace-entries
IGEN_INSN=$(srcdir)/v850.igen
IGEN_DC=$(srcdir)/v850-dc
-tmp-igen: $(IGEN_INSN) $(IGEN_DC) ../igen/igen
- $(IGEN) \
+tmp-igen: $(IGEN_INSN) $(IGEN_DC) $(IGEN)
+ $(IGEN_RUN) \
$(IGEN_TRACE) \
-G gen-direct-access \
-G gen-zero-r0 \
More information about the Gdb-cvs
mailing list