diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rwxr-xr-x | configure | 410 | ||||
-rw-r--r-- | configure.ac | 410 |
3 files changed, 660 insertions, 166 deletions
@@ -1,3 +1,9 @@ +2011-04-28 Joseph Myers <joseph@codesourcery.com> + + * configure.ac: Separate cases disabling Java and Java libraries + from general case over targets. + * configure: Regenerate. + 2011-04-06 Joseph Myers <joseph@codesourcery.com> * configure.ac (build_tools): Remove build-byacc. @@ -3111,6 +3111,301 @@ case "${target}" in ;; esac +# Disable Java, libgcj or related libraries for some systems. +case "${target}" in + *-*-chorusos) + ;; + powerpc-*-darwin*) + ;; + i[3456789]86-*-darwin*) + ;; + x86_64-*-darwin[912]*) + ;; + *-*-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 + ;; + *-*-kaos*) + ;; + *-*-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}" + ;; + *-*-rtems*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + *-*-tpf*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + *-*-uclinux*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + *-*-vxworks*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + alpha*-dec-osf*) + ;; + alpha*-*-*vms*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + alpha*-*-linux*) + ;; + alpha*-*-*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + am33_2.0-*-linux*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + sh-*-linux*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + sh*-*-pe|mips*-*-pe|*arm-wince-pe) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + arc-*-*) + ;; + arm-*-coff) + ;; + arm-*-elf* | arm*-*-eabi* ) + noconfigdirs="$noconfigdirs target-libffi" + ;; + arm*-*-linux-gnueabi) + ;; + 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 + *-*-linux*) + ;; + *) # See PR46792 regarding target-libffi. + 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 + # headers, crt*.o, etc., all of which are needed by these. + noconfigdirs="$noconfigdirs target-zlib" + ;; + 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*) + ;; + ia64*-*-*vms*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + i[3456789]86-*-coff | i[3456789]86-*-elf) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + i[3456789]86-*-linux*) + ;; + i[3456789]86-w64-mingw*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + i[3456789]86-*-mingw*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + x86_64-*-mingw*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + *-*-cygwin*) + ;; + 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}" + ;; + m68*-*-* | fido-*-*) + ;; + 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. + # Also, boehm-gc won't build on IRIX 6.5, according to Jeffrey Oldham + # <oldham@codesourcery.com> + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + mips*-*-bsd*) + ;; + mips*-*-linux*) + ;; + mips*-*-*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + 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*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + *-*-*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; +esac + # Default libgloss CPU subdirectory. libgloss_dir="$target_cpu" @@ -3133,7 +3428,6 @@ case "${target}" in *-*-darwin*) noconfigdirs="$noconfigdirs ld gas gdb gprof" noconfigdirs="$noconfigdirs sim target-rda" - noconfigdirs="$noconfigdirs ${libgcj}" ;; *-*-dragonfly*) noconfigdirs="$noconfigdirs target-newlib target-libgloss" @@ -3144,16 +3438,6 @@ case "${target}" in && test -f /usr/local/include/gmp.h; then with_gmp=/usr/local fi - - # Skip some stuff that's unsupported on some FreeBSD configurations. - case "${target}" in - i*86-*-*) ;; - alpha*-*-*) ;; - x86_64-*-*) ;; - *) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - esac ;; *-*-kaos*) # Remove unsupported stuff on all kaOS configurations. @@ -3162,31 +3446,22 @@ case "${target}" in *-*-netbsd*) # Skip some stuff on all NetBSD configurations. noconfigdirs="$noconfigdirs target-newlib target-libgloss" - - # 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 target-newlib target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; *-*-rtems*) - noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss" ;; # The tpf target doesn't support gdb yet. *-*-tpf*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj} gdb tcl tk libgui itcl" + noconfigdirs="$noconfigdirs target-newlib target-libgloss gdb tcl tk libgui itcl" ;; *-*-uclinux*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss target-rda ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib target-libgloss target-rda" ;; *-*-vxworks*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; alpha*-dec-osf*) # ld works, but does not support shared libraries. @@ -3195,7 +3470,7 @@ case "${target}" in noconfigdirs="$noconfigdirs gas ld target-newlib target-libgloss" ;; alpha*-*-*vms*) - noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss" ;; alpha*-*-linux*) # newlib is not 64 bit ready @@ -3203,16 +3478,15 @@ case "${target}" in ;; alpha*-*-*) # newlib is not 64 bit ready - noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; am33_2.0-*-linux*) - noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; sh-*-linux*) - noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; sh*-*-pe|mips*-*-pe|*arm-wince-pe) - noconfigdirs="$noconfigdirs ${libgcj}" noconfigdirs="$noconfigdirs tcl tk itcl libgui sim" noconfigdirs="$noconfigdirs target-newlib" libgloss_dir=wince @@ -3224,7 +3498,6 @@ case "${target}" in libgloss_dir=arm ;; arm-*-elf* | arm*-*-eabi* ) - noconfigdirs="$noconfigdirs target-libffi" libgloss_dir=arm ;; arm*-*-linux-gnueabi) @@ -3234,21 +3507,17 @@ case "${target}" in libgloss_dir=arm ;; arm*-*-symbianelf*) - noconfigdirs="$noconfigdirs ${libgcj}" libgloss_dir=arm ;; arm-*-pe*) - noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss" ;; arm-*-riscix*) noconfigdirs="$noconfigdirs ld target-libgloss" ;; avr-*-*) - noconfigdirs="$noconfigdirs ${libgcj}" ;; bfin-*-*) - unsupported_languages="$unsupported_languages java" - noconfigdirs="$noconfigdirs target-boehm-gc" ;; c4x-*-* | tic4x-*-*) noconfigdirs="$noconfigdirs target-libgloss" @@ -3257,15 +3526,12 @@ case "${target}" in noconfigdirs="$noconfigdirs target-libgloss gdb" ;; cr16-*-*) - noconfigdirs="$noconfigdirs ${libgcj} gdb" + noconfigdirs="$noconfigdirs gdb" ;; cris-*-* | crisv32-*-*) - unsupported_languages="$unsupported_languages java" case "${target}" in *-*-linux*) noconfigdirs="$noconfigdirs target-newlib target-libgloss";; - *) # See PR46792 regarding target-libffi. - noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";; esac libgloss_dir=cris ;; @@ -3276,17 +3542,15 @@ case "${target}" in noconfigdirs="$noconfigdirs gdb" ;; fr30-*-elf*) - noconfigdirs="$noconfigdirs ${libgcj} gdb" + noconfigdirs="$noconfigdirs gdb" ;; frv-*-*) - noconfigdirs="$noconfigdirs ${libgcj}" ;; moxie-*-*) - noconfigdirs="$noconfigdirs ${libgcj}" noconfigdirs="$noconfigdirs gprof" ;; h8300*-*-*) - noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss" ;; h8500-*-*) noconfigdirs="$noconfigdirs target-libgloss" @@ -3294,10 +3558,6 @@ case "${target}" in 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 - # headers, crt*.o, etc., all of which are needed by these. - noconfigdirs="$noconfigdirs target-zlib" ;; hppa*-*-linux*) ;; @@ -3305,7 +3565,6 @@ case "${target}" in hppa*-*-lites* | \ hppa*-*-openbsd* | \ hppa*64*-*-*) - noconfigdirs="$noconfigdirs ${libgcj}" ;; hppa*-hp-hpux11*) noconfigdirs="$noconfigdirs ld" @@ -3314,9 +3573,7 @@ case "${target}" in libgloss_dir=pa ;; hppa*-*-*) - # According to Alexandre Oliva <aoliva@redhat.com>, libjava won't - # build on HP-UX 10.20. - noconfigdirs="$noconfigdirs ld ${libgcj}" + noconfigdirs="$noconfigdirs ld" ;; i960-*-*) noconfigdirs="$noconfigdirs gdb" @@ -3327,14 +3584,13 @@ case "${target}" in ;; ia64*-**-hpux*) # No ld support yet. - noconfigdirs="$noconfigdirs ${libgcj} libgui itcl ld" + noconfigdirs="$noconfigdirs libgui itcl ld" ;; ia64*-*-*vms*) # No gdb or ld support yet. - noconfigdirs="$noconfigdirs ${libgcj} readline libgui itcl gdb ld" + noconfigdirs="$noconfigdirs readline libgui itcl gdb ld" ;; i[3456789]86-*-coff | i[3456789]86-*-elf) - noconfigdirs="$noconfigdirs ${libgcj}" libgloss_dir=i386 ;; i[3456789]86-*-linux*) @@ -3350,14 +3606,14 @@ case "${target}" in # 'target-newlib' will appear in skipdirs. ;; i[3456789]86-w64-mingw*) - noconfigdirs="$noconfigdirs target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss target-newlib" ;; i[3456789]86-*-mingw*) target_configdirs="$target_configdirs target-winsup" - noconfigdirs="$noconfigdirs target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss target-newlib" ;; x86_64-*-mingw*) - noconfigdirs="$noconfigdirs target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss target-newlib" ;; *-*-cygwin*) target_configdirs="$target_configdirs target-libtermcap target-winsup" @@ -3395,27 +3651,24 @@ case "${target}" in noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss" ;; m32r-*-*) - noconfigdirs="$noconfigdirs ${libgcj}" ;; m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*) libgloss_dir=m68hc11 ;; m68k-*-elf*) - noconfigdirs="$noconfigdirs ${libgcj}" ;; m68*-*-* | fido-*-*) libgloss_dir=m68k ;; mmix-*-*) - noconfigdirs="$noconfigdirs target-libffi target-boehm-gc gdb" - unsupported_languages="$unsupported_languages java" + noconfigdirs="$noconfigdirs gdb" ;; mt-*-*) noconfigdirs="$noconfigdirs sim" ;; powerpc-*-aix*) # copied from rs6000-*-* entry - noconfigdirs="$noconfigdirs gprof target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs gprof target-libgloss target-newlib" ;; powerpc*-*-winnt* | powerpc*-*-pe*) target_configdirs="$target_configdirs target-winsup" @@ -3432,29 +3685,27 @@ case "${target}" in noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss" ;; powerpc-*-eabi) - noconfigdirs="$noconfigdirs ${libgcj}" libgloss_dir=rs6000 ;; powerpc-*-eabi* | powerpcle-*-eabi* | powerpc-*-rtems* ) libgloss_dir=rs6000 ;; rs6000-*-lynxos*) - noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib gprof" ;; rs6000-*-aix*) - noconfigdirs="$noconfigdirs gprof target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs gprof target-libgloss target-newlib" ;; rs6000-*-*) - noconfigdirs="$noconfigdirs gprof ${libgcj}" + noconfigdirs="$noconfigdirs gprof" ;; m68k-apollo-*) noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss" ;; microblaze*) - noconfigdirs="$noconfigdirs gprof ${libgcj}" + noconfigdirs="$noconfigdirs gprof" ;; mips*-sde-elf*) - noconfigdirs="$noconfigdirs ${libgcj}" if test x$with_newlib = xyes; then noconfigdirs="$noconfigdirs gprof" fi @@ -3464,11 +3715,7 @@ case "${target}" in noconfigdirs="$noconfigdirs gprof target-libgloss" ;; mips*-*-irix6*) - # Linking libjava exceeds command-line length limits on at least - # IRIX 6.2, but not on IRIX 6.5. - # Also, boehm-gc won't build on IRIX 6.5, according to Jeffrey Oldham - # <oldham@codesourcery.com> - noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs gprof target-libgloss" ;; mips*-*-bsd*) noconfigdirs="$noconfigdirs gprof target-libgloss" @@ -3477,25 +3724,23 @@ case "${target}" in noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; mips*-*-*) - noconfigdirs="$noconfigdirs gprof ${libgcj}" + noconfigdirs="$noconfigdirs gprof" libgloss_dir=mips ;; sh-*-* | sh64-*-*) case "${target}" in sh*-*-elf) - noconfigdirs="$noconfigdirs ${libgcj}" ;; + ;; *) - noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;; + noconfigdirs="$noconfigdirs target-libgloss" ;; esac ;; sparclet-*-aout* | sparc86x-*-*) libgloss_dir=sparc ;; sparc-*-elf*) - noconfigdirs="$noconfigdirs ${libgcj}" ;; sparc64-*-elf*) - noconfigdirs="$noconfigdirs ${libgcj}" libgloss_dir=sparc ;; sparclite-*-*) @@ -3511,22 +3756,21 @@ case "${target}" in sparc-*-solaris* | sparc64-*-solaris* | sparcv9-*-solaris*) ;; tic6x-*-*) - noconfigdirs="$noconfigdirs gdb sim ${libgcj}" + noconfigdirs="$noconfigdirs gdb sim" ;; v810-*-*) noconfigdirs="$noconfigdirs bfd binutils gas gdb ld opcodes target-libgloss" ;; vax-*-*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; *-*-lynxos*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; *-*-*) - noconfigdirs="$noconfigdirs ${libgcj}" ;; esac diff --git a/configure.ac b/configure.ac index 68208dc..a85e709 100644 --- a/configure.ac +++ b/configure.ac @@ -558,6 +558,301 @@ case "${target}" in ;; esac +# Disable Java, libgcj or related libraries for some systems. +case "${target}" in + *-*-chorusos) + ;; + powerpc-*-darwin*) + ;; + i[[3456789]]86-*-darwin*) + ;; + x86_64-*-darwin[[912]]*) + ;; + *-*-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 + ;; + *-*-kaos*) + ;; + *-*-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}" + ;; + *-*-rtems*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + *-*-tpf*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + *-*-uclinux*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + *-*-vxworks*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + alpha*-dec-osf*) + ;; + alpha*-*-*vms*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + alpha*-*-linux*) + ;; + alpha*-*-*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + am33_2.0-*-linux*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + sh-*-linux*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + sh*-*-pe|mips*-*-pe|*arm-wince-pe) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + arc-*-*) + ;; + arm-*-coff) + ;; + arm-*-elf* | arm*-*-eabi* ) + noconfigdirs="$noconfigdirs target-libffi" + ;; + arm*-*-linux-gnueabi) + ;; + 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 + *-*-linux*) + ;; + *) # See PR46792 regarding target-libffi. + 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 + # headers, crt*.o, etc., all of which are needed by these. + noconfigdirs="$noconfigdirs target-zlib" + ;; + 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*) + ;; + ia64*-*-*vms*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + i[[3456789]]86-*-coff | i[[3456789]]86-*-elf) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + i[[3456789]]86-*-linux*) + ;; + i[[3456789]]86-w64-mingw*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + i[[3456789]]86-*-mingw*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + x86_64-*-mingw*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + *-*-cygwin*) + ;; + 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}" + ;; + m68*-*-* | fido-*-*) + ;; + 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. + # Also, boehm-gc won't build on IRIX 6.5, according to Jeffrey Oldham + # <oldham@codesourcery.com> + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + mips*-*-bsd*) + ;; + mips*-*-linux*) + ;; + mips*-*-*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + 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*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + *-*-*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; +esac + # Default libgloss CPU subdirectory. libgloss_dir="$target_cpu" @@ -580,7 +875,6 @@ case "${target}" in *-*-darwin*) noconfigdirs="$noconfigdirs ld gas gdb gprof" noconfigdirs="$noconfigdirs sim target-rda" - noconfigdirs="$noconfigdirs ${libgcj}" ;; *-*-dragonfly*) noconfigdirs="$noconfigdirs target-newlib target-libgloss" @@ -591,16 +885,6 @@ case "${target}" in && test -f /usr/local/include/gmp.h; then with_gmp=/usr/local fi - - # Skip some stuff that's unsupported on some FreeBSD configurations. - case "${target}" in - i*86-*-*) ;; - alpha*-*-*) ;; - x86_64-*-*) ;; - *) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - esac ;; *-*-kaos*) # Remove unsupported stuff on all kaOS configurations. @@ -609,31 +893,22 @@ case "${target}" in *-*-netbsd*) # Skip some stuff on all NetBSD configurations. noconfigdirs="$noconfigdirs target-newlib target-libgloss" - - # 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 target-newlib target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; *-*-rtems*) - noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss" ;; # The tpf target doesn't support gdb yet. *-*-tpf*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj} gdb tcl tk libgui itcl" + noconfigdirs="$noconfigdirs target-newlib target-libgloss gdb tcl tk libgui itcl" ;; *-*-uclinux*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss target-rda ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib target-libgloss target-rda" ;; *-*-vxworks*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; alpha*-dec-osf*) # ld works, but does not support shared libraries. @@ -642,7 +917,7 @@ case "${target}" in noconfigdirs="$noconfigdirs gas ld target-newlib target-libgloss" ;; alpha*-*-*vms*) - noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss" ;; alpha*-*-linux*) # newlib is not 64 bit ready @@ -650,16 +925,15 @@ case "${target}" in ;; alpha*-*-*) # newlib is not 64 bit ready - noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; am33_2.0-*-linux*) - noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; sh-*-linux*) - noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; sh*-*-pe|mips*-*-pe|*arm-wince-pe) - noconfigdirs="$noconfigdirs ${libgcj}" noconfigdirs="$noconfigdirs tcl tk itcl libgui sim" noconfigdirs="$noconfigdirs target-newlib" libgloss_dir=wince @@ -671,7 +945,6 @@ case "${target}" in libgloss_dir=arm ;; arm-*-elf* | arm*-*-eabi* ) - noconfigdirs="$noconfigdirs target-libffi" libgloss_dir=arm ;; arm*-*-linux-gnueabi) @@ -681,21 +954,17 @@ case "${target}" in libgloss_dir=arm ;; arm*-*-symbianelf*) - noconfigdirs="$noconfigdirs ${libgcj}" libgloss_dir=arm ;; arm-*-pe*) - noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss" ;; arm-*-riscix*) noconfigdirs="$noconfigdirs ld target-libgloss" ;; avr-*-*) - noconfigdirs="$noconfigdirs ${libgcj}" ;; bfin-*-*) - unsupported_languages="$unsupported_languages java" - noconfigdirs="$noconfigdirs target-boehm-gc" ;; c4x-*-* | tic4x-*-*) noconfigdirs="$noconfigdirs target-libgloss" @@ -704,15 +973,12 @@ case "${target}" in noconfigdirs="$noconfigdirs target-libgloss gdb" ;; cr16-*-*) - noconfigdirs="$noconfigdirs ${libgcj} gdb" + noconfigdirs="$noconfigdirs gdb" ;; cris-*-* | crisv32-*-*) - unsupported_languages="$unsupported_languages java" case "${target}" in *-*-linux*) noconfigdirs="$noconfigdirs target-newlib target-libgloss";; - *) # See PR46792 regarding target-libffi. - noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";; esac libgloss_dir=cris ;; @@ -723,17 +989,15 @@ case "${target}" in noconfigdirs="$noconfigdirs gdb" ;; fr30-*-elf*) - noconfigdirs="$noconfigdirs ${libgcj} gdb" + noconfigdirs="$noconfigdirs gdb" ;; frv-*-*) - noconfigdirs="$noconfigdirs ${libgcj}" ;; moxie-*-*) - noconfigdirs="$noconfigdirs ${libgcj}" noconfigdirs="$noconfigdirs gprof" ;; h8300*-*-*) - noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss" ;; h8500-*-*) noconfigdirs="$noconfigdirs target-libgloss" @@ -741,10 +1005,6 @@ case "${target}" in 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 - # headers, crt*.o, etc., all of which are needed by these. - noconfigdirs="$noconfigdirs target-zlib" ;; hppa*-*-linux*) ;; @@ -752,7 +1012,6 @@ case "${target}" in hppa*-*-lites* | \ hppa*-*-openbsd* | \ hppa*64*-*-*) - noconfigdirs="$noconfigdirs ${libgcj}" ;; hppa*-hp-hpux11*) noconfigdirs="$noconfigdirs ld" @@ -761,9 +1020,7 @@ case "${target}" in libgloss_dir=pa ;; hppa*-*-*) - # According to Alexandre Oliva <aoliva@redhat.com>, libjava won't - # build on HP-UX 10.20. - noconfigdirs="$noconfigdirs ld ${libgcj}" + noconfigdirs="$noconfigdirs ld" ;; i960-*-*) noconfigdirs="$noconfigdirs gdb" @@ -774,14 +1031,13 @@ case "${target}" in ;; ia64*-**-hpux*) # No ld support yet. - noconfigdirs="$noconfigdirs ${libgcj} libgui itcl ld" + noconfigdirs="$noconfigdirs libgui itcl ld" ;; ia64*-*-*vms*) # No gdb or ld support yet. - noconfigdirs="$noconfigdirs ${libgcj} readline libgui itcl gdb ld" + noconfigdirs="$noconfigdirs readline libgui itcl gdb ld" ;; i[[3456789]]86-*-coff | i[[3456789]]86-*-elf) - noconfigdirs="$noconfigdirs ${libgcj}" libgloss_dir=i386 ;; i[[3456789]]86-*-linux*) @@ -797,14 +1053,14 @@ case "${target}" in # 'target-newlib' will appear in skipdirs. ;; i[[3456789]]86-w64-mingw*) - noconfigdirs="$noconfigdirs target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss target-newlib" ;; i[[3456789]]86-*-mingw*) target_configdirs="$target_configdirs target-winsup" - noconfigdirs="$noconfigdirs target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss target-newlib" ;; x86_64-*-mingw*) - noconfigdirs="$noconfigdirs target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss target-newlib" ;; *-*-cygwin*) target_configdirs="$target_configdirs target-libtermcap target-winsup" @@ -842,27 +1098,24 @@ case "${target}" in noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss" ;; m32r-*-*) - noconfigdirs="$noconfigdirs ${libgcj}" ;; m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*) libgloss_dir=m68hc11 ;; m68k-*-elf*) - noconfigdirs="$noconfigdirs ${libgcj}" ;; m68*-*-* | fido-*-*) libgloss_dir=m68k ;; mmix-*-*) - noconfigdirs="$noconfigdirs target-libffi target-boehm-gc gdb" - unsupported_languages="$unsupported_languages java" + noconfigdirs="$noconfigdirs gdb" ;; mt-*-*) noconfigdirs="$noconfigdirs sim" ;; powerpc-*-aix*) # copied from rs6000-*-* entry - noconfigdirs="$noconfigdirs gprof target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs gprof target-libgloss target-newlib" ;; powerpc*-*-winnt* | powerpc*-*-pe*) target_configdirs="$target_configdirs target-winsup" @@ -879,29 +1132,27 @@ case "${target}" in noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss" ;; powerpc-*-eabi) - noconfigdirs="$noconfigdirs ${libgcj}" libgloss_dir=rs6000 ;; powerpc-*-eabi* | powerpcle-*-eabi* | powerpc-*-rtems* ) libgloss_dir=rs6000 ;; rs6000-*-lynxos*) - noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib gprof" ;; rs6000-*-aix*) - noconfigdirs="$noconfigdirs gprof target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs gprof target-libgloss target-newlib" ;; rs6000-*-*) - noconfigdirs="$noconfigdirs gprof ${libgcj}" + noconfigdirs="$noconfigdirs gprof" ;; m68k-apollo-*) noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss" ;; microblaze*) - noconfigdirs="$noconfigdirs gprof ${libgcj}" + noconfigdirs="$noconfigdirs gprof" ;; mips*-sde-elf*) - noconfigdirs="$noconfigdirs ${libgcj}" if test x$with_newlib = xyes; then noconfigdirs="$noconfigdirs gprof" fi @@ -911,11 +1162,7 @@ case "${target}" in noconfigdirs="$noconfigdirs gprof target-libgloss" ;; mips*-*-irix6*) - # Linking libjava exceeds command-line length limits on at least - # IRIX 6.2, but not on IRIX 6.5. - # Also, boehm-gc won't build on IRIX 6.5, according to Jeffrey Oldham - # <oldham@codesourcery.com> - noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs gprof target-libgloss" ;; mips*-*-bsd*) noconfigdirs="$noconfigdirs gprof target-libgloss" @@ -924,25 +1171,23 @@ case "${target}" in noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; mips*-*-*) - noconfigdirs="$noconfigdirs gprof ${libgcj}" + noconfigdirs="$noconfigdirs gprof" libgloss_dir=mips ;; sh-*-* | sh64-*-*) case "${target}" in sh*-*-elf) - noconfigdirs="$noconfigdirs ${libgcj}" ;; + ;; *) - noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;; + noconfigdirs="$noconfigdirs target-libgloss" ;; esac ;; sparclet-*-aout* | sparc86x-*-*) libgloss_dir=sparc ;; sparc-*-elf*) - noconfigdirs="$noconfigdirs ${libgcj}" ;; sparc64-*-elf*) - noconfigdirs="$noconfigdirs ${libgcj}" libgloss_dir=sparc ;; sparclite-*-*) @@ -958,22 +1203,21 @@ case "${target}" in sparc-*-solaris* | sparc64-*-solaris* | sparcv9-*-solaris*) ;; tic6x-*-*) - noconfigdirs="$noconfigdirs gdb sim ${libgcj}" + noconfigdirs="$noconfigdirs gdb sim" ;; v810-*-*) noconfigdirs="$noconfigdirs bfd binutils gas gdb ld opcodes target-libgloss" ;; vax-*-*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; *-*-lynxos*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; *-*-*) - noconfigdirs="$noconfigdirs ${libgcj}" ;; esac |