libstdc++: Pass CXXFLAGS to check_performance script

It looks like our check-performance target runs completely unoptimized,
which is a bit silly. This exports the CXXFLAGS from the parent make
process to the check_performance script.

libstdc++-v3/ChangeLog:

	* scripts/check_performance: Use gnu++11 instead of gnu++0x.
	* testsuite/Makefile.am (check-performance): Export CXXFLAGS to
	child process.
	* testsuite/Makefile.in: Regenerate.

diff --git a/libstdc++-v3/scripts/check_performance b/libstdc++-v3/scripts/check_performance
index 3fa927480c9ea714270ac9ac4c12fe79712b049d..cde3874741c4ffd97e52c7f22d29ac0b7fc03612 100755 (executable)
--- a/libstdc++-v3/scripts/check_performance
+++ b/libstdc++-v3/scripts/check_performance
@@ -32,7 +32,7 @@ SH_FLAG="-Wl,--rpath -Wl,$BUILD_DIR/../../gcc \
          -Wl,--rpath -Wl,$BUILD_DIR/src/.libs"
 ST_FLAG="-static"
 LINK=$SH_FLAG
-CXX="$COMPILER $INCLUDES $FLAGS -std=gnu++0x $CXXFLAGS $LINK"
+CXX="$COMPILER $INCLUDES $FLAGS -std=gnu++11 $CXXFLAGS $LINK"
 LIBS="./libtestc++.a"
 TESTS_FILE="testsuite_files_performance"
 

diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index 9cef1e65e1b9649a190b17e88f1aa189ab14399e..2fca179fca4f3a334f2fc5e3bb7392d3b5e296b6 100644 (file)
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -182,6 +182,7 @@ check-compile: testsuite_files ${compile_script}
 check_performance_script=${glibcxx_srcdir}/scripts/check_performance
 check-performance: testsuite_files_performance ${performance_script}
        -@(chmod + ${check_performance_script}; \
+         export CXXFLAGS="$(CXXFLAGS)"; \
          ${check_performance_script} ${glibcxx_srcdir} ${glibcxx_builddir})
 
 # Runs the testsuite in debug mode.

diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index 7be29e59a091c1e017b0d8556018d5c4cb96ce8c..4e829d0e80fe7ecc916b1187e26177a7e3c61a73 100644 (file)
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -703,6 +703,7 @@ check-compile: testsuite_files ${compile_script}
          ${compile_script} ${glibcxx_srcdir} ${glibcxx_builddir})
 check-performance: testsuite_files_performance ${performance_script}
        -@(chmod + ${check_performance_script}; \
+         export CXXFLAGS="$(CXXFLAGS)"; \
          ${check_performance_script} ${glibcxx_srcdir} ${glibcxx_builddir})
 
 check-debug: site.exp