This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-235-gc0f4faf
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 20 Aug 2012 16:53:27 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-235-gc0f4faf
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via c0f4faf046c6bab77200a6e78f35980887ceb445 (commit)
from a35cbf28fb4ecfa2d36c1466b4068a7223ffe34f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c0f4faf046c6bab77200a6e78f35980887ceb445
commit c0f4faf046c6bab77200a6e78f35980887ceb445
Author: Roland McGrath <roland@hack.frob.com>
Date: Mon Aug 20 09:51:04 2012 -0700
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];
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
elf/dl-sysdep.c | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources