* configure.ac: Disable Java for targets not supporting libffi.

	(*-*-chorusos, *-*-kaos*, am33_2.0-*-linux*, sh*-*-pe|mips*-*-pe):
	Remove cases in Java-disabling statement.
	(*arm-wince-pe): Change to arm-wince-pe.
	(arc-*-*, arm-*-coff, arm-*-pe*, arm-*-riscix*, avr-*-*): Remove
	cases in Java-disabling statement.
	(bfin-*-*): Don't disable Java again.
	(c4x-*-* | tic4x-*-*, tic54x-*-*, cr16-*-*, d10v-*-*, d30v-*-*,
	fr30-*-elf*, moxie-*-*, h8300*-*-*, h8500-*-*, hppa1.1-*-osf* |
	hppa1.1-*-bsd*, hppa*-*-*elf* | hppa*-*-lites* | hppa*-*-openbsd*,
	hppa*-*-pro*, i960-*-*, i[[3456789]]86-*-coff,
	i[[3456789]]86-*-pe, i[[3456789]]86-*-sco3.2v5*,
	i[[3456789]]86-*-sco*, i[[3456789]]86-*-sysv4*,
	i[[3456789]]86-*-beos*, i[[3456789]]86-*-rdos*,
	m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*): Remove cases in
	Java-disabling statement.
	(mmix-*-*): Don't disable Java again.
	(mt-*-*, powerpc*-*-winnt* | powerpc*-*-pe*, powerpcle-*-solaris*,
	powerpc-*-beos*, rs6000-*-lynxos*, rs6000-*-*, m68k-apollo-*,
	microblaze*, mips*-sde-elf*, mips*-*-irix5*, mips*-*-bsd*,
	sparclet-*-aout* | sparc86x-*-*, sparclite-*-*, sparc-*-sunos4*,
	tic6x-*-*, v810-*-*, vax-*-*): Remove cases in Java-disabling
	statement.
	* configure: Regenerate.

1 files changed, 55 insertions, 108 deletions

diff --git a/configure b/configure
index 1bcc681..a2572a3 100755
--- a/configure
+++ b/configure
@@ -3111,12 +3111,63 @@ case "${target}" in
     ;;
 esac
 
-# Disable Java, libgcj or related libraries for some systems.
+# Disable Java if libffi is not supported.
 case "${target}" in
-  *-*-chorusos)
+  alpha*-*-*)
+    ;;
+  arm*-*-*)
+    ;;
+  cris-*-*)
+    ;;
+  frv-*-*)
+    ;;
+  hppa*-*-linux*)
+    ;;
+  hppa*-*-hpux*)
+    ;;
+  i?86-*-*)
+    ;;
+  ia64*-*-*)
+    ;;
+  m32r*-*-*)
+    ;;
+  m68k-*-*)
+    ;;
+  mips-sgi-irix6.* | mips*-*-rtems*)
+    ;;
+  mips*-*-linux*)
+    ;;
+  powerpc*-*-linux*)
     ;;
   powerpc-*-darwin*)
     ;;
+  powerpc-*-aix* | rs6000-*-aix*)
+    ;;
+  powerpc-*-freebsd*)
+    ;;
+  powerpc64-*-freebsd*)
+    ;;
+  powerpc*-*-rtems*)
+    ;;
+  s390-*-* | s390x-*-*)
+    ;;
+  sh-*-* | sh[34]*-*-*)
+    ;;
+  sh64-*-* | sh5*-*-*)
+    ;;
+  sparc*-*-*)
+    ;;
+  x86_64-*-*)
+    ;;
+  *-*-*)
+    unsupported_languages="$unsupported_languages java"
+    ;;
+esac
+
+# Disable Java, libgcj or related libraries for some systems.
+case "${target}" in
+  powerpc-*-darwin*)
+    ;;
   i[3456789]86-*-darwin*)
     ;;
   x86_64-*-darwin[912]*)
@@ -3137,8 +3188,6 @@ case "${target}" in
 	;;
     esac
     ;;
-  *-*-kaos*)
-    ;;
   *-*-netbsd*)
     # Skip some stuff that's unsupported on some NetBSD configurations.
     case "${target}" in
@@ -3174,19 +3223,12 @@ case "${target}" in
   alpha*-*-*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
-  am33_2.0-*-linux*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
   sh-*-linux*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
-  sh*-*-pe|mips*-*-pe|*arm-wince-pe)
+  arm-wince-pe)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
-  arc-*-*)
-    ;;
-  arm-*-coff)
-    ;;
   arm-*-elf* | arm*-*-eabi* )
     noconfigdirs="$noconfigdirs target-libffi"
     ;;
