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.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 99f95c645682b5769c6043fd89f4f9b2e8ac8b31..47c23e05c4fe9bb7462d99eedad15541697e19c5 100644 (file)
--- 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 5d179e1316813fef799202e62c717df4b34fa1c3..5804dd1ab386cfddcaa259ee4d1209900c8eba46 100644 (file)
--- 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 605ce0a9ff25dee9f170c71d45a7b31691c6f084..29c26263061d914bbae8d1874014bf895ade2435 100644 (file)
--- 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 40ebdf3ca0a4c34afaf209dec81c01453f56496b..9497c1bf8536f24daf6265c5b8a4182de9d178f2 100644 (file)
--- 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}" \

diff --git a/sim/Makefile.in b/sim/Makefile.in
index 3da1b25d04069419fa9a29f2a03ed2288225ec68..3dd14543450e530d2162cbc678a62d0398a6d265 100644 (file)
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -1871,7 +1871,7 @@ SIM_COMMON_LIBS = \
        $(LIBGNU) \
        $(LIBGNU_EXTRA_LIBS)
 
-GUILE = $(or $(wildcard ../guile/libguile/guile),guile)
+GUILE = guile
 CGEN = "$(GUILE) -l $(cgendir)/guile.scm -s"
 CGENFLAGS = -v
 CGEN_CPU_DIR = $(cgendir)/cpu

diff --git a/sim/common/cgen.sh b/sim/common/cgen.sh
index 394ef2d2e1bcf62296bcb74953ee5eedc783f9ba..a7479ec8d4ca4a26c94866b8bd0f29e297172a3e 100755 (executable)
--- a/sim/common/cgen.sh
+++ b/sim/common/cgen.sh
@@ -60,7 +60,6 @@ arch)
        rm -f ${tmp}-all.h1 ${tmp}-all.h
 
        ${cgen} ${cgendir}/cgen-sim.scm \
-               -s ${cgendir} \
                ${cgenflags} \
                -f "${archflags}" \
                -m ${mach} \
@@ -125,7 +124,6 @@ cpu | decode | cpu-decode)
        esac
 
        ${cgen} ${cgendir}/cgen-sim.scm \
-               -s ${cgendir} \
                ${cgenflags} \
                -f "${archflags}" \
                -m ${mach} \
@@ -187,7 +185,6 @@ defs)
        rm -f ${tmp}-defs.h1 ${tmp}-defs.h
        
        ${cgen} ${cgendir}/cgen-sim.scm \
-               -s ${cgendir} \
                ${cgenflags} \
                -f "${archflags}" \
                -m ${mach} \
@@ -205,7 +202,6 @@ desc)
        rm -f ${tmp}-opc.h1 ${tmp}-opc.h
 
        ${cgen} ${cgendir}/cgen-opc.scm \
-               -s ${cgendir} \
                ${cgenflags} \
                -OPC ${opcfile} \
                -f "${archflags}" \

diff --git a/sim/common/local.mk b/sim/common/local.mk
index 5d0992fbd9e67a88f62cf78f9f24178c1f89e686..08da2275b7dc511a55be0a16b5a8549aedc3f1d7 100644 (file)
--- a/sim/common/local.mk
+++ b/sim/common/local.mk
@@ -178,7 +178,7 @@ SIM_COMMON_LIBS = \
 ##
 
 ## If the local tree has a bundled copy of guile, use that.
-GUILE = $(or $(wildcard ../guile/libguile/guile),guile)
+GUILE = guile
 CGEN = "$(GUILE) -l $(cgendir)/guile.scm -s"
 CGENFLAGS = -v
 CGEN_CPU_DIR = $(cgendir)/cpu