From: Roland McGrath <roland@hack.frob.com>
Date: Mon, 20 Aug 2012 16:51:04 +0000 (-0700)
Subject: Fix conditional on using DSOCAPS to match condition on defining it.
X-Git-Tag: upstream/2.30~10392
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c0f4faf046c6bab77200a6e78f35980887ceb445;p=external%2Fglibc.git

Fix conditional on using DSOCAPS to match condition on defining it.
---

diff --git a/ChangeLog b/ChangeLog
index 111503e..7f8b7b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-20  Roland McGrath  <roland@hack.frob.com>
+
+	* elf/dl-sysdep.c (_dl_important_hwcaps): Fix conditional on using
+	DSOCAPS to match condition on defining it.
+
 2012-08-20  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/unix/sysv/linux/kernel-features.h
diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c
index e2a9d93..7d22839 100644
--- a/elf/dl-sysdep.c
+++ b/elf/dl-sysdep.c
@@ -420,7 +420,7 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
   /* Create temporary data structure to generate result table.  */
   temp = (struct r_strlenpair *) alloca (cnt * sizeof (*temp));
   m = 0;
-#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
+#if (defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO) && defined SHARED
   if (dsocaps != NULL)
     {
       const ElfW(Word) mask = ((const ElfW(Word) *) dsocaps)[-1];