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-213-gb7c08a6
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 17 Aug 2012 16:54:56 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-213-gb7c08a6
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 b7c08a66f6b8855ce93743a0f4587667301fa8f9 (commit)
from b2e1c562728699642e98c528bed175929cceff4d (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=b7c08a66f6b8855ce93743a0f4587667301fa8f9
commit b7c08a66f6b8855ce93743a0f4587667301fa8f9
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri Aug 17 09:49:37 2012 -0700
Add a cast to silence a warning.
diff --git a/ChangeLog b/ChangeLog
index 9d8543c..672409e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-08-17 Roland McGrath <roland@hack.frob.com>
+ * elf/dl-close.c (_dl_close_worker): Add a cast and a comment to the
+ last change.
+
* libio/genops.c (_IO_unbuffer_write): Conditionalize locking code on
[_IO_MTSAFE_IO].
* libio/libioP.h [!_IO_MTSAFE_IO && !NOT_IN_libc]
diff --git a/elf/dl-close.c b/elf/dl-close.c
index 216bd81..e6ff7e7 100644
--- a/elf/dl-close.c
+++ b/elf/dl-close.c
@@ -486,7 +486,7 @@ _dl_close_worker (struct link_map *map)
/* Speed up removing most recently added objects. */
j = cnt;
else
- for (i = 0; i < cnt; i++)
+ for (i = 0; i < cnt; i++)
if (ns_msl->r_list[i]->l_removed == 0)
{
if (i != j)
@@ -641,7 +641,11 @@ _dl_close_worker (struct link_map *map)
#ifdef SHARED
assert (nsid != LM_ID_BASE);
#endif
- r->r_map = ns->_ns_loaded = imap->l_next;
+ ns->_ns_loaded = imap->l_next;
+
+ /* Update the pointer to the head of the list
+ we leave for debuggers to examine. */
+ r->r_map = (void *) ns->_ns_loaded;
}
--ns->_ns_nloaded;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 3 +++
elf/dl-close.c | 8 ++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources