diff options
author | Cesar Philippidis <cesar@codesourcery.com> | 2014-05-20 14:31:30 -0700 |
---|---|---|
committer | Sandra Loosemore <sandra@gcc.gnu.org> | 2014-05-20 17:31:30 -0400 |
commit | 6ed9c90a5db18fa72928d77d47c0159f75486b45 (patch) | |
tree | 1656eaca20e3114aae455c329cfde81cccf4e2d6 /libstdc++-v3 | |
parent | ec27069c86f249327f8b6b6fcfa2ce72ae186f96 (diff) | |
download | gcc-6ed9c90a5db18fa72928d77d47c0159f75486b45.zip gcc-6ed9c90a5db18fa72928d77d47c0159f75486b45.tar.gz gcc-6ed9c90a5db18fa72928d77d47c0159f75486b45.tar.bz2 |
testsuite_flags.in (cxxflags): Remove @CXXFLAGS@ since libstdc++.exp imports those flags via getenv.
2014-05-20 Cesar Philippidis <cesar@codesourcery.com>
libstdc++-v3/
* scripts/testsuite_flags.in (cxxflags): Remove @CXXFLAGS@ since
libstdc++.exp imports those flags via getenv.
* testsuite/lib/libstdc++.exp (libstdc++_init): Ensure that
CXXFLAGS contains a '-O' flag.
From-SVN: r210659
Diffstat (limited to 'libstdc++-v3')
-rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
-rwxr-xr-x | libstdc++-v3/scripts/testsuite_flags.in | 2 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/lib/libstdc++.exp | 5 |
3 files changed, 13 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 72bf941..d2f4d46 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2014-05-20 Cesar Philippidis <cesar@codesourcery.com> + + * scripts/testsuite_flags.in (cxxflags): Remove @CXXFLAGS@ since + libstdc++.exp imports those flags via getenv. + * testsuite/lib/libstdc++.exp (libstdc++_init): Ensure that + CXXFLAGS contains a '-O' flag. + 2014-05-20 Alexey Merzlyakov <alexey.merzlyakov@samsung.com> PR libstdc++/61223 diff --git a/libstdc++-v3/scripts/testsuite_flags.in b/libstdc++-v3/scripts/testsuite_flags.in index cf692f8..5e7ad32 100755 --- a/libstdc++-v3/scripts/testsuite_flags.in +++ b/libstdc++-v3/scripts/testsuite_flags.in @@ -57,7 +57,7 @@ case ${query} in ;; --cxxflags) CXXFLAGS_default="-D_GLIBCXX_ASSERT -fmessage-length=0" - CXXFLAGS_config="@SECTION_FLAGS@ @CXXFLAGS@ @EXTRA_CXX_FLAGS@" + CXXFLAGS_config="@SECTION_FLAGS@ @EXTRA_CXX_FLAGS@" echo ${CXXFLAGS_default} ${CXXFLAGS_config} ;; --cxxvtvflags) diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index a23ea3b..2b2a38b 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -282,6 +282,11 @@ proc libstdc++_init { testfile } { } append cxxflags " " append cxxflags [getenv CXXFLAGS] + + if ![regexp "\-O" $cxxflags] { + append cxxflags " -g -O2" + } + v3track cxxflags 2 # Always use MO files built by this test harness. |