* [PATCH] Fix PR 67102: Add libstdc++ dependancy to libffi
@ 2021-09-15 20:56 apinski
2021-09-16 15:27 ` Jeff Law
2021-09-17 7:45 ` Thomas Schwinge
0 siblings, 2 replies; 5+ messages in thread
From: apinski @ 2021-09-15 20:56 UTC (permalink / raw)
To: gcc-patches; +Cc: Andrew Pinski
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(+)
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
--
2.17.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Fix PR 67102: Add libstdc++ dependancy to libffi
2021-09-15 20:56 [PATCH] Fix PR 67102: Add libstdc++ dependancy to libffi apinski
@ 2021-09-16 15:27 ` Jeff Law
2021-09-17 7:45 ` Thomas Schwinge
1 sibling, 0 replies; 5+ messages in thread
From: Jeff Law @ 2021-09-16 15:27 UTC (permalink / raw)
To: apinski, gcc-patches
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Fix PR 67102: Add libstdc++ dependancy to libffi
2021-09-15 20:56 [PATCH] Fix PR 67102: Add libstdc++ dependancy to libffi apinski
2021-09-16 15:27 ` Jeff Law
@ 2021-09-17 7:45 ` Thomas Schwinge
2021-09-17 8:01 ` Andrew Pinski
1 sibling, 1 reply; 5+ messages in thread
From: Thomas Schwinge @ 2021-09-17 7:45 UTC (permalink / raw)
To: Andrew Pinski, gcc-patches; +Cc: Maciej W.Rozycki
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Fix PR 67102: Add libstdc++ dependancy to libffi
2021-09-17 7:45 ` Thomas Schwinge
@ 2021-09-17 8:01 ` Andrew Pinski
2022-01-25 17:48 ` Thomas Schwinge
0 siblings, 1 reply; 5+ messages in thread
From: Andrew Pinski @ 2021-09-17 8:01 UTC (permalink / raw)
To: Thomas Schwinge; +Cc: Andrew Pinski, GCC Patches, Maciej W.Rozycki
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Fix PR 67102: Add libstdc++ dependancy to libffi
2021-09-17 8:01 ` Andrew Pinski
@ 2022-01-25 17:48 ` Thomas Schwinge
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Schwinge @ 2022-01-25 17:48 UTC (permalink / raw)
To: Andrew Pinski, Andrew Pinski, gcc-patches; +Cc: Maciej W.Rozycki
[-- Attachment #1: Type: text/plain, Size: 3517 bytes --]
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Revert-Fix-PR-67102-Add-libstdc-dependancy-to-libffi.patch --]
[-- Type: text/x-diff, Size: 4517 bytes --]
From aeac414923aa1e87986c7fc6f9b921d89a9b86cf Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Tue, 25 Jan 2022 18:44:02 +0100
Subject: [PATCH] Revert "Fix PR 67102: Add libstdc++ dependancy to libffi"
[PR67102]
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 4e2087fbcfa..80347fd13da 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -620,7 +620,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 79c77fccf0f..7d97049c8d6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -66516,7 +66516,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-liboffloadmic: maybe-configure-target-libgomp
--
2.34.1
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-01-25 17:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-15 20:56 [PATCH] Fix PR 67102: Add libstdc++ dependancy to libffi apinski
2021-09-16 15:27 ` Jeff Law
2021-09-17 7:45 ` Thomas Schwinge
2021-09-17 8:01 ` Andrew Pinski
2022-01-25 17:48 ` Thomas Schwinge
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).