sync a change from gcc

diff --git a/ChangeLog b/ChangeLog
index 14f8b58c65b1a6d7c4d265735fe4650d12710c8c..52eb72352ff249edc21c3e453bdcf7b50fc28bf5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-12  Andreas Tobler  <a.tobler@schweiz.org>
+
+       PR bootstrap/30134
+       * configure.in: Correct x86 darwin support for libjava to powerpc
+       and i?86 only.
+       * configure: Regenerate.
+
 2006-12-11  Alan Modra  <amodra@bigpond.net.au>
 
        * configure.in:  Handle spu makefile frag.

diff --git a/configure b/configure
index a2082f4184710303f06b6aeb4334982c2191e88a..dedcb100ecc5b08a83de8746ab9ca0541cfdbc56 100755 (executable)
--- a/configure
+++ b/configure
@@ -1192,7 +1192,7 @@ case "${target}" in
   *-*-chorusos)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
     ;;
-  powerpc-*-darwin*)
+  powerpc-*-darwin* | i[3456789]86-*-darwin*)
     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof"
     noconfigdirs="$noconfigdirs sim target-rda"
     ;;

diff --git a/configure.in b/configure.in
index 9c01b0ca499911d91bfcab6f0028ca80e632a766..21f9aee10b2511b9f9cdb34115fdf9a74b8f9309 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -368,7 +368,7 @@ case "${target}" in
   *-*-chorusos)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
     ;;
-  powerpc-*-darwin*)
+  powerpc-*-darwin* | i[[3456789]]86-*-darwin*)
     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof"
     noconfigdirs="$noconfigdirs sim target-rda"
     ;;