From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 1E05A3857C64; Fri, 9 Oct 2020 13:02:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1E05A3857C64 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-3755] libstdc++: Pass CXXFLAGS to check_performance script X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: f9919ba717dfaf6018b7e625bebc84a461477b52 X-Git-Newrev: 7e7eef2a1bb45c61ee26936ccaab7159dcceca94 Message-Id: <20201009130206.1E05A3857C64@sourceware.org> Date: Fri, 9 Oct 2020 13:02:06 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Oct 2020 13:02:06 -0000 https://gcc.gnu.org/g:7e7eef2a1bb45c61ee26936ccaab7159dcceca94 commit r11-3755-g7e7eef2a1bb45c61ee26936ccaab7159dcceca94 Author: Jonathan Wakely Date: Fri Oct 9 13:59:27 2020 +0100 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: --- libstdc++-v3/scripts/check_performance | 2 +- libstdc++-v3/testsuite/Makefile.am | 1 + libstdc++-v3/testsuite/Makefile.in | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) 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. diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index 7be29e59a09..4e829d0e80f 100644 --- 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