From 5219ed3570dafacfa9b512fd9a2167515628c14a Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 10 Sep 2009 05:16:08 +0000
Subject: [PATCH] 	* configure.ac: Check glibc version even if we have an
 in-tree 	assembler.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151585 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog    |  5 +++++
 gcc/configure    | 22 +++++++++++-----------
 gcc/configure.ac |  7 +++----
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f9cea3d..b47b5d5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-09  Jason Merrill  <jason@redhat.com>
+
+	* configure.ac: Check glibc version even if we have an in-tree
+	assembler.
+
 2009-09-09  Anthony Green  <green@moxielogic.com>
 
 	* config/moxie/moxie.md (*movsi, *movhi, *movqi): Use xor to load
diff --git a/gcc/configure b/gcc/configure
index 2db7cf2..3cfc903 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -23985,16 +23985,7 @@ fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }
     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]*\)"`
-      glibcnum=`expr $glibcmajor \* 1000 + $glibcminor`
-      if test "$glibcnum" -ge 2011 ; then
-        gcc_cv_as_gnu_unique_object=yes
-      fi
-    fi
+	gcc_cv_as_gnu_unique_object=yes
     else
       echo "configure: failed program was" >&5
       cat conftest.s >&5
@@ -24005,7 +23996,16 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_gnu_unique_object" >&5
 $as_echo "$gcc_cv_as_gnu_unique_object" >&6; }
 if test $gcc_cv_as_gnu_unique_object = yes; then
-  enable_gnu_unique_object=yes
+  # 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]*\)"`
+      glibcnum=`expr $glibcmajor \* 1000 + $glibcminor`
+      if test "$glibcnum" -ge 2011 ; then
+        enable_gnu_unique_object=yes
+      fi
+    fi
 fi
 fi
 
diff --git a/gcc/configure.ac b/gcc/configure.ac
index f613871..b8ec90e 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -3391,7 +3391,7 @@ Valid choices are 'yes' and 'no'.]) ;;
   esac],
  [gcc_GAS_CHECK_FEATURE([gnu_unique_object], gcc_cv_as_gnu_unique_object,
    [elf,2,19,52],,
-   [.type foo, @gnu_unique_object],
+   [.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
@@ -3399,10 +3399,9 @@ Valid choices are 'yes' and 'no'.]) ;;
       glibcminor=`expr "$glibcver" : "ldd (GNU libc) [[0-9]]*\.\([[0-9]]*\)"`
       glibcnum=`expr $glibcmajor \* 1000 + $glibcminor`
       if test "$glibcnum" -ge 2011 ; then
-        gcc_cv_as_gnu_unique_object=yes
+        enable_gnu_unique_object=yes
       fi
-    fi],
-   [enable_gnu_unique_object=yes])])
+    fi])])
 if test x$enable_gnu_unique_object = xyes; then
   AC_DEFINE(HAVE_GAS_GNU_UNIQUE_OBJECT, 1,
    [Define if your assembler supports @gnu_unique_object.])
-- 
2.7.4