From 62bede1313c3a1fa477a092006d64436de6821b1 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Mon, 27 Jun 2011 20:39:05 -0700
Subject: [PATCH] Distinguish configure check for .ctors/.dtors
 header/trailers.

---
 ChangeLog    |  4 ++++
 configure    | 18 +++++++++++++++++-
 configure.in | 12 +++++++++++-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 94dac81..76779f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-06-27  Roland McGrath  <roland@hack.frob.com>
 
+	* configure.in (NO_CTORS_DTORS_SECTIONS): Give this check its own
+	AC_CACHE_CHECK invocation.
+	* configure: Regenerated.
+
 	* elf/soinit.c (__CTOR_LIST__, __DTOR_LIST__): Add used attribute.
 
 2011-06-27  Ulrich Drepper  <drepper@gmail.com>
diff --git a/configure b/configure
index 1db57ae..7814072 100755
--- a/configure
+++ b/configure
@@ -6111,12 +6111,28 @@ fi
 $as_echo "$libc_cv_initfini_array" >&6; }
   if test $libc_cv_initfini_array != yes; then
     as_fn_error $? "Need linker with .init_array/.fini_array support." "$LINENO" 5
-  elif { ac_try='${CC-cc} -Wl,--verbose 2>&1|grep SORT_BY_INIT_PRIORITY 1>&5'
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use .ctors/.dtors header and trailer" >&5
+$as_echo_n "checking whether to use .ctors/.dtors header and trailer... " >&6; }
+if ${libc_cv_ctors_header+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+    if { ac_try='${CC-cc} -Wl,--verbose 2>&1|grep SORT_BY_INIT_PRIORITY 1>&5'
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
+    libc_cv_ctors_header=no
+  else
+    libc_cv_ctors_header=yes
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_ctors_header" >&5
+$as_echo "$libc_cv_ctors_header" >&6; }
+
+  if test $libc_cv_ctors_header = no; then
     $as_echo "#define NO_CTORS_DTORS_SECTIONS 1" >>confdefs.h
 
   fi
diff --git a/configure.in b/configure.in
index d3f5210..fc2a193 100644
--- a/configure.in
+++ b/configure.in
@@ -1479,7 +1479,17 @@ EOF
   rm -f conftest*])
   if test $libc_cv_initfini_array != yes; then
     AC_MSG_ERROR([Need linker with .init_array/.fini_array support.])
-  elif AC_TRY_COMMAND([${CC-cc} -Wl,--verbose 2>&1|grep SORT_BY_INIT_PRIORITY 1>&AS_MESSAGE_LOG_FD]); then
+  fi
+
+  AC_CACHE_CHECK(whether to use .ctors/.dtors header and trailer,
+		 libc_cv_ctors_header, [dnl
+  if AC_TRY_COMMAND([${CC-cc} -Wl,--verbose 2>&1|grep SORT_BY_INIT_PRIORITY 1>&AS_MESSAGE_LOG_FD]); then
+    libc_cv_ctors_header=no
+  else
+    libc_cv_ctors_header=yes
+  fi])
+
+  if test $libc_cv_ctors_header = no; then
     AC_DEFINE(NO_CTORS_DTORS_SECTIONS)
   fi
 
-- 
2.7.4