* [committed] libstdc++: Pass CXXFLAGS to check_performance script
@ 2020-10-09 13:02 Jonathan Wakely
2020-10-09 13:09 ` Jonathan Wakely
0 siblings, 1 reply; 2+ messages in thread
From: Jonathan Wakely @ 2020-10-09 13:02 UTC (permalink / raw)
To: libstdc++, gcc-patches
[-- Attachment #1: Type: text/plain, Size: 437 bytes --]
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.
[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 1813 bytes --]
commit 7e7eef2a1bb45c61ee26936ccaab7159dcceca94
Author: Jonathan Wakely <jwakely@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.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [committed] libstdc++: Pass CXXFLAGS to check_performance script
2020-10-09 13:02 [committed] libstdc++: Pass CXXFLAGS to check_performance script Jonathan Wakely
@ 2020-10-09 13:09 ` Jonathan Wakely
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Wakely @ 2020-10-09 13:09 UTC (permalink / raw)
To: libstdc++, gcc-patches
[-- Attachment #1: Type: text/plain, Size: 537 bytes --]
On 09/10/20 14:02 +0100, Jonathan Wakely wrote:
>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.
A small adjustment to that last patch.
Tested powerpc64le-linux. Committed to trunk.
[-- Attachment #2: patch.txt --]
[-- Type: text/x-patch, Size: 1101 bytes --]
commit 6ce2cb116af6e0965ff0dd69e7fd1925cf5dc68c
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Fri Oct 9 14:07:22 2020
libstdc++: Adjust variable export in makefile
We usually export variables in recipes this way. I'm not sure it's
necessary, but it's consistent.
libstdc++-v3/ChangeLog:
* testsuite/Makefile.am: Set and export variable separately.
* testsuite/Makefile.in: Regenerate.
diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index 2fca179fca4..7b412411bfe 100644
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -182,7 +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)"; \
+ CXXFLAGS='$(CXXFLAGS)'; export CXXFLAGS; \
${check_performance_script} ${glibcxx_srcdir} ${glibcxx_builddir})
# Runs the testsuite in debug mode.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-09 13:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-09 13:02 [committed] libstdc++: Pass CXXFLAGS to check_performance script Jonathan Wakely
2020-10-09 13:09 ` Jonathan Wakely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).