From: Brett Cannon <brett@python.org>
Date: Thu, 3 Nov 2016 23:20:00 +0000 (-0700)
Subject: Issue #28605: Fix the help and What's New entry for --with-optimizations.
X-Git-Tag: v3.6.0b4~156
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d8f755e67dfb758e9bb41f9c944b0319e201513;p=thirdparty%2FPython%2Fcpython.git

Issue #28605: Fix the help and What's New entry for --with-optimizations.
---

diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index e88d618adbdd..1b943027b5f5 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 000986fe49ce..64b75c9cd28e 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 8ce2ae998e5b..73927b141719 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"