summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog8
-rw-r--r--libstdc++-v3/testsuite/lib/libstdc++.exp2
2 files changed, 9 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 51d12d4bd42..9328e36138e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2018-10-08 Joseph Myers <joseph@codesourcery.com>
+
+ Backport from mainline
+ 2018-10-02 Joseph Myers <joseph@codesourcery.com>
+
+ * testsuite/lib/libstdc++.exp (libstdc++_init): Use
+ -fno-show-column in default cxxflags.
+
2018-08-08 Jonathan Wakely <jwakely@redhat.com>
Backport from mainline
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 18ee31882e1..70ddda93f10 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -235,7 +235,7 @@ proc libstdc++_init { testfile } {
# Default settings.
set cxx [transform "g++"]
- set cxxflags "-D_GLIBCXX_ASSERT -fmessage-length=0"
+ set cxxflags "-D_GLIBCXX_ASSERT -fmessage-length=0 -fno-show-column"
set cxxpchflags ""
set cxxvtvflags ""
set cxxldflags ""