configure.ac: Separate cases disabling target-libssp...

* configure.ac: Separate cases disabling target-libssp,
	target-libiberty, target-libstdc++-v3 and Fortran from general
	case over targets.
	* configure: Regenerate.

From-SVN: r171827
This commit is contained in:
Joseph Myers 2011-04-01 12:59:22 +01:00 committed by Joseph Myers
parent 0036370fac
commit 1e9e0e2398
3 changed files with 189 additions and 46 deletions

View File

@ -1,3 +1,10 @@
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> 2011-04-01 Joseph Myers <joseph@codesourcery.com>
* configure.ac (*-*-chorusos): Don't disable libgcj. * configure.ac (*-*-chorusos): Don't disable libgcj.

114
configure vendored
View File

@ -3070,6 +3070,87 @@ if test x$enable_libgomp = x ; then
esac esac
fi 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. # Default libgloss CPU subdirectory.
libgloss_dir="$target_cpu" libgloss_dir="$target_cpu"
@ -3116,12 +3197,11 @@ case "${target}" in
;; ;;
*-*-kaos*) *-*-kaos*)
# Remove unsupported stuff on all kaOS configurations. # Remove unsupported stuff on all kaOS configurations.
skipdirs="target-libiberty"
noconfigdirs="$noconfigdirs target-libgloss" noconfigdirs="$noconfigdirs target-libgloss"
;; ;;
*-*-netbsd*) *-*-netbsd*)
# Skip some stuff on all NetBSD configurations. # 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. # Skip some stuff that's unsupported on some NetBSD configurations.
case "${target}" in case "${target}" in
@ -3133,21 +3213,20 @@ case "${target}" in
esac esac
;; ;;
*-*-netware*) *-*-netware*)
noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj}" noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
;; ;;
*-*-rtems*) *-*-rtems*)
skipdirs="${skipdirs} target-libiberty"
noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
;; ;;
# The tpf target doesn't support gdb yet. # The tpf target doesn't support gdb yet.
*-*-tpf*) *-*-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*) *-*-uclinux*)
noconfigdirs="$noconfigdirs target-newlib target-libgloss target-rda ${libgcj}" noconfigdirs="$noconfigdirs target-newlib target-libgloss target-rda ${libgcj}"
;; ;;
*-*-vxworks*) *-*-vxworks*)
noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty target-libstdc++-v3 ${libgcj}" noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
;; ;;
alpha*-dec-osf*) alpha*-dec-osf*)
# ld works, but does not support shared libraries. # ld works, but does not support shared libraries.
@ -3174,10 +3253,7 @@ case "${target}" in
;; ;;
sh*-*-pe|mips*-*-pe|*arm-wince-pe) sh*-*-pe|mips*-*-pe|*arm-wince-pe)
noconfigdirs="$noconfigdirs ${libgcj}" noconfigdirs="$noconfigdirs ${libgcj}"
noconfigdirs="$noconfigdirs target-libiberty"
noconfigdirs="$noconfigdirs tcl tk itcl libgui sim" 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" noconfigdirs="$noconfigdirs target-newlib"
libgloss_dir=wince libgloss_dir=wince
;; ;;
@ -3198,7 +3274,7 @@ case "${target}" in
libgloss_dir=arm libgloss_dir=arm
;; ;;
arm*-*-symbianelf*) arm*-*-symbianelf*)
noconfigdirs="$noconfigdirs ${libgcj} target-libiberty" noconfigdirs="$noconfigdirs ${libgcj}"
libgloss_dir=arm libgloss_dir=arm
;; ;;
arm-*-pe*) arm-*-pe*)
@ -3208,7 +3284,7 @@ case "${target}" in
noconfigdirs="$noconfigdirs ld target-libgloss" noconfigdirs="$noconfigdirs ld target-libgloss"
;; ;;
avr-*-*) avr-*-*)
noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj} target-libssp" noconfigdirs="$noconfigdirs ${libgcj}"
;; ;;
bfin-*-*) bfin-*-*)
unsupported_languages="$unsupported_languages java" unsupported_languages="$unsupported_languages java"
@ -3362,7 +3438,6 @@ case "${target}" in
noconfigdirs="$noconfigdirs ${libgcj}" noconfigdirs="$noconfigdirs ${libgcj}"
;; ;;
m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*) m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
noconfigdirs="$noconfigdirs target-libiberty"
libgloss_dir=m68hc11 libgloss_dir=m68hc11
;; ;;
m68k-*-elf*) m68k-*-elf*)
@ -3373,17 +3448,14 @@ case "${target}" in
;; ;;
mmix-*-*) mmix-*-*)
noconfigdirs="$noconfigdirs target-libffi target-boehm-gc gdb" noconfigdirs="$noconfigdirs target-libffi target-boehm-gc gdb"
unsupported_languages="$unsupported_languages fortran java" unsupported_languages="$unsupported_languages java"
;; ;;
mt-*-*) mt-*-*)
noconfigdirs="$noconfigdirs sim" noconfigdirs="$noconfigdirs sim"
;; ;;
picochip-*-*)
noconfigdirs="$noconfigdirs target-libiberty"
;;
powerpc-*-aix*) powerpc-*-aix*)
# copied from rs6000-*-* entry # 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*) powerpc*-*-winnt* | powerpc*-*-pe*)
target_configdirs="$target_configdirs target-winsup" target_configdirs="$target_configdirs target-winsup"
@ -3410,7 +3482,7 @@ case "${target}" in
noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}" noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}"
;; ;;
rs6000-*-aix*) rs6000-*-aix*)
noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp target-newlib ${libgcj}" noconfigdirs="$noconfigdirs gprof target-libgloss target-newlib ${libgcj}"
;; ;;
rs6000-*-*) rs6000-*-*)
noconfigdirs="$noconfigdirs gprof ${libgcj}" noconfigdirs="$noconfigdirs gprof ${libgcj}"
@ -3419,10 +3491,9 @@ case "${target}" in
noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss" noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss"
;; ;;
microblaze*) microblaze*)
noconfigdirs="$noconfigdirs gprof target-libssp ${libgcj}" noconfigdirs="$noconfigdirs gprof ${libgcj}"
;; ;;
mips*-sde-elf*) mips*-sde-elf*)
skipdirs="$skipdirs target-libiberty"
noconfigdirs="$noconfigdirs ${libgcj}" noconfigdirs="$noconfigdirs ${libgcj}"
if test x$with_newlib = xyes; then if test x$with_newlib = xyes; then
noconfigdirs="$noconfigdirs gprof" noconfigdirs="$noconfigdirs gprof"
@ -3488,9 +3559,6 @@ case "${target}" in
vax-*-*) vax-*-*)
noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
;; ;;
ip2k-*-*)
noconfigdirs="$noconfigdirs target-libiberty"
;;
*-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
noconfigdirs="$noconfigdirs target-newlib target-libgloss" noconfigdirs="$noconfigdirs target-newlib target-libgloss"
;; ;;

