From c0f4faf046c6bab77200a6e78f35980887ceb445 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 20 Aug 2012 09:51:04 -0700 Subject: [PATCH] Fix conditional on using DSOCAPS to match condition on defining it. --- ChangeLog | 5 +++++ elf/dl-sysdep.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 111503e311..7f8b7b04fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-08-20 Roland McGrath + + * elf/dl-sysdep.c (_dl_important_hwcaps): Fix conditional on using + DSOCAPS to match condition on defining it. + 2012-08-20 Joseph Myers * sysdeps/unix/sysv/linux/kernel-features.h diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c index e2a9d935ab..7d2283910e 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];