re PR libstdc++/68838 (AIX 32 bit wchar_t testsuite failures)

PR libstdc++/68838
* testsuite/lib/libstdc++.exp (DEFAULT_CXXFLAGS): Add -Wl,-bmaxdata on AIX.
* testsuite/23_containers/vector/profile/vector.cc: Remove
dg-additional-options.

From-SVN: r242967

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4a26191fb8fe95c16dad926fc3e6a1c672a1935f..02ad29e6c19e653d909e314a338a032e0f62870a 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2016-11-29  David Edelsohn  <dje.gcc@gmail.com>
+
+       PR libstdc++/68838
+       * testsuite/lib/libstdc++.exp (DEFAULT_CXXFLAGS): Add -Wl,-bmaxdata on
+       AIX.
+       * testsuite/23_containers/vector/profile/vector.cc: Remove
+       dg-additional-options.
+
 2016-11-26  Tim Shen  <timshen@google.com>
 
        PR libstdc++/78441

diff --git a/libstdc++-v3/testsuite/23_containers/vector/profile/vector.cc b/libstdc++-v3/testsuite/23_containers/vector/profile/vector.cc
index 9630a391c6060cc165f0973e1f60cc33b7726246..7806fb24bf35cd93054a6b3a1b3e9abc854c7566 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/vector/profile/vector.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/profile/vector.cc
@@ -2,8 +2,6 @@
 // Advice: set tmp as 10000
 
 // { dg-options "-DITERATIONS=20" { target simulator } }
-// AIX requires higher memory limit
-// { dg-additional-options "-Wl,-bmaxdata:0x20000000" { target { powerpc-ibm-aix* } } }
 
 #ifndef ITERATIONS
 #define ITERATIONS 2000

diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index bdb80a06a36c307452bc4a6c18d71394d2049d21..190f070a5d0449f2306ec2345bb18371e6933d82 100644 (file)
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -136,6 +136,9 @@ proc libstdc++_init { testfile } {
        if { [string match "powerpc-*-darwin*" $target_triplet] } {
            append DEFAULT_CXXFLAGS " -multiply_defined suppress"
        } 
+       if { [string match "powerpc-ibm-aix*" $target_triplet] } {
+           append DEFAULT_CXXFLAGS " -Wl,-bmaxdata:0x20000000"
+       } 
     }
     v3track DEFAULT_CXXFLAGS 2