[committed] libstdc++: Fix test failure on AIX

[committed] libstdc++: Fix test failure on AIX

[Jonathan Wakely]

Tested x86_64-linux, pushed to trunk.

-- >8 --

This fixes a test failure due to a non-reserved name in an AIX system
header (included via <pthread.h>). That name clashes with one of the
names we check our own headers for, so skip checking that name on AIX.

libstdc++-v3/ChangeLog:

	* testsuite/17_intro/names.cc (func): Undef on AIX.
---
 libstdc++-v3/testsuite/17_intro/names.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index 1f7f83da8fa..ede2fe8caa7 100644
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -203,6 +203,8 @@
 #undef y
 // <sys/var.h> defines vario::v
 #undef v
+// <sys/timer.h> defines trb::func and cputime_tmr::func
+#undef func
 #endif
 
 #ifdef __APPLE__
-- 
2.34.1

[committed] libstdc++: Fix test failure on AIX

[Jonathan Wakely]

[-- Attachment #1: Type: text/plain, Size: 637 bytes --]

This fixes a failure on AIX 7.2:

FAIL: 17_intro/names.cc (test for excess errors)
Excess errors:
/home/jwakely/src/gcc/libstdc++-v3/testsuite/17_intro/names.cc:99: error: expected identifier before '(' token
/usr/include/sys/var.h:187: error: expected unqualified-id before '{' token
/usr/include/sys/var.h:187: error: expected ')' before '{' token
/usr/include/sys/var.h:337: error: expected unqualified-id before ';' token
/usr/include/sys/var.h:337: error: expected ')' before ';' token

libstdc++-v3/ChangeLog:

	* testsuite/17_intro/names.cc: Do not test 'v' on AIX.

Tested powerpc64le-linux and powerpc-aix. Committed to trunk.


[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 1155 bytes --]

commit 1a8d1f54de371de88b2604d8c0e4e01306be8870
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Wed Nov 25 16:58:05 2020

    libstdc++: Fix test failure on AIX
    
    This fixes a failure on AIX 7.2:
    
    FAIL: 17_intro/names.cc (test for excess errors)
    Excess errors:
    /home/jwakely/src/gcc/libstdc++-v3/testsuite/17_intro/names.cc:99: error: expected identifier before '(' token
    /usr/include/sys/var.h:187: error: expected unqualified-id before '{' token
    /usr/include/sys/var.h:187: error: expected ')' before '{' token
    /usr/include/sys/var.h:337: error: expected unqualified-id before ';' token
    /usr/include/sys/var.h:337: error: expected ')' before ';' token
    
    libstdc++-v3/ChangeLog:
    
            * testsuite/17_intro/names.cc: Do not test 'v' on AIX.

diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index 5a61c97e9899..2c8bfff26e1c 100644
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -193,6 +193,8 @@
 #undef r
 #undef x
 #undef y
+// <sys/var.h> defines vario::v
+#undef v
 #endif
 
 #ifdef __hpux__