Message ID | 20230807111029.2320238-42-arsen@aarsen.me |
---|---|
State | Unresolved |
Headers |
Return-Path: <binutils-bounces+ouuuleilei=gmail.com@sourceware.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1390672vqr; Mon, 7 Aug 2023 04:52:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6/qrlUYnPBtIPYinE267jscsOPV5hr6EYJ3nd43hwpWsKuSVSXH/pWgjxj/NFR/HkudHn X-Received: by 2002:a05:6402:d7:b0:523:1e18:3a78 with SMTP id i23-20020a05640200d700b005231e183a78mr6852818edu.12.1691409125740; Mon, 07 Aug 2023 04:52:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691409125; cv=none; d=google.com; s=arc-20160816; b=Dikhw9jiJpSJ7vavkNOsVrp619pe97YKHl87MvKZpNySs10N5g8b+G0fEmVoM/o3N1 M/EM0R02RFuDSzFBDu+XXdptkouaZdoGcQEepp3Eae6gspMltpChmKnhFbyqbyGbpw2R xxVqy+Wzg9ojf2TtUHuwHqxfv4eoFSOmOD9HU9Bh53a3hOQJa+PlvJAdXnTh0En72kh2 UZO2MnkLWx2VecLnbcavlXQj1BtILqKoSN+/MgX7yrm4jPVYZITonX9MBsHdFNEWSN49 0Bif2KyAQ5OGCgJmsHn+sttZVpN8vyCOiCRPS6f6evWBFDKgGE4AE7IYxl8hMBwNjXb/ ZdAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=G8nZFhJNSWCyy3V+LzCRZcZsdmV+L05o+YHPVtqxz3U=; fh=jzN3YirciA8DjxQ6xj55/ueE9dT+juMNx4NBscLw5dM=; b=KF+J4laE3f76Qp7aJRA+vdFKXZAxaCXq2sBOg7WptmZfVFY2ilkj928qg6fgARTnZj a7h2xZXzA2VqTdXsQKolBet8vvNBqBiMX6FGlh7oxR62YNZfXKQKRCTXgI+g9URgfMiv Obc9XrWusPWTOqzh6ClUAhhJ0wZMtDoUldD0CzkRkDh/HMczTm/I35gGerVeqgvpcyUQ bDRaIkqjwWTxqZNmzwW6l3ztvft9P0rdRlYBlGqk4cEpqtopsaDeNrBaXFkHeeGSyfJM MNvcn3DCtmXizSlWg0LWKPQt8ky9asc+kUoO16+vSq1Qpt5Zx0Y7NVvmE1N7tpFYaBUx z/Fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=dQ8Iup79; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id m19-20020aa7c493000000b0051e031046a1si4476136edq.444.2023.08.07.04.51.35 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 04:52:05 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=dQ8Iup79; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 78294395B04B for <ouuuleilei@gmail.com>; Mon, 7 Aug 2023 11:35:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 78294395B04B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1691408134; bh=G8nZFhJNSWCyy3V+LzCRZcZsdmV+L05o+YHPVtqxz3U=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=dQ8Iup79KjpLvqIdH8Ho8Sl6r0nNFMMNFYsQEVkdvn1zTImh+MZGD0xTpSrC0b+MM 8amU+odmwROmjcPvYQsZotZvKgEr6APyp/TLExRaZ5oAJKY/p+MfcC0gwN4zp0c2rS oTS7KFDVR1vzaH7WHM9B+BAZAvlkPD6LfJAwPJiE= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [IPv6:2001:67c:2050:0:465::101]) by sourceware.org (Postfix) with ESMTPS id 1E49F3858035; Mon, 7 Aug 2023 11:20:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1E49F3858035 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4RKDPT1d5jz9sZD; Mon, 7 Aug 2023 13:19:57 +0200 (CEST) To: gdb-patches@sourceware.org, binutils@sourceware.org Cc: Thomas Schwinge <thomas@codesourcery.com> Subject: [PATCH 41/45] Revert "Fix PR 67102: Add libstdc++ dependancy to libffi" [PR67102] Date: Mon, 7 Aug 2023 13:07:44 +0200 Message-ID: <20230807111029.2320238-42-arsen@aarsen.me> In-Reply-To: <20230807111029.2320238-1-arsen@aarsen.me> References: <20230807111029.2320238-1-arsen@aarsen.me> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4RKDPT1d5jz9sZD X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_INFOUSMEBIZ, RCVD_IN_DNSWL_LOW, 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list <binutils.sourceware.org> List-Unsubscribe: <https://sourceware.org/mailman/options/binutils>, <mailto:binutils-request@sourceware.org?subject=unsubscribe> List-Archive: <https://sourceware.org/pipermail/binutils/> List-Post: <mailto:binutils@sourceware.org> List-Help: <mailto:binutils-request@sourceware.org?subject=help> List-Subscribe: <https://sourceware.org/mailman/listinfo/binutils>, <mailto:binutils-request@sourceware.org?subject=subscribe> From: =?utf-8?q?Arsen_Arsenovi=C4=87_via_Binutils?= <binutils@sourceware.org> Reply-To: =?utf-8?q?Arsen_Arsenovi=C4=87?= <arsen@aarsen.me> Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" <binutils-bounces+ouuuleilei=gmail.com@sourceware.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773571015507844596 X-GMAIL-MSGID: 1773571015507844596 |
Series |
Synchronize shared build infrastructure with GCC tree
|
|
Checks
Context | Check | Description |
---|---|---|
snail/binutils-gdb-check | warning | Git am fail log |
Commit Message
Arsen Arsenović
Aug. 7, 2023, 11:07 a.m. UTC
From: Thomas Schwinge <thomas@codesourcery.com> This reverts commit db1a65d9364fe72c2fff65fb2dec051728b6f3fa. On 2021-09-17T01:01:39-0700, Andrew Pinski via Gcc-patches <gcc-patches@gcc.gnu.org> wrote: > On Fri, Sep 17, 2021 at 12:46 AM Thomas Schwinge <thomas@codesourcery.com> wrote: >> On 2021-09-15T13:56:37-0700, apinski--- via Gcc-patches <gcc-patches@gcc.gnu.org> wrote: >> > The error message is obvious -funconfigured-libstdc++-v3 is used >> > on the g++ command line. So we just add the dependancy. >> >> > --- a/Makefile.def >> > +++ b/Makefile.def >> > @@ -592,6 +592,7 @@ dependencies = { module=configure-target-fastjar; on=configure-target-zlib; }; >> > dependencies = { module=all-target-fastjar; on=all-target-zlib; }; >> > dependencies = { module=configure-target-libgo; on=configure-target-libffi; }; >> > dependencies = { module=configure-target-libgo; on=all-target-libstdc++-v3; }; >> > +dependencies = { module=configure-target-libffi; on=all-target-libstdc++-v3; }; >> > dependencies = { module=all-target-libgo; on=all-target-libbacktrace; }; >> > dependencies = { module=all-target-libgo; on=all-target-libffi; }; >> > dependencies = { module=all-target-libgo; on=all-target-libatomic; }; >> >> I'm confused, because given that this 'Makefile.def' change only has the >> following effect: >> >> > --- a/Makefile.in >> > +++ b/Makefile.in >> > @@ -61261,6 +61261,7 @@ all-bison: maybe-all-intl >> > all-flex: maybe-all-intl >> > all-m4: maybe-all-intl >> > configure-target-libgo: maybe-all-target-libstdc++-v3 >> > +configure-target-libffi: maybe-all-target-libstdc++-v3 >> > configure-target-liboffloadmic: maybe-configure-target-libgomp >> > all-target-liboffloadmic: maybe-all-target-libgomp >> > configure-target-newlib: maybe-all-binutils >> >> ... isn't that actually a no-op, because we already had such a dependency >> listed? Now twice: >> >> $ grep -n -F 'configure-target-libffi: maybe-all-target-libstdc++-v3' -- Makefile.in >> 61264:configure-target-libffi: maybe-all-target-libstdc++-v3 >> 61372:configure-target-libffi: maybe-all-target-libstdc++-v3 >> >> Compared to the existing one, the one you've added is additionally >> restricted by '@unless gcc-bootstrap'. >> >> I noticed this as I remembered that on our og[...] development branches >> we have a patch in the opposite direction: get rid of this dependency via >> removing 'lang_env_dependencies = { module=libffi; cxx=true; };' from >> 'Makefile.def'. See >> <http://mid.mail-archive.com/alpine.DEB.2.21.9999.1812201344250.99920@build7-trusty-cs.sje.mentorg.com> >> "Disable libstdc++ dependency for libffi". (Maciej CCed in case you have >> any further thoughts on that.) > > Oh, I see what happened now, the old bug was actually fixed by r6-5415 > which added cxx=true. > So yes my patch is actually not needed and can be reverted. > I tried to look to see if there was a dependency was there but for > some reason I did not see it. --- Makefile.def | 1 - Makefile.in | 1 - 2 files changed, 2 deletions(-)
diff --git a/Makefile.def b/Makefile.def index d6cafdbc180..ee7559fdd3e 100644 --- a/Makefile.def +++ b/Makefile.def @@ -640,7 +640,6 @@ dependencies = { module=configure-target-fastjar; on=configure-target-zlib; }; dependencies = { module=all-target-fastjar; on=all-target-zlib; }; dependencies = { module=configure-target-libgo; on=configure-target-libffi; }; dependencies = { module=configure-target-libgo; on=all-target-libstdc++-v3; }; -dependencies = { module=configure-target-libffi; on=all-target-libstdc++-v3; }; dependencies = { module=all-target-libgo; on=all-target-libbacktrace; }; dependencies = { module=all-target-libgo; on=all-target-libffi; }; dependencies = { module=all-target-libgo; on=all-target-libatomic; }; diff --git a/Makefile.in b/Makefile.in index cfb31f03318..5f0402b5bb7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -67057,7 +67057,6 @@ all-m4: maybe-all-intl configure-target-fastjar: maybe-configure-target-zlib all-target-fastjar: maybe-all-target-zlib configure-target-libgo: maybe-all-target-libstdc++-v3 -configure-target-libffi: maybe-all-target-libstdc++-v3 all-target-libgo: maybe-all-target-libbacktrace all-target-libgo: maybe-all-target-libatomic configure-target-libgm2: maybe-all-target-libstdc++-v3