summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2016-11-03 23:20:00 (GMT)
committerBrett Cannon <brett@python.org>2016-11-03 23:20:00 (GMT)
commit1d8f755e67dfb758e9bb41f9c944b0319e201513 (patch)
tree2ff1bc4c4a3b5b5cbcdd811823e07fea1e7f161b
parentf905063ee37c3fb9d119f84d299d361d47e6d73a (diff)
downloadcpython-1d8f755e67dfb758e9bb41f9c944b0319e201513.zip
cpython-1d8f755e67dfb758e9bb41f9c944b0319e201513.tar.gz
cpython-1d8f755e67dfb758e9bb41f9c944b0319e201513.tar.bz2
Issue #28605: Fix the help and What's New entry for --with-optimizations.
-rw-r--r--Doc/whatsnew/3.6.rst2
-rwxr-xr-xconfigure6
-rw-r--r--configure.ac4
3 files changed, 6 insertions, 6 deletions
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index e88d618..1b94302 100644
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -1176,7 +1176,7 @@ Build and C API Changes
with only about 16 tests failures. See the Android meta-issue :issue:`26865`.
* The ``--with-optimizations`` configure flag has been added. Turning it on
- will activate LTO and PGO build support (when available).
+ will activate expensive optimizations like PGO.
(Original patch by Alecsandru Patrascu of Intel in :issue:`26539`.)
* New :c:func:`Py_FinalizeEx` API which indicates if flushing buffered data
diff --git a/configure b/configure
index 000986f..64b75c9 100755
--- a/configure
+++ b/configure
@@ -1499,8 +1499,8 @@ Optional Packages:
compiler
--with-suffix=.exe set executable suffix
--with-pydebug build with Py_DEBUG defined
- --with-optimizations Enable expensive optimizations (PGO, maybe LTO,
- etc). Disabled by default.
+ --with-optimizations Enable expensive optimizations (PGO, etc). Disabled
+ by default.
--with-lto Enable Link Time Optimization in PGO builds.
Disabled by default.
--with-hash-algorithm=[fnv|siphash24]
@@ -6548,7 +6548,7 @@ fi
if test "$Py_OPT" = 'true' ; then
# Intentionally not forcing Py_LTO='true' here. Too many toolchains do not
# compile working code using it and both test_distutils and test_gdb are
- # broken when you do managed to get a toolchain that works with it. People
+ # broken when you do manage to get a toolchain that works with it. People
# who want LTO need to use --with-lto themselves.
DEF_MAKE_ALL_RULE="profile-opt"
REQUIRE_PGO="yes"
diff --git a/configure.ac b/configure.ac
index 8ce2ae9..73927b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1282,7 +1282,7 @@ AC_SUBST(DEF_MAKE_ALL_RULE)
AC_SUBST(DEF_MAKE_RULE)
Py_OPT='false'
AC_MSG_CHECKING(for --with-optimizations)
-AC_ARG_WITH(optimizations, AS_HELP_STRING([--with-optimizations], [Enable expensive optimizations (PGO, maybe LTO, etc). Disabled by default.]),
+AC_ARG_WITH(optimizations, AS_HELP_STRING([--with-optimizations], [Enable expensive optimizations (PGO, etc). Disabled by default.]),
[
if test "$withval" != no
then
@@ -1296,7 +1296,7 @@ fi],
if test "$Py_OPT" = 'true' ; then
# Intentionally not forcing Py_LTO='true' here. Too many toolchains do not
# compile working code using it and both test_distutils and test_gdb are
- # broken when you do managed to get a toolchain that works with it. People
+ # broken when you do manage to get a toolchain that works with it. People
# who want LTO need to use --with-lto themselves.
DEF_MAKE_ALL_RULE="profile-opt"
REQUIRE_PGO="yes"