diff options
| author | Tom Tromey <tom@tromey.com> | 2023-08-22 11:32:43 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2023-08-26 13:09:38 -0600 |
| commit | fd669f71eaf711915ed89b65714969e20997b0a7 (patch) | |
| tree | a355fd0d264be16744d0a3fa6668a5b71646d1aa | |
| parent | 9030a82d6f700e03ab143f0d002e9f21ae2fd52f (diff) | |
| download | gdb-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.
| -rw-r--r-- | opcodes/ChangeLog | 6 | ||||
| -rw-r--r-- | opcodes/Makefile.am | 2 | ||||
| -rw-r--r-- | opcodes/Makefile.in | 2 | ||||
| -rw-r--r-- | opcodes/cgen.sh | 2 | ||||
| -rw-r--r-- | sim/Makefile.in | 2 | ||||
| -rwxr-xr-x | sim/common/cgen.sh | 4 | ||||
| -rw-r--r-- | sim/common/local.mk | 2 |
7 files changed, 10 insertions, 10 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}" \ diff --git a/sim/Makefile.in b/sim/Makefile.in index 3da1b25..3dd1454 100644 --- 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 394ef2d..a7479ec 100755 --- 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 5d0992f..08da227 100644 --- 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 |