From: David Edelsohn <dje.gcc@gmail.com>
Date: Tue, 29 Nov 2016 17:50:27 +0000 (+0000)
Subject: re PR libstdc++/68838 (AIX 32 bit wchar_t testsuite failures)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=57e27acf2810cc98f89aa429d2babb6d7673ded9;p=gcc.git

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 4a26191fb8f..02ad29e6c19 100644
--- 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 9630a391c60..7806fb24bf3 100644
--- 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 bdb80a06a36..190f070a5d0 100644
--- 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