This patch cleans up the libgcj-disabling case statement at toplevel,
removing the default disabling for *-*-* (which allows other empty
cases to be removed) and disabling based on architecture, or most
cases of architecture-OS combination where the OS previously had
libgcj built for other architectures.
I left the logic restricting libgcj on Darwin to certain targets, but
removed that relating to FreeBSD and NetBSD targets (given the removal
of support for a.out NetBSD, and that there was never such support for
a.out FreeBSD, I doubt the reliability of the lists of targets that
were present). target-libffi disabling for arm-*-elf* | arm*-*-eabi*
was removed (given that there *is* libffi support for those targets),
and target-zlib disabling for hppa*64*-*-linux* was changed to disable
Java.
This is the last cleanup I plan for this libgcj-disabling logic. This
patch is *not* conservatively safe; the idea is that if it turns out
that there are problems building some Java library on a
libffi-supporting target where the library was not previously built,
appropriate disabling should be added *with a comment explaining the
problem and probably pointing to a relevant PR*.
OK to commit?
2011-04-28 Joseph Myers <jos...@codesourcery.com>
* configure.ac (*-*-dragonfly*, *-*-freebsd*, *-*-netbsd*,
alpha*-dec-osf*, alpha*-*-linux*, alpha*-*-*, sh-*-linux*,
arm-*-elf* | arm*-*-eabi*, arm*-*-linux-gnueabi, frv-*-*): Remove
cases in libgcj-disabling case statement.
(hppa*64*-*-linux*): Set unsupported_languages instead of
disabling target-zlib.
(hppa*64*-*-*): Restrict case in libgcj-disabling case statement
to hppa*64*-*-hpux*.
(hppa*-*-*): Restrict case in libgcj-disabling case statement to
hppa*-*-hpux*.
(ia64*-*-elf*, ia64*-**-hpux*, i[[3456789]]86-*-elf,
i[[3456789]]86-*-linux*, *-*-cygwin*, i[[3456789]]86-*-interix*,
i[[3456789]]86-*-solaris2*, m32r-*-*, m68k-*-elf*, m68*-*-* |
fido-*-*, powerpc-*-eabi, powerpc-*-eabi* | powerpcle-*-eabi* |
powerpc-*-rtems*, mips*-*-linux*, mips*-*-*, sh-*-* | sh64-*-*,
sparc-*-elf*, sparc64-*-elf*, sparc-*-solaris* |
sparc64-*-solaris* | sparcv9-*-solaris*, *-*-linux* | *-*-gnu* |
*-*-k*bsd*-gnu | *-*-kopensolaris*-gnu, *-*-*): Remove cases in
libgcj-disabling case statement.
* configure: Regenerate.
Index: configure.ac
===================================================================
--- configure.ac (revision 173069)
+++ configure.ac (working copy)
@@ -622,29 +622,6 @@
*-*-darwin*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
- *-*-dragonfly*)
- ;;
- *-*-freebsd*)
- # Skip some stuff that's unsupported on some FreeBSD configurations.
- case "${target}" in
- i*86-*-*) ;;
- alpha*-*-*) ;;
- x86_64-*-*) ;;
- *)
- noconfigdirs="$noconfigdirs ${libgcj}"
- ;;
- esac
- ;;
- *-*-netbsd*)
- # Skip some stuff that's unsupported on some NetBSD configurations.
- case "${target}" in
- i*86-*-netbsdelf*) ;;
- arm*-*-netbsdelf*) ;;
- *)
- noconfigdirs="$noconfigdirs ${libgcj}"
- ;;
- esac
- ;;
*-*-netware*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
@@ -660,27 +637,12 @@
*-*-vxworks*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
- alpha*-dec-osf*)
- ;;
alpha*-*-*vms*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
- alpha*-*-linux*)
- ;;
- alpha*-*-*)
- noconfigdirs="$noconfigdirs ${libgcj}"
- ;;
- sh-*-linux*)
- noconfigdirs="$noconfigdirs ${libgcj}"
- ;;
arm-wince-pe)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
- arm-*-elf* | arm*-*-eabi* )
- noconfigdirs="$noconfigdirs target-libffi"
- ;;
- arm*-*-linux-gnueabi)
- ;;
arm*-*-symbianelf*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
@@ -696,39 +658,25 @@
noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
esac
;;
- frv-*-*)
- noconfigdirs="$noconfigdirs ${libgcj}"
- ;;
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
# headers, crt*.o, etc., all of which are needed by these.
- noconfigdirs="$noconfigdirs target-zlib"
+ unsupported_languages="$unsupported_languages java"
;;
- hppa*-*-linux*)
- ;;
- hppa*64*-*-*)
+ hppa*64*-*-hpux*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
hppa*-hp-hpux11*)
;;
- hppa*-*-*)
+ hppa*-*-hpux*)
# According to Alexandre Oliva <aol...@redhat.com>, libjava won't
# build on HP-UX 10.20.
noconfigdirs="$noconfigdirs ${libgcj}"
;;
- ia64*-*-elf*)
- ;;
- ia64*-**-hpux*)
- ;;
ia64*-*-*vms*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
- i[[3456789]]86-*-elf)
- noconfigdirs="$noconfigdirs ${libgcj}"
- ;;
- i[[3456789]]86-*-linux*)
- ;;
i[[3456789]]86-w64-mingw*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
@@ -738,20 +686,6 @@
x86_64-*-mingw*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
- *-*-cygwin*)
- ;;
- i[[3456789]]86-*-interix* )
- ;;
- i[[3456789]]86-*-solaris2*)
- ;;
- m32r-*-*)
- noconfigdirs="$noconfigdirs ${libgcj}"
- ;;
- m68k-*-elf*)
- noconfigdirs="$noconfigdirs ${libgcj}"
- ;;
- m68*-*-* | fido-*-*)
- ;;
mmix-*-*)
noconfigdirs="$noconfigdirs target-libffi target-boehm-gc"
;;
@@ -759,11 +693,6 @@
# copied from rs6000-*-* entry
noconfigdirs="$noconfigdirs ${libgcj}"
;;
- powerpc-*-eabi)
- noconfigdirs="$noconfigdirs ${libgcj}"
- ;;
- powerpc-*-eabi* | powerpcle-*-eabi* | powerpc-*-rtems* )
- ;;
rs6000-*-aix*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
@@ -774,30 +703,9 @@
# <old...@codesourcery.com>
noconfigdirs="$noconfigdirs ${libgcj}"
;;
- mips*-*-linux*)
- ;;
- mips*-*-*)
- noconfigdirs="$noconfigdirs ${libgcj}"
- ;;
- sh-*-* | sh64-*-*)
- noconfigdirs="$noconfigdirs ${libgcj}"
- ;;
- sparc-*-elf*)
- noconfigdirs="$noconfigdirs ${libgcj}"
- ;;
- sparc64-*-elf*)
- noconfigdirs="$noconfigdirs ${libgcj}"
- ;;
- sparc-*-solaris* | sparc64-*-solaris* | sparcv9-*-solaris*)
- ;;
- *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
- ;;
*-*-lynxos*)
noconfigdirs="$noconfigdirs ${libgcj}"
;;
- *-*-*)
- noconfigdirs="$noconfigdirs ${libgcj}"
- ;;
esac
# Default libgloss CPU subdirectory.
--
Joseph S. Myers
jos...@codesourcery.com
