sync a change from gcc

3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 14f8b58..52eb723 100644
--- 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 a2082f4..dedcb10 100755
--- 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 9c01b0c..21f9aee 100644
--- 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"
     ;;