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

diff --git a/ChangeLog b/ChangeLog
index 111503e311d81100e24eb2f4e3e5ef14d5d63c80..7f8b7b04fe07efd21f456f434289709ab911050b 100644 (file)
--- 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 e2a9d935ab3e3a74e66a221426924488581c4b3e..7d2283910e974e0bedd70fb43c73cc6cc9fe682d 100644 (file)
--- 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];