aboutsummaryrefslogtreecommitdiff
path: root/opcodes
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2023-08-22 11:32:43 -0600
committerTom Tromey <tom@tromey.com>2023-08-26 13:09:38 -0600
commitfd669f71eaf711915ed89b65714969e20997b0a7 (patch)
treea355fd0d264be16744d0a3fa6668a5b71646d1aa /opcodes
parent9030a82d6f700e03ab143f0d002e9f21ae2fd52f (diff)
downloadgdb-fd669f71eaf711915ed89b65714969e20997b0a7.zip
gdb-fd669f71eaf711915ed89b65714969e20997b0a7.tar.gz
gdb-fd669f71eaf711915ed89b65714969e20997b0a7.tar.bz2
Simplify definition of GUILE
This patch sets GUILE to just plain 'guile'. In the distant ("devo") past, the top-level build did support building Guile in-tree. However, I don't think this really works any more. For one thing, there are no build dependencies on it, so there's no guarantee it would actually be built before the uses. This patch also removes the use of "-s" as an option to cgen scheme scripts. With my latest patch upstream, this is no longer needed. After the upstream changes, either Guile 2 or Guile 3 will work, with or without the compiler enabled. 2023-08-24 Tom Tromey <tom@tromey.com> * cgen.sh: Don't pass "-s" to cgen. * Makefile.in: Rebuild. * Makefile.am (GUILE): Simplify.
Diffstat (limited to 'opcodes')
-rw-r--r--opcodes/ChangeLog6
-rw-r--r--opcodes/Makefile.am2
-rw-r--r--opcodes/Makefile.in2
-rw-r--r--opcodes/cgen.sh2
4 files changed, 8 insertions, 4 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 99f95c6..47c23e0 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2023-08-24 Tom Tromey <tom@tromey.com>
+
+ * cgen.sh: Don't pass "-s" to cgen.
+ * Makefile.in: Rebuild.
+ * Makefile.am (GUILE): Simplify.
+
2023-07-31 Jose E. Marchesi <jose.marchesi@oracle.com>
PR 30705
diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index 5d179e1..5804dd1 100644
--- a/opcodes/Makefile.am
+++ b/opcodes/Makefile.am
@@ -336,7 +336,7 @@ CLEANFILES = \
CGENDIR = @cgendir@
CPUDIR = $(srcdir)/../cpu
-GUILE = `if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi`
+GUILE = guile
CGEN = "$(GUILE) -l ${cgendir}/guile.scm -s"
CGENFLAGS = -v
diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index 605ce0a..29c2626 100644
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -695,7 +695,7 @@ CLEANFILES = \
CGENDIR = @cgendir@
CPUDIR = $(srcdir)/../cpu
-GUILE = `if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi`
+GUILE = guile
CGEN = "$(GUILE) -l ${cgendir}/guile.scm -s"
CGENFLAGS = -v
CGENDEPS = \
diff --git a/opcodes/cgen.sh b/opcodes/cgen.sh
index 40ebdf3..9497c1b 100644
--- a/opcodes/cgen.sh
+++ b/opcodes/cgen.sh
@@ -99,7 +99,6 @@ opcodes)
# Run CGEN.
${cgen} ${cgendir}/cgen-opc.scm \
- -s ${cgendir} \
${cgenflags} \
-f "${options}" \
-m all \
@@ -182,7 +181,6 @@ desc)
rm -f ${tmp}-opc.h1 ${tmp}-opc.h
${cgen} ${cgendir}/cgen-opc.scm \
- -s ${cgendir} \
${cgenflags} \
-OPC ${opcfile} \
-f "${archflags}" \