From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from omta35.uswest2.a.cloudfilter.net (omta35.uswest2.a.cloudfilter.net [35.89.44.34]) by sourceware.org (Postfix) with ESMTPS id 975AF3858D28 for ; Tue, 22 Aug 2023 19:48:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 975AF3858D28 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from eig-obgw-6005a.ext.cloudfilter.net ([10.0.30.201]) by cmsmtp with ESMTP id Y9VHqTJwFEoVsYXMNq7J5s; Tue, 22 Aug 2023 19:48:15 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id YXMMqmuQcNE1FYXMMqwP8d; Tue, 22 Aug 2023 19:48:14 +0000 X-Authority-Analysis: v=2.4 cv=Tu/1ORbh c=1 sm=1 tr=0 ts=64e510fe a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=UttIx32zK-AA:10 a=Qbun_eYptAEA:10 a=k9HirJ2AxV6qng3aPDUA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=zP0QgVu6pOh4nWr/A9kQmQkqQUKDLpQS63pynZFLmO0=; b=eBlc1dogFCimcEEl+ij4kz1Zaq fWWLu2pJVA8eA2QCCTpNvW7Dw3dXNiE3bkTxl9mYeCq0SQ6y7QVpaPg+pmodV15Q7tigToxzOjxPd eWyy8aLt6Lmw1dcfn1vRnlngo; Received: from 75-166-142-177.hlrn.qwest.net ([75.166.142.177]:44558 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1qYXMM-0032he-0E; Tue, 22 Aug 2023 13:48:14 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: binutils@sourcware.org, Tom Tromey Subject: [PATCH] Simplify definition of GUILE Date: Tue, 22 Aug 2023 13:48:04 -0600 Message-ID: <20230822194804.1306194-1-tom@tromey.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.142.177 X-Source-L: No X-Exim-ID: 1qYXMM-0032he-0E X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-142-177.hlrn.qwest.net (localhost.localdomain) [75.166.142.177]:44558 X-Source-Auth: tom+tromey.com X-Email-Count: 5 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfNSfUmr9IQ4W2neslBBiyIhv921e5/KEpQViLO3+24OSeSCdens32e/R7fbhLaiex4klAWblZrIV14+ZK+xf23Rax/4PkL0Ri+w1mCQ/BjcaFi8mXG1P H/YR4gYvpV2r3IXq3XHHuRgJy6hrNhTzHV2R8EQ7fv/3dDoVO8Eiy1EywdD29oDNHOt8QcDrqTAFFoG9mR+yY6bMsyQDw29GT/0= X-Spam-Status: No, score=-3025.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,JMQ_SPF_NEUTRAL,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_BL,RCVD_IN_MSPIKE_L3,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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. --- 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 +- 6 files changed, 4 insertions(+), 10 deletions(-) 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 = \ 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 605ce0a9ff2..29c26263061 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 40ebdf3ca0a..9497c1bf853 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 3da1b25d040..3dd14543450 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 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 ${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 5d0992fbd9e..08da2275b7d 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 -- 2.41.0