lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Update.

Browse Source 
2000-08-15  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/generic/ldsodefs.h: Declare _nl_nloaded.
	* elf/Versions [ld] (GLIBC_2.2): Add _nl_nloaded.
	* elf/dl-support.c: Define _nl_nloaded.
	* elf/rtld.c: Likewise.  Increment _nl_nloaded for rtld itself.
	* elf/dl-object.c (_dl_new_object): Increment _nl_nloaded after adding
	object to global list.
	* elf/dl-close.c (_dl_close): Decrement _nl_nloaded after removing
	from _dl_loaded list.
	* elf/dl-load.c (_dl_map_object_from_fd): Likewise.
	* elf/dl-fini.c (_dl_fini): Use _nl_nloaded instead of computing the
	number here.

	* sysdeps/i386/fpu/fedisblxcpt.c (fedisableexcept): Mask, not
	unmask, exceptions.
	* sysdeps/i386/fpu/feenablxcpt.c (feenableexcept): Unmask, not mask,
	exceptions.
	Reported by Harvey J. Stein <hjstein@bfr.co.il>.
This commit is contained in:
Ulrich Drepper
2000-08-16 06:30:08 +00:00
parent 74e61bb4e5
commit 1ebba33ece
8 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
elf/dl-fini.c
View File

@ -42,29 +42,28 @@ _dl_fini (void)
using `dlopen' there are possibly several other modules with its
dependencies to be taken into account. Therefore we have to start
determining the order of the modules once again from the beginning. */
unsigned int nloaded = 0;
unsigned int i;
struct link_map *l;
struct link_map **maps;
/* First count how many objects are there. */
for (l = _dl_loaded; l != NULL; l = l->l_next)
++nloaded;
/* XXX Could it be (in static binaries) that there is no object loaded? */
assert (nloaded > 0);
assert (_dl_nloaded > 0);
/* Now we can allocate an array to hold all the pointers and copy
the pointers in. */
maps = (struct link_map **) alloca (nloaded * sizeof (struct link_map *));
for (l = _dl_loaded, nloaded = 0; l != NULL; l = l->l_next)
maps = (struct link_map **) alloca (_dl_nloaded
* sizeof (struct link_map *));
for (l = _dl_loaded, i = 0; l != NULL; l = l->l_next)
{
maps[nloaded++] = l;
assert (i < _dl_nloaded);
maps[i++] = l;
/* Bump l_opencount of all objects so that they are not dlclose()ed
from underneath us. */
++l->l_opencount;
}
assert (i == _dl_nloaded);
/* Now we have to do the sorting. */
for (l = _dl_loaded->l_next; l != NULL; l = l->l_next)
@ -78,7 +77,7 @@ _dl_fini (void)
/* Find all object for which the current one is a dependency and
move the found object (if necessary) in front. */
for (k = j + 1; k < nloaded; ++k)
for (k = j + 1; k < _dl_nloaded; ++k)
{
struct link_map **runp;
@ -129,7 +128,7 @@ _dl_fini (void)
/* `maps' now contains the objects in the right order. Now call the
destructors. We have to process this array from the front. */
for (i = 0; i < nloaded; ++i)
for (i = 0; i < _dl_nloaded; ++i)
{
l = maps[i];