aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4800c0c..72e6a91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2011-04-28 Joseph Myers <joseph@codesourcery.com>
+ Merge from GCC:
+
+ 2011-04-18 Jack Howarth <howarth@bromo.med.uc.edu>
+
+ PR lto/48086
+ * configure.ac: Re-enable LTO on *-apple-darwin9*.
+ * configure: Regenerate.
+
+2011-04-28 Joseph Myers <joseph@codesourcery.com>
+
* configure.ac: Separate cases disabling Java and Java libraries
from general case over targets.
* configure: Regenerate.
diff --git a/configure b/configure
index 059e54b..1bcc681 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 a85e709..58fdd30 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