diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-05-29 13:34:38 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-06-08 00:57:58 -0400 |
| commit | a55b92be28bab98a2acae597cbd365eb53b5faf3 (patch) | |
| tree | 2f0c4394cb0fbbf586f645cfc931e690d725187c /sim/mips | |
| parent | d20bc122888f03a2d2a5a9162f6287de5a79a8f9 (diff) | |
| download | fsf-binutils-gdb-a55b92be28bab98a2acae597cbd365eb53b5faf3.zip fsf-binutils-gdb-a55b92be28bab98a2acae597cbd365eb53b5faf3.tar.gz fsf-binutils-gdb-a55b92be28bab98a2acae597cbd365eb53b5faf3.tar.bz2 | |
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.
Diffstat (limited to 'sim/mips')
| -rw-r--r-- | sim/mips/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/mips/Makefile.in | 30 |
2 files changed, 20 insertions, 15 deletions
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index f885391..624936a 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 d8eba87..7e1356c 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 \ |