Merge from gcc:

2007-12-10  Andreas Tobler  <a.tobler@schweiz.org>

	* configure.ac: Enable libjava for x86_64-*-darwin9.
	* configure: Regenerate.

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index dc9a839..ba0daaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-10  Andreas Tobler  <a.tobler@schweiz.org>
+
+	* configure.ac: Enable libjava for x86_64-*-darwin9.
+	* configure: Regenerate.
+
 2007-12-05  Ben Elliston  <bje@au.ibm.com>
 
 	* config.sub, config.guess: Update from upstream sources.
diff --git a/configure b/configure
index d8afdf2..d847956 100755
--- a/configure
+++ b/configure
@@ -2129,7 +2129,7 @@ case "${target}" in
   *-*-chorusos)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
     ;;
-  powerpc-*-darwin* | i[3456789]86-*-darwin*)
+  powerpc-*-darwin* | i[3456789]86-*-darwin* | x86_64-*-darwin9*)
     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof"
     noconfigdirs="$noconfigdirs sim target-rda"
     ;;
diff --git a/configure.ac b/configure.ac
index da6adf1..63b9c93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -406,7 +406,7 @@ case "${target}" in
   *-*-chorusos)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
     ;;
-  powerpc-*-darwin* | i[[3456789]]86-*-darwin*)
+  powerpc-*-darwin* | i[[3456789]]86-*-darwin* | x86_64-*-darwin9*)
     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof"
     noconfigdirs="$noconfigdirs sim target-rda"
     ;;