diff options
author | Brett Cannon <brett@python.org> | 2016-11-03 16:21:11 -0700 |
---|---|---|
committer | Brett Cannon <brett@python.org> | 2016-11-03 16:21:11 -0700 |
commit | e9fb76e31335ee480ff21255d46e581112d3abc6 (patch) | |
tree | bc91aa024ee3b09b797f93601acbb875bb2ba69f | |
parent | ebd703ca95354d2b4ef8ea831973e88cbf2c4c8c (diff) | |
parent | ced9bb408868f1e2b4fbd8f9c472aae8fb6f8d6b (diff) | |
download | cpython-e9fb76e31335ee480ff21255d46e581112d3abc6.tar.gz |
Merge for issue #28605
-rw-r--r-- | Doc/whatsnew/3.6.rst | 2 | ||||
-rwxr-xr-x | configure | 20 | ||||
-rw-r--r-- | configure.ac | 4 |
3 files changed, 7 insertions, 19 deletions
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst index a612d6b866..c5b6c04b4f 100644 --- a/Doc/whatsnew/3.6.rst +++ b/Doc/whatsnew/3.6.rst @@ -1177,7 +1177,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 @@ -784,7 +784,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -895,7 +894,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1148,15 +1146,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1294,7 +1283,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1447,7 +1436,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1511,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] @@ -6560,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 1ca8825f19..b915b067ec 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" |