X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=configure;h=9322d7b84b06ace1ab6ba73474e7b253efe248da;hb=6e715a9023de49ae28bd2cfbcea6eccac839e4fd;hp=a44f4184e6f8cc6ad4386a6960c235562bd431f0;hpb=604a285ae61302130a01df29dec7fc8f27576340;p=pf3gnuchains%2Fgcc-fork.git diff --git a/configure b/configure index a44f4184e6f..9322d7b84b0 100755 --- a/configure +++ b/configure @@ -741,6 +741,9 @@ ac_user_opts=' enable_option_checking with_build_libsubdir enable_gold +enable_ld +enable_libquadmath +enable_libquadmath_support enable_libada enable_libssp enable_build_with_cxx @@ -1450,66 +1453,77 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-gold[=ARG] build gold [ARG={both}[/{gold,ld}]] + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-ld[=ARG] build ld [ARG={default,yes,no}] + --disable-libquadmath do not build libquadmath directory + --disable-libquadmath-support + disable libquadmath support for Fortran --enable-libada build libada directory --enable-libssp build libssp directory --enable-build-with-cxx build with C++ compiler instead of C compiler - --disable-ppl-version-check disable check for PPL version + --disable-ppl-version-check + disable check for PPL version --enable-cloog-backend[=BACKEND] set the CLooG BACKEND used to either isl, ppl or ppl-legacy (default) --disable-cloog-version-check disable check for CLooG version --enable-lto enable link time optimization support - --enable-stage1-languages[=all] choose additional languages to build during - stage1. Mostly useful for compiler development. - --enable-objc-gc enable use of Boehm's garbage collector with the - GNU Objective-C runtime + --enable-stage1-languages[=all] + choose additional languages to build during stage1. + Mostly useful for compiler development + --enable-objc-gc enable use of Boehm's garbage collector with the GNU + Objective-C runtime --enable-bootstrap enable bootstrapping [yes if native build] --enable-serial-[{host,target,build}-]configure - force sequential configuration of - sub-packages for the host, target or build - machine, or all sub-packages - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --enable-stage1-checking[=all] choose additional checking for stage1 - of the compiler + force sequential configuration of sub-packages for + the host, target or build machine, or all + sub-packages + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-stage1-checking[=all] + choose additional checking for stage1 of the + compiler --enable-werror enable -Werror in bootstrap stage2 and later Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-build-libsubdir=DIR Directory where to find libraries for build system - --with-mpc=PATH specify prefix directory for installed MPC package. - Equivalent to --with-mpc-include=PATH/include - plus --with-mpc-lib=PATH/lib - --with-mpc-include=PATH - specify directory for installed MPC include files - --with-mpc-lib=PATH specify directory for the installed MPC library + --with-mpc=PATH specify prefix directory for installed MPC package. + Equivalent to --with-mpc-include=PATH/include plus + --with-mpc-lib=PATH/lib + --with-mpc-include=PATH specify directory for installed MPC include files + --with-mpc-lib=PATH specify directory for the installed MPC library --with-mpfr-dir=PATH this option has been REMOVED --with-mpfr=PATH specify prefix directory for installed MPFR package. - Equivalent to --with-mpfr-include=PATH/include - plus --with-mpfr-lib=PATH/lib + Equivalent to --with-mpfr-include=PATH/include plus + --with-mpfr-lib=PATH/lib --with-mpfr-include=PATH specify directory for installed MPFR include files --with-mpfr-lib=PATH specify directory for the installed MPFR library --with-gmp-dir=PATH this option has been REMOVED - --with-gmp=PATH specify prefix directory for the installed GMP package. - Equivalent to --with-gmp-include=PATH/include - plus --with-gmp-lib=PATH/lib + --with-gmp=PATH specify prefix directory for the installed GMP + package. Equivalent to + --with-gmp-include=PATH/include plus + --with-gmp-lib=PATH/lib --with-gmp-include=PATH specify directory for installed GMP include files --with-gmp-lib=PATH specify directory for the installed GMP library - --with-host-libstdcxx=L Use linker arguments L to link with libstdc++ - when linking with PPL - --with-stage1-ldflags=FLAGS Linker flags for stage1 - -with-stage1-libs=LIBS Libraries for stage1 - --with-boot-libs=LIBS Libraries for stage2 and later - --with-boot-ldflags=FLAGS Linker flags for stage2 and later - --with-ppl=PATH Specify prefix directory for the installed PPL package - Equivalent to --with-ppl-include=PATH/include - plus --with-ppl-lib=PATH/lib - --with-ppl-include=PATH Specify directory for installed PPL include files - --with-ppl-lib=PATH Specify the directory for the installed PPL library + --with-host-libstdcxx=L use linker arguments L to link with libstdc++ when + linking with PPL + --with-stage1-ldflags=FLAGS + linker flags for stage1 + --with-stage1-libs=LIBS libraries for stage1 + --with-boot-libs=LIBS libraries for stage2 and later + --with-boot-ldflags=FLAGS + linker flags for stage2 and later + --with-ppl=PATH specify prefix directory for the installed PPL + package. Equivalent to + --with-ppl-include=PATH/include plus + --with-ppl-lib=PATH/lib + --with-ppl-include=PATH specify directory for installed PPL include files + --with-ppl-lib=PATH specify directory for the installed PPL library --with-cloog=PATH Specify prefix directory for the installed CLooG-PPL package. Equivalent to --with-cloog-include=PATH/include plus @@ -1521,9 +1535,9 @@ Optional Packages: --with-build-sysroot=SYSROOT use sysroot as the system root during the build --with-debug-prefix-map='A=B C=D ...' - map A to B, C to D ... in debug information ---with-build-config='NAME NAME2...' - Use config/NAME.mk build configuration + map A to B, C to D ... in debug information + --with-build-config='NAME NAME2...' + use config/NAME.mk build configuration --with-build-time-tools=PATH use given path to find target tools during the build @@ -2712,10 +2726,9 @@ target_libraries="target-libgcc \ # run only in the target environment # # note: any program that *uses* libraries that are in the "target_libraries" -# list belongs in this list. those programs are also very likely -# candidates for the "native_only" list which follows +# list belongs in this list. # -target_tools="target-examples target-groff target-gperf target-rda" +target_tools="target-examples target-gperf target-rda" ################################################################################ @@ -2821,17 +2834,12 @@ case ${with_x} in *) echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2 ;; esac -# Some tools are only suitable for building in a "native" situation. -# Remove these if host!=target. -native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff target-groff guile perl time ash bash bzip2 prms gnuserv target-gperf" - -# Similarly, some are only suitable for cross toolchains. +# Some are only suitable for cross toolchains. # Remove these if host=target. cross_only="target-libgloss target-newlib target-opcodes" case $is_cross_compiler in no) skipdirs="${skipdirs} ${cross_only}" ;; - yes) skipdirs="${skipdirs} ${native_only}" ;; esac # If both --with-headers and --with-libs are specified, default to @@ -2849,13 +2857,25 @@ case ${with_newlib} in yes) skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` ;; esac -# Handle --enable-gold. -# --enable-gold Build only gold -# --disable-gold [default] Build only ld -# --enable-gold=both Build both gold and ld, ld is default -# --enable-gold=both/ld Same -# --enable-gold=both/gold Build both gold and ld, gold is default, ld is renamed ld.bfd - +# Handle --enable-gold, --enable-ld. +# --disable-gold [--enable-ld] +# Build only ld. Default option. +# --enable-gold [--enable-ld] +# Build both gold and ld. Install gold as "ld.gold", install ld +# as "ld.bfd" and "ld". +# --enable-gold=default [--enable-ld] +# Build both gold and ld. Install gold as "ld.gold" and "ld", +# install ld as "ld.bfd". +# --enable-gold[=default] --disable-ld +# Build only gold, which is then installed as both "ld.gold" and "ld". +# --enable-gold --enable-ld=default +# Build both gold (installed as "ld.gold") and ld (installed as "ld" +# and ld.bfd). +# In other words, ld is default +# --enable-gold=default --enable-ld=default +# Error. + +default_ld= # Check whether --enable-gold was given. if test "${enable_gold+set}" = set; then : enableval=$enable_gold; ENABLE_GOLD=$enableval @@ -2863,14 +2883,15 @@ else ENABLE_GOLD=no fi - case "${ENABLE_GOLD}" in - yes|both|both/gold|both/ld) +case "${ENABLE_GOLD}" in + yes|default) # Check for ELF target. is_elf=no case "${target}" in *-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \ | *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \ - | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-solaris2* | *-*-nto*) + | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* \ + | *-*-solaris2* | *-*-nto*) case "${target}" in *-*-linux*aout* | *-*-linux*oldld*) ;; @@ -2884,14 +2905,10 @@ fi # Check for target supported by gold. case "${target}" in i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-* | arm*-*-*) - case "${ENABLE_GOLD}" in - both*) - configdirs="$configdirs gold" - ;; - *) - configdirs=`echo " ${configdirs} " | sed -e 's/ ld / gold /'` - ;; - esac + configdirs="$configdirs gold" + if test x${ENABLE_GOLD} = xdefault; then + default_ld=gold + fi ENABLE_GOLD=yes ;; esac @@ -2902,7 +2919,35 @@ fi *) as_fn_error "invalid --enable-gold argument" "$LINENO" 5 ;; - esac +esac + +# Check whether --enable-ld was given. +if test "${enable_ld+set}" = set; then : + enableval=$enable_ld; ENABLE_LD=$enableval +else + ENABLE_LD=yes +fi + + +case "${ENABLE_LD}" in + default) + if test x${default_ld} != x; then + as_fn_error "either gold or ld can be the default ld" "$LINENO" 5 + fi + ;; + yes) + ;; + no) + if test x${ENABLE_GOLD} != xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: neither ld nor gold are enabled" >&5 +$as_echo "$as_me: WARNING: neither ld nor gold are enabled" >&2;} + fi + configdirs=`echo " ${configdirs} " | sed -e 's/ ld / /'` + ;; + *) + as_fn_error "invalid --enable-ld argument" "$LINENO" 5 + ;; +esac # Configure extra directories which are host specific @@ -2920,40 +2965,37 @@ unsupported_languages= # exist yet. case "${host}" in - hppa*64*-*-*) - noconfigdirs="$noconfigdirs byacc" - ;; - i[3456789]86-*-vsta) - noconfigdirs="$noconfigdirs tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl itcl gnuserv gettext" - ;; - i[3456789]86-*-go32* | i[3456789]86-*-msdosdjgpp*) - noconfigdirs="$noconfigdirs tcl tk expect dejagnu send-pr uudecode guile itcl gnuserv libffi" - ;; - x86_64-*-mingw*) - noconfigdirs="$noconfigdirs expect dejagnu autoconf automake send-pr rcs guile perl texinfo libtool newlib" - ;; - i[3456789]86-*-mingw32*) - # noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl itcl gnuserv" - noconfigdirs="$noconfigdirs expect dejagnu autoconf automake send-pr rcs guile perl texinfo libtool newlib" - ;; - i[3456789]86-*-beos*) - noconfigdirs="$noconfigdirs tk itcl libgui gdb" - ;; - *-*-cygwin*) - noconfigdirs="$noconfigdirs autoconf automake send-pr rcs guile perl" - ;; - *-*-netbsd*) - noconfigdirs="$noconfigdirs rcs" - ;; - ppc*-*-pe) - noconfigdirs="$noconfigdirs patch diff make tk tcl expect dejagnu autoconf automake texinfo bison send-pr gprof rcs guile perl itcl gnuserv" - ;; - powerpc-*-beos*) - noconfigdirs="$noconfigdirs tk itcl libgui gdb dejagnu readline" + i[3456789]86-*-msdosdjgpp*) + noconfigdirs="$noconfigdirs tcl tk itcl" ;; esac +# Check whether --enable-libquadmath was given. +if test "${enable_libquadmath+set}" = set; then : + enableval=$enable_libquadmath; ENABLE_LIBQUADMATH=$enableval +else + ENABLE_LIBQUADMATH=yes +fi + +if test "${ENABLE_LIBQUADMATH}" = "no" ; then + noconfigdirs="$noconfigdirs target-libquadmath" +fi + + +# Check whether --enable-libquadmath-support was given. +if test "${enable_libquadmath_support+set}" = set; then : + enableval=$enable_libquadmath_support; ENABLE_LIBQUADMATH_SUPPORT=$enableval +else + ENABLE_LIBQUADMATH_SUPPORT=yes +fi + +enable_libquadmath_support= +if test "${ENABLE_LIBQUADMATH_SUPPORT}" = "no" ; then + enable_libquadmath_support=no +fi + + # Check whether --enable-libada was given. if test "${enable_libada+set}" = set; then : enableval=$enable_libada; ENABLE_LIBADA=$enableval @@ -2987,6 +3029,9 @@ no) # Make sure we get it printed in the list of not supported target libs. # Don't disable libffi, though, other languages use it. noconfigdirs="$noconfigdirs `echo ${libgcj} | sed -e 's/target-libffi//'`" + # Clear libgcj_saved so that even if java is enabled libffi won't be + # built. + libgcj_saved= ;; esac @@ -3013,7 +3058,7 @@ if test x$enable_libgomp = x ; then case "${target}" in *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) ;; - *-*-netbsd* | *-*-freebsd* | *-*-openbsd*) + *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly*) ;; *-*-solaris2* | *-*-sysv4* | *-*-irix6* | *-*-osf* | *-*-hpux11*) ;; @@ -3049,6 +3094,9 @@ case "${target}" in noconfigdirs="$noconfigdirs sim target-rda" noconfigdirs="$noconfigdirs ${libgcj}" ;; + *-*-dragonfly*) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; *-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*) noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}" ;; @@ -3071,8 +3119,8 @@ case "${target}" in ;; *-*-kaos*) # Remove unsupported stuff on all kaOS configurations. - skipdirs="target-libiberty ${libgcj} target-libstdc++-v3 target-librx" - skipdirs="$skipdirs target-libobjc target-examples target-groff target-gperf" + skipdirs="target-libiberty ${libgcj} target-libstdc++-v3" + skipdirs="$skipdirs target-libobjc" skipdirs="$skipdirs zlib fastjar target-libjava target-boehm-gc target-zlib" noconfigdirs="$noconfigdirs target-libgloss" ;; @@ -3090,7 +3138,7 @@ case "${target}" in esac ;; *-*-netware*) - noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap" + noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj}" ;; *-*-rtems*) skipdirs="${skipdirs} target-libiberty" @@ -3098,7 +3146,7 @@ case "${target}" in ;; # The tpf target doesn't support gdb yet. *-*-tpf*) - noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty ${libgcj} target-libmudflap gdb tcl tk libgui itcl" + noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty ${libgcj} gdb tcl tk libgui itcl" ;; *-*-uclinux*) noconfigdirs="$noconfigdirs target-newlib target-libgloss target-rda ${libgcj}" @@ -3108,9 +3156,9 @@ case "${target}" in ;; alpha*-dec-osf*) # ld works, but does not support shared libraries. - # newlib is not 64 bit ready. I'm not sure about fileutils. + # newlib is not 64 bit ready. # gas doesn't generate exception information. - noconfigdirs="$noconfigdirs gas ld fileutils target-newlib target-libgloss" + noconfigdirs="$noconfigdirs gas ld target-newlib target-libgloss" ;; alpha*-*-*vms*) noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}" @@ -3131,35 +3179,26 @@ case "${target}" in ;; sh*-*-pe|mips*-*-pe|*arm-wince-pe) noconfigdirs="$noconfigdirs ${libgcj}" - noconfigdirs="$noconfigdirs target-examples" - noconfigdirs="$noconfigdirs target-libiberty texinfo send-pr" + noconfigdirs="$noconfigdirs target-libiberty" noconfigdirs="$noconfigdirs tcl tk itcl libgui sim" - noconfigdirs="$noconfigdirs expect dejagnu" # the C++ libraries don't build on top of CE's C libraries noconfigdirs="$noconfigdirs target-libstdc++-v3" noconfigdirs="$noconfigdirs target-newlib" - case "${host}" in - *-*-cygwin*) ;; # keep gdb and readline - *) noconfigdirs="$noconfigdirs gdb readline" - ;; - esac libgloss_dir=wince ;; arc-*-*) - noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" - ;; - arm-semi-aof ) + noconfigdirs="$noconfigdirs target-libgloss" ;; - arm-*-coff | strongarm-*-coff | xscale-*-coff) + arm-*-coff) noconfigdirs="$noconfigdirs ${libgcj}" libgloss_dir=arm ;; - arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* ) - noconfigdirs="$noconfigdirs target-libffi target-qthreads" + arm-*-elf* | arm*-*-eabi* ) + noconfigdirs="$noconfigdirs target-libffi" libgloss_dir=arm ;; arm*-*-linux-gnueabi) - noconfigdirs="$noconfigdirs target-qthreads" + noconfigdirs="$noconfigdirs" case ${with_newlib} in no) noconfigdirs="$noconfigdirs target-newlib target-libgloss" esac @@ -3172,15 +3211,6 @@ case "${target}" in arm-*-pe*) noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;; - thumb-*-coff) - noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" - ;; - thumb-*-elf) - noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" - ;; - thumb-*-pe) - noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" - ;; arm-*-riscix*) noconfigdirs="$noconfigdirs ld target-libgloss ${libgcj}" ;; @@ -3189,7 +3219,7 @@ case "${target}" in ;; bfin-*-*) unsupported_languages="$unsupported_languages java" - noconfigdirs="$noconfigdirs target-boehm-gc gdb" + noconfigdirs="$noconfigdirs target-boehm-gc" if test x${is_cross_compiler} != xno ; then target_configdirs="${target_configdirs} target-bsp target-cygmon" fi @@ -3198,7 +3228,7 @@ case "${target}" in noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}" ;; c54x*-*-* | tic54x-*-*) - noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj} gcc gdb newlib" + noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj} gcc gdb" ;; cr16-*-*) noconfigdirs="$noconfigdirs ${libgcj} gdb" @@ -3209,8 +3239,8 @@ case "${target}" in *-*-aout) unsupported_languages="$unsupported_languages fortran" noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";; - *-*-elf) - noconfigdirs="$noconfigdirs target-boehm-gc";; + *-*-elf) # See PR46792 regarding target-libffi. + noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";; *-*-linux*) noconfigdirs="$noconfigdirs target-newlib target-libgloss";; *) @@ -3219,18 +3249,12 @@ case "${target}" in esac libgloss_dir=cris ;; - crx-*-*) - noconfigdirs="$noconfigdirs target-libstdc++-v3 target-mudflap ${libgcj}" - ;; d10v-*-*) noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}" ;; d30v-*-*) noconfigdirs="$noconfigdirs ${libgcj} gdb" ;; - ep9312-*-elf | ep9312-*-coff) - libgloss_dir=arm - ;; fr30-*-elf*) noconfigdirs="$noconfigdirs ${libgcj} gdb" ;; @@ -3249,13 +3273,13 @@ case "${target}" in ;; hppa1.1-*-osf* | hppa1.1-*-bsd* ) ;; - hppa*64*-*-linux* | parisc*64*-*-linux*) + 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" ;; - parisc*-*-linux* | hppa*-*-linux*) + hppa*-*-linux*) ;; hppa*-*-*elf* | \ hppa*-*-lites* | \ @@ -3264,7 +3288,7 @@ case "${target}" in noconfigdirs="$noconfigdirs ${libgcj}" ;; hppa*-hp-hpux11*) - noconfigdirs="$noconfigdirs ld shellutils" + noconfigdirs="$noconfigdirs ld" ;; hppa*-*-pro*) libgloss_dir=pa @@ -3272,24 +3296,22 @@ case "${target}" in hppa*-*-*) # According to Alexandre Oliva , libjava won't # build on HP-UX 10.20. - noconfigdirs="$noconfigdirs ld shellutils ${libgcj}" + noconfigdirs="$noconfigdirs ld ${libgcj}" ;; i960-*-*) noconfigdirs="$noconfigdirs ${libgcj} gdb" ;; ia64*-*-elf*) # No gdb support yet. - noconfigdirs="$noconfigdirs readline mmalloc libgui itcl gdb" + noconfigdirs="$noconfigdirs readline libgui itcl gdb" ;; ia64*-**-hpux*) - # No gdb or ld support yet. - noconfigdirs="$noconfigdirs ${libgcj} readline mmalloc libgui itcl gdb ld" + # No ld support yet. + noconfigdirs="$noconfigdirs ${libgcj} libgui itcl ld" ;; ia64*-*-*vms*) # No gdb or ld support yet. - noconfigdirs="$noconfigdirs ${libgcj} tix readline mmalloc libgui itcl gdb ld" - ;; - i370-*-opened*) + noconfigdirs="$noconfigdirs ${libgcj} readline libgui itcl gdb ld" ;; i[3456789]86-*-coff | i[3456789]86-*-elf) noconfigdirs="$noconfigdirs ${libgcj}" @@ -3315,18 +3337,18 @@ case "${target}" in # 'target-newlib' will appear in skipdirs. ;; i[3456789]86-w64-mingw*) - noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss target-newlib ${libgcj}" ;; i[3456789]86-*-mingw*) target_configdirs="$target_configdirs target-winsup" - noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss target-newlib ${libgcj}" ;; x86_64-*-mingw*) - noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss target-newlib ${libgcj}" ;; *-*-cygwin*) target_configdirs="$target_configdirs target-libtermcap target-winsup" - noconfigdirs="$noconfigdirs target-gperf target-libgloss" + noconfigdirs="$noconfigdirs target-libgloss" # always build newlib if winsup directory is present. if test -d "$srcdir/winsup/cygwin"; then skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` @@ -3334,11 +3356,10 @@ case "${target}" in echo "Warning: winsup/cygwin is missing so newlib can't be built." fi ;; - i[3456789]86-moss-msdos | i[3456789]86-*-moss* | \ - i[3456789]86-*-uwin* | i[3456789]86-*-interix* ) + i[3456789]86-*-interix* ) ;; i[3456789]86-*-pe) - noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss" ;; i[3456789]86-*-sco3.2v5*) # The linker does not yet know about weak symbols in COFF, @@ -3364,7 +3385,7 @@ case "${target}" in noconfigdirs="$noconfigdirs ${libgcj}" ;; m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*) - noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}" + noconfigdirs="$noconfigdirs target-libiberty" libgloss_dir=m68hc11 ;; m68k-*-elf*) @@ -3376,11 +3397,6 @@ case "${target}" in m68*-*-* | fido-*-*) libgloss_dir=m68k ;; - mcore-*-pe*) - # The EPOC C++ environment does not support exceptions or rtti, - # and so building libstdc++-v3 tends not to always work. - noconfigdirs="$noconfigdirs target-libstdc++-v3" - ;; mmix-*-*) noconfigdirs="$noconfigdirs target-libffi target-boehm-gc gdb libgloss" unsupported_languages="$unsupported_languages fortran java" @@ -3394,19 +3410,22 @@ case "${target}" in 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}" ;; - powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe) + powerpc*-*-winnt* | powerpc*-*-pe*) target_configdirs="$target_configdirs target-winsup" - noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl gnuserv ${libgcj}" + noconfigdirs="$noconfigdirs gdb tcl tk target-libgloss itcl ${libgcj}" # always build newlib. skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` ;; # This is temporary until we can link against shared libraries powerpcle-*-solaris*) - noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl gnuserv ${libgcj}" + noconfigdirs="$noconfigdirs gdb sim tcl tk itcl ${libgcj}" libgloss_dir=rs6000 ;; powerpc-*-beos*) @@ -3466,12 +3485,6 @@ case "${target}" in noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}" ;; sh-*-* | sh64-*-*) - case "${host}" in - i[3456789]86-*-vsta) ;; # don't add gprof back in - i[3456789]86-*-go32*) ;; # don't add gprof back in - i[3456789]86-*-msdosdjgpp*) ;; # don't add gprof back in - *) skipdirs=`echo " ${skipdirs} " | sed -e 's/ gprof / /'` ;; - esac case "${target}" in sh*-*-elf) noconfigdirs="$noconfigdirs ${libgcj}" ;; @@ -3546,111 +3559,9 @@ case "${noconfigdirs}" in esac # Work in distributions that contain no compiler tools, like Autoconf. -tentative_cc="" host_makefile_frag=/dev/null if test -d ${srcdir}/config ; then case "${host}" in - m68k-hp-hpux*) - # Avoid "too much defining" errors from HPUX compiler. - tentative_cc="cc -Wp,-H256000" - # If "ar" in $PATH is GNU ar, the symbol table may need rebuilding. - # If it's HP/UX ar, this should be harmless. - RANLIB="ar ts" - ;; - m68k-apollo-sysv*) - tentative_cc="cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DUSG" - ;; - m68k-apollo-bsd*) - #None of the Apollo compilers can compile gas or binutils. The preprocessor - # chokes on bfd, the compiler won't let you assign integers to enums, and - # other problems. Defining CC to gcc is a questionable way to say "don't use - # the apollo compiler" (the preferred version of GCC could be called cc, - # or whatever), but I'm not sure leaving CC as cc is any better... - #CC=cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DNO_STDARG - # Used to have BISON=yacc. - tentative_cc=gcc - ;; - m88k-dg-dgux*) - tentative_cc="gcc -Wall -ansi -D__using_DGUX" - ;; - m88k-harris-cxux*) - # Under CX/UX, we want to tell the compiler to use ANSI mode. - tentative_cc="cc -Xa" - host_makefile_frag="config/mh-cxux" - ;; - m88k-motorola-sysv*) - ;; - mips*-dec-ultrix*) - tentative_cc="cc -Wf,-XNg1000" - host_makefile_frag="config/mh-decstation" - ;; - mips*-nec-sysv4*) - # The C compiler on NEC MIPS SVR4 needs bigger tables. - tentative_cc="cc -ZXNd=5000 -ZXNg=1000" - host_makefile_frag="config/mh-necv4" - ;; - mips*-sgi-irix4*) - # Tell compiler to use K&R C. We can't compile under the SGI Ansi - # environment. Also bump switch table size so that cp-parse will - # compile. Bump string length limit so linker builds. - tentative_cc="cc -cckr -Wf,-XNg1500 -Wf,-XNk1000 -Wf,-XNh2000 -Wf,-XNl8192" - ;; - mips*-*-sysv4*) - host_makefile_frag="config/mh-sysv4" - ;; - mips*-*-sysv*) - # This is for a MIPS running RISC/os 4.52C. - - # This is needed for GDB, but needs to be in the top-level make because - # if a library is compiled with the bsd headers and gets linked with the - # sysv system libraries all hell can break loose (e.g. a jmp_buf might be - # a different size). - # ptrace(2) apparently has problems in the BSD environment. No workaround is - # known except to select the sysv environment. Could we use /proc instead? - # These "sysv environments" and "bsd environments" often end up being a pain. - # - # This is not part of CFLAGS because perhaps not all C compilers have this - # option. - tentative_cc="cc -systype sysv" - ;; - i370-ibm-opened*) - tentative_cc="c89" - ;; - i[3456789]86-*-sysv5*) - host_makefile_frag="config/mh-sysv5" - ;; - i[3456789]86-*-dgux*) - tentative_cc="gcc -Wall -ansi -D__using_DGUX" - host_makefile_frag="config/mh-dgux386" - ;; - i[3456789]86-ncr-sysv4.3*) - # The MetaWare compiler will generate a copyright message unless you - # turn it off by adding the -Hnocopyr flag. - tentative_cc="cc -Hnocopyr" - ;; - i[3456789]86-ncr-sysv4*) - # for an NCR 3000 (i486/SVR4) system. - # The NCR 3000 ships with a MetaWare compiler installed as /bin/cc. - # This compiler not only emits obnoxious copyright messages every time - # you run it, but it chokes and dies on a whole bunch of GNU source - # files. Default to using the AT&T compiler installed in /usr/ccs/ATT/cc. - tentative_cc="/usr/ccs/ATT/cc" - host_makefile_frag="config/mh-ncr3000" - ;; - i[3456789]86-*-sco3.2v5*) - ;; - i[3456789]86-*-sco*) - # The native C compiler botches some simple uses of const. Unfortunately, - # it doesn't defined anything like "__sco__" for us to test for in ansidecl.h. - tentative_cc="cc -Dconst=" - host_makefile_frag="config/mh-sco" - ;; - i[3456789]86-*-udk*) - host_makefile_frag="config/mh-sysv5" - ;; - i[3456789]86-*-solaris2*) - host_makefile_frag="config/mh-sysv4" - ;; i[3456789]86-*-msdosdjgpp*) host_makefile_frag="config/mh-djgpp" ;; @@ -3683,37 +3594,15 @@ fi *-interix*) host_makefile_frag="config/mh-interix" ;; - vax-*-ultrix2*) - # The old BSD pcc isn't up to compiling parts of gdb so use gcc - tentative_cc=gcc - ;; - *-*-solaris2*) - host_makefile_frag="config/mh-solaris" - ;; - m68k-sun-sunos*) - # Sun's C compiler needs the -J flag to be able to compile cp-parse.c - # without overflowing the jump tables (-J says to use a 32 bit table) - tentative_cc="cc -J" - ;; hppa*-hp-hpux10*) - tentative_cc="cc -Wp,-H256000" host_makefile_frag="config/mh-pa-hpux10" ;; - hppa*-hp-hpux* | hppa*-*-hiux*) - tentative_cc="cc -Wp,-H256000" + hppa*-hp-hpux*) host_makefile_frag="config/mh-pa" ;; hppa*-*) host_makefile_frag="config/mh-pa" ;; - *-hp-hpux* | *-*-hiux*) - tentative_cc="cc -Wp,-H256000" - ;; - rs6000-*-lynxos*) - # /bin/cc is less than useful for our purposes. Always use GCC - tentative_cc="/usr/cygnus/progressive/bin/gcc" - host_makefile_frag="config/mh-lynxrs6k" - ;; *-*-darwin*) host_makefile_frag="config/mh-darwin" ;; @@ -3723,40 +3612,9 @@ fi rs6000-*-aix*) host_makefile_frag="config/mh-ppc-aix" ;; - *-*-lynxos*) - # /bin/cc is less than useful for our purposes. Always use GCC - tentative_cc="/bin/gcc" - ;; - *-*-sysv4*) - host_makefile_frag="config/mh-sysv4" - ;; - # This is placed last to prevent interfering with the cases above. - i[3456789]86-*-*) - # Build the stage2 and stage3 compilers with -fomit-frame-pointer. - host_makefile_frag="config/mh-x86omitfp" - ;; esac fi -# If we aren't going to be using gcc, see if we can extract a definition -# of CC from the fragment. -# Actually, use the 'pre-extracted' version above. -if test -z "${CC}" && test "${build}" = "${host}" ; then - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" - found= - for dir in $PATH; do - test -z "$dir" && dir=. - if test -f $dir/gcc; then - found=yes - break - fi - done - IFS="$save_ifs" - if test -z "${found}" && test -n "${tentative_cc}" ; then - CC=$tentative_cc - fi -fi - if test "${build}" != "${host}" ; then AR_FOR_BUILD=${AR_FOR_BUILD-ar} AS_FOR_BUILD=${AS_FOR_BUILD-as} @@ -5568,10 +5426,10 @@ if test "${with_boot_ldflags+set}" = set; then : fi else poststage1_ldflags= - # With --enable-build-with-cxx, default to linking libstdc++ and - # libgcc statically. But if the user explicitly specified the - # libraries to use, trust that they are doing what they want. - if test "$ENABLE_BUILD_WITH_CXX" = "yes" -a "$poststage1_libs" = ""; then + # In stages 2 and 3, default to linking libstdc++ and libgcc + # statically. But if the user explicitly specified the libraries to + # use, trust that they are doing what they want. + if test "$poststage1_libs" = ""; then poststage1_ldflags="-static-libstdc++ -static-libgcc" fi fi @@ -5579,8 +5437,9 @@ fi # Check for PPL -ppllibs=" -lppl_c -lppl -lgmpxx" +ppllibs= pplinc= +pwllib= # Check whether --with-ppl was given. @@ -5601,52 +5460,110 @@ if test "${with_ppl_lib+set}" = set; then : fi +# Check whether --enable-ppl-version-check was given. +if test "${enable_ppl_version_check+set}" = set; then : + enableval=$enable_ppl_version_check; +fi + + case $with_ppl in - no) - ppllibs= - ;; - "" | yes) + yes | no | "") ;; *) - ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx" + ppllibs="-L$with_ppl/lib" pplinc="-I$with_ppl/include $pplinc" + if test -d "$with_ppl/lib" && test -d "$with_ppl/include"; then + with_ppl=yes + else + as_fn_error "cannot find directories \"$with_ppl/lib\" or \"$with_ppl/include\"" "$LINENO" 5 + fi ;; esac -if test "x$with_ppl_include" != x; then + +if test x"$with_ppl_include" != x; then pplinc="-I$with_ppl_include $pplinc" + with_ppl=yes fi + if test "x$with_ppl_lib" != x; then - ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx" + ppllibs="-L$with_ppl_lib" + with_ppl=yes fi -if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then - ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/'"$lt_cv_objdir"' -L$$r/$(HOST_SUBDIR)/ppl/src/'"$lt_cv_objdir"' -lppl_c -lppl -lgmpxx ' + +if test x"$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then + if test x"$enable_watchdog" = xyes; then + pwllib="-lpwl" + fi + ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/'"$lt_cv_objdir"' -L$$r/$(HOST_SUBDIR)/ppl/src/'"$lt_cv_objdir" pplinc='-I$$r/$(HOST_SUBDIR)/ppl/src -I$$r/$(HOST_SUBDIR)/ppl/interfaces/C ' enable_ppl_version_check=no + with_ppl=yes fi -# Check whether --enable-ppl-version-check was given. -if test "${enable_ppl_version_check+set}" = set; then : - enableval=$enable_ppl_version_check; ENABLE_PPL_CHECK=$enableval +if test "x$with_ppl" != xno; then + if test "x$pwllib" = x; then + saved_LIBS="$LIBS" + LIBS="$LIBS $ppllibs -lstdc++ -lm" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PWL_handle_timeout in -lpwl" >&5 +$as_echo_n "checking for PWL_handle_timeout in -lpwl... " >&6; } +if test "${ac_cv_lib_pwl_PWL_handle_timeout+set}" = set; then : + $as_echo_n "(cached) " >&6 else - ENABLE_PPL_CHECK=yes + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpwl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char PWL_handle_timeout (); +int +main () +{ +return PWL_handle_timeout (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pwl_PWL_handle_timeout=yes +else + ac_cv_lib_pwl_PWL_handle_timeout=no fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pwl_PWL_handle_timeout" >&5 +$as_echo "$ac_cv_lib_pwl_PWL_handle_timeout" >&6; } +if test "x$ac_cv_lib_pwl_PWL_handle_timeout" = x""yes; then : + pwllib="-lpwl" +fi + + LIBS="$saved_LIBS" + fi + ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx" -if test "x$with_ppl" != "xno" -a "${ENABLE_PPL_CHECK}" = "yes"; then - saved_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $pplinc $gmpinc" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.10 (or later revision) of PPL" >&5 -$as_echo_n "checking for version 0.10 (or later revision) of PPL... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "$enable_ppl_version_check" != no; then + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $pplinc $gmpinc" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.11 (revision 0 or later) of PPL" >&5 +$as_echo_n "checking for version 0.11 (revision 0 or later) of PPL... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "ppl_c.h" int main () { - #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10 - choke me - #endif + #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11 + choke me + #endif ; return 0; @@ -5660,7 +5577,8 @@ else $as_echo "no" >&6; }; ppllibs= ; pplinc= ; with_ppl=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$saved_CFLAGS" + CFLAGS="$saved_CFLAGS" + fi fi # Flags needed for PPL @@ -5736,6 +5654,23 @@ fi if test "x$with_ppl" = "xno"; then + + + + if test "x${with_cloog}" = xno; then + graphite_requested=no + elif test "x${with_cloog}" != x \ + || test "x${with_cloog_include}" != x \ + || test "x${with_cloog_lib}" != x ; then + graphite_requested=yes + else + graphite_requested=no + fi + + + if test "${graphite_requested}" = yes; then + as_fn_error "Unable to find a usable PPL. See config.log for details." "$LINENO" 5 + fi with_cloog=no fi if test "x${with_cloog}" = x && test "x${with_cloog_include}" = x \ @@ -5865,7 +5800,7 @@ $as_echo "$gcc_cv_cloog_type" >&6; } ;; "ISL") clooginc="${clooginc} ${_cloogorginc}" - clooglibs="${clooglibs} -lcloog-isl" + clooglibs="${clooglibs} -lcloog-isl -lisl" cloog_org=yes ;; "PPL") @@ -5897,8 +5832,8 @@ $as_echo "$gcc_cv_cloog_type" >&6; } LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" if test "${cloog_org}" = yes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.14.0 of CLooG" >&5 -$as_echo_n "checking for version 0.14.0 of CLooG... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 +$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -5909,8 +5844,8 @@ int main () { #if CLOOG_VERSION_MAJOR != 0 \ - || CLOOG_VERSION_MINOR != 14 \ - || CLOOG_VERSION_REVISION < 0 + || CLOOG_VERSION_MINOR != 16 \ + || CLOOG_VERSION_REVISION < 1 choke me #endif ; @@ -5988,7 +5923,9 @@ $as_echo "$gcc_cv_cloog_ct_0_15_5" >&6; } - if test "x${with_cloog}" != x \ + if test "x${with_cloog}" = xno; then + graphite_requested=no + elif test "x${with_cloog}" != x \ || test "x${with_cloog_include}" != x \ || test "x${with_cloog_lib}" != x ; then graphite_requested=yes @@ -6009,7 +5946,7 @@ $as_echo "$gcc_cv_cloog_ct_0_15_5" >&6; } && test "x${clooglibs}" = x \ && test "x${clooginc}" = x ; then - as_fn_error "Unable to find a usable CLooG. See config.log for details." "$LINENO" 5 + as_fn_error "Unable to find a usable CLooG. See config.log for details." "$LINENO" 5 fi @@ -6046,7 +5983,7 @@ if test $target_elf = yes; then : else if test x"$default_enable_lto" = x"yes" ; then case $target in - *-apple-darwin* | *-cygwin* | *-mingw*) ;; + *-apple-darwin9 | *-cygwin* | *-mingw*) ;; # On other non-ELF platforms, LTO has yet to be validated. *) enable_lto=no ;; esac @@ -6783,9 +6720,6 @@ extra_nmflags_for_target= extra_ranlibflags_for_target= target_makefile_frag=/dev/null case "${target}" in - mep*-*-*) - target_makefile_frag="config/mt-mep" - ;; spu-*-*) target_makefile_frag="config/mt-spu" ;; @@ -6798,9 +6732,6 @@ case "${target}" in mips*-*-*linux* | mips*-*-gnu*) target_makefile_frag="config/mt-mips-gnu" ;; - *-*-netware*) - target_makefile_frag="config/mt-netware" - ;; *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) target_makefile_frag="config/mt-gnu" ;; @@ -6815,9 +6746,6 @@ case "${target}" in # ranlib before Darwin10 requires the -c flag to look at common symbols. extra_ranlibflags_for_target=" -c" ;; - mips*-*-pe | sh*-*-pe | *arm-wince-pe) - target_makefile_frag="config/mt-wince" - ;; esac alphaieee_frag=/dev/null @@ -6944,7 +6872,7 @@ esac # Decide which environment variable is used to find dynamic libraries. case "${host}" in *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; - *-*-darwin* | *-*-rhapsody* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; + *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;; *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; esac @@ -7230,6 +7158,7 @@ serialization_dependencies=serdep.tmp # Also strip program-prefix, program-suffix, and program-transform-name, # so that we can pass down a consistent program-transform-name. baseargs= +tbaseargs= keep_next=no skip_next=no eval "set -- $ac_configure_args" @@ -7245,6 +7174,7 @@ do ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac baseargs="$baseargs '$ac_arg'" + tbaseargs="$tbaseargs '$ac_arg'" keep_next=no continue fi @@ -7266,11 +7196,45 @@ do ;; esac + skip_targ=no + case $ac_arg in + + --with-* | --without-*) + libopt=`echo "$ac_arg" | sed -e 's,^--[^-_]*[-_],,' -e 's,=.*$,,'` + + case $libopt in + *[-_]include) + lib=`echo "$libopt" | sed 's,[-_]include$,,'` + ;; + *[-_]lib) + lib=`echo "$libopt" | sed 's,[-_]lib$,,'` + ;; + *) + lib=$libopt + ;; + esac + + + case $lib in + mpc | mpfr | gmp | ppl | cloog) + # If we're processing --with-$lib, --with-$lib-include or + # --with-$lib-lib, for one of the libs above, and target is + # different from host, don't pass the current argument to any + # target library's configure. + if test x$is_cross_compiler = xyes; then + skip_targ=yes + fi + ;; + esac + ;; + esac + case "$ac_arg" in --cache-file=/dev/null | \ -cache-file=/dev/null ) # Handled here to avoid the test to skip args below. baseargs="$baseargs '$ac_arg'" + tbaseargs="$tbaseargs '$ac_arg'" # Assert: $separate_arg should always be no. keep_next=$separate_arg ;; @@ -7301,6 +7265,9 @@ do ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac baseargs="$baseargs '$ac_arg'" + if test X"$skip_targ" = Xno; then + tbaseargs="$tbaseargs '$ac_arg'" + fi keep_next=$separate_arg ;; *) @@ -7327,10 +7294,13 @@ EOF_SED gcc_transform_name=`cat conftestsed.out` rm -f conftestsed.out baseargs="$baseargs --program-transform-name='${gcc_transform_name}'" +tbaseargs="$tbaseargs --program-transform-name='${gcc_transform_name}'" if test "$silent" = yes; then baseargs="$baseargs --silent" + tbaseargs="$tbaseargs --silent" fi baseargs="$baseargs --disable-option-checking" +tbaseargs="$tbaseargs --disable-option-checking" # Record and document user additions to sub configure arguments. @@ -7356,7 +7326,7 @@ esac # This seems to be due to autoconf 2.5x stupidity. host_configargs="$host_configargs --cache-file=./config.cache ${extra_host_args} ${baseargs}" -target_configargs="$target_configargs ${baseargs}" +target_configargs="$target_configargs ${tbaseargs}" # Passing a --with-cross-host argument lets the target libraries know # whether they are being built with a cross-compiler or being built @@ -13325,7 +13295,7 @@ else esac if test $ok = yes; then # An in-tree tool is available and we can use it - CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' + CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `if test -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags; then $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes; else echo -funconfigured-libstdc++-v3 ; fi` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5 $as_echo "just compiled" >&6; } elif expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then