Merge from gcc:

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

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

diff --git a/ChangeLog b/ChangeLog
index dc9a83959b74ec485def95b8e5e38e8192c63c7a..ba0daaa828500a0ad0a8280661f2aa0e62cdf6a1 100644 (file)
--- 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 d8afdf2b4d761a13c7e6dd0497cc80f5fc83559c..d847956a512be4e610e35ee3fc2c75af451b65f3 100755 (executable)
--- 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 da6adf1e6b89820ef670e64342cba6ec2cb24771..63b9c933235436562cefd6ff8b39b633e723f96a 100644 (file)
--- 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"
     ;;