diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-01-27 21:30:46 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-01-27 21:30:46 +0000 |
| commit | e8ed861df7f58c9663e9b63cc2f2ee5346a18f3b (patch) | |
| tree | adfe079858f8bd8ffcb8c96a5adc9c5136b8f5be /elf/dl-iteratephdr.c | |
| parent | bed12f78fab86b2349cab6e7f4c0e46bde5e9711 (diff) | |
Update.
2004-01-26 David Mosberger <davidm@hpl.hp.com>
* elf/link.h (struct dl_phdr_info): Fix typo in comment.
* elf/rtld.c (dl_main): After incrementing dl_nloaded, also
increment dl_load_adds.
* elf/dl-iteratephdr.c (__dl_iterate_phdr): Replace GL(dl_load_subs)
with equivalent GL(dl_load_adds - GL(dl_nloaded).
(dl_iterate_phdr): Likewise.
* elf/dl-close.c (_dl_close): Delete increment of GL(dl_load_subs).
* elf/dl-support.c: Remove global variable _dl_load_subs.
* sysdeps/generic/ldsodefs.h (struct rtld_global): Remove
_dl_load_subs member.
2004-01-27 Jakub Jelinek <jakub@redhat.com>
* elf/rtld.c (_dl_start_final): Don't set l_relro_* here.
(_dl_start): And neither here.
(dl_main): Set GL(dl_loaded)->l_relro_* and
GL(dl_rtld_map)->l_relro_*.
Diffstat (limited to 'elf/dl-iteratephdr.c')
| -rw-r--r-- | elf/dl-iteratephdr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/elf/dl-iteratephdr.c b/elf/dl-iteratephdr.c index a6df7f21e8..d615cd6312 100644 --- a/elf/dl-iteratephdr.c +++ b/elf/dl-iteratephdr.c @@ -49,7 +49,7 @@ __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, info.dlpi_phdr = l->l_phdr; info.dlpi_phnum = l->l_phnum; info.dlpi_adds = GL(dl_load_adds); - info.dlpi_subs = GL(dl_load_subs); + info.dlpi_subs = GL(dl_load_adds) - GL(dl_nloaded); ret = callback (&info, sizeof (struct dl_phdr_info), data); if (ret) break; @@ -87,7 +87,7 @@ dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info, info.dlpi_phdr = _dl_phdr; info.dlpi_phnum = _dl_phnum; info.dlpi_adds = GL(dl_load_adds); - info.dlpi_subs = GL(dl_load_subs); + info.dlpi_subs = GL(dl_load_adds) - GL(dl_nloaded); ret = (*callback) (&info, sizeof (struct dl_phdr_info), data); if (ret) return ret; |