diff options
| author | mrg <mrg@NetBSD.org> | 2008-10-06 00:07:08 +0000 |
|---|---|---|
| committer | mrg <mrg@NetBSD.org> | 2008-10-06 00:07:08 +0000 |
| commit | 5e3d72fe3159a02793bb28d7cd5df2b58cadb8f5 (patch) | |
| tree | 063370adee06f88f0f0bbaaf6083ce458881c735 /gnu | |
| parent | 983106fbb37ba160a0b9ea266212564f44b067fe (diff) | |
move the code that sets ld_vers and other variables so that it is
always executed, regardless of cached values. this lets the comdat
version test for gas work properly.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/dist/gcc4/gcc/configure | 25 | ||||
| -rw-r--r-- | gnu/dist/gcc4/gcc/configure.ac | 23 |
2 files changed, 28 insertions, 20 deletions
diff --git a/gnu/dist/gcc4/gcc/configure b/gnu/dist/gcc4/gcc/configure index 1a3646b8fcb..c328f7b2e66 100644 --- a/gnu/dist/gcc4/gcc/configure +++ b/gnu/dist/gcc4/gcc/configure @@ -14903,6 +14903,20 @@ fi $as_echo "$gcc_cv_as_hidden" >&6; } + ld_ver=`$gcc_cv_ld --version 2>/dev/null | sed 1q` + if echo "$ld_ver" | grep GNU > /dev/null; then + ld_vers=`echo $ld_ver | sed -n \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*.*\)$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\)[ ].*$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[ ].*$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[ ].*$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[ -].*$,\1,p'` + ld_date=`echo $ld_ver | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'` + ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'` + ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'` + ld_vers_patch=`expr "$ld_vers" : '[0-9]*\.[0-9]*\.\([0-9]*\)'` + fi + { $as_echo "$as_me:$LINENO: checking linker for .hidden support" >&5 $as_echo_n "checking linker for .hidden support... " >&6; } if test "${gcc_cv_ld_hidden+set}" = set; then @@ -14916,18 +14930,7 @@ else fi else gcc_cv_ld_hidden=yes - ld_ver=`$gcc_cv_ld --version 2>/dev/null | sed 1q` if echo "$ld_ver" | grep GNU > /dev/null; then - ld_vers=`echo $ld_ver | sed -n \ - -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*.*\)$,\1,p' \ - -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\)[ ].*$,\1,p' \ - -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[ ].*$,\1,p' \ - -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[ ].*$,\1,p' \ - -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[ -].*$,\1,p'` - ld_date=`echo $ld_ver | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'` - ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'` - ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'` - ld_vers_patch=`expr "$ld_vers" : '[0-9]*\.[0-9]*\.\([0-9]*\)'` 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 diff --git a/gnu/dist/gcc4/gcc/configure.ac b/gnu/dist/gcc4/gcc/configure.ac index c72f14737e0..0eb55d36f98 100644 --- a/gnu/dist/gcc4/gcc/configure.ac +++ b/gnu/dist/gcc4/gcc/configure.ac @@ -1981,15 +1981,6 @@ gcc_GAS_CHECK_FEATURE([.hidden], gcc_cv_as_hidden, [ .hidden foobar foobar:]) -AC_CACHE_CHECK(linker for .hidden support, gcc_cv_ld_hidden, -[if test $in_tree_ld = yes ; then - gcc_cv_ld_hidden=no - if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 13 -o "$gcc_cv_gld_major_version" -gt 2 \ - && test $in_tree_ld_is_elf = yes; then - gcc_cv_ld_hidden=yes - fi -else - gcc_cv_ld_hidden=yes ld_ver=`$gcc_cv_ld --version 2>/dev/null | sed 1q` if echo "$ld_ver" | grep GNU > /dev/null; then changequote(,)dnl @@ -2003,6 +1994,20 @@ changequote(,)dnl ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'` ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'` ld_vers_patch=`expr "$ld_vers" : '[0-9]*\.[0-9]*\.\([0-9]*\)'` +changequote([,])dnl + fi + +AC_CACHE_CHECK(linker for .hidden support, gcc_cv_ld_hidden, +[if test $in_tree_ld = yes ; then + gcc_cv_ld_hidden=no + if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 13 -o "$gcc_cv_gld_major_version" -gt 2 \ + && test $in_tree_ld_is_elf = yes; then + gcc_cv_ld_hidden=yes + fi +else + gcc_cv_ld_hidden=yes +changequote(,)dnl + if echo "$ld_ver" | grep GNU > /dev/null; then 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 |
