diff options
| -rw-r--r-- | ChangeLog | 23 | ||||
| -rwxr-xr-x | configure | 98 | ||||
| -rw-r--r-- | configure.ac | 98 |
3 files changed, 29 insertions, 190 deletions
@@ -1,5 +1,28 @@ 2011-04-28 Joseph Myers <joseph@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. + +2011-04-28 Joseph Myers <joseph@codesourcery.com> + * 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. @@ -3175,29 +3175,6 @@ case "${target}" in *-*-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}" ;; @@ -3213,27 +3190,12 @@ case "${target}" in *-*-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}" ;; @@ -3249,39 +3211,25 @@ case "${target}" in 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" - ;; - hppa*-*-linux*) + unsupported_languages="$unsupported_languages java" ;; - hppa*64*-*-*) + hppa*64*-*-hpux*) noconfigdirs="$noconfigdirs ${libgcj}" ;; hppa*-hp-hpux11*) ;; - hppa*-*-*) + hppa*-*-hpux*) # According to Alexandre Oliva <aoliva@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}" ;; @@ -3291,20 +3239,6 @@ case "${target}" in 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" ;; @@ -3312,11 +3246,6 @@ case "${target}" in # copied from rs6000-*-* entry noconfigdirs="$noconfigdirs ${libgcj}" ;; - powerpc-*-eabi) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - powerpc-*-eabi* | powerpcle-*-eabi* | powerpc-*-rtems* ) - ;; rs6000-*-aix*) noconfigdirs="$noconfigdirs ${libgcj}" ;; @@ -3327,30 +3256,9 @@ case "${target}" in # <oldham@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. diff --git a/configure.ac b/configure.ac index f78e720..a536c5e 100644 --- a/configure.ac +++ b/configure.ac @@ -622,29 +622,6 @@ case "${target}" in *-*-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 @@ case "${target}" in *-*-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 @@ case "${target}" in 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" - ;; - hppa*-*-linux*) + unsupported_languages="$unsupported_languages java" ;; - hppa*64*-*-*) + hppa*64*-*-hpux*) noconfigdirs="$noconfigdirs ${libgcj}" ;; hppa*-hp-hpux11*) ;; - hppa*-*-*) + hppa*-*-hpux*) # According to Alexandre Oliva <aoliva@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 @@ case "${target}" in 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 @@ case "${target}" in # 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 @@ case "${target}" in # <oldham@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. |