From c4bb124a75b23d1a82cee232005dc7e8c43a4276 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 8 Sep 2001 16:27:08 +0000 Subject: Update. 2001-09-08 Ulrich Drepper * elf/dl-close.c (_dl_close): If object has no r_list (i.e., wasn't loaded directly) determine length if l_initfini list by iterating over its elements. Minor optimizations. * elf/dl-deps.c (_dl_map_object_deps): Always add own map to l_initfini for dependency objects. If object was already loaded check whether any of the dependencies is already on the relocation dependency list. If yes, remove the latter. Minor optimizations. * elf/dl-lookup.c (add_dependency): Add check for self reference of maps here. Search l_initfini list only if the object was loaded directly and not only as a dependency. (_dl_lookup_symbol): Add relocation dependency also if object is not in global scope. Remove test for self-reference here. (_dl_lookup_versioned_symbol): Likewise. * elf/dl-object (_dl_new_object): Cleanup. Initialize dont_free element of first name record. * elf/loadtest.c: Add some more test to recognize early if an object wasn't unloaded. * elf/Makefile: Add rules to build and run reldep5. * elf/reldep5.c: New file. * elf/reldepmod5.c: New file. * elf/reldepmod6.c: New file. * elf/reldep2.c: Fix typo. * elf/dl-object.c (_dl_new_object): Initialize l_scope and l_scope_max. --- elf/dl-object.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'elf/dl-object.c') diff --git a/elf/dl-object.c b/elf/dl-object.c index 9c32c08ff2..65e90d66a0 100644 --- a/elf/dl-object.c +++ b/elf/dl-object.c @@ -37,14 +37,18 @@ _dl_new_object (char *realname, const char *libname, int type, struct link_map *l; int idx; size_t libname_len = strlen (libname) + 1; - struct link_map *new = calloc (sizeof *new, 1); - struct libname_list *newname = malloc (sizeof *newname + libname_len); - if (! new || ! newname) + struct link_map *new; + struct libname_list *newname; + + new = (struct link_map *) calloc (sizeof *new, 1); + newname = (struct libname_list *) malloc (sizeof *newname + libname_len); + if (new == NULL || newname == NULL) return NULL; new->l_name = realname; - newname->name = memcpy (newname + 1, libname, libname_len); + newname->name = (char *) memcpy (newname + 1, libname, libname_len); newname->next = NULL; + newname->dont_free = 0; new->l_libname = newname; new->l_type = type; new->l_loader = loader; -- cgit v1.2.3