configure.ac (gnu-unique-object): Fix ldd version check.

2010-01-27  Matthias Klose  <doko@ubuntu.com>

        * configure.ac (gnu-unique-object): Fix ldd version check.
        * configure: Regenerate.

From-SVN: r156281
This commit is contained in:
Matthias Klose 2010-01-27 13:02:50 +00:00 committed by Matthias Klose
parent 21d11f4f30
commit cdf6bfb713
3 changed files with 11 additions and 6 deletions

View File

@ -1,3 +1,8 @@
2010-01-27 Matthias Klose <doko@ubuntu.com>
* configure.ac (gnu-unique-object): Fix ldd version check.
* configure: Regenerate.
2010-01-27 Wei Guozhi <carrot@google.com>
PR target/42671

6
gcc/configure vendored
View File

@ -24220,9 +24220,9 @@ $as_echo "$gcc_cv_as_gnu_unique_object" >&6; }
if test $gcc_cv_as_gnu_unique_object = yes; then
# Also check for ld.so support, i.e. glibc 2.11 or higher.
if test x$host = x$build -a x$host = x$target &&
glibcver=`ldd --version 2>/dev/null`; then
glibcmajor=`expr "$glibcver" : "ldd (GNU libc) \([0-9]*\)"`
glibcminor=`expr "$glibcver" : "ldd (GNU libc) [0-9]*\.\([0-9]*\)"`
glibcver=`ldd --version 2>/dev/null | sed 's/.* //;q'`; then
glibcmajor=`expr "$glibcver" : "\(0-9*\)"`
glibcminor=`expr "$glibcver" : "2-9*\.\(0-9*\)"`
glibcnum=`expr $glibcmajor \* 1000 + $glibcminor`
if test "$glibcnum" -ge 2011 ; then
enable_gnu_unique_object=yes

View File

@ -3567,9 +3567,9 @@ Valid choices are 'yes' and 'no'.]) ;;
[.type foo, @gnu_unique_object],,
# Also check for ld.so support, i.e. glibc 2.11 or higher.
[if test x$host = x$build -a x$host = x$target &&
glibcver=`ldd --version 2>/dev/null`; then
glibcmajor=`expr "$glibcver" : "ldd (GNU libc) \([[0-9]]*\)"`
glibcminor=`expr "$glibcver" : "ldd (GNU libc) [[0-9]]*\.\([[0-9]]*\)"`
glibcver=`ldd --version 2>/dev/null | sed 's/.* //;q'`; then
glibcmajor=`expr "$glibcver" : "\([0-9]*\)"`
glibcminor=`expr "$glibcver" : "[2-9]*\.\([0-9]*\)"`
glibcnum=`expr $glibcmajor \* 1000 + $glibcminor`
if test "$glibcnum" -ge 2011 ; then
enable_gnu_unique_object=yes