View File

@ -516,6 +516,87 @@ if test x$enable_libgomp = x ; then
esac esac
fi 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. # Default libgloss CPU subdirectory.
libgloss_dir="$target_cpu" libgloss_dir="$target_cpu"
@ -562,12 +643,11 @@ case "${target}" in
;; ;;
*-*-kaos*) *-*-kaos*)
# Remove unsupported stuff on all kaOS configurations. # Remove unsupported stuff on all kaOS configurations.
skipdirs="target-libiberty"
noconfigdirs="$noconfigdirs target-libgloss" noconfigdirs="$noconfigdirs target-libgloss"
;; ;;
*-*-netbsd*) *-*-netbsd*)
# Skip some stuff on all NetBSD configurations. # 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. # Skip some stuff that's unsupported on some NetBSD configurations.
case "${target}" in case "${target}" in
@ -579,21 +659,20 @@ case "${target}" in
esac esac
;; ;;
*-*-netware*) *-*-netware*)
noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj}" noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
;; ;;
*-*-rtems*) *-*-rtems*)
skipdirs="${skipdirs} target-libiberty"
noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
;; ;;
# The tpf target doesn't support gdb yet. # The tpf target doesn't support gdb yet.
*-*-tpf*) *-*-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*) *-*-uclinux*)
noconfigdirs="$noconfigdirs target-newlib target-libgloss target-rda ${libgcj}" noconfigdirs="$noconfigdirs target-newlib target-libgloss target-rda ${libgcj}"
;; ;;
*-*-vxworks*) *-*-vxworks*)
noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty target-libstdc++-v3 ${libgcj}" noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
;; ;;
alpha*-dec-osf*) alpha*-dec-osf*)
# ld works, but does not support shared libraries. # ld works, but does not support shared libraries.
@ -620,10 +699,7 @@ case "${target}" in
;; ;;
sh*-*-pe|mips*-*-pe|*arm-wince-pe) sh*-*-pe|mips*-*-pe|*arm-wince-pe)
noconfigdirs="$noconfigdirs ${libgcj}" noconfigdirs="$noconfigdirs ${libgcj}"
noconfigdirs="$noconfigdirs target-libiberty"
noconfigdirs="$noconfigdirs tcl tk itcl libgui sim" 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" noconfigdirs="$noconfigdirs target-newlib"
libgloss_dir=wince libgloss_dir=wince
;; ;;
@ -644,7 +720,7 @@ case "${target}" in
libgloss_dir=arm libgloss_dir=arm
;; ;;
arm*-*-symbianelf*) arm*-*-symbianelf*)
noconfigdirs="$noconfigdirs ${libgcj} target-libiberty" noconfigdirs="$noconfigdirs ${libgcj}"
libgloss_dir=arm libgloss_dir=arm
;; ;;
arm-*-pe*) arm-*-pe*)
@ -654,7 +730,7 @@ case "${target}" in
noconfigdirs="$noconfigdirs ld target-libgloss" noconfigdirs="$noconfigdirs ld target-libgloss"
;; ;;
avr-*-*) avr-*-*)
noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj} target-libssp" noconfigdirs="$noconfigdirs ${libgcj}"
;; ;;
bfin-*-*) bfin-*-*)
unsupported_languages="$unsupported_languages java" unsupported_languages="$unsupported_languages java"
@ -808,7 +884,6 @@ case "${target}" in
noconfigdirs="$noconfigdirs ${libgcj}" noconfigdirs="$noconfigdirs ${libgcj}"
;; ;;
m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*) m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
noconfigdirs="$noconfigdirs target-libiberty"
libgloss_dir=m68hc11 libgloss_dir=m68hc11
;; ;;
m68k-*-elf*) m68k-*-elf*)
@ -819,17 +894,14 @@ case "${target}" in
;; ;;
mmix-*-*) mmix-*-*)
noconfigdirs="$noconfigdirs target-libffi target-boehm-gc gdb" noconfigdirs="$noconfigdirs target-libffi target-boehm-gc gdb"
unsupported_languages="$unsupported_languages fortran java" unsupported_languages="$unsupported_languages java"
;; ;;
mt-*-*) mt-*-*)
noconfigdirs="$noconfigdirs sim" noconfigdirs="$noconfigdirs sim"
;; ;;
picochip-*-*)
noconfigdirs="$noconfigdirs target-libiberty"
;;
powerpc-*-aix*) powerpc-*-aix*)
# copied from rs6000-*-* entry # 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*) powerpc*-*-winnt* | powerpc*-*-pe*)
target_configdirs="$target_configdirs target-winsup" target_configdirs="$target_configdirs target-winsup"
@ -856,7 +928,7 @@ case "${target}" in
noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}" noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}"
;; ;;
rs6000-*-aix*) rs6000-*-aix*)
noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp target-newlib ${libgcj}" noconfigdirs="$noconfigdirs gprof target-libgloss target-newlib ${libgcj}"
;; ;;
rs6000-*-*) rs6000-*-*)
noconfigdirs="$noconfigdirs gprof ${libgcj}" noconfigdirs="$noconfigdirs gprof ${libgcj}"
@ -865,10 +937,9 @@ case "${target}" in
noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss" noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss"
;; ;;
microblaze*) microblaze*)
noconfigdirs="$noconfigdirs gprof target-libssp ${libgcj}" noconfigdirs="$noconfigdirs gprof ${libgcj}"
;; ;;
mips*-sde-elf*) mips*-sde-elf*)
skipdirs="$skipdirs target-libiberty"
noconfigdirs="$noconfigdirs ${libgcj}" noconfigdirs="$noconfigdirs ${libgcj}"
if test x$with_newlib = xyes; then if test x$with_newlib = xyes; then
noconfigdirs="$noconfigdirs gprof" noconfigdirs="$noconfigdirs gprof"
@ -934,9 +1005,6 @@ case "${target}" in
vax-*-*) vax-*-*)
noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
;; ;;
ip2k-*-*)
noconfigdirs="$noconfigdirs target-libiberty"
;;
*-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
noconfigdirs="$noconfigdirs target-newlib target-libgloss" noconfigdirs="$noconfigdirs target-newlib target-libgloss"
;; ;;