diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2009-12-09 10:13:43 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2009-12-09 10:13:43 +0100 |
| commit | 10ca6198db59c22024a551b23035538c398e2377 (patch) | |
| tree | e49d361af64d555e89805eeded9c6a4288ff251a | |
| parent | e34915db75a9e3cbf331a580586318d8430a9336 (diff) | |
| download | gcc-10ca6198db59c22024a551b23035538c398e2377.zip gcc-10ca6198db59c22024a551b23035538c398e2377.tar.gz gcc-10ca6198db59c22024a551b23035538c398e2377.tar.bz2 | |
configure.ac: Compute ld_ver...
* configure.ac: Compute ld_ver, ld_vers, ld_date, ld_vers_major,
ld_vers_minor and ld_vers_path always, not just when gcc_cv_ld_hidden
isn't cached.
* configure: Regenerated.
From-SVN: r155103
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rwxr-xr-x | gcc/configure | 19 | ||||
| -rw-r--r-- | gcc/configure.ac | 21 |
3 files changed, 33 insertions, 14 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b32aa3d..e2bb149 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2009-12-09 Jakub Jelinek <jakub@redhat.com> + + * configure.ac: Compute ld_ver, ld_vers, ld_date, ld_vers_major, + ld_vers_minor and ld_vers_path always, not just when gcc_cv_ld_hidden + isn't cached. + * configure: Regenerated. + 2009-12-08 Richard Henderson <rth@redhat.com> * combine.c (setup_incoming_promotions): Fix sign-extend of diff --git a/gcc/configure b/gcc/configure index c837203..8c72a93 100755 --- a/gcc/configure +++ b/gcc/configure @@ -21155,6 +21155,18 @@ fi $as_echo "$gcc_cv_as_hidden" >&6; } +if test $in_tree_ld != yes ; then + 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'` + 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 +fi + { $as_echo "$as_me:${as_lineno-$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 : @@ -21168,14 +21180,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'` - 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/gcc/configure.ac b/gcc/configure.ac index 665863f..6ea6d7a 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2111,6 +2111,20 @@ gcc_GAS_CHECK_FEATURE([.hidden], gcc_cv_as_hidden, [ .hidden foobar foobar:]) +changequote(,)dnl +if test $in_tree_ld != yes ; then + 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'` + 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 +fi +changequote([,])dnl + AC_CACHE_CHECK(linker for .hidden support, gcc_cv_ld_hidden, [if test $in_tree_ld = yes ; then gcc_cv_ld_hidden=no @@ -2121,14 +2135,7 @@ AC_CACHE_CHECK(linker for .hidden support, gcc_cv_ld_hidden, else changequote(,)dnl 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'` - 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 |