diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-08-16 06:30:08 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-08-16 06:30:08 +0000 |
| commit | 1ebba33ece5a998d3d79fa14adca3ae7985cbff5 (patch) | |
| tree | c5e37a6ed7614a055548537d58d8ab58b94b3f9f /elf/rtld.c | |
| parent | 74e61bb4e5fe0691d497f04cf71fbd4717da6db2 (diff) | |
| download | glibc-1ebba33ece5a998d3d79fa14adca3ae7985cbff5.tar.gz | |
Update.
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>.
Diffstat (limited to 'elf/rtld.c')
| -rw-r--r-- | elf/rtld.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/elf/rtld.c b/elf/rtld.c index 1d144c536e..9a444fcfd9 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -101,6 +101,8 @@ int _dl_bind_not; /* This is a pointer to the map for the main object and through it to all loaded objects. */ struct link_map *_dl_loaded; +/* Number of object in the _dl_loaded list. */ +unsigned int _dl_nloaded; /* Pointer to the l_searchlist element of the link map of the main object. */ struct r_scope_elem *_dl_main_searchlist; /* Copy of the content of `_dl_main_searchlist'. */ @@ -670,6 +672,7 @@ of this helper program; chances are you did not intend to run this program.\n\ _dl_rtld_map.l_type = lt_library; _dl_loaded->l_next = &_dl_rtld_map; _dl_rtld_map.l_prev = _dl_loaded; + ++_dl_nloaded; /* We have two ways to specify objects to preload: via environment variable and via the file /etc/ld.so.preload. The latter can also |