diff --git a/ChangeLog b/ChangeLog index 4800c0c18..72e6a9168 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2011-04-28 Joseph Myers + + Merge from GCC: + + 2011-04-18 Jack Howarth + + PR lto/48086 + * configure.ac: Re-enable LTO on *-apple-darwin9*. + * configure: Regenerate. + 2011-04-28 Joseph Myers * configure.ac: Separate cases disabling Java and Java libraries diff --git a/configure b/configure index 059e54b95..1bcc68156 100755 --- a/configure +++ b/configure @@ -6206,7 +6206,7 @@ if test $target_elf = yes; then : else if test x"$default_enable_lto" = x"yes" ; then case $target in - *-apple-darwin9 | *-cygwin* | *-mingw*) ;; + *-apple-darwin9* | *-cygwin* | *-mingw*) ;; # On other non-ELF platforms, LTO has yet to be validated. *) enable_lto=no ;; esac diff --git a/configure.ac b/configure.ac index a85e70932..58fdd309e 100644 --- a/configure.ac +++ b/configure.ac @@ -1744,7 +1744,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. build_lto_plugin=yes ],[if test x"$default_enable_lto" = x"yes" ; then case $target in - *-apple-darwin9 | *-cygwin* | *-mingw*) ;; + *-apple-darwin9* | *-cygwin* | *-mingw*) ;; # On other non-ELF platforms, LTO has yet to be validated. *) enable_lto=no ;; esac