diff --git a/ChangeLog b/ChangeLog index 7e208181826..1a360f9339f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-09-17 Daniel Jacobowitz + + * configure.in (TOPLEVEL_CONFIGURE_ARGUMENTS, baseargs): Fix + quoting. + * configure: Regenerated. + 2003-09-16 Joel Brobecker * MAINTAINERS (Write After Approval): Add myself to write after diff --git a/configure b/configure index b204110f118..a06c8ce584c 100755 --- a/configure +++ b/configure @@ -795,19 +795,13 @@ progname=$0 if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi # Export original configure arguments for use by sub-configures. These -# will be expanded once by make, and once by the shell, so they need to -# have '$' quoted for make, and then each argument quoted for the shell. -# What's more, the 'echo' below might expand backslashes. -cat <<\EOF_SED > conftestsed -s,\\,\\\\,g; s,\$,$$,g +# will be expanded by make, so quote '$'. +tmp="$progname $@" +sed -e 's,\$,$$,g' < conftestsed.out +$tmp EOF_SED -tmp="'$progname'" -for ac_arg -do - tmp="$tmp '"`echo "$ac_arg" | sed -f conftestsed` -done -rm -f conftestsed -TOPLEVEL_CONFIGURE_ARGUMENTS="$tmp" +TOPLEVEL_CONFIGURE_ARGUMENTS=`cat conftestsed.out` +rm -f conftestsed.out moveifchange=${srcdir}/move-if-change @@ -2516,7 +2510,7 @@ serialization_dependencies=serdep.tmp # Base args. Strip norecursion, cache-file, srcdir, host, build, # target and nonopt. These are the ones we might not want to pass -# down to subconfigures. +# down to subconfigures. These will be expanded by make, so quote '$'. cat <<\EOF_SED > conftestsed s/ --no[^ ]* / / s/ --c[a-z-]*[= ][^ ]* / / @@ -2531,10 +2525,13 @@ s/ -build[= ][^ ]* / / s/ -target[= ][^ ]* / / s/ [^' -][^ ]* / / s/^ *//;s/ *$// -s,\\,\\\\,g; s,\$,$$,g +s,\$,$$,g EOF_SED -baseargs=`echo " ${ac_configure_args} " | sed -f conftestsed` -rm -f conftestsed +sed -f conftestsed < conftestsed.out + ${ac_configure_args} +EOF_SED +baseargs=`cat conftestsed.out` +rm -f conftestsed conftestsed.out # For the build-side libraries, we just need to pretend we're native, # and not use the same cache file. Multilibs are neither needed nor @@ -2785,7 +2782,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias- # Extract the first word of "${ncn_tool_prefix}ar", so it can be a program name with args. set dummy ${ncn_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2789: checking for $ac_word" >&5 +echo "configure:2786: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2818,7 +2815,7 @@ if test -z "$ac_cv_prog_AR" ; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2822: checking for $ac_word" >&5 +echo "configure:2819: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2857,7 +2854,7 @@ fi # Extract the first word of "${ncn_tool_prefix}as", so it can be a program name with args. set dummy ${ncn_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2861: checking for $ac_word" >&5 +echo "configure:2858: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2890,7 +2887,7 @@ if test -z "$ac_cv_prog_AS" ; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2894: checking for $ac_word" >&5 +echo "configure:2891: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2929,7 +2926,7 @@ fi # Extract the first word of "${ncn_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ncn_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2933: checking for $ac_word" >&5 +echo "configure:2930: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2962,7 +2959,7 @@ if test -z "$ac_cv_prog_DLLTOOL" ; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2966: checking for $ac_word" >&5 +echo "configure:2963: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3001,7 +2998,7 @@ fi # Extract the first word of "${ncn_tool_prefix}ld", so it can be a program name with args. set dummy ${ncn_tool_prefix}ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3005: checking for $ac_word" >&5 +echo "configure:3002: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3034,7 +3031,7 @@ if test -z "$ac_cv_prog_LD" ; then # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3038: checking for $ac_word" >&5 +echo "configure:3035: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3073,7 +3070,7 @@ fi # Extract the first word of "${ncn_tool_prefix}nm", so it can be a program name with args. set dummy ${ncn_tool_prefix}nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3077: checking for $ac_word" >&5 +echo "configure:3074: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3106,7 +3103,7 @@ if test -z "$ac_cv_prog_NM" ; then # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3110: checking for $ac_word" >&5 +echo "configure:3107: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3145,7 +3142,7 @@ fi # Extract the first word of "${ncn_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ncn_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3149: checking for $ac_word" >&5 +echo "configure:3146: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3178,7 +3175,7 @@ if test -z "$ac_cv_prog_RANLIB" ; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3182: checking for $ac_word" >&5 +echo "configure:3179: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3217,7 +3214,7 @@ fi # Extract the first word of "${ncn_tool_prefix}windres", so it can be a program name with args. set dummy ${ncn_tool_prefix}windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3221: checking for $ac_word" >&5 +echo "configure:3218: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3250,7 +3247,7 @@ if test -z "$ac_cv_prog_WINDRES" ; then # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3254: checking for $ac_word" >&5 +echo "configure:3251: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3289,7 +3286,7 @@ fi # Extract the first word of "${ncn_tool_prefix}objcopy", so it can be a program name with args. set dummy ${ncn_tool_prefix}objcopy; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3293: checking for $ac_word" >&5 +echo "configure:3290: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3322,7 +3319,7 @@ if test -z "$ac_cv_prog_OBJCOPY" ; then # Extract the first word of "objcopy", so it can be a program name with args. set dummy objcopy; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3326: checking for $ac_word" >&5 +echo "configure:3323: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJCOPY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3361,7 +3358,7 @@ fi # Extract the first word of "${ncn_tool_prefix}objdump", so it can be a program name with args. set dummy ${ncn_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3365: checking for $ac_word" >&5 +echo "configure:3362: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3394,7 +3391,7 @@ if test -z "$ac_cv_prog_OBJDUMP" ; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3398: checking for $ac_word" >&5 +echo "configure:3395: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3442,7 +3439,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}ar", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3446: checking for $ac_word" >&5 +echo "configure:3443: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3475,7 +3472,7 @@ if test -z "$ac_cv_prog_AR_FOR_TARGET" ; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3479: checking for $ac_word" >&5 +echo "configure:3476: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3514,7 +3511,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}as", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3518: checking for $ac_word" >&5 +echo "configure:3515: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3547,7 +3544,7 @@ if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3551: checking for $ac_word" >&5 +echo "configure:3548: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3586,7 +3583,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3590: checking for $ac_word" >&5 +echo "configure:3587: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3619,7 +3616,7 @@ if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" ; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3623: checking for $ac_word" >&5 +echo "configure:3620: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3658,7 +3655,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}ld", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3662: checking for $ac_word" >&5 +echo "configure:3659: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3691,7 +3688,7 @@ if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3695: checking for $ac_word" >&5 +echo "configure:3692: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3730,7 +3727,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}nm", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3734: checking for $ac_word" >&5 +echo "configure:3731: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3763,7 +3760,7 @@ if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then # Extract the first word of "nm", so it can be a program name with args. set dummy nm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3767: checking for $ac_word" >&5 +echo "configure:3764: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3802,7 +3799,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3806: checking for $ac_word" >&5 +echo "configure:3803: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3835,7 +3832,7 @@ if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3839: checking for $ac_word" >&5 +echo "configure:3836: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3874,7 +3871,7 @@ fi # Extract the first word of "${ncn_target_tool_prefix}windres", so it can be a program name with args. set dummy ${ncn_target_tool_prefix}windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3878: checking for $ac_word" >&5 +echo "configure:3875: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3907,7 +3904,7 @@ if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3911: checking for $ac_word" >&5 +echo "configure:3908: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES_FOR_TARGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3974,7 +3971,7 @@ RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target} NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target} echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:3978: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:3975: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" diff --git a/configure.in b/configure.in index ae3ff2ae8c8..74ea0e13902 100644 --- a/configure.in +++ b/configure.in @@ -67,19 +67,13 @@ progname=$0 if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi # Export original configure arguments for use by sub-configures. These -# will be expanded once by make, and once by the shell, so they need to -# have '$' quoted for make, and then each argument quoted for the shell. -# What's more, the 'echo' below might expand backslashes. -cat <<\EOF_SED > conftestsed -s,\\,\\\\,g; s,\$,$$,g +# will be expanded by make, so quote '$'. +tmp="$progname $@" +sed -e 's,\$,$$,g' < conftestsed.out +$tmp EOF_SED -tmp="'$progname'" -for ac_arg -do - tmp="$tmp '"`echo "$ac_arg" | sed -f conftestsed` -done -rm -f conftestsed -TOPLEVEL_CONFIGURE_ARGUMENTS="$tmp" +TOPLEVEL_CONFIGURE_ARGUMENTS=`cat conftestsed.out` +rm -f conftestsed.out AC_SUBST(TOPLEVEL_CONFIGURE_ARGUMENTS) moveifchange=${srcdir}/move-if-change @@ -1766,7 +1760,7 @@ AC_SUBST_FILE(serialization_dependencies) # Base args. Strip norecursion, cache-file, srcdir, host, build, # target and nonopt. These are the ones we might not want to pass -# down to subconfigures. +# down to subconfigures. These will be expanded by make, so quote '$'. cat <<\EOF_SED > conftestsed s/ --no[[^ ]]* / / s/ --c[[a-z-]]*[[= ]][[^ ]]* / / @@ -1781,10 +1775,13 @@ s/ -build[[= ]][[^ ]]* / / s/ -target[[= ]][[^ ]]* / / s/ [[^' -][^ ]*] / / s/^ *//;s/ *$// -s,\\,\\\\,g; s,\$,$$,g +s,\$,$$,g EOF_SED -baseargs=`echo " ${ac_configure_args} " | sed -f conftestsed` -rm -f conftestsed +sed -f conftestsed < conftestsed.out + ${ac_configure_args} +EOF_SED +baseargs=`cat conftestsed.out` +rm -f conftestsed conftestsed.out # For the build-side libraries, we just need to pretend we're native, # and not use the same cache file. Multilibs are neither needed nor diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ac84b978b30..8f1d4785f16 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-09-17 Daniel Jacobowitz + + * configure.in: Quote gcc_config_arguments for configargs.h. + * configure: Regenerated. + * gccbug.in: Don't shell-expand gcc_config_arguments. + 2003-09-17 Gabriel Dos Reis PR c++/11357 diff --git a/gcc/configure b/gcc/configure index 8dbe3edd15f..6a9cb419fb9 100755 --- a/gcc/configure +++ b/gcc/configure @@ -2387,7 +2387,7 @@ fi # Find some useful tools -for ac_prog in gawk mawk nawk awk +for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -5356,9 +5356,18 @@ if test -f configargs.h ; then else gcc_config_arguments="$TOPLEVEL_CONFIGURE_ARGUMENTS" fi + +# Double all backslashes and backslash all quotes to turn +# gcc_config_arguments into a C string. +sed -e 's/\\/\\\\/g; s/"/\\"/g' <conftest.out +$gcc_config_arguments +EOF +gcc_config_arguments_str=`cat conftest.out` +rm -f conftest.out + cat > configargs.h <&6 -echo "configure:5389: checking whether NLS is requested" >&5 +echo "configure:5398: checking whether NLS is requested" >&5 if test x"$USE_NLS" != xyes; then echo "$ac_t""no" 1>&6 else @@ -5396,7 +5405,7 @@ EOF echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:5400: checking for catalogs to be installed" >&5 +echo "configure:5409: checking for catalogs to be installed" >&5 # Look for .po and .gmo files in the source directory. CATALOGS= XLINGUAS= @@ -5446,7 +5455,7 @@ fi case $host_os in win32 | pe | cygwin* | mingw32* | uwin*) echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6 -echo "configure:5450: checking whether windows registry support is requested" >&5 +echo "configure:5459: checking whether windows registry support is requested" >&5 if test "x$enable_win32_registry" != xno; then cat >> confdefs.h <<\EOF #define ENABLE_WIN32_REGISTRY 1 @@ -5455,14 +5464,14 @@ EOF echo "$ac_t""yes" 1>&6 echo $ac_n "checking for library containing RegOpenKeyExA""... $ac_c" 1>&6 -echo "configure:5459: checking for library containing RegOpenKeyExA" >&5 +echo "configure:5468: checking for library containing RegOpenKeyExA" >&5 if eval "test \"`echo '$''{'ac_cv_search_RegOpenKeyExA'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_RegOpenKeyExA="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_RegOpenKeyExA="none required" else @@ -5484,7 +5493,7 @@ rm -f conftest* test "$ac_cv_search_RegOpenKeyExA" = "no" && for i in advapi32; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_RegOpenKeyExA="-l$i" break @@ -5537,7 +5546,7 @@ esac if test "x$enable_win32_registry" != xno; then echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6 -echo "configure:5541: checking registry key on windows hosts" >&5 +echo "configure:5550: checking registry key on windows hosts" >&5 cat >> confdefs.h <target assembler and hope that it will have the same features # as the host->target assembler we'll be using. echo $ac_n "checking what assembler to use""... $ac_c" 1>&6 -echo "configure:5800: checking what assembler to use" >&5 +echo "configure:5809: checking what assembler to use" >&5 in_tree_gas=no gcc_cv_as= gcc_cv_gas_major_version= @@ -5920,7 +5929,7 @@ esac # build->target linker and hope that it will have the same features # as the host->target linker we'll be using. echo $ac_n "checking what linker to use""... $ac_c" 1>&6 -echo "configure:5924: checking what linker to use" >&5 +echo "configure:5933: checking what linker to use" >&5 in_tree_ld=no gcc_cv_ld= gcc_cv_gld_major_version= @@ -6028,7 +6037,7 @@ esac # Figure out what nm we will be using. gcc_cv_binutils_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/binutils echo $ac_n "checking what nm to use""... $ac_c" 1>&6 -echo "configure:6032: checking what nm to use" >&5 +echo "configure:6041: checking what nm to use" >&5 in_tree_nm=no if test -x nm$host_exeext; then gcc_cv_nm=./nm$host_exeext @@ -6051,7 +6060,7 @@ esac # Figure out what objdump we will be using. echo $ac_n "checking what objdump to use""... $ac_c" 1>&6 -echo "configure:6055: checking what objdump to use" >&5 +echo "configure:6064: checking what objdump to use" >&5 in_tree_objdump=no if test -x objdump$host_exeext; then gcc_cv_objdump=./objdump$host_exeext @@ -6076,7 +6085,7 @@ esac # Figure out what assembler alignment features are present. echo $ac_n "checking assembler for .balign and .p2align""... $ac_c" 1>&6 -echo "configure:6080: checking assembler for .balign and .p2align" >&5 +echo "configure:6089: checking assembler for .balign and .p2align" >&5 if eval "test \"`echo '$''{'gcc_cv_as_balign_and_p2align'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6088,7 +6097,7 @@ fi elif test x$gcc_cv_as != x; then echo '.balign 4 .p2align 2' > conftest.s - if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then gcc_cv_as_balign_and_p2align=yes else @@ -6108,7 +6117,7 @@ EOF fi echo $ac_n "checking assembler for .p2align with maximum skip""... $ac_c" 1>&6 -echo "configure:6112: checking assembler for .p2align with maximum skip" >&5 +echo "configure:6121: checking assembler for .p2align with maximum skip" >&5 if eval "test \"`echo '$''{'gcc_cv_as_max_skip_p2align'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6119,7 +6128,7 @@ else fi elif test x$gcc_cv_as != x; then echo '.p2align 4,,7' > conftest.s - if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then gcc_cv_as_max_skip_p2align=yes else @@ -6139,7 +6148,7 @@ EOF fi echo $ac_n "checking assembler for working .subsection -1""... $ac_c" 1>&6 -echo "configure:6143: checking assembler for working .subsection -1" >&5 +echo "configure:6152: checking assembler for working .subsection -1" >&5 if eval "test \"`echo '$''{'gcc_cv_as_subsection_m1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6154,7 +6163,7 @@ fi .subsection -1 conftest_label2: .word 0 .previous' > conftest.s - if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then if test x$gcc_cv_nm != x; then $gcc_cv_nm conftest.o | grep conftest_label1 > conftest.nm1 @@ -6182,7 +6191,7 @@ EOF fi echo $ac_n "checking assembler for .weak""... $ac_c" 1>&6 -echo "configure:6186: checking assembler for .weak" >&5 +echo "configure:6195: checking assembler for .weak" >&5 if eval "test \"`echo '$''{'gcc_cv_as_weak'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6193,7 +6202,7 @@ else fi elif test x$gcc_cv_as != x; then echo ' .weak foobar' > conftest.s - if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then gcc_cv_as_weak=yes else @@ -6220,7 +6229,7 @@ fi # to be safe. # The gcc_GAS_CHECK_FEATURE call just sets a cache variable. echo $ac_n "checking assembler for .hidden""... $ac_c" 1>&6 -echo "configure:6224: checking assembler for .hidden" >&5 +echo "configure:6233: checking assembler for .hidden" >&5 if eval "test \"`echo '$''{'gcc_cv_as_hidden'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6233,7 +6242,7 @@ fi elif test x$gcc_cv_as != x; then echo ' .hidden foobar foobar:' > conftest.s - if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then gcc_cv_as_hidden=yes else @@ -6248,7 +6257,7 @@ echo "$ac_t""$gcc_cv_as_hidden" 1>&6 echo $ac_n "checking linker for .hidden support""... $ac_c" 1>&6 -echo "configure:6252: checking linker for .hidden support" >&5 +echo "configure:6261: checking linker for .hidden support" >&5 if eval "test \"`echo '$''{'gcc_cv_ld_hidden'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6313,7 +6322,7 @@ fi # Check if we have .[us]leb128, and support symbol arithmetic with it. echo $ac_n "checking assembler for .sleb128 and .uleb128""... $ac_c" 1>&6 -echo "configure:6317: checking assembler for .sleb128 and .uleb128" >&5 +echo "configure:6326: checking assembler for .sleb128 and .uleb128" >&5 if eval "test \"`echo '$''{'gcc_cv_as_leb128'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6330,7 +6339,7 @@ L1: .uleb128 1280 .sleb128 -1010 L2:' > conftest.s - if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then # GAS versions before 2.11 do not support uleb128, # despite appearing to. @@ -6366,7 +6375,7 @@ fi # GAS versions up to and including 2.11.0 may mis-optimize # .eh_frame data. echo $ac_n "checking assembler for eh_frame optimization""... $ac_c" 1>&6 -echo "configure:6370: checking assembler for eh_frame optimization" >&5 +echo "configure:6379: checking assembler for eh_frame optimization" >&5 if eval "test \"`echo '$''{'gcc_cv_as_eh_frame'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6409,7 +6418,7 @@ __FRAME_BEGIN__: .byte 0x4 .4byte .L1-.LFB1 .LEFDE1:' > conftest.s - if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then cat > conftest.lit < /dev/null 2>&1; } then gcc_cv_as_eh_frame=yes - elif { ac_try='$gcc_cv_as -o conftest.o --traditional-format /dev/null'; { (eval echo configure:6434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + elif { ac_try='$gcc_cv_as -o conftest.o --traditional-format /dev/null'; { (eval echo configure:6443: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then gcc_cv_as_eh_frame=buggy else # Uh oh, what do we do now? @@ -6455,7 +6464,7 @@ EOF fi echo $ac_n "checking assembler for section merging support""... $ac_c" 1>&6 -echo "configure:6459: checking assembler for section merging support" >&5 +echo "configure:6468: checking assembler for section merging support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_shf_merge'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6467,7 +6476,7 @@ else fi elif test x$gcc_cv_as != x; then echo '.section .rodata.str, "aMS", @progbits, 1' > conftest.s - if { ac_try='$gcc_cv_as --fatal-warnings -o conftest.o conftest.s >&5'; { (eval echo configure:6471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as --fatal-warnings -o conftest.o conftest.s >&5'; { (eval echo configure:6480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then gcc_cv_as_shf_merge=yes else @@ -6693,7 +6702,7 @@ if test -z "$tls_first_major"; then : # If we don't have a check, assume no support. else echo $ac_n "checking assembler for thread-local storage support""... $ac_c" 1>&6 -echo "configure:6697: checking assembler for thread-local storage support" >&5 +echo "configure:6706: checking assembler for thread-local storage support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_tls'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6704,7 +6713,7 @@ else fi elif test x$gcc_cv_as != x; then echo "$conftest_s" > conftest.s - if { ac_try='$gcc_cv_as $tls_as_opt --fatal-warnings -o conftest.o conftest.s >&5'; { (eval echo configure:6708: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as $tls_as_opt --fatal-warnings -o conftest.o conftest.s >&5'; { (eval echo configure:6717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then gcc_cv_as_tls=yes else @@ -6730,7 +6739,7 @@ case "$target" in # All TARGET_ABI_OSF targets. alpha*-*-osf* | alpha*-*-linux* | alpha*-*-*bsd*) echo $ac_n "checking assembler for explicit relocation support""... $ac_c" 1>&6 -echo "configure:6734: checking assembler for explicit relocation support" >&5 +echo "configure:6743: checking assembler for explicit relocation support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_alpha_explicit_relocs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6753,7 +6762,7 @@ fi ldah $1, d($29) !gprelhigh lda $1, d($1) !gprellow lda $29, 0($29) !gpdisp!3' > conftest.s - if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then gcc_cv_as_alpha_explicit_relocs=yes else @@ -6775,14 +6784,14 @@ fi sparc*-*-*) echo $ac_n "checking assembler for .register""... $ac_c" 1>&6 -echo "configure:6779: checking assembler for .register" >&5 +echo "configure:6788: checking assembler for .register" >&5 if eval "test \"`echo '$''{'gcc_cv_as_sparc_register_op'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else gcc_cv_as_sparc_register_op=no if test x$gcc_cv_as != x; then echo '.register %g2, #scratch' > conftest.s - if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6795: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then gcc_cv_as_sparc_register_op=yes else @@ -6802,14 +6811,14 @@ EOF fi echo $ac_n "checking assembler for -relax option""... $ac_c" 1>&6 -echo "configure:6806: checking assembler for -relax option" >&5 +echo "configure:6815: checking assembler for -relax option" >&5 if eval "test \"`echo '$''{'gcc_cv_as_sparc_relax'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else gcc_cv_as_sparc_relax=no if test x$gcc_cv_as != x; then echo '.text' > conftest.s - if { ac_try='$gcc_cv_as -relax -o conftest.o conftest.s >&5'; { (eval echo configure:6813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -relax -o conftest.o conftest.s >&5'; { (eval echo configure:6822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then gcc_cv_as_sparc_relax=yes else @@ -6829,7 +6838,7 @@ EOF fi echo $ac_n "checking assembler for unaligned pcrel relocs""... $ac_c" 1>&6 -echo "configure:6833: checking assembler for unaligned pcrel relocs" >&5 +echo "configure:6842: checking assembler for unaligned pcrel relocs" >&5 if eval "test \"`echo '$''{'gcc_cv_as_sparc_ua_pcrel'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6842,7 +6851,7 @@ foo: .align 4 .byte 0 .uaword %r_disp32(foo)' > conftest.s - if { ac_try='$gcc_cv_as -K PIC -o conftest.o conftest.s >&5'; { (eval echo configure:6846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -K PIC -o conftest.o conftest.s >&5'; { (eval echo configure:6855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then if test x$gcc_cv_ld != x \ && $gcc_cv_ld -o conftest conftest.o -G > /dev/null 2>&1; then @@ -6865,7 +6874,7 @@ EOF echo $ac_n "checking assembler for unaligned pcrel relocs against hidden symbols""... $ac_c" 1>&6 -echo "configure:6869: checking assembler for unaligned pcrel relocs against hidden symbols" >&5 +echo "configure:6878: checking assembler for unaligned pcrel relocs against hidden symbols" >&5 if eval "test \"`echo '$''{'gcc_cv_as_sparc_ua_pcrel_hidden'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6880,7 +6889,7 @@ else .hidden foo foo: .skip 4' > conftest.s - if { ac_try='$gcc_cv_as -K PIC -o conftest.o conftest.s >&5'; { (eval echo configure:6884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -K PIC -o conftest.o conftest.s >&5'; { (eval echo configure:6893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then if test x$gcc_cv_ld != x && test x$gcc_cv_objdump != x \ && $gcc_cv_ld -o conftest conftest.o -G > /dev/null 2>&1 \ @@ -6913,7 +6922,7 @@ fi fi # unaligned pcrel relocs echo $ac_n "checking assembler for offsetable %lo()""... $ac_c" 1>&6 -echo "configure:6917: checking assembler for offsetable %lo()" >&5 +echo "configure:6926: checking assembler for offsetable %lo()" >&5 if eval "test \"`echo '$''{'gcc_cv_as_sparc_offsetable_lo10'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6922,7 +6931,7 @@ else echo '.text or %g1, %lo(ab) + 12, %g1 or %g1, %lo(ab + 12), %g1' > conftest.s - if { ac_try='$gcc_cv_as -xarch=v9 -o conftest.o conftest.s >&5'; { (eval echo configure:6926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -xarch=v9 -o conftest.o conftest.s >&5'; { (eval echo configure:6935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then if test x$gcc_cv_objdump != x \ && %gcc_cv_objdump -s -j .text conftest.o 2> /dev/null \ @@ -6948,7 +6957,7 @@ fi i[34567]86-*-* | x86_64-*-*) echo $ac_n "checking assembler for filds and fists mnemonics""... $ac_c" 1>&6 -echo "configure:6952: checking assembler for filds and fists mnemonics" >&5 +echo "configure:6961: checking assembler for filds and fists mnemonics" >&5 if eval "test \"`echo '$''{'gcc_cv_as_ix86_filds_fists'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6959,7 +6968,7 @@ else fi elif test x$gcc_cv_as != x; then echo 'filds mem; fists mem' > conftest.s - if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then gcc_cv_as_ix86_filds_fists=yes else @@ -6979,14 +6988,14 @@ EOF fi echo $ac_n "checking assembler for cmov syntax""... $ac_c" 1>&6 -echo "configure:6983: checking assembler for cmov syntax" >&5 +echo "configure:6992: checking assembler for cmov syntax" >&5 if eval "test \"`echo '$''{'gcc_cv_as_ix86_cmov_sun_syntax'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else gcc_cv_as_ix86_cmov_sun_syntax=no if test x$gcc_cv_as != x; then echo 'cmovl.l %edx, %eax' > conftest.s - if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then gcc_cv_as_ix86_cmov_sun_syntax=yes else @@ -7008,7 +7017,7 @@ fi # This one is used unconditionally by i386.[ch]; it is to be defined # to 1 if the feature is present, 0 otherwise. echo $ac_n "checking assembler for GOTOFF in data""... $ac_c" 1>&6 -echo "configure:7012: checking assembler for GOTOFF in data" >&5 +echo "configure:7021: checking assembler for GOTOFF in data" >&5 if eval "test \"`echo '$''{'gcc_cv_as_ix86_gotoff_in_data'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7023,7 +7032,7 @@ fi nop .data .long .L0@GOTOFF' > conftest.s - if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then gcc_cv_as_ix86_gotoff_in_data=yes else @@ -7044,7 +7053,7 @@ EOF ia64*-*-*) echo $ac_n "checking assembler for ltoffx and ldxmov relocs""... $ac_c" 1>&6 -echo "configure:7048: checking assembler for ltoffx and ldxmov relocs" >&5 +echo "configure:7057: checking assembler for ltoffx and ldxmov relocs" >&5 if eval "test \"`echo '$''{'gcc_cv_as_ia64_ltoffx_ldxmov_relocs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7058,7 +7067,7 @@ fi addl r15 = @ltoffx(x#), gp ;; ld8.mov r16 = [r15], x#' > conftest.s - if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then gcc_cv_as_ia64_ltoffx_ldxmov_relocs=yes else @@ -7088,7 +7097,7 @@ fi mfcr 3,128" echo $ac_n "checking assembler for mfcr field support""... $ac_c" 1>&6 -echo "configure:7092: checking assembler for mfcr field support" >&5 +echo "configure:7101: checking assembler for mfcr field support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_powerpc_mfcrf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7099,7 +7108,7 @@ else fi elif test x$gcc_cv_as != x; then echo "$conftest_s" > conftest.s - if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then gcc_cv_as_powerpc_mfcrf=yes else @@ -7121,7 +7130,7 @@ fi mips*-*-*) echo $ac_n "checking assembler for explicit relocation support""... $ac_c" 1>&6 -echo "configure:7125: checking assembler for explicit relocation support" >&5 +echo "configure:7134: checking assembler for explicit relocation support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_mips_explicit_relocs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7132,7 +7141,7 @@ else fi elif test x$gcc_cv_as != x; then echo ' lw $4,%gp_rel(foo)($4)' > conftest.s - if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then gcc_cv_as_mips_explicit_relocs=yes else @@ -7178,7 +7187,7 @@ if test x"$insn" != x; then .loc 1 3 0 $insn" echo $ac_n "checking assembler for dwarf2 debug_line support""... $ac_c" 1>&6 -echo "configure:7182: checking assembler for dwarf2 debug_line support" >&5 +echo "configure:7191: checking assembler for dwarf2 debug_line support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_dwarf2_debug_line'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7190,7 +7199,7 @@ else fi elif test x$gcc_cv_as != x; then echo "$conftest_s" > conftest.s - if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then # ??? This fails with non-gnu grep. Maybe use objdump? if grep debug_line conftest.o > /dev/null 2>&1; then @@ -7212,7 +7221,7 @@ echo "$ac_t""$gcc_cv_as_dwarf2_debug_line" 1>&6 # by DW_AT_decl_file. Approximate this test by testing if # the assembler bitches if the same index is assigned twice. echo $ac_n "checking assembler for buggy dwarf2 .file directive""... $ac_c" 1>&6 -echo "configure:7216: checking assembler for buggy dwarf2 .file directive" >&5 +echo "configure:7225: checking assembler for buggy dwarf2 .file directive" >&5 if eval "test \"`echo '$''{'gcc_cv_as_dwarf2_file_buggy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7220,7 +7229,7 @@ else if test x$gcc_cv_as != x; then echo ' .file 1 "foo.s" .file 1 "bar.s"' > conftest.s - if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then gcc_cv_as_dwarf2_file_buggy=yes else @@ -7243,7 +7252,7 @@ EOF fi echo $ac_n "checking assembler for --gdwarf2 option""... $ac_c" 1>&6 -echo "configure:7247: checking assembler for --gdwarf2 option" >&5 +echo "configure:7256: checking assembler for --gdwarf2 option" >&5 if eval "test \"`echo '$''{'gcc_cv_as_gdwarf2_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7255,7 +7264,7 @@ else fi elif test x$gcc_cv_as != x; then echo "$insn" > conftest.s - if { ac_try='$gcc_cv_as --gdwarf2 -o conftest.o conftest.s >&5'; { (eval echo configure:7259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as --gdwarf2 -o conftest.o conftest.s >&5'; { (eval echo configure:7268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then gcc_cv_as_gdwarf2_flag=yes else @@ -7275,7 +7284,7 @@ EOF fi echo $ac_n "checking assembler for --gstabs option""... $ac_c" 1>&6 -echo "configure:7279: checking assembler for --gstabs option" >&5 +echo "configure:7288: checking assembler for --gstabs option" >&5 if eval "test \"`echo '$''{'gcc_cv_as_gstabs_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7287,12 +7296,12 @@ else fi elif test x$gcc_cv_as != x; then echo "$insn" > conftest.s - if { ac_try='$gcc_cv_as --gstabs -o conftest.o conftest.s >&5'; { (eval echo configure:7291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as --gstabs -o conftest.o conftest.s >&5'; { (eval echo configure:7300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then # The native Solaris 9/Intel assembler doesn't understand --gstabs # and warns about it, but still exits successfully. So check for # this. - if { ac_try='$gcc_cv_as --gstabs -o conftest.o conftest.s 2>&1 | grep -i warning > /dev/null'; { (eval echo configure:7296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='$gcc_cv_as --gstabs -o conftest.o conftest.s 2>&1 | grep -i warning > /dev/null'; { (eval echo configure:7305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then : else gcc_cv_as_gstabs_flag=yes fi @@ -7314,7 +7323,7 @@ fi fi echo $ac_n "checking linker read-only and read-write section mixing""... $ac_c" 1>&6 -echo "configure:7318: checking linker read-only and read-write section mixing" >&5 +echo "configure:7327: checking linker read-only and read-write section mixing" >&5 gcc_cv_ld_ro_rw_mix=unknown if test $in_tree_ld = yes ; then if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 10 -o "$gcc_cv_gld_major_version" -gt 2 \ @@ -7353,7 +7362,7 @@ fi echo "$ac_t""$gcc_cv_ld_ro_rw_mix" 1>&6 echo $ac_n "checking linker PT_GNU_EH_FRAME support""... $ac_c" 1>&6 -echo "configure:7357: checking linker PT_GNU_EH_FRAME support" >&5 +echo "configure:7366: checking linker PT_GNU_EH_FRAME support" >&5 gcc_cv_ld_eh_frame_hdr=no if test $in_tree_ld = yes ; then if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 12 -o "$gcc_cv_gld_major_version" -gt 2 \ @@ -7375,7 +7384,7 @@ fi echo "$ac_t""$gcc_cv_ld_eh_frame_hdr" 1>&6 echo $ac_n "checking linker position independent executable support""... $ac_c" 1>&6 -echo "configure:7379: checking linker position independent executable support" >&5 +echo "configure:7388: checking linker position independent executable support" >&5 gcc_cv_ld_pie=no if test $in_tree_ld = yes ; then if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 15 -o "$gcc_cv_gld_major_version" -gt 2 \ @@ -7400,7 +7409,7 @@ echo "$ac_t""$gcc_cv_ld_pie" 1>&6 case "$target" in mips*-*-*) echo $ac_n "checking whether libgloss uses STARTUP directives consistently""... $ac_c" 1>&6 -echo "configure:7404: checking whether libgloss uses STARTUP directives consistently" >&5 +echo "configure:7413: checking whether libgloss uses STARTUP directives consistently" >&5 gcc_cv_mips_libgloss_startup=no gcc_cv_libgloss_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/libgloss if test "x$exec_prefix" = xNONE; then @@ -7602,7 +7611,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:7606: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:7615: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" diff --git a/gcc/configure.in b/gcc/configure.in index 20a2c35eea0..81b1adc4a3f 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -1180,9 +1180,18 @@ if test -f configargs.h ; then else gcc_config_arguments="$TOPLEVEL_CONFIGURE_ARGUMENTS" fi + +# Double all backslashes and backslash all quotes to turn +# gcc_config_arguments into a C string. +sed -e 's/\\/\\\\/g; s/"/\\"/g' <conftest.out +$gcc_config_arguments +EOF +gcc_config_arguments_str=`cat conftest.out` +rm -f conftest.out + cat > configargs.h <> $file << \__EOF__ configured with: @gcc_config_arguments@ +__EOF__ + cat >> $file << __EOF__ >Description: $DESCRIPTION_C >How-To-Repeat: