diff options
Diffstat (limited to 'gcc/configure')
| -rwxr-xr-x | gcc/configure | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/gcc/configure b/gcc/configure index 45bba8e785e..387de5b743c 100755 --- a/gcc/configure +++ b/gcc/configure @@ -21237,11 +21237,15 @@ for f in $gcc_cv_as_bfd_srcdir/configure \ $gcc_cv_as_gas_srcdir/configure \ $gcc_cv_as_gas_srcdir/configure.in \ $gcc_cv_as_gas_srcdir/Makefile.in ; do - gcc_cv_gas_version=`sed -n -e 's/^[ ]*\(VERSION=[0-9]*\.[0-9]*.*\)/\1/p' < $f` + gcc_cv_gas_version=`sed -n -e 's/^[ ]*VERSION=[^0-9A-Za-z_]*\([0-9]*\.[0-9]*.*\)/VERSION=\1/p' < $f` if test x$gcc_cv_gas_version != x; then break fi done +case $gcc_cv_gas_version in + VERSION=[0-9]*) ;; + *) as_fn_error "cannot find version of in-tree assembler" "$LINENO" 5;; +esac gcc_cv_gas_major_version=`expr "$gcc_cv_gas_version" : "VERSION=\([0-9]*\)"` gcc_cv_gas_minor_version=`expr "$gcc_cv_gas_version" : "VERSION=[0-9]*\.\([0-9]*\)"` gcc_cv_gas_patch_version=`expr "$gcc_cv_gas_version" : "VERSION=[0-9]*\.[0-9]*\.\([0-9]*\)"` @@ -21395,11 +21399,15 @@ $as_echo "newly built ld" >&6; } fi for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.in $gcc_cv_ld_gld_srcdir/Makefile.in do - gcc_cv_gld_version=`sed -n -e 's/^[ ]*\(VERSION=[0-9]*\.[0-9]*.*\)/\1/p' < $f` + gcc_cv_gld_version=`sed -n -e 's/^[ ]*VERSION=[^0-9A-Za-z_]*\([0-9]*\.[0-9]*.*\)/VERSION=\1/p' < $f` if test x$gcc_cv_gld_version != x; then break fi done + case $gcc_cv_gld_version in + VERSION=[0-9]*) ;; + *) as_fn_error "cannot find version of in-tree linker" "$LINENO" 5 ;; + esac gcc_cv_gld_major_version=`expr "$gcc_cv_gld_version" : "VERSION=\([0-9]*\)"` gcc_cv_gld_minor_version=`expr "$gcc_cv_gld_version" : "VERSION=[0-9]*\.\([0-9]*\)"` else @@ -22063,6 +22071,12 @@ else if test x"$ld_is_gold" = xyes; then : elif echo "$ld_ver" | grep GNU > /dev/null; then + case "${target}" in + mmix-knuth-mmixware) + # The linker emits by default mmo, not ELF, so "no" is appropriate. + gcc_cv_ld_hidden=no + ;; + esac if test 0"$ld_date" -lt 20020404; then if test -n "$ld_date"; then # If there was date string, but was earlier than 2002-04-04, fail @@ -22820,6 +22834,9 @@ $as_echo "$gcc_cv_as_comdat_group_percent" >&6; } if test $gcc_cv_as_comdat_group_percent = yes; then gcc_cv_as_comdat_group_group=no else + if test -z "${gcc_cv_as_comdat_group_group+set}"; then + gcc_cv_as_comdat_group_group=no + fi case "${target}" in # Sun as uses a completely different syntax. *-*-solaris2*) @@ -25346,8 +25363,8 @@ if test "${gcc_cv_as_aix_ref+set}" = set; then : else gcc_cv_as_aix_ref=no if test $in_tree_gas = yes; then - if test $gcc_cv_gas_vers -ge `expr \( \( 2.21.0 \* 1000 \) + gcc_cv_as_aix_ref=yes \) \* 1000 + ` - then : + if test $gcc_cv_gas_vers -ge `expr \( \( 2 \* 1000 \) + 21 \) \* 1000 + 0` + then gcc_cv_as_aix_ref=yes fi elif test x$gcc_cv_as != x; then $as_echo ' .csect stuff[rw] |