diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-03-07 08:39:57 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-03-07 08:39:57 +0000 |
| commit | c31e278f8636fbe11ad933d9089e98361665a978 (patch) | |
| tree | 5101942451f1417f14d3f4b0702ee101464a50c4 /elf/dl-close.c | |
| parent | 021723ab784461de9eac57398ea16a47d4ab9366 (diff) | |
| download | glibc-c31e278f8636fbe11ad933d9089e98361665a978.zip glibc-c31e278f8636fbe11ad933d9089e98361665a978.tar.gz glibc-c31e278f8636fbe11ad933d9089e98361665a978.tar.bz2 | |
Update.
2004-03-07 Ulrich Drepper <drepper@redhat.com>
* sysdeps/generic/ldsodefs.h: Move _dl_initial_searclist,
_dl_hp_timing_overhead, _dl_init_all_dirs, and the content of
dl-procinfo.c from _rtld_global to _rtld_global_ro.
* elf/rtld.c: Adjust initializer for _rtld_global_ro.
* elf/dl-close.c: Use GLRO instead of GL where appropriate.
* elf/dl-libc.c: Likewise.
* elf/dl-load.c: Likewise.
* sysdeps/i386/dl-procinfo.h: Likewise.
* sysdeps/i386/i686/hp-timing.h: Likewise.
* sysdeps/ia64/hp-timing.h: Likewise.
* sysdeps/sparc/sparc32/sparcv9/hp-timing.h: Likewise.
* sysdeps/sparc/sparc64/hp-timing.h: Likewise.
* sysdeps/unix/sysv/linux/arm/dl-procinfo.h: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-procinfo.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.h: Likewise.
Diffstat (limited to 'elf/dl-close.c')
| -rw-r--r-- | elf/dl-close.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/elf/dl-close.c b/elf/dl-close.c index 62c257c..500b9d5 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -597,14 +597,15 @@ free_slotinfo (struct dtv_slotinfo_list **elemp) libc_freeres_fn (free_mem) { if (__builtin_expect (GL(dl_global_scope_alloc), 0) != 0 - && GL(dl_main_searchlist)->r_nlist == GL(dl_initial_searchlist).r_nlist) + && (GL(dl_main_searchlist)->r_nlist + == GLRO(dl_initial_searchlist).r_nlist)) { /* All object dynamically loaded by the program are unloaded. Free the memory allocated for the global scope variable. */ struct link_map **old = GL(dl_main_searchlist)->r_list; /* Put the old map in. */ - GL(dl_main_searchlist)->r_list = GL(dl_initial_searchlist).r_list; + GL(dl_main_searchlist)->r_list = GLRO(dl_initial_searchlist).r_list; /* Signal that the original map is used. */ GL(dl_global_scope_alloc) = 0; |