diff options
Diffstat (limited to 'sysdeps/i386')
| -rw-r--r-- | sysdeps/i386/dl-machine.h | 20 | ||||
| -rw-r--r-- | sysdeps/i386/dl-runtime.c | 6 |
2 files changed, 23 insertions, 3 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index f387a887c1..5ef56a7088 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 8e218e2a62..aac5f993ea 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); |