diff options
| author | Roland McGrath <roland@gnu.org> | 1995-06-08 09:00:23 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-06-08 09:00:23 +0000 |
| commit | 5bf62f2d3a8af353fac661b224fc1604d4de51ea (patch) | |
| tree | d71b6ad14564a99917f2d4133a8685df94d24c61 /elf/dl-load.c | |
| parent | 75598ca67e469359c3c0b6b8704dae17bf2b9d89 (diff) | |
Thu Jun 8 02:50:26 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* elf/rtld.c [! NDEBUG] (__assert_perror_fail): New function.
* hurd/hurdstartup.c (_hurd_startup): Fancier kludge to guess phdr
and user entry point addresses.
* elf/dl-load.c (open_path): Don't do strlen on DIRPATH if it's null.
(_dl_map_object): DT_RPATH value is relative to DT_STRTAB value.
* Makerules (install-lib.so): Don't include libc.so.
[$(build-shared)=yes] (install): Depend on the installed libc.so file.
[$(build-shared)=yes] (install-no-libc.a): Make this, rather than
install, depend on the installed $(install-lib.so) files.
[$(build-shared)=yes] (install-lib.so): Append libc.so after that rule.
* sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_start): Add kludge to
allocate high addresses to avoid random mappings appearing there.
(mmap): Comment out mask; always pass zero.
Tue Jun 6 13:34:53 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* sysdeps/i386/dl-machine.h (ELF_MACHINE_USER_ADDRESS_MASK): New macro.
* sysdeps/mach/hurd/dl-sysdep.c (mmap): Use it as mask in vm_map call.
* elf/dl-error.c (_dl_catch_error): Clear *ERRSTRING and *OBJNAME
when successful.
* sysdeps/mach/hurd/dl-sysdep.c (threadvars): New static variable.
(__hurd_threadvar_max, __hurd_threadvar_stack_offset): Define these
variables, using the `threadvars' buffer.
* elf/dl-reloc.c: Don't dereference L->l_prev when it's null.
* sysdeps/i386/dl-runtime.c: Likewise.
* elf/rtld.c (dl_main): Add missing NULL terminating argument in
_dl_sysdep_fatal call.
(__assert_fail): Likewise.
* locale/Makefile (localedef-modules): Renamed ctype to
locale-ctype so as not to conflict with the object file for
ctype/ctype.c in the build directory.
* sysdeps/i386/dl-machine.h (elf_machine_rel): If MAP->l_type is
lt_interpreter, first undo relocation done during bootstrapping.
Diffstat (limited to 'elf/dl-load.c')
| -rw-r--r-- | elf/dl-load.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index bb1ad972d4..c48286f938 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -54,7 +54,7 @@ open_path (const char *name, size_t namelen, const char *dirpath, char **realname) { - char buf[strlen (dirpath) + 1 + namelen]; + char *buf; const char *p; int fd; @@ -65,6 +65,7 @@ open_path (const char *name, size_t namelen, return -1; } + buf = alloca (strlen (dirpath) + 1 + namelen); do { dirpath = p; @@ -166,7 +167,8 @@ _dl_map_object (struct link_map *loader, const char *name, fd = -1; if (loader && loader->l_info[DT_RPATH]) trypath ((const char *) (loader->l_addr + - loader->l_info[DT_RPATH]->d_un.d_ptr)); + loader->l_info[DT_STRTAB]->d_un.d_ptr + + loader->l_info[DT_RPATH]->d_un.d_val)); if (fd == -1 && ! _dl_secure) trypath (getenv ("LD_LIBRARY_PATH")); if (fd == -1) |