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.

Tested powerpc64le-linux. Committed to trunk.

commit 7e7eef2a1bb45c61ee26936ccaab7159dcceca94
Author: Jonathan Wakely <jwak...@redhat.com>
Date:   Fri Oct 9 13:59:27 2020

    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 3fa927480c9..cde3874741c 100755
--- 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 9cef1e65e1b..2fca179fca4 100644
--- 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.

Reply via email to