aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sim/mn10300/ChangeLog5
-rw-r--r--sim/mn10300/Makefile.in5
-rw-r--r--sim/mn10300/mn10300.igen1
3 files changed, 9 insertions, 2 deletions
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 5638b86..4e37778 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,8 @@
+2021-04-15 John Baldwin <jhb@FreeBSD.org>
+
+ * Makefile.in: (tmp-igen) Only pass mn10300.igen to igen.
+ * mn10300.igen: Include am33-2.igen.
+
2021-04-12 Mike Frysinger <vapier@gentoo.org>
* interp.c (sim_open): Delete 3rd arg to sim_cpu_alloc_all.
diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in
index 773b7f9..120958f 100644
--- a/sim/mn10300/Makefile.in
+++ b/sim/mn10300/Makefile.in
@@ -66,9 +66,10 @@ clean-igen:
rm -f tmp-igen tmp-insns
IGEN_TRACE= # -G omit-line-numbers # -G trace-rule-selection -G trace-rule-rejection -G trace-entries
-IGEN_INSN=$(srcdir)/mn10300.igen $(srcdir)/am33.igen $(srcdir)/am33-2.igen
+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_DC) ../igen/igen
+tmp-igen: $(IGEN_INSN) $(IGEN_INSN_INC) $(IGEN_DC) ../igen/igen
$(IGEN) \
$(IGEN_TRACE) \
-G gen-direct-access \
diff --git a/sim/mn10300/mn10300.igen b/sim/mn10300/mn10300.igen
index c7b83ed..80a3943 100644
--- a/sim/mn10300/mn10300.igen
+++ b/sim/mn10300/mn10300.igen
@@ -4590,4 +4590,5 @@
:include::am33:am33.igen
+:include::am33-2:am33-2.igen