diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-09-06 09:16:53 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-09-06 09:16:53 +0000 |
| commit | be93561004695198611aa8707f10250f780988b2 (patch) | |
| tree | 7b9a502d849b761d966114b855a1fa9de4022e90 /sysdeps | |
| parent | 9eb71e60ef889158238c3066c75b65336d846684 (diff) | |
| download | glibc-be93561004695198611aa8707f10250f780988b2.zip glibc-be93561004695198611aa8707f10250f780988b2.tar.gz glibc-be93561004695198611aa8707f10250f780988b2.tar.bz2 | |
Update.
1998-09-06 09:00 Ulrich Drepper <drepper@cygnus.com>
* version.h (VERSION): Bump to 2.0.96.
Rewrite runtime linker to be truly thread-safe. There is now no
global variable specifying the scope. We create all needed
scopes at the time the link maps are created.
* elf/Versions [GLIBC_2.1]: Add _dl_loaded and _dl_main_searchlist.
* elf/link.h: Add struct r_scope_elem and use this for l_searchlist,
l_symbolic_searchlist, l_scope, and l_local_scope elements in
struct link_map.
* elf/dl-close.c: Rewritten accordingly.
* elf/dl-deps.c: Likewise.
* elf/dl-error.c: Likewise.
* elf/dl-init.c: Likewise.
* elf/dl-load.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-object.c: Likewise.
* elf/dl-open.c: Likewise.
* elf/dl-reloc.c: Likewise.
* elf/dl-runtime.c: Likewise.
* elf/dl-support.c: Likewise.
* elf/dl-symbol.c: Likewise.
* elf/dl-version.c: Likewise.
* elf/dlfcn.h: Likewise.
* elf/dlsym.c: Likewise.
* elf/dlvsym.c: Likewise.
* elf/ldsodefs.h: Likewise.
* elf/rtld.c: Likewise.
* iconv/gconv_dl.c: Likewise.
* nss/nsswitch.c: Likewise.
* sysdeps/i386/dl-machine.h: Likewise.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h: Likewise.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/i386/dl-machine.h | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/dl-librecon.h | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index a6d8974..87d9248 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -227,9 +227,10 @@ _dl_start_user:\n\ leal (%esp,%eax,4), %esp\n\ # Push back the modified argument count.\n\ pushl %ecx\n\ - # Push _dl_default_scope[2] as argument in _dl_init_next call below.\n\ - movl _dl_default_scope@GOT(%ebx), %eax\n\ - movl 8(%eax), %esi\n\ + # Push the searchlist of the main object as argument in\n\ + # _dl_init_next call below.\n\ + movl _dl_main_searchlist@GOT(%ebx), %eax\n\ + movl (%eax), %esi\n\ 0: movl %esi,%eax\n\ # Call _dl_init_next to return the address of an initializer\n\ # function to run.\n\ diff --git a/sysdeps/unix/sysv/linux/i386/dl-librecon.h b/sysdeps/unix/sysv/linux/i386/dl-librecon.h index b9ef9af..4ae2e87 100644 --- a/sysdeps/unix/sysv/linux/i386/dl-librecon.h +++ b/sysdeps/unix/sysv/linux/i386/dl-librecon.h @@ -27,14 +27,16 @@ /* We have to find out whether the binary is linked against \ libc 5 or glibc. We do this by looking at all the DT_NEEDED \ entries. If one is libc.so.5 this is a libc 5 linked binary. */ \ - if (main_map->l_info[DT_NEEDED]) \ + if (_dl_loaded->l_info[DT_NEEDED]) \ { \ /* We have dependencies. */ \ - const char *strtab = ((void *) main_map->l_addr \ - + main_map->l_info[DT_STRTAB]->d_un.d_ptr); \ const ElfW(Dyn) *d; \ + const char *strtab; \ \ - for (d = main_map->l_ld; d->d_tag != DT_NULL; ++d) \ + strtab = ((void *) _dl_loaded->l_addr \ + + _dl_loaded->l_info[DT_STRTAB]->d_un.d_ptr); \ + \ + for (d = _dl_loaded->l_ld; d->d_tag != DT_NULL; ++d) \ if (d->d_tag == DT_NEEDED \ && strcmp (strtab + d->d_un.d_val, "libc.so.5") == 0) \ break; \ |