aboutsummaryrefslogtreecommitdiff
path: root/elf/dl-fini.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-04-03 03:51:04 +0000
committerUlrich Drepper <drepper@redhat.com>2000-04-03 03:51:04 +0000
commitcf197e41e7e468697e5a8d7b3f4c4930dd557990 (patch)
treee1872dc669824d35aa47cc9964aa6fe9ea159f7b /elf/dl-fini.c
parentec79422d9e17bd5388a3fc34fcd2ef434e0cac26 (diff)
downloadglibc-cf197e41e7e468697e5a8d7b3f4c4930dd557990.tar
glibc-cf197e41e7e468697e5a8d7b3f4c4930dd557990.tar.gz
glibc-cf197e41e7e468697e5a8d7b3f4c4930dd557990.tar.bz2
glibc-cf197e41e7e468697e5a8d7b3f4c4930dd557990.zip
Update.
2000-04-02 Ulrich Drepper <drepper@redhat.com> * elf/dl-fini.c (_dl_fini): Increment j counter after swapping in element at this position. * elf/Versions [ld.so] (GLIBC_2.2): Export _dl_load_lock. * elf/link.h (struct link_map): Add l_reldepsmax, l_reldepsact, and l_reldeps elements. * elf/dl-lookup.c (add_dependency): New function. (_dl_lookup_symbol): Use it whenever symbol was found in a global, dynamically loaded object. (_dl_lookup_symbol_skip): Likewise. (_dl_lookup_versioned_symbol): Likewise. (_dl_lookup_versioned_symbol_skip): Likewise. * elf/dl-open.c: Don't define _dl_load_lock here... * elf/rtld.c: ...but here... * elf/dl-support.c: ...and here. * elf/dl-close.c (_dl_close): Close also dependent objects introduce through relocation. * elf/dl-fini.c (_dl_fini): Also take dependencies introduced through relocations. * dlfcn/Makefile (glrefmain.out): Test is not expected to fail anymore. * dlfcn/glrefmain.c: Add one more debug message. * Makeconfig (preprocess-versions): Don't add $(CPPFLAGS) to compiler command line. * Makerules (sysd-versions): Use ( ) instead of { }. * elf/dl-load.c: Use __builtin_expect to signal that compiler should optimize for the non-debugging case. * elf/dl-lookup.c: Likewise. * sysdeps/generic/libc-start.c: Likewise.
Diffstat (limited to 'elf/dl-fini.c')
-rw-r--r--elf/dl-fini.c27
1 files changed, 25 insertions, 2 deletions
diff --git a/elf/dl-fini.c b/elf/dl-fini.c
index 61dedd5168..fd22bc0a4d 100644
--- a/elf/dl-fini.c
+++ b/elf/dl-fini.c
@@ -87,18 +87,41 @@ _dl_fini (void)
memmove (&maps[j] + 1,
&maps[j],
(k - j) * sizeof (struct link_map *));
- maps[j] = here;
+ maps[j++] = here;
break;
}
else
++runp;
}
+
+ if (__builtin_expect (maps[k]->l_reldeps != NULL, 0))
+ {
+ unsigned int m = maps[k]->l_reldepsact;
+ struct link_map **relmaps = maps[k]->l_reldeps;
+
+ while (m-- > 0)
+ {
+ if (relmaps[m] == l)
+ {
+ struct link_map *here = maps[k];
+
+ /* Move it now. */
+ memmove (&maps[j] + 1,
+ &maps[j],
+ (k - j) * sizeof (struct link_map *));
+ maps[j] = here;
+
+ break;
+ }
+
+ }
+ }
}
}
/* `maps' now contains the objects in the right order. Now call the
- destructors. We have the process this array from the front. */
+ destructors. We have to process this array from the front. */
for (i = 0; i < nloaded; ++i)
{
l = maps[i];