1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
* elf/dl-deps.c (_dl_map_object_deps): Put l_initfini array before
	r_list array in allocated memory.
	* elf/dl-close.c (_dl_close): Optimize access to l_initfini list
	and remove use of r_list.
This commit is contained in:
Ulrich Drepper
2000-10-24 19:18:25 +00:00
parent 8edd917253
commit 2e93b4a4cd
3 changed files with 24 additions and 22 deletions

View File

@ -468,12 +468,16 @@ _dl_map_object_deps (struct link_map *map,
/* Store the search list we built in the object. It will be used for
searches in the scope of this object. */
map->l_searchlist.r_list = malloc ((2 * nlist + 1
+ (nlist == nduplist ? 0 : nduplist))
* sizeof (struct link_map *));
if (map->l_searchlist.r_list == NULL)
map->l_initfini =
(struct link_map **) malloc ((2 * nlist + 1
+ (nlist == nduplist ? 0 : nduplist))
* sizeof (struct link_map *));
if (map->l_initfini == NULL)
_dl_signal_error (ENOMEM, map->l_name,
N_("cannot allocate symbol search list"));
map->l_searchlist.r_list = &map->l_initfini[nlist + 1];
map->l_searchlist.r_nlist = nlist;
for (nlist = 0, runp = known; runp; runp = runp->unique)
@ -507,10 +511,8 @@ _dl_map_object_deps (struct link_map *map,
}
/* Now determine the order in which the initialization has to happen. */
map->l_initfini =
(struct link_map **) memcpy (map->l_searchlist.r_duplist + nduplist,
map->l_searchlist.r_list,
nlist * sizeof (struct link_map *));
memcpy (map->l_initfini, map->l_searchlist.r_list,
nlist * sizeof (struct link_map *));
/* We can skip looking for the binary itself which is at the front
of the search list. Look through the list backward so that circular
dependencies are not changing the order. */