aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/i386
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-06-08 09:00:23 +0000
committerRoland McGrath <roland@gnu.org>1995-06-08 09:00:23 +0000
commit5bf62f2d3a8af353fac661b224fc1604d4de51ea (patch)
treed71b6ad14564a99917f2d4133a8685df94d24c61 /sysdeps/i386
parent75598ca67e469359c3c0b6b8704dae17bf2b9d89 (diff)
downloadglibc-5bf62f2d3a8af353fac661b224fc1604d4de51ea.zip
glibc-5bf62f2d3a8af353fac661b224fc1604d4de51ea.tar.gz
glibc-5bf62f2d3a8af353fac661b224fc1604d4de51ea.tar.bz2
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 'sysdeps/i386')
-rw-r--r--sysdeps/i386/dl-machine.h20
-rw-r--r--sysdeps/i386/dl-runtime.c6
2 files changed, 23 insertions, 3 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index f387a88..5ef56a7 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -88,10 +88,22 @@ elf_machine_rel (struct link_map *map,
*reloc_addr = sym_value;
break;
case R_386_32:
+ if (map->l_type == lt_interpreter)
+ {
+ /* Undo the relocation done here during bootstrapping. Now we will
+ relocate it anew, possibly using a binding found in the user
+ program or a loaded library rather than the dynamic linker's
+ built-in definitions used while loading those libraries. */
+ const Elf32_Sym *const dlsymtab
+ = (void *) (map->l_addr + map->l_info[DT_SYMTAB]->d_un.d_ptr);
+ *reloc_addr -= (map->l_addr +
+ dlsymtab[ELF32_R_SYM (reloc->r_info)].st_value);
+ }
*reloc_addr += sym_value;
break;
case R_386_RELATIVE:
- *reloc_addr += map->l_addr;
+ if (map->l_type != lt_interpreter) /* Already done in dynamic linker. */
+ *reloc_addr += map->l_addr;
break;
case R_386_PC32:
*reloc_addr = sym_value - (Elf32_Addr) reloc_addr;
@@ -142,6 +154,12 @@ elf_machine_runtime_setup (struct link_map *l)
}
+/* Mask identifying addresses reserved for the user program,
+ where the dynamic linker should not map anything. */
+#define ELF_MACHINE_USER_ADDRESS_MASK 0xf8000000UL
+
+
+
/* Initial entry point code for the dynamic linker.
The C function `_dl_start' is the real entry point;
its return value is the user program's entry point. */
diff --git a/sysdeps/i386/dl-runtime.c b/sysdeps/i386/dl-runtime.c
index 8e218e2..aac5f99 100644
--- a/sysdeps/i386/dl-runtime.c
+++ b/sysdeps/i386/dl-runtime.c
@@ -54,8 +54,9 @@ _dl_runtime_resolve (Elf32_Word reloc_offset)
real_next = l->l_next;
if (l->l_info[DT_SYMBOLIC])
{
- l->l_prev->l_next = real_next;
l->l_next = _dl_loaded;
+ if (l->l_prev)
+ l->l_prev->l_next = real_next;
scope = l;
}
else
@@ -67,7 +68,8 @@ _dl_runtime_resolve (Elf32_Word reloc_offset)
/* Restore list frobnication done above for DT_SYMBOLIC. */
l->l_next = real_next;
- l->l_prev->l_next = l;
+ if (l->l_prev)
+ l->l_prev->l_next = l;
/* Apply the relocation with that value. */
elf_machine_rel (l, reloc, loadbase, definer);