diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | configure | 114 | ||||
| -rw-r--r-- | configure.ac | 114 |
3 files changed, 189 insertions, 46 deletions
@@ -1,5 +1,12 @@ 2011-04-01 Joseph Myers <joseph@codesourcery.com> + * configure.ac: Separate cases disabling target-libssp, + target-libiberty, target-libstdc++-v3 and Fortran from general + case over targets. + * configure: Regenerate. + +2011-04-01 Joseph Myers <joseph@codesourcery.com> + * configure.ac (*-*-chorusos): Don't disable libgcj. (*-*-freebsd[[12]] | *-*-freebsd[[12]].* | *-*-freebsd*aout*): Remove case. @@ -3070,6 +3070,87 @@ if test x$enable_libgomp = x ; then esac fi +# Disable libssp for some systems. +case "${target}" in + avr-*-*) + noconfigdirs="$noconfigdirs target-libssp" + ;; + powerpc-*-aix* | rs6000-*-aix*) + noconfigdirs="$noconfigdirs target-libssp" + ;; + microblaze*) + noconfigdirs="$noconfigdirs target-libssp" + ;; +esac + +# Disable target libiberty for some systems. +case "${target}" in + *-*-kaos*) + # Remove unsupported stuff on all kaOS configurations. + skipdirs="target-libiberty" + ;; + *-*-netbsd*) + # Skip some stuff on all NetBSD configurations. + noconfigdirs="$noconfigdirs target-libiberty" + ;; + *-*-netware*) + noconfigdirs="$noconfigdirs target-libiberty" + ;; + *-*-rtems*) + skipdirs="${skipdirs} target-libiberty" + ;; + *-*-tpf*) + noconfigdirs="$noconfigdirs target-libiberty" + ;; + *-*-vxworks*) + noconfigdirs="$noconfigdirs target-libiberty" + ;; + sh*-*-pe|mips*-*-pe|*arm-wince-pe) + noconfigdirs="$noconfigdirs target-libiberty" + ;; + arm*-*-symbianelf*) + noconfigdirs="$noconfigdirs target-libiberty" + ;; + avr-*-*) + noconfigdirs="$noconfigdirs target-libiberty" + ;; + m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*) + noconfigdirs="$noconfigdirs target-libiberty" + ;; + picochip-*-*) + noconfigdirs="$noconfigdirs target-libiberty" + ;; + mips*-sde-elf*) + skipdirs="$skipdirs target-libiberty" + ;; + ip2k-*-*) + noconfigdirs="$noconfigdirs target-libiberty" + ;; +esac + +# Disable libstdc++-v3 for some systems. +case "${target}" in + *-*-vxworks*) + # VxWorks uses the Dinkumware C++ library. + noconfigdirs="$noconfigdirs target-libstdc++-v3" + ;; + arm*-wince-pe*) + # the C++ libraries don't build on top of CE's C libraries + noconfigdirs="$noconfigdirs target-libstdc++-v3" + ;; + avr-*-*) + noconfigdirs="$noconfigdirs target-libstdc++-v3" + ;; +esac + +# Disable Fortran for some systems. +case "${target}" in + mmix-*-*) + # See <http://gcc.gnu.org/ml/gcc-patches/2004-11/msg00572.html>. + unsupported_languages="$unsupported_languages fortran" + ;; +esac + # Default libgloss CPU subdirectory. libgloss_dir="$target_cpu" @@ -3116,12 +3197,11 @@ case "${target}" in ;; *-*-kaos*) # Remove unsupported stuff on all kaOS configurations. - skipdirs="target-libiberty" noconfigdirs="$noconfigdirs target-libgloss" ;; *-*-netbsd*) # Skip some stuff on all NetBSD configurations. - noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss" + noconfigdirs="$noconfigdirs target-newlib target-libgloss" # Skip some stuff that's unsupported on some NetBSD configurations. case "${target}" in @@ -3133,21 +3213,20 @@ case "${target}" in esac ;; *-*-netware*) - noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" ;; *-*-rtems*) - skipdirs="${skipdirs} target-libiberty" noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;; # The tpf target doesn't support gdb yet. *-*-tpf*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty ${libgcj} gdb tcl tk libgui itcl" + noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj} gdb tcl tk libgui itcl" ;; *-*-uclinux*) noconfigdirs="$noconfigdirs target-newlib target-libgloss target-rda ${libgcj}" ;; *-*-vxworks*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty target-libstdc++-v3 ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" ;; alpha*-dec-osf*) # ld works, but does not support shared libraries. @@ -3174,10 +3253,7 @@ case "${target}" in ;; sh*-*-pe|mips*-*-pe|*arm-wince-pe) noconfigdirs="$noconfigdirs ${libgcj}" - noconfigdirs="$noconfigdirs target-libiberty" noconfigdirs="$noconfigdirs tcl tk itcl libgui sim" - # the C++ libraries don't build on top of CE's C libraries - noconfigdirs="$noconfigdirs target-libstdc++-v3" noconfigdirs="$noconfigdirs target-newlib" libgloss_dir=wince ;; @@ -3198,7 +3274,7 @@ case "${target}" in libgloss_dir=arm ;; arm*-*-symbianelf*) - noconfigdirs="$noconfigdirs ${libgcj} target-libiberty" + noconfigdirs="$noconfigdirs ${libgcj}" libgloss_dir=arm ;; arm-*-pe*) @@ -3208,7 +3284,7 @@ case "${target}" in noconfigdirs="$noconfigdirs ld target-libgloss" ;; avr-*-*) - noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj} target-libssp" + noconfigdirs="$noconfigdirs ${libgcj}" ;; bfin-*-*) unsupported_languages="$unsupported_languages java" @@ -3362,7 +3438,6 @@ case "${target}" in noconfigdirs="$noconfigdirs ${libgcj}" ;; m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*) - noconfigdirs="$noconfigdirs target-libiberty" libgloss_dir=m68hc11 ;; m68k-*-elf*) @@ -3373,17 +3448,14 @@ case "${target}" in ;; mmix-*-*) noconfigdirs="$noconfigdirs target-libffi target-boehm-gc gdb" - unsupported_languages="$unsupported_languages fortran java" + unsupported_languages="$unsupported_languages java" ;; mt-*-*) noconfigdirs="$noconfigdirs sim" ;; - picochip-*-*) - noconfigdirs="$noconfigdirs target-libiberty" - ;; powerpc-*-aix*) # copied from rs6000-*-* entry - noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs gprof target-libgloss target-newlib ${libgcj}" ;; powerpc*-*-winnt* | powerpc*-*-pe*) target_configdirs="$target_configdirs target-winsup" @@ -3410,7 +3482,7 @@ case "${target}" in noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}" ;; rs6000-*-aix*) - noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs gprof target-libgloss target-newlib ${libgcj}" ;; rs6000-*-*) noconfigdirs="$noconfigdirs gprof ${libgcj}" @@ -3419,10 +3491,9 @@ case "${target}" in noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss" ;; microblaze*) - noconfigdirs="$noconfigdirs gprof target-libssp ${libgcj}" + noconfigdirs="$noconfigdirs gprof ${libgcj}" ;; mips*-sde-elf*) - skipdirs="$skipdirs target-libiberty" noconfigdirs="$noconfigdirs ${libgcj}" if test x$with_newlib = xyes; then noconfigdirs="$noconfigdirs gprof" @@ -3488,9 +3559,6 @@ case "${target}" in vax-*-*) noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" ;; - ip2k-*-*) - noconfigdirs="$noconfigdirs target-libiberty" - ;; *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; diff --git a/configure.ac b/configure.ac index 8ef103c03d..5a082c3292 100644 --- a/configure.ac +++ b/configure.ac @@ -516,6 +516,87 @@ if test x$enable_libgomp = x ; then esac fi +# Disable libssp for some systems. +case "${target}" in + avr-*-*) + noconfigdirs="$noconfigdirs target-libssp" + ;; + powerpc-*-aix* | rs6000-*-aix*) + noconfigdirs="$noconfigdirs target-libssp" + ;; + microblaze*) + noconfigdirs="$noconfigdirs target-libssp" + ;; +esac + +# Disable target libiberty for some systems. +case "${target}" in + *-*-kaos*) + # Remove unsupported stuff on all kaOS configurations. + skipdirs="target-libiberty" + ;; + *-*-netbsd*) + # Skip some stuff on all NetBSD configurations. + noconfigdirs="$noconfigdirs target-libiberty" + ;; + *-*-netware*) + noconfigdirs="$noconfigdirs target-libiberty" + ;; + *-*-rtems*) + skipdirs="${skipdirs} target-libiberty" + ;; + *-*-tpf*) + noconfigdirs="$noconfigdirs target-libiberty" + ;; + *-*-vxworks*) + noconfigdirs="$noconfigdirs target-libiberty" + ;; + sh*-*-pe|mips*-*-pe|*arm-wince-pe) + noconfigdirs="$noconfigdirs target-libiberty" + ;; + arm*-*-symbianelf*) + noconfigdirs="$noconfigdirs target-libiberty" + ;; + avr-*-*) + noconfigdirs="$noconfigdirs target-libiberty" + ;; + m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*) + noconfigdirs="$noconfigdirs target-libiberty" + ;; + picochip-*-*) + noconfigdirs="$noconfigdirs target-libiberty" + ;; + mips*-sde-elf*) + skipdirs="$skipdirs target-libiberty" + ;; + ip2k-*-*) + noconfigdirs="$noconfigdirs target-libiberty" + ;; +esac + +# Disable libstdc++-v3 for some systems. +case "${target}" in + *-*-vxworks*) + # VxWorks uses the Dinkumware C++ library. + noconfigdirs="$noconfigdirs target-libstdc++-v3" + ;; + arm*-wince-pe*) + # the C++ libraries don't build on top of CE's C libraries + noconfigdirs="$noconfigdirs target-libstdc++-v3" + ;; + avr-*-*) + noconfigdirs="$noconfigdirs target-libstdc++-v3" + ;; +esac + +# Disable Fortran for some systems. +case "${target}" in + mmix-*-*) + # See <http://gcc.gnu.org/ml/gcc-patches/2004-11/msg00572.html>. + unsupported_languages="$unsupported_languages fortran" + ;; +esac + # Default libgloss CPU subdirectory. libgloss_dir="$target_cpu" @@ -562,12 +643,11 @@ case "${target}" in ;; *-*-kaos*) # Remove unsupported stuff on all kaOS configurations. - skipdirs="target-libiberty" noconfigdirs="$noconfigdirs target-libgloss" ;; *-*-netbsd*) # Skip some stuff on all NetBSD configurations. - noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss" + noconfigdirs="$noconfigdirs target-newlib target-libgloss" # Skip some stuff that's unsupported on some NetBSD configurations. case "${target}" in @@ -579,21 +659,20 @@ case "${target}" in esac ;; *-*-netware*) - noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" ;; *-*-rtems*) - skipdirs="${skipdirs} target-libiberty" noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;; # The tpf target doesn't support gdb yet. *-*-tpf*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty ${libgcj} gdb tcl tk libgui itcl" + noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj} gdb tcl tk libgui itcl" ;; *-*-uclinux*) noconfigdirs="$noconfigdirs target-newlib target-libgloss target-rda ${libgcj}" ;; *-*-vxworks*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty target-libstdc++-v3 ${libgcj}" + noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" ;; alpha*-dec-osf*) # ld works, but does not support shared libraries. @@ -620,10 +699,7 @@ case "${target}" in ;; sh*-*-pe|mips*-*-pe|*arm-wince-pe) noconfigdirs="$noconfigdirs ${libgcj}" - noconfigdirs="$noconfigdirs target-libiberty" noconfigdirs="$noconfigdirs tcl tk itcl libgui sim" - # the C++ libraries don't build on top of CE's C libraries - noconfigdirs="$noconfigdirs target-libstdc++-v3" noconfigdirs="$noconfigdirs target-newlib" libgloss_dir=wince ;; @@ -644,7 +720,7 @@ case "${target}" in libgloss_dir=arm ;; arm*-*-symbianelf*) - noconfigdirs="$noconfigdirs ${libgcj} target-libiberty" + noconfigdirs="$noconfigdirs ${libgcj}" libgloss_dir=arm ;; arm-*-pe*) @@ -654,7 +730,7 @@ case "${target}" in noconfigdirs="$noconfigdirs ld target-libgloss" ;; avr-*-*) - noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj} target-libssp" + noconfigdirs="$noconfigdirs ${libgcj}" ;; bfin-*-*) unsupported_languages="$unsupported_languages java" @@ -808,7 +884,6 @@ case "${target}" in noconfigdirs="$noconfigdirs ${libgcj}" ;; m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*) - noconfigdirs="$noconfigdirs target-libiberty" libgloss_dir=m68hc11 ;; m68k-*-elf*) @@ -819,17 +894,14 @@ case "${target}" in ;; mmix-*-*) noconfigdirs="$noconfigdirs target-libffi target-boehm-gc gdb" - unsupported_languages="$unsupported_languages fortran java" + unsupported_languages="$unsupported_languages java" ;; mt-*-*) noconfigdirs="$noconfigdirs sim" ;; - picochip-*-*) - noconfigdirs="$noconfigdirs target-libiberty" - ;; powerpc-*-aix*) # copied from rs6000-*-* entry - noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs gprof target-libgloss target-newlib ${libgcj}" ;; powerpc*-*-winnt* | powerpc*-*-pe*) target_configdirs="$target_configdirs target-winsup" @@ -856,7 +928,7 @@ case "${target}" in noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}" ;; rs6000-*-aix*) - noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs gprof target-libgloss target-newlib ${libgcj}" ;; rs6000-*-*) noconfigdirs="$noconfigdirs gprof ${libgcj}" @@ -865,10 +937,9 @@ case "${target}" in noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss" ;; microblaze*) - noconfigdirs="$noconfigdirs gprof target-libssp ${libgcj}" + noconfigdirs="$noconfigdirs gprof ${libgcj}" ;; mips*-sde-elf*) - skipdirs="$skipdirs target-libiberty" noconfigdirs="$noconfigdirs ${libgcj}" if test x$with_newlib = xyes; then noconfigdirs="$noconfigdirs gprof" @@ -934,9 +1005,6 @@ case "${target}" in vax-*-*) noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" ;; - ip2k-*-*) - noconfigdirs="$noconfigdirs target-libiberty" - ;; *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) noconfigdirs="$noconfigdirs target-newlib target-libgloss" ;; |
