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-401-g91363db
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 28 Sep 2012 21:32:33 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-401-g91363db
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 91363dbbb9e4fe96c9f3ec465852c5e04fd4f68e (commit)
from cc87f7d8511e6ca777211abea0bf979138c4c60d (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=91363dbbb9e4fe96c9f3ec465852c5e04fd4f68e
commit 91363dbbb9e4fe96c9f3ec465852c5e04fd4f68e
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri Sep 28 14:29:14 2012 -0700
Conditionalize elf/dl-sysdep.c contents on [SHARED].
diff --git a/ChangeLog b/ChangeLog
index 7108c3c..ab26207 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2012-09-28 Roland McGrath <roland@hack.frob.com>
+ * elf/dl-sysdep.c: Conditionalize whole contents on [SHARED].
+
* Makeconfig (nssobjdir, resolvobjdir): Remove variables.
(elfobjdir): Move out of conditionals.
diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c
index 7d22839..fb0849a 100644
--- a/elf/dl-sysdep.c
+++ b/elf/dl-sysdep.c
@@ -1,6 +1,5 @@
/* Operating system support for run-time dynamic linker. Generic Unix version.
- Copyright (C) 1995-1998,2000-2010,2012
- Free Software Foundation, Inc.
+ Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -17,6 +16,12 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+/* We conditionalize the whole of this file rather than simply eliding it
+ from the static build, because other sysdeps/ versions of this file
+ might define things needed by a static build. */
+
+#ifdef SHARED
+
#include <assert.h>
#include <elf.h>
#include <errno.h>
@@ -592,3 +597,5 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
return result;
}
+
+#endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 ++
elf/dl-sysdep.c | 11 +++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources