From a8eb3f0a482ef60bd7dc0acc9e3113173d5b8e79 Mon Sep 17 00:00:00 2001 From: Dave Korn Date: Thu, 7 Oct 2010 20:50:02 +0000 Subject: [PATCH] * configure.ac (build_lto_plugin): New shell variable. (--enable-lto): Turn on by default for all non-ELF platforms that have had LTO support added so far. Set build_lto_plugin appropriately for both ELF and non-ELF. (configdirs): Add lto-plugin or not based on build_lto_plugin. * configure: Regenerate. --- ChangeLog | 9 +++++++++ configure | 13 ++++++++++--- configure.ac | 13 ++++++++++--- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1b2ec5f969..a98c33b49fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-10-07 Dave Korn + + * configure.ac (build_lto_plugin): New shell variable. + (--enable-lto): Turn on by default for all non-ELF platforms that + have had LTO support added so far. Set build_lto_plugin appropriately + for both ELF and non-ELF. + (configdirs): Add lto-plugin or not based on build_lto_plugin. + * configure: Regenerate. + 2010-10-02 Ralf Wildenhues PR bootstrap/45326 diff --git a/configure b/configure index 7762106f9de..b1fbfaa73d0 100755 --- a/configure +++ b/configure @@ -6676,11 +6676,13 @@ to specify its location." "$LINENO" 5 # Flags needed for libelf. + # ELF platforms build the lto-plugin when GOLD is in use. + build_lto_plugin=${ENABLE_GOLD} fi else if test x"$default_enable_lto" = x"yes" ; then case $target in - *-apple-darwin*) ;; + *-apple-darwin* | *-cygwin* | *-mingw*) ;; # On other non-ELF platforms, LTO must be explicitly enabled. *) enable_lto=no ;; esac @@ -6691,13 +6693,18 @@ else # warn during gcc/ subconfigure; unless you're bootstrapping with # -flto it won't be needed until after installation anyway. case $target in - *-cygwin*|*-mingw* | *-apple-darwin*) ;; + *-cygwin* | *-mingw* | *-apple-darwin*) ;; *) if test x"$enable_lto" = x"yes"; then as_fn_error "LTO support is not enabled for this target." "$LINENO" 5 fi ;; esac fi + # Among non-ELF, only Windows platforms support the lto-plugin so far. + case $target in + *-cygwin* | *-mingw*) build_lto_plugin=yes ;; + *) ;; + esac default_enable_lto=no fi @@ -6778,7 +6785,7 @@ if test -d ${srcdir}/gcc; then *,lto,*) ;; *) enable_languages="${enable_languages},lto" ;; esac - if test "${ENABLE_GOLD}" = "yes" ; then + if test "${build_lto_plugin}" = "yes" ; then configdirs="$configdirs lto-plugin" extra_host_libiberty_configure_flags=--enable-shared fi diff --git a/configure.ac b/configure.ac index 6af4be17a82..bf5fe3ad832 100644 --- a/configure.ac +++ b/configure.ac @@ -1786,9 +1786,11 @@ to specify its location.]) # Flags needed for libelf. AC_SUBST(libelflibs) AC_SUBST(libelfinc) + # ELF platforms build the lto-plugin when GOLD is in use. + build_lto_plugin=${ENABLE_GOLD} fi],[if test x"$default_enable_lto" = x"yes" ; then case $target in - *-apple-darwin*) ;; + *-apple-darwin* | *-cygwin* | *-mingw*) ;; # On other non-ELF platforms, LTO must be explicitly enabled. *) enable_lto=no ;; esac @@ -1799,13 +1801,18 @@ fi],[if test x"$default_enable_lto" = x"yes" ; then # warn during gcc/ subconfigure; unless you're bootstrapping with # -flto it won't be needed until after installation anyway. case $target in - *-cygwin*|*-mingw* | *-apple-darwin*) ;; + *-cygwin* | *-mingw* | *-apple-darwin*) ;; *) if test x"$enable_lto" = x"yes"; then AC_MSG_ERROR([LTO support is not enabled for this target.]) fi ;; esac fi + # Among non-ELF, only Windows platforms support the lto-plugin so far. + case $target in + *-cygwin* | *-mingw*) build_lto_plugin=yes ;; + *) ;; + esac default_enable_lto=no]) @@ -1884,7 +1891,7 @@ if test -d ${srcdir}/gcc; then *,lto,*) ;; *) enable_languages="${enable_languages},lto" ;; esac - if test "${ENABLE_GOLD}" = "yes" ; then + if test "${build_lto_plugin}" = "yes" ; then configdirs="$configdirs lto-plugin" extra_host_libiberty_configure_flags=--enable-shared fi -- 2.30.2