[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r15125 - in /fsf/trunk/libc: ChangeLog elf/rtld.c
- To: commits@xxxxxxxxxx
- Subject: [commits] r15125 - in /fsf/trunk/libc: ChangeLog elf/rtld.c
- From: eglibc@xxxxxxxxxx
- Date: Wed, 31 Aug 2011 07:02:31 -0000
Author: eglibc
Date: Wed Aug 31 00:02:29 2011
New Revision: 15125
Log:
Import glibc-mainline for 2011-08-31
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/elf/rtld.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Aug 31 00:02:29 2011
@@ -1,3 +1,7 @@
+2011-08-30 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ * elf/rtld.c (dl_main): Relocate objects in dependency order.
+
2011-08-29 Jiri Olsa <jolsa@xxxxxxxxxx>
* sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Fix cfi
Modified: fsf/trunk/libc/elf/rtld.c
==============================================================================
--- fsf/trunk/libc/elf/rtld.c (original)
+++ fsf/trunk/libc/elf/rtld.c Wed Aug 31 00:02:29 2011
@@ -2255,13 +2255,12 @@
/* If we are profiling we also must do lazy reloaction. */
GLRO(dl_lazy) |= consider_profiling;
- struct link_map *l = main_map;
- while (l->l_next)
- l = l->l_next;
-
HP_TIMING_NOW (start);
- do
+ unsigned i = main_map->l_searchlist.r_nlist;
+ while (i-- > 0)
{
+ struct link_map *l = main_map->l_initfini[i];
+
/* While we are at it, help the memory handling a bit. We have to
mark some data structures as allocated with the fake malloc()
implementation in ld.so. */
@@ -2280,10 +2279,7 @@
/* Add object to slot information data if necessasy. */
if (l->l_tls_blocksize != 0 && tls_init_tp_called)
_dl_add_to_slotinfo (l);
-
- l = l->l_prev;
}
- while (l);
HP_TIMING_NOW (stop);
HP_TIMING_DIFF (relocate_time, start, stop);