aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2021-06-28 21:26:48 -0400
committerMike Frysinger <vapier@gentoo.org>2021-07-01 18:05:40 -0400
commit2fe36d31f96519ea5ef988d85df1310bc177b5fa (patch)
treed75694894bf0749d04acee940a8168cc7b85884d
parentf375d32b35cef9813410107430963d51600d6896 (diff)
downloadgdb-2fe36d31f96519ea5ef988d85df1310bc177b5fa.zip
gdb-2fe36d31f96519ea5ef988d85df1310bc177b5fa.tar.gz
gdb-2fe36d31f96519ea5ef988d85df1310bc177b5fa.tar.bz2
cgen: split GUILE setting out
This makes it easier to override to point to an older version of guile. The current cgen code doesn't work with guile-2, so need to point to an older guile-1.8.
-rw-r--r--opcodes/ChangeLog6
-rw-r--r--opcodes/Makefile.am3
-rw-r--r--opcodes/Makefile.in3
-rw-r--r--sim/common/ChangeLog5
-rw-r--r--sim/common/Make-common.in3
5 files changed, 17 insertions, 3 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 1205dbf..b3d73dc 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,5 +1,11 @@
2021-07-01 Mike Frysinger <vapier@gentoo.org>
+ * Makefile.am (GUILE): New variable.
+ (CGEN): Use $(GUILE).
+ * Makefile.in: Regenerate.
+
+2021-07-01 Mike Frysinger <vapier@gentoo.org>
+
* mep-asm.c (macros): Mark static & const.
(lookup_macro): Change return & m to const.
(expand_macro): Change mac to const.
diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index ddae8bd..0e04b4c 100644
--- a/opcodes/Makefile.am
+++ b/opcodes/Makefile.am
@@ -363,7 +363,8 @@ CLEANFILES = \
CGENDIR = @cgendir@
CPUDIR = $(srcdir)/../cpu
-CGEN = "`if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi` -l ${cgendir}/guile.scm -s"
+GUILE = `if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi`
+CGEN = "$(GUILE) -l ${cgendir}/guile.scm -s"
CGENFLAGS = -v
CGENDEPS = \
diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index 23a52bc..42c15f0 100644
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -722,7 +722,8 @@ CLEANFILES = \
CGENDIR = @cgendir@
CPUDIR = $(srcdir)/../cpu
-CGEN = "`if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi` -l ${cgendir}/guile.scm -s"
+GUILE = `if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi`
+CGEN = "$(GUILE) -l ${cgendir}/guile.scm -s"
CGENFLAGS = -v
CGENDEPS = \
$(CGENDIR)/desc.scm $(CGENDIR)/desc-cpu.scm \
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 5b167eb..37d4dc9 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2021-07-01 Mike Frysinger <vapier@gentoo.org>
+
+ * Make-common.in (GUILE): New variable.
+ (CGEN): Use $(GUILE).
+
2021-06-30 Mike Frysinger <vapier@gentoo.org>
* Make-common.in (SIM_SCACHE): Delete.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index e7c1cce..a02f529 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -542,7 +542,8 @@ Makefile: Makefile.in $(srccom)/Make-common.in $(config.status)
# CGEN support
-CGEN = "`if [ -f ../../guile/libguile/guile ]; then echo ../../guile/libguile/guile; else echo guile ; fi` -l $(CGENDIR)/guile.scm -s"
+GUILE = `if [ -f ../../guile/libguile/guile ]; then echo ../../guile/libguile/guile; else echo guile ; fi`
+CGEN = "$(GUILE) -l $(CGENDIR)/guile.scm -s"
CGENFLAGS = -v
CGEN_CPU_DIR = $(CGENDIR)/cpu