@@ -3195,25 +3237,9 @@ case "${target}" in
   arm*-*-symbianelf*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
-  arm-*-pe*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  arm-*-riscix*)
-    ;;
-  avr-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
   bfin-*-*)
-    unsupported_languages="$unsupported_languages java"
     noconfigdirs="$noconfigdirs target-boehm-gc"
     ;;
-  c4x-*-* | tic4x-*-*)
-    ;;
-  tic54x-*-*)
-    ;;
-  cr16-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
   cris-*-* | crisv32-*-*)
     unsupported_languages="$unsupported_languages java"
     case "${target}" in
@@ -3223,26 +3249,9 @@ case "${target}" in
 	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
     esac
     ;;
-  d10v-*-*)
-    ;;
-  d30v-*-*)
-    ;;
-  fr30-*-elf*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
   frv-*-*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
-  moxie-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  h8300*-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  h8500-*-*)
-    ;;
-  hppa1.1-*-osf* | hppa1.1-*-bsd* )
-    ;;
   hppa*64*-*-linux*)
     # In this case, it's because the hppa64-linux target is for
     # the kernel only at this point and has no libc, and thus no
@@ -3251,23 +3260,16 @@ case "${target}" in
     ;;
   hppa*-*-linux*)
     ;;
-  hppa*-*-*elf* | \
-  hppa*-*-lites* | \
-  hppa*-*-openbsd* | \
   hppa*64*-*-*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
   hppa*-hp-hpux11*)
     ;;
-  hppa*-*-pro*)
-    ;;
   hppa*-*-*)
     # According to Alexandre Oliva <aoliva@redhat.com>, libjava won't
     # build on HP-UX 10.20.
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
-  i960-*-*)
-    ;;
   ia64*-*-elf*)
     ;;
   ia64*-**-hpux*)
@@ -3275,7 +3277,7 @@ case "${target}" in
   ia64*-*-*vms*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
-  i[3456789]86-*-coff | i[3456789]86-*-elf)
+  i[3456789]86-*-elf)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
   i[3456789]86-*-linux*)
@@ -3293,25 +3295,11 @@ case "${target}" in
     ;;
   i[3456789]86-*-interix* )
     ;;
-  i[3456789]86-*-pe)
-    ;;
-  i[3456789]86-*-sco3.2v5*)
-    ;;
-  i[3456789]86-*-sco*)
-    ;;
   i[3456789]86-*-solaris2*)
     ;;
-  i[3456789]86-*-sysv4*)
-    ;;
-  i[3456789]86-*-beos*)
-    ;;
-  i[3456789]86-*-rdos*)
-    ;;
   m32r-*-*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
-  m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
-    ;;
   m68k-*-elf*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
@@ -3319,44 +3307,19 @@ case "${target}" in
     ;;
   mmix-*-*)
     noconfigdirs="$noconfigdirs target-libffi target-boehm-gc"
-    unsupported_languages="$unsupported_languages java"
-    ;;
-  mt-*-*)
     ;;
   powerpc-*-aix*)
     # copied from rs6000-*-* entry
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
-  powerpc*-*-winnt* | powerpc*-*-pe*)
-    ;;
-  powerpcle-*-solaris*)
-    ;;
-  powerpc-*-beos*)
-    ;;
   powerpc-*-eabi)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
   powerpc-*-eabi* | powerpcle-*-eabi* | powerpc-*-rtems* )
     ;;
-  rs6000-*-lynxos*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
   rs6000-*-aix*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
-  rs6000-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  m68k-apollo-*)
-    ;;
-  microblaze*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  mips*-sde-elf*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  mips*-*-irix5*)
-    ;;
   mips*-*-irix6*)
     # Linking libjava exceeds command-line length limits on at least
     # IRIX 6.2, but not on IRIX 6.5.
@@ -3364,8 +3327,6 @@ case "${target}" in
     # <oldham@codesourcery.com>
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
-  mips*-*-bsd*)
-    ;;
   mips*-*-linux*)
     ;;
   mips*-*-*)
@@ -3374,28 +3335,14 @@ case "${target}" in
   sh-*-* | sh64-*-*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
-  sparclet-*-aout* | sparc86x-*-*)
-    ;;
   sparc-*-elf*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
   sparc64-*-elf*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
-  sparclite-*-*)
-    ;;
-  sparc-*-sunos4*)
-    ;;
   sparc-*-solaris* | sparc64-*-solaris* | sparcv9-*-solaris*)
     ;;
-  tic6x-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  v810-*-*)
-    ;;
-  vax-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
   *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
     ;;
   *-*-lynxos*)