diff mbox

PR libstdc++/79789 fix non-reserved names in headers

Message ID 20170310152017.GR3501@redhat.com
State New
Headers show

Commit Message

Jonathan Wakely March 10, 2017, 3:20 p.m. UTC 
On 09/03/17 19:46 +0000, Jonathan Wakely wrote:
>On 03/03/17 10:47 -0500, David Edelsohn wrote:
>>This patch caused a new regression on AIX.
>
>I'm unable to bootstrap on either gcc111 or gcc119 so I can't test
>the fix.

export CONFIG_SHELL=/usr/bin/bash
PATH=/opt/freeware/bin:$PATH
$gccsrcdir/configure ... --disable-werror --with-included-gettext --with-gmp=/opt/cfarm --with-libiconv-prefix=/opt/cfarm --disable-libstdcxx-pch

Here's what I'm committing to trunk.

Tested powerpc64le-linux and powerpc-ibm-aix7.2.0.0

Comments

David Edelsohn March 10, 2017, 4:11 p.m. UTC | #1 
On Fri, Mar 10, 2017 at 10:20 AM, Jonathan Wakely <jwakely@redhat.com> wrote:
> On 09/03/17 19:46 +0000, Jonathan Wakely wrote:
>>
>> On 03/03/17 10:47 -0500, David Edelsohn wrote:
>>>
>>> This patch caused a new regression on AIX.
>>
>>
>> I'm unable to bootstrap on either gcc111 or gcc119 so I can't test
>> the fix.
>
>
> export CONFIG_SHELL=/usr/bin/bash
> PATH=/opt/freeware/bin:$PATH
> $gccsrcdir/configure ... --disable-werror --with-included-gettext
> --with-gmp=/opt/cfarm --with-libiconv-prefix=/opt/cfarm
> --disable-libstdcxx-pch
>
> Here's what I'm committing to trunk.
>
> Tested powerpc64le-linux and powerpc-ibm-aix7.2.0.0

Great!

Thank you very much!

- David
Jonathan Wakely March 14, 2017, 11:14 p.m. UTC | #2 
On 10/03/17 15:20 +0000, Jonathan Wakely wrote:
>On 09/03/17 19:46 +0000, Jonathan Wakely wrote:
>>On 03/03/17 10:47 -0500, David Edelsohn wrote:
>>>This patch caused a new regression on AIX.
>>
>>I'm unable to bootstrap on either gcc111 or gcc119 so I can't test
>>the fix.
>
>export CONFIG_SHELL=/usr/bin/bash
>PATH=/opt/freeware/bin:$PATH
>$gccsrcdir/configure ... --disable-werror --with-included-gettext --with-gmp=/opt/cfarm --with-libiconv-prefix=/opt/cfarm --disable-libstdcxx-pch
>
>Here's what I'm committing to trunk.
>
>Tested powerpc64le-linux and powerpc-ibm-aix7.2.0.0

Also committed to gcc-5-branch and gcc-6-branch.


>commit 5e390a2874a9629c13eaddb76f82a66f0634a864
>Author: Jonathan Wakely <jwakely@redhat.com>
>Date:   Fri Mar 10 13:14:33 2017 +0000
>
>    Fix libstdc++ reserved names test to pass on AIX
>    
>    	* testsuite/17_intro/names.cc: Undefine macros that clash with
>    	identifiers in AIX system headers.
>
>diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
>index a7d9a6b..c525861 100644
>--- a/libstdc++-v3/testsuite/17_intro/names.cc
>+++ b/libstdc++-v3/testsuite/17_intro/names.cc
>@@ -98,4 +98,13 @@
> #define x (
> #define y (
> #define z (
>+
>+#ifdef _AIX
>+// See https://gcc.gnu.org/ml/libstdc++/2017-03/msg00015.html
>+#undef f
>+#undef r
>+#undef x
>+#undef y
>+#endif
>+
> #include <bits/stdc++.h>
diff mbox

Patch

commit 5e390a2874a9629c13eaddb76f82a66f0634a864
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Fri Mar 10 13:14:33 2017 +0000

    Fix libstdc++ reserved names test to pass on AIX
    
    	* testsuite/17_intro/names.cc: Undefine macros that clash with
    	identifiers in AIX system headers.

diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index a7d9a6b..c525861 100644
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -98,4 +98,13 @@ 
 #define x (
 #define y (
 #define z (
+
+#ifdef _AIX
+// See https://gcc.gnu.org/ml/libstdc++/2017-03/msg00015.html
+#undef f
+#undef r
+#undef x
+#undef y
+#endif
+
 #include <bits/stdc++.h>