From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 08A1F3857738; Sat, 26 Aug 2023 19:10:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 08A1F3857738 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: bfd-cvs@sourceware.org, gdb-cvs@sourceware.org Subject: [binutils-gdb] Simplify definition of GUILE X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 9030a82d6f700e03ab143f0d002e9f21ae2fd52f X-Git-Newrev: fd669f71eaf711915ed89b65714969e20997b0a7 Message-Id: <20230826191007.08A1F3857738@sourceware.org> Date: Sat, 26 Aug 2023 19:10:07 +0000 (GMT) X-BeenThere: binutils-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Aug 2023 19:10:07 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dfd669f71eaf7= 11915ed89b65714969e20997b0a7 commit fd669f71eaf711915ed89b65714969e20997b0a7 Author: Tom Tromey Date: Tue Aug 22 11:32:43 2023 -0600 Simplify definition of GUILE =20 This patch sets GUILE to just plain 'guile'. =20 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. =20 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. =20 After the upstream changes, either Guile 2 or Guile 3 will work, with or without the compiler enabled. =20 2023-08-24 Tom Tromey =20 * cgen.sh: Don't pass "-s" to cgen. * Makefile.in: Rebuild. * Makefile.am (GUILE): Simplify. Diff: --- opcodes/ChangeLog | 6 ++++++ opcodes/Makefile.am | 2 +- opcodes/Makefile.in | 2 +- opcodes/cgen.sh | 2 -- sim/Makefile.in | 2 +- sim/common/cgen.sh | 4 ---- sim/common/local.mk | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 99f95c64568..47c23e05c4f 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,9 @@ +2023-08-24 Tom Tromey + + * cgen.sh: Don't pass "-s" to cgen. + * Makefile.in: Rebuild. + * Makefile.am (GUILE): Simplify. + 2023-07-31 Jose E. Marchesi =20 PR 30705 diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index 5d179e13168..5804dd1ab38 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -336,7 +336,7 @@ CLEANFILES =3D \ =20 CGENDIR =3D @cgendir@ CPUDIR =3D $(srcdir)/../cpu -GUILE =3D `if test -f ../guile/libguile/guile ; then echo ../guile/libguil= e/guile; else echo guile ; fi` +GUILE =3D guile CGEN =3D "$(GUILE) -l ${cgendir}/guile.scm -s" CGENFLAGS =3D -v =20 diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index 605ce0a9ff2..29c26263061 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -695,7 +695,7 @@ CLEANFILES =3D \ =20 CGENDIR =3D @cgendir@ CPUDIR =3D $(srcdir)/../cpu -GUILE =3D `if test -f ../guile/libguile/guile ; then echo ../guile/libguil= e/guile; else echo guile ; fi` +GUILE =3D guile CGEN =3D "$(GUILE) -l ${cgendir}/guile.scm -s" CGENFLAGS =3D -v CGENDEPS =3D \ diff --git a/opcodes/cgen.sh b/opcodes/cgen.sh index 40ebdf3ca0a..9497c1bf853 100644 --- a/opcodes/cgen.sh +++ b/opcodes/cgen.sh @@ -99,7 +99,6 @@ opcodes) =20 # 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 =20 ${cgen} ${cgendir}/cgen-opc.scm \ - -s ${cgendir} \ ${cgenflags} \ -OPC ${opcfile} \ -f "${archflags}" \ diff --git a/sim/Makefile.in b/sim/Makefile.in index 3da1b25d040..3dd14543450 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -1871,7 +1871,7 @@ SIM_COMMON_LIBS =3D \ $(LIBGNU) \ $(LIBGNU_EXTRA_LIBS) =20 -GUILE =3D $(or $(wildcard ../guile/libguile/guile),guile) +GUILE =3D guile CGEN =3D "$(GUILE) -l $(cgendir)/guile.scm -s" CGENFLAGS =3D -v CGEN_CPU_DIR =3D $(cgendir)/cpu diff --git a/sim/common/cgen.sh b/sim/common/cgen.sh index 394ef2d2e1b..a7479ec8d4c 100755 --- a/sim/common/cgen.sh +++ b/sim/common/cgen.sh @@ -60,7 +60,6 @@ arch) rm -f ${tmp}-all.h1 ${tmp}-all.h =20 ${cgen} ${cgendir}/cgen-sim.scm \ - -s ${cgendir} \ ${cgenflags} \ -f "${archflags}" \ -m ${mach} \ @@ -125,7 +124,6 @@ cpu | decode | cpu-decode) esac =20 ${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 =09 ${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 =20 ${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 5d0992fbd9e..08da2275b7d 100644 --- a/sim/common/local.mk +++ b/sim/common/local.mk @@ -178,7 +178,7 @@ SIM_COMMON_LIBS =3D \ ## =20 ## If the local tree has a bundled copy of guile, use that. -GUILE =3D $(or $(wildcard ../guile/libguile/guile),guile) +GUILE =3D guile CGEN =3D "$(GUILE) -l $(cgendir)/guile.scm -s" CGENFLAGS =3D -v CGEN_CPU_DIR =3D $(cgendir)/cpu