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.

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

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
 

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 = \

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}" \

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

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}" \

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