This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.14-118-gc883572


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  c8835729b8a4a862e70213e00b0751e1b19d3f9d (commit)
      from  8991e135f7cc0f9e9c11860e570516f5d5b581dc (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=c8835729b8a4a862e70213e00b0751e1b19d3f9d

commit c8835729b8a4a862e70213e00b0751e1b19d3f9d
Author: Marek Polacek <mpolacek@redhat.com>
Date:   Tue Jul 19 20:27:43 2011 -0400

    _dl_sort_fini: Remove unused argument

diff --git a/ChangeLog b/ChangeLog
index 04c72c1..7ec4bb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-14  Marek Polacek  <mpolacek@redhat.com>
+
+	* elf/dl-fini.c (_dl_sort_fini): Remove unused link_map *l argument,
+	* elf/dl-fini.c (_dl_fini): Adjust caller.
+	* elf/dl-close.c (_dl_close_worker): Likewise.
+	* sysdeps/generic/ldsodefs.h: Adjust declaration.
+
 2011-07-15  Marek Polacek  <mpolacek@redhat.com>
 
 	* elf/cache.c (load_aux_cache): Remove unnecessary condition of
diff --git a/elf/dl-close.c b/elf/dl-close.c
index 229e288..4cf98c3 100644
--- a/elf/dl-close.c
+++ b/elf/dl-close.c
@@ -231,7 +231,7 @@ _dl_close_worker (struct link_map *map)
     }
 
   /* Sort the entries.  */
-  _dl_sort_fini (ns->_ns_loaded, maps, nloaded, used, nsid);
+  _dl_sort_fini (maps, nloaded, used, nsid);
 
   /* Call all termination functions at once.  */
 #ifdef SHARED
diff --git a/elf/dl-fini.c b/elf/dl-fini.c
index 269bcec..0a138e9 100644
--- a/elf/dl-fini.c
+++ b/elf/dl-fini.c
@@ -30,8 +30,7 @@ typedef void (*fini_t) (void);
 
 void
 internal_function
-_dl_sort_fini (struct link_map *l, struct link_map **maps, size_t nmaps,
-	       char *used, Lmid_t ns)
+_dl_sort_fini (struct link_map **maps, size_t nmaps, char *used, Lmid_t ns)
 {
   /* A list of one element need not be sorted.  */
   if (nmaps == 1)
@@ -199,7 +198,7 @@ _dl_fini (void)
       nmaps = i;
 
       /* Now we have to do the sorting.  */
-      _dl_sort_fini (GL(dl_ns)[ns]._ns_loaded, maps, nmaps, NULL, ns);
+      _dl_sort_fini (maps, nmaps, NULL, ns);
 
       /* We do not rely on the linked list of loaded object anymore from
 	 this point on.  We have our own list here (maps).  The various
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index d040590..26c74f6 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -1,5 +1,5 @@
 /* Run-time dynamic linker data structures for loaded ELF shared objects.
-   Copyright (C) 1995-2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1995-2009, 2010, 2011 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
@@ -947,8 +947,8 @@ extern void _dl_init (struct link_map *main_map, int argc, char **argv,
 extern void _dl_fini (void) internal_function;
 
 /* Sort array MAPS according to dependencies of the contained objects.  */
-extern void _dl_sort_fini (struct link_map *l, struct link_map **maps,
-			   size_t nmaps, char *used, Lmid_t ns)
+extern void _dl_sort_fini (struct link_map **maps, size_t nmaps, char *used,
+			   Lmid_t ns)
      internal_function;
 
 /* The dynamic linker calls this function before and having changing

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |    7 +++++++
 elf/dl-close.c             |    2 +-
 elf/dl-fini.c              |    5 ++---
 sysdeps/generic/ldsodefs.h |    6 +++---
 4 files changed, 13 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]