diff options
| author | Roland McGrath <roland@hack.frob.com> | 2012-08-20 09:51:04 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-08-20 09:51:04 -0700 |
| commit | c0f4faf046c6bab77200a6e78f35980887ceb445 (patch) | |
| tree | 419f2eef5e8ab0a79bd98af1c6c8ca53cc76095e | |
| parent | a35cbf28fb4ecfa2d36c1466b4068a7223ffe34f (diff) | |
| download | glibc-c0f4faf046c6bab77200a6e78f35980887ceb445.tar glibc-c0f4faf046c6bab77200a6e78f35980887ceb445.tar.gz glibc-c0f4faf046c6bab77200a6e78f35980887ceb445.tar.bz2 glibc-c0f4faf046c6bab77200a6e78f35980887ceb445.zip | |
Fix conditional on using DSOCAPS to match condition on defining it.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/dl-sysdep.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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 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]; |