From patchwork Tue Jan 23 00:19:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 190502 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp37547dyi; Mon, 22 Jan 2024 16:21:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IGSMmA+IAa9BbLjUMvA1cGjSiMdOvCkWOEd90KTu5LYDUh/LKWqTRMCTmrKYtDIOnC0aRYJ X-Received: by 2002:ac8:588a:0:b0:42a:297c:fc28 with SMTP id t10-20020ac8588a000000b0042a297cfc28mr46115qta.82.1705969289413; Mon, 22 Jan 2024 16:21:29 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705969289; cv=pass; d=google.com; s=arc-20160816; b=kb5aMS0/Ju+lcr9byVJpFIXsW9V+M+f7a9A0IMymVgfMaratnMUGub3IRZNcStjW35 F9VXcaFgJ04lKDd2yKfbkJxII+wNVj9wlk/qKiq2crh4oOSTy1T59CjIanDck7A96B/N Cy8TZUy9DzF9lMtrp+piSNwMlcHt7/KxQMbKJwlfXApd9wmu1i2lLh1ZSfCIHIsp5HNu 5qf4Pij0nq9z/MD2RHAcTXdOEwLw1+gG8kv9kjy4THo+lvrWxIWdOTB7vBqS6ZStXWzp hjZo1oGGqt6uG15vJV57iJbG+mpfKxLGdLDltvF+t4YvhQbhxbHnm0Bs6l/lNoEXDuyT F+0A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=hU7zfI9T3fbAivPTpwUEtkB5fEL5bzbqlIJNtzqE/c4=; fh=VYZJvH25voZkmMTfhgIt1HXx41dOa25128PgfV0yCmo=; b=ooipGIeJJciMXkULfyWSuydk0aUWmYGfregu+R630O72wENhnyYwEDTaLmjF2xn56I rzBBWuurpVl357pBz8NyElW3ulpL4TW5Pg2gUx5gj3W7HaREt0WarywTWDVN4uKuD31B AhbQkNT9pRglNEaNN42X7ljq5/7qATm9jMeThzMInMMr7Qfrkd+lTIzLuHR9cs+NqM2P cCL4rkRnTpaDvf/vGPXgKZ6mgBsSOx0IP2YWbBHVz89dtRE9cuNIum2gznHALr5LN43Y 60mYEetyqlpiYTFCRZ7+oWfJ7mzudbr7Vr6W9R6NsIeAd7BAX5c79QAvd3ymkPjxgJeA lGWQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=fail header.i=@tromey.com header.s=default header.b=AGfKAY0+; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id w9-20020ac857c9000000b0042a476cb71fsi1866189qta.800.2024.01.22.16.21.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 16:21:29 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=fail header.i=@tromey.com header.s=default header.b=AGfKAY0+; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 154A1385840E for ; Tue, 23 Jan 2024 00:21:29 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from omta036.useast.a.cloudfilter.net (omta036.useast.a.cloudfilter.net [44.202.169.35]) by sourceware.org (Postfix) with ESMTPS id F15C83858D3C for ; Tue, 23 Jan 2024 00:19:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F15C83858D3C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org F15C83858D3C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.35 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705969226; cv=none; b=NAciAgs/N31oxFNTkg4JLYcyQwM3nGo1D8y3oxT5bZ6Eg9g+IRJtT0knGXSi1/hKkDaOIhSnIk1cGY1VuwN7bVgNojfbblQrZn6jlo0wFZWmk0reSlKQJKChHfg2aRt1Zxs6lQ3kOYa3uAZu0TRJ0t26ftweb3AtjdPGIg3DkEk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705969226; c=relaxed/simple; bh=4cKHXELT2w30nty8TMq3p6aQhiZ/tYmI+Iba+eBjTvY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=WU74MrkW3VM/bm2LVaNgRb9NpPzY/UKUN1lr43bKtWs1mw7VrH/+nonDJpYv9a7tkN5WxxNfSuQqVIg6ywElmFqnAXPGAPL4ZtLlprBDq2vK7aXFLlNKfARFb3jLbK9fWIOgeg9f0+qPVdzmiKiS5/Nmvwq5oYttg5PFYeHQrfU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5007a.ext.cloudfilter.net ([10.0.29.141]) by cmsmtp with ESMTPS id S2aRrcyF48uLRS4VsrSzp9; Tue, 23 Jan 2024 00:19:36 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id S4VrryDkGPwzWS4Vsr0Zch; Tue, 23 Jan 2024 00:19:36 +0000 X-Authority-Analysis: v=2.4 cv=T8yf8tGQ c=1 sm=1 tr=0 ts=65af0618 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dEuoMetlWLkA:10 a=Qbun_eYptAEA:10 a=LQkeXghegzqIkTuooEAA: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=hU7zfI9T3fbAivPTpwUEtkB5fEL5bzbqlIJNtzqE/c4=; b=AGfKAY0+2iACET0XRolCVe0MzG fXN4dr2CbEHTpYhzBOhxz1PKhHX4yGuWvwcEZSNcMeAQ7sRWCortcEpGR2xRcVm/5YzD8BSsPdzGW ivN7eBjk1LpE/qJofn+pUyWri; Received: from [161.98.8.3] (port=35428 helo=prentzel.ci.boulder.co.us) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1rS4Vr-003Gf5-0q; Mon, 22 Jan 2024 17:19:35 -0700 From: Tom Tromey To: gcc-patches@gcc.gnu.org Cc: gdb-patches@sourceware.org, Andrew Burgess , Tom Tromey Subject: [PATCH] Revert "Pass GUILE down to subdirectories" Date: Mon, 22 Jan 2024 17:19:28 -0700 Message-ID: <20240123001928.787780-1-tom@tromey.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 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 - gcc.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 161.98.8.3 X-Source-L: No X-Exim-ID: 1rS4Vr-003Gf5-0q X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (prentzel.ci.boulder.co.us) [161.98.8.3]:35428 X-Source-Auth: tom+tromey.com X-Email-Count: 9 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfAh6zKbWQMOpI70lWZ0gybUg4tM4dSFAqsf1ciPLjE+mM9oNUqk6c25ssX5FtPGGb636kcdcImDkLoMwqdCK38P8Qrk0cJryKpN7jgqN+Z7VG4WZLqtK Va7GJ4zi2WuBbmEU+rqLr4D7Nd1ez2c5pcfs31mAVs8ZbcrxkunfZR+VrTmaciQw53mghD+nN+R75J/nW9/2Ktjyr68adn37KCI= X-Spam-Status: No, score=-3022.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788838453729906853 X-GMAIL-MSGID: 1788838453729906853 This reverts commit b7e5a29602143b53267efcd9c8d5ecc78cd5a62f. This patch caused problems for some users when building gdb, because it would cause 'guild' to be invoked with the wrong versin of guile. On the whole it seems simpler to just back this out. * Makefile.in: Rebuild. * Makefile.tpl (BASE_EXPORTS): Remove GUILE. (GUILE): Remove. * Makefile.def (flags_to_pass): Remove GUILE. --- Makefile.def | 1 - Makefile.in | 8 ++------ Makefile.tpl | 7 ++----- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Makefile.def b/Makefile.def index 19954e7d731..c8c80af3657 100644 --- a/Makefile.def +++ b/Makefile.def @@ -312,7 +312,6 @@ flags_to_pass = { flag= GNATBIND ; }; flags_to_pass = { flag= GNATMAKE ; }; flags_to_pass = { flag= GDC ; }; flags_to_pass = { flag= GDCFLAGS ; }; -flags_to_pass = { flag= GUILE ; }; // Target tools flags_to_pass = { flag= AR_FOR_TARGET ; }; diff --git a/Makefile.in b/Makefile.in index edb0c8a9a42..245dd610b53 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,7 +3,7 @@ # # Makefile for directory with subdirs to build. # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2023 +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # Free Software Foundation # # This file is free software; you can redistribute it and/or modify @@ -143,8 +143,7 @@ BASE_EXPORTS = \ M4="$(M4)"; export M4; \ SED="$(SED)"; export SED; \ AWK="$(AWK)"; export AWK; \ - MAKEINFO="$(MAKEINFO)"; export MAKEINFO; \ - GUILE="$(GUILE)"; export GUILE; + MAKEINFO="$(MAKEINFO)"; export MAKEINFO; # This is the list of variables to export in the environment when # configuring subdirectories for the build system. @@ -452,8 +451,6 @@ GM2FLAGS = $(CFLAGS) PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -GUILE = guile - # Pass additional PGO and LTO compiler options to the PGO build. BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS) override CFLAGS += $(BUILD_CFLAGS) @@ -886,7 +883,6 @@ BASE_FLAGS_TO_PASS = \ "GNATMAKE=$(GNATMAKE)" \ "GDC=$(GDC)" \ "GDCFLAGS=$(GDCFLAGS)" \ - "GUILE=$(GUILE)" \ "AR_FOR_TARGET=$(AR_FOR_TARGET)" \ "AS_FOR_TARGET=$(AS_FOR_TARGET)" \ "CC_FOR_TARGET=$(CC_FOR_TARGET)" \ diff --git a/Makefile.tpl b/Makefile.tpl index adbcbdd1d57..6e22adecd2f 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -6,7 +6,7 @@ in # # Makefile for directory with subdirs to build. # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2023 +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 # Free Software Foundation # # This file is free software; you can redistribute it and/or modify @@ -146,8 +146,7 @@ BASE_EXPORTS = \ M4="$(M4)"; export M4; \ SED="$(SED)"; export SED; \ AWK="$(AWK)"; export AWK; \ - MAKEINFO="$(MAKEINFO)"; export MAKEINFO; \ - GUILE="$(GUILE)"; export GUILE; + MAKEINFO="$(MAKEINFO)"; export MAKEINFO; # This is the list of variables to export in the environment when # configuring subdirectories for the build system. @@ -455,8 +454,6 @@ GM2FLAGS = $(CFLAGS) PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -GUILE = guile - # Pass additional PGO and LTO compiler options to the PGO build. BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS) override CFLAGS += $(BUILD_CFLAGS)