X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=configure;h=6dde71a00d7da9802d67831785431199fdc4c677;hb=62324487d5a7c61edfc0be6553c9d2dc86a96ada;hp=dcb582f540bd4dcd0ed4e3e664d6e4abcaf024da;hpb=4076133bfe500a46435f8f1cbd089b42798fb966;p=pf3gnuchains%2Fgcc-fork.git diff --git a/configure b/configure index dcb582f540b..6dde71a00d7 100755 --- a/configure +++ b/configure @@ -578,6 +578,7 @@ LD_FOR_TARGET DLLTOOL_FOR_TARGET AS_FOR_TARGET AR_FOR_TARGET +GOC_FOR_TARGET GFORTRAN_FOR_TARGET GCJ_FOR_TARGET GCC_FOR_TARGET @@ -610,6 +611,7 @@ RANLIB_FOR_BUILD NM_FOR_BUILD LD_FOR_BUILD LDFLAGS_FOR_BUILD +GOC_FOR_BUILD GFORTRAN_FOR_BUILD GCJ_FOR_BUILD DLLTOOL_FOR_BUILD @@ -739,6 +741,7 @@ ac_user_opts=' enable_option_checking with_build_libsubdir enable_gold +enable_ld enable_libada enable_libssp enable_build_with_cxx @@ -765,6 +768,7 @@ enable_ppl_version_check with_cloog with_cloog_include with_cloog_lib +enable_cloog_backend enable_cloog_version_check enable_lto enable_stage1_languages @@ -810,6 +814,7 @@ CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET +GOC_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET @@ -1446,11 +1451,15 @@ 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}] --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 + --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 @@ -1558,6 +1567,8 @@ Some influential environment variables: GCJ for the target GFORTRAN_FOR_TARGET GFORTRAN for the target + GOC_FOR_TARGET + GOC for the target AR_FOR_TARGET AR for the target AS_FOR_TARGET @@ -2691,11 +2702,13 @@ target_libraries="target-libgcc \ target-libstdc++-v3 \ target-libmudflap \ target-libssp \ + target-libquadmath \ target-libgfortran \ target-boehm-gc \ ${libgcj} \ target-libobjc \ - target-libada" + target-libada \ + target-libgo" # these tools are built using the target libraries, and are intended to # run only in the target environment @@ -2838,13 +2851,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 @@ -2852,8 +2877,8 @@ 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 @@ -2873,14 +2898,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 @@ -2891,7 +2912,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 @@ -2974,7 +3023,8 @@ yes) ;; no) # Make sure we get it printed in the list of not supported target libs. - noconfigdirs="$noconfigdirs ${libgcj}" + # Don't disable libffi, though, other languages use it. + noconfigdirs="$noconfigdirs `echo ${libgcj} | sed -e 's/target-libffi//'`" ;; esac @@ -3197,8 +3247,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";; *) @@ -3752,6 +3802,7 @@ if test "${build}" != "${host}" ; then CXX_FOR_BUILD=${CXX_FOR_BUILD-g++} GCJ_FOR_BUILD=${GCJ_FOR_BUILD-gcj} GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran} + GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo} DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool} LD_FOR_BUILD=${LD_FOR_BUILD-ld} NM_FOR_BUILD=${NM_FOR_BUILD-nm} @@ -3765,6 +3816,7 @@ else CXX_FOR_BUILD="\$(CXX)" GCJ_FOR_BUILD="\$(GCJ)" GFORTRAN_FOR_BUILD="\$(GFORTRAN)" + GOC_FOR_BUILD="\$(GOC)" DLLTOOL_FOR_BUILD="\$(DLLTOOL)" LD_FOR_BUILD="\$(LD)" NM_FOR_BUILD="\$(NM)" @@ -5118,13 +5170,13 @@ if test "${with_mpc+set}" = set; then : fi -# Check whether --with-mpc_include was given. +# Check whether --with-mpc-include was given. if test "${with_mpc_include+set}" = set; then : withval=$with_mpc_include; fi -# Check whether --with-mpc_lib was given. +# Check whether --with-mpc-lib was given. if test "${with_mpc_lib+set}" = set; then : withval=$with_mpc_lib; fi @@ -5167,13 +5219,13 @@ if test "${with_mpfr+set}" = set; then : fi -# Check whether --with-mpfr_include was given. +# Check whether --with-mpfr-include was given. if test "${with_mpfr_include+set}" = set; then : withval=$with_mpfr_include; fi -# Check whether --with-mpfr_lib was given. +# Check whether --with-mpfr-lib was given. if test "${with_mpfr_lib+set}" = set; then : withval=$with_mpfr_lib; fi @@ -5216,13 +5268,13 @@ if test "${with_gmp+set}" = set; then : fi -# Check whether --with-gmp_include was given. +# Check whether --with-gmp-include was given. if test "${with_gmp_include+set}" = set; then : withval=$with_gmp_include; fi -# Check whether --with-gmp_lib was given. +# Check whether --with-gmp-lib was given. if test "${with_gmp_lib+set}" = set; then : withval=$with_gmp_lib; fi @@ -5554,10 +5606,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 @@ -5575,13 +5627,13 @@ if test "${with_ppl+set}" = set; then : fi -# Check whether --with-ppl_include was given. +# Check whether --with-ppl-include was given. if test "${with_ppl_include+set}" = set; then : withval=$with_ppl_include; fi -# Check whether --with-ppl_lib was given. +# Check whether --with-ppl-lib was given. if test "${with_ppl_lib+set}" = set; then : withval=$with_ppl_lib; fi @@ -5664,18 +5716,31 @@ if test "${with_cloog+set}" = set; then : fi -# Check whether --with-cloog_include was given. +# Check whether --with-cloog-include was given. if test "${with_cloog_include+set}" = set; then : withval=$with_cloog_include; fi -# Check whether --with-cloog_lib was given. +# Check whether --with-cloog-lib was given. if test "${with_cloog_lib+set}" = set; then : withval=$with_cloog_lib; fi + # Check whether --enable-cloog-backend was given. +if test "${enable_cloog_backend+set}" = set; then : + enableval=$enable_cloog_backend; if test "x${enableval}" = "xisl"; then + cloog_backend=isl + elif test "x${enableval}" = "xppl"; then + cloog_backend=ppl + else + cloog_backend=ppl-legacy + fi +else + cloog_backend=ppl-legacy +fi + # Check whether --enable-cloog-version-check was given. if test "${enable_cloog_version_check+set}" = set; then : enableval=$enable_cloog_version_check; ENABLE_CLOOG_CHECK=$enableval @@ -5725,26 +5790,31 @@ if test "x$with_cloog" != "xno"; then _cloog_saved_LDFLAGS=$LDFLAGS _cloog_saved_LIBS=$LIBS - _clooglegacyinc="-DCLOOG_PPL_BACKEND" _cloogorginc="-DCLOOG_INT_GMP -DCLOOG_ORG" - CFLAGS="${CFLAGS} ${clooginc} ${pplinc} ${gmpinc}" - CPPFLAGS="${CPPFLAGS} ${_clooglegacyinc} ${_cloogorginc}" - LDFLAGS="${LDFLAGS} ${clooglibs} ${ppllibs}" + CFLAGS="${CFLAGS} ${clooginc} ${gmpinc}" + CPPFLAGS="${CPPFLAGS} ${_cloogorginc}" + LDFLAGS="${LDFLAGS} ${clooglibs}" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG" >&5 -$as_echo_n "checking for installed CLooG... " >&6; } + case $cloog_backend in + "ppl-legacy") + CFLAGS="${CFLAGS} ${pplinc}" + LDFLAGS="${LDFLAGS} ${ppllibs}" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG PPL Legacy" >&5 +$as_echo_n "checking for installed CLooG PPL Legacy... " >&6; } if test "${gcc_cv_cloog_type+set}" = set; then : $as_echo_n "(cached) " >&6 else LIBS="-lcloog ${_cloog_saved_LIBS}" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#include "cloog/cloog.h" int main () { -ppl_version_major () +#ifndef CLOOG_PPL_BACKEND + choke me + #endif ; return 0; } @@ -5752,10 +5822,24 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : gcc_cv_cloog_type="PPL Legacy" else - LIBS="-lcloog-isl -lisl ${_cloog_saved_LIBS}" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + gcc_cv_cloog_type=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type" >&5 +$as_echo "$gcc_cv_cloog_type" >&6; } + ;; + "isl") + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG ISL" >&5 +$as_echo_n "checking for installed CLooG ISL... " >&6; } +if test "${gcc_cv_cloog_type+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + LIBS="-lcloog-isl ${_cloog_saved_LIBS}" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#include "cloog/cloog.h" int main () { @@ -5765,12 +5849,29 @@ cloog_version () } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - gcc_cv_cloog_type=ISL + gcc_cv_cloog_type="ISL" +else + gcc_cv_cloog_type=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type" >&5 +$as_echo "$gcc_cv_cloog_type" >&6; } + ;; + "ppl") + CFLAGS="${CFLAGS} ${pplinc}" + LDFLAGS="${LDFLAGS} ${ppllibs}" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed CLooG PPL" >&5 +$as_echo_n "checking for installed CLooG PPL... " >&6; } +if test "${gcc_cv_cloog_type+set}" = set; then : + $as_echo_n "(cached) " >&6 else LIBS="-lcloog-ppl ${_cloog_saved_LIBS}" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#include "cloog/cloog.h" + #include "cloog/ppl/cloog.h" int main () { @@ -5780,25 +5881,23 @@ cloog_version () } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - gcc_cv_cloog_type=PPL + gcc_cv_cloog_type="PPL" else gcc_cv_cloog_type=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog_type" >&5 $as_echo "$gcc_cv_cloog_type" >&6; } + ;; + *) + gcc_cv_cloog_type="" + esac case $gcc_cv_cloog_type in "PPL Legacy") - clooginc="${clooginc} ${_clooglegacyinc}" + clooginc="${clooginc}" clooglibs="${clooglibs} -lcloog" cloog_org=no ;; @@ -6062,11 +6161,13 @@ if test -d ${srcdir}/gcc; then # an apparent bug in bash 1.12 on linux. ${srcdir}/gcc/[*]/config-lang.in) ;; *) - # From the config-lang.in, get $language, $lang_requires + # From the config-lang.in, get $language, $lang_requires, and + # $lang_requires_boot_languages. language= lang_requires= + lang_requires_boot_languages= . ${lang_frag} - for other in ${lang_requires} ; do + for other in ${lang_requires} ${lang_requires_boot_languages}; do case ,${enable_languages}, in *,$other,*) ;; *,all,*) ;; @@ -6076,6 +6177,22 @@ if test -d ${srcdir}/gcc; then ;; esac done + for other in ${lang_requires_boot_languages} ; do + if test "$other" != "c"; then + case ,${enable_stage1_languages}, in + *,$other,*) ;; + *,all,*) ;; + *) + case ,${enable_languages}, in + *,$language,*) + echo " '$other' language required by '$language' in stage 1; enabling" 1>&2 + enable_stage1_languages="$enable_stage1_languages,${other}" + ;; + esac + ;; + esac + fi + done ;; esac done @@ -6099,6 +6216,9 @@ if test -d ${srcdir}/gcc; then missing_languages=`echo ",$enable_languages," | sed -e s/,all,/,/ -e s/,c,/,/ ` potential_languages=,c, + enabled_target_libs= + disabled_target_libs= + for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do case ${lang_frag} in ..) ;; @@ -6176,17 +6296,20 @@ if test -d ${srcdir}/gcc; then case $add_this_lang in unsupported) # Remove language-dependent dirs. - eval noconfigdirs='"$noconfigdirs "'\"$target_libs $lang_dirs\" + disabled_target_libs="$disabled_target_libs $target_libs" + noconfigdirs="$noconfigdirs $lang_dirs" ;; no) # Remove language-dependent dirs; still show language as supported. - eval noconfigdirs='"$noconfigdirs "'\"$target_libs $lang_dirs\" + disabled_target_libs="$disabled_target_libs $target_libs" + noconfigdirs="$noconfigdirs $lang_dirs" potential_languages="${potential_languages}${language}," ;; yes) new_enable_languages="${new_enable_languages}${language}," potential_languages="${potential_languages}${language}," missing_languages=`echo "$missing_languages" | sed "s/,$language,/,/"` + enabled_target_libs="$enabled_target_libs $target_libs" case "${boot_language}:,$enable_stage1_languages," in yes:* | *:*,$language,* | *:*,yes, | *:*,all,) # Add to (comma-separated) list of stage 1 languages. @@ -6204,6 +6327,17 @@ if test -d ${srcdir}/gcc; then esac done + # Add target libraries which are only needed for disabled languages + # to noconfigdirs. + if test -n "$disabled_target_libs"; then + for dir in $disabled_target_libs; do + case " $enabled_target_libs " in + *" ${dir} "*) ;; + *) noconfigdirs="$noconfigdirs $dir" ;; + esac + done + fi + # Check whether --enable-stage1-languages was given. if test "${enable_stage1_languages+set}" = set; then : enableval=$enable_stage1_languages; case ,${enable_stage1_languages}, in @@ -7317,7 +7451,7 @@ case " $target_configdirs " in # to it. This is right: we don't want to search that directory # for binaries, but we want the header files in there, so add # them explicitly. - FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include' + FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include -isystem $$r/$(HOST_SUBDIR)/gcc/include-fixed' # Someone might think of using the pre-installed headers on # Canadian crosses, in case the installed compiler is not fully @@ -7456,6 +7590,7 @@ done + # Generate default definitions for YACC, M4, LEX and other programs that run # on the build machine. These are used if the Makefile can't locate these # programs in objdir. @@ -10370,6 +10505,167 @@ fi +if test -n "$GOC_FOR_TARGET"; then + ac_cv_prog_GOC_FOR_TARGET=$GOC_FOR_TARGET +elif test -n "$ac_cv_prog_GOC_FOR_TARGET"; then + GOC_FOR_TARGET=$ac_cv_prog_GOC_FOR_TARGET +fi + +if test -n "$ac_cv_prog_GOC_FOR_TARGET"; then + for ncn_progname in gccgo; do + # Extract the first word of "${ncn_progname}", so it can be a program name with args. +set dummy ${ncn_progname}; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_GOC_FOR_TARGET+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$GOC_FOR_TARGET"; then + ac_cv_prog_GOC_FOR_TARGET="$GOC_FOR_TARGET" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_GOC_FOR_TARGET="${ncn_progname}" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +GOC_FOR_TARGET=$ac_cv_prog_GOC_FOR_TARGET +if test -n "$GOC_FOR_TARGET"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOC_FOR_TARGET" >&5 +$as_echo "$GOC_FOR_TARGET" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + done +fi + +if test -z "$ac_cv_prog_GOC_FOR_TARGET" && test -n "$with_build_time_tools"; then + for ncn_progname in gccgo; do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5 +$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; } + if test -x $with_build_time_tools/${ncn_progname}; then + ac_cv_prog_GOC_FOR_TARGET=$with_build_time_tools/${ncn_progname} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + break + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + done +fi + +if test -z "$ac_cv_prog_GOC_FOR_TARGET"; then + for ncn_progname in gccgo; do + if test -n "$ncn_target_tool_prefix"; then + # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args. +set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_GOC_FOR_TARGET+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$GOC_FOR_TARGET"; then + ac_cv_prog_GOC_FOR_TARGET="$GOC_FOR_TARGET" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_GOC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +GOC_FOR_TARGET=$ac_cv_prog_GOC_FOR_TARGET +if test -n "$GOC_FOR_TARGET"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOC_FOR_TARGET" >&5 +$as_echo "$GOC_FOR_TARGET" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi + if test -z "$ac_cv_prog_GOC_FOR_TARGET" && test $build = $target ; then + # Extract the first word of "${ncn_progname}", so it can be a program name with args. +set dummy ${ncn_progname}; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_GOC_FOR_TARGET+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$GOC_FOR_TARGET"; then + ac_cv_prog_GOC_FOR_TARGET="$GOC_FOR_TARGET" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_GOC_FOR_TARGET="${ncn_progname}" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +GOC_FOR_TARGET=$ac_cv_prog_GOC_FOR_TARGET +if test -n "$GOC_FOR_TARGET"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOC_FOR_TARGET" >&5 +$as_echo "$GOC_FOR_TARGET" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi + test -n "$ac_cv_prog_GOC_FOR_TARGET" && break + done +fi + +if test -z "$ac_cv_prog_GOC_FOR_TARGET" ; then + set dummy gccgo + if test $build = $target ; then + GOC_FOR_TARGET="$2" + else + GOC_FOR_TARGET="${ncn_target_tool_prefix}$2" + fi +else + GOC_FOR_TARGET="$ac_cv_prog_GOC_FOR_TARGET" +fi + + + cat > conftest.c << \EOF #ifdef __GNUC__ gcc_yay; @@ -13067,7 +13363,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 @@ -13306,6 +13602,51 @@ $as_echo "pre-installed" >&6; } fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target gccgo" >&5 +$as_echo_n "checking where to find the target gccgo... " >&6; } +if test "x${build}" != "x${host}" ; then + if expr "x$GOC_FOR_TARGET" : "x/" > /dev/null; then + # We already found the complete path + ac_dir=`dirname $GOC_FOR_TARGET` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5 +$as_echo "pre-installed in $ac_dir" >&6; } + else + # Canadian cross, just use what we found + { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5 +$as_echo "pre-installed" >&6; } + fi +else + ok=yes + case " ${configdirs} " in + *" gcc "*) ;; + *) ok=no ;; + esac + case ,${enable_languages}, in + *,go,*) ;; + *) ok=no ;; + esac + if test $ok = yes; then + # An in-tree tool is available and we can use it + GOC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gccgo -B$$r/$(HOST_SUBDIR)/gcc/' + { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5 +$as_echo "just compiled" >&6; } + elif expr "x$GOC_FOR_TARGET" : "x/" > /dev/null; then + # We already found the complete path + ac_dir=`dirname $GOC_FOR_TARGET` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5 +$as_echo "pre-installed in $ac_dir" >&6; } + elif test "x$target" = "x$host"; then + # We can use an host tool + GOC_FOR_TARGET='$(GOC)' + { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5 +$as_echo "host tool" >&6; } + else + # We need a cross tool + { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5 +$as_echo "pre-installed" >&6; } + fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target ld" >&5 $as_echo_n "checking where to find the target ld... " >&6; } if test "x${build}" != "x${host}" ; then @@ -13527,7 +13868,7 @@ else if test $ok = yes; then # An in-tree tool is available and we can use it - STRIP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/strip' + STRIP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/strip-new' { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5 $as_echo "just compiled" >&6; } elif expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then