Message ID | 1631739397-1078-1-git-send-email-apinski@marvell.com |
---|---|
State | Committed |
Commit | db1a65d9364fe72c2fff65fb2dec051728b6f3fa |
Headers |
Return-Path: <gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org> X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C3E453858006 for <patchwork@sourceware.org>; Wed, 15 Sep 2021 20:57:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C3E453858006 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1631739433; bh=ZWkiTM+XWetHWxEGXTctK4OivU9H76xQetLdHtEb1SA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=rI8RE5Hi5IZrJdZON8tW6nKXOhYVv/Xj+y9IbkQyqSQFWnHp+9QXwI4RWo6z+nk0c /X/Dm+jCku+DNr1iI6PNZ1i30AMnKEFBcmR98vsa04lFg+2Sm8Avkk5yBzyh65BNlE jrQmUoMLbbI3uONTdYILAqvJ374xLbd0PMWhJyNI= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by sourceware.org (Postfix) with ESMTPS id EA8D53858413 for <gcc-patches@gcc.gnu.org>; Wed, 15 Sep 2021 20:56:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EA8D53858413 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18FHdwUm023174 for <gcc-patches@gcc.gnu.org>; Wed, 15 Sep 2021 13:56:43 -0700 Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com with ESMTP id 3b3f6y26ht-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for <gcc-patches@gcc.gnu.org>; Wed, 15 Sep 2021 13:56:43 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 15 Sep 2021 13:56:40 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Wed, 15 Sep 2021 13:56:40 -0700 Received: from linux.wrightpinski.org.com (unknown [10.69.242.197]) by maili.marvell.com (Postfix) with ESMTP id D1BF53F703F; Wed, 15 Sep 2021 13:56:40 -0700 (PDT) To: <gcc-patches@gcc.gnu.org> Subject: [PATCH] Fix PR 67102: Add libstdc++ dependancy to libffi Date: Wed, 15 Sep 2021 13:56:37 -0700 Message-ID: <1631739397-1078-1-git-send-email-apinski@marvell.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-GUID: Bi2A-jcmIkIngUBAjTiIepz8udrNISws X-Proofpoint-ORIG-GUID: Bi2A-jcmIkIngUBAjTiIepz8udrNISws X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.391,FMLib:17.0.607.475 definitions=2021-09-15_06,2021-09-15_01,2020-04-07_01 X-Spam-Status: No, score=-14.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list <gcc-patches.gcc.gnu.org> List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe> List-Archive: <https://gcc.gnu.org/pipermail/gcc-patches/> List-Post: <mailto:gcc-patches@gcc.gnu.org> List-Help: <mailto:gcc-patches-request@gcc.gnu.org?subject=help> List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe> From: apinski--- via Gcc-patches <gcc-patches@gcc.gnu.org> Reply-To: apinski@marvell.com Cc: Andrew Pinski <apinski@marvell.com> Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" <gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org> |
Series |
Fix PR 67102: Add libstdc++ dependancy to libffi
|
|
Commit Message
Li, Pan2 via Gcc-patches
Sept. 15, 2021, 8:56 p.m. UTC
From: Andrew Pinski <apinski@marvell.com>
The error message is obvious -funconfigured-libstdc++-v3 is used
on the g++ command line. So we just add the dependancy.
OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions.
ChangeLog:
* Makefile.def: Have configure-target-libffi depend on
all-target-libstdc++-v3.
* Makefile.in: Regenerate.
---
Makefile.def | 1 +
Makefile.in | 1 +
2 files changed, 2 insertions(+)
Comments
On 9/15/2021 2:56 PM, apinski--- via Gcc-patches wrote: > From: Andrew Pinski <apinski@marvell.com> > > The error message is obvious -funconfigured-libstdc++-v3 is used > on the g++ command line. So we just add the dependancy. > > OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions. > > ChangeLog: > > * Makefile.def: Have configure-target-libffi depend on > all-target-libstdc++-v3. > * Makefile.in: Regenerate. OK jeff
Hi Andrew! First, I appreciate you working through all these old PRs! 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.) Grüße Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
On Fri, Sep 17, 2021 at 12:46 AM Thomas Schwinge <thomas@codesourcery.com> wrote: > > Hi Andrew! > > First, I appreciate you working through all these old PRs! > > > 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. Also it looks like the OpenACC changes never went to the trunk either .... > > > Grüße > Thomas > ----------------- > Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
Hi! 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: >> First, I appreciate you working through all these old PRs! >> >> >> 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. I have thus pushed 'git revert db1a65d9364fe72c2fff65fb2dec051728b6f3fa' to master branch in commit aeac414923aa1e87986c7fc6f9b921d89a9b86cf 'Revert "Fix PR 67102: Add libstdc++ dependancy to libffi" [PR67102]', see attached. Grüße Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
diff --git a/Makefile.def b/Makefile.def index de3e0052106..90316364d01 100644 --- 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; }; diff --git a/Makefile.in b/Makefile.in index 61af99dc75a..81b26c7177e 100644 --- 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