diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-08-28 22:54:57 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-08-28 22:54:57 +0000 |
| commit | b0cf070b98234cf46009b9be18d379ac3ed7215a (patch) | |
| tree | c12209b28a59382f20ca802520f274fa419f9e8f /sysdeps/i386 | |
| parent | 75311719d35dc0c132e46f883beaeb5b3d9eb75a (diff) | |
| download | glibc-b0cf070b98234cf46009b9be18d379ac3ed7215a.tar.gz glibc-b0cf070b98234cf46009b9be18d379ac3ed7215a.tar.xz glibc-b0cf070b98234cf46009b9be18d379ac3ed7215a.zip | |
Update.
1998-08-28 22:49 Ulrich Drepper <drepper@cygnus.com> * elf/do-rel.h (elf_dynamic_do_rel): Call elf_machine_lazy_rel with load address, not map address. * sysdeps/alpha/dl-machine.h (elf_machine_lazy_rel): Change first parameter and use this value. * sysdeps/arm/dl-machine.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/m68k/dl-machine.h: Likewise. * sysdeps/mips/dl-machine.h (elf_machine_lazy_rel): Change first parameter. * sysdeps/powerpc/dl-machine.h: Likewise * sysdeps/sparc/sparc32/dl-machine.h: Likewise * sysdeps/sparc/sparc64/dl-machine.h: Likewise
Diffstat (limited to 'sysdeps/i386')
| -rw-r--r-- | sysdeps/i386/dl-machine.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index fdc9e48e0e..a6d8974ab3 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -384,18 +384,12 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, } static inline void -elf_machine_lazy_rel (struct link_map *map, const Elf32_Rel *reloc) +elf_machine_lazy_rel (Elf32_Addr l_addr, const Elf32_Rel *reloc) { - Elf32_Addr *const reloc_addr = (void *) (map->l_addr + reloc->r_offset); - switch (ELF32_R_TYPE (reloc->r_info)) - { - case R_386_JMP_SLOT: - *reloc_addr += map->l_addr; - break; - default: - assert (! "unexpected PLT reloc type"); - break; - } + Elf32_Addr *const reloc_addr = (void *) (l_addr + reloc->r_offset); + /* Check for unexpected PLT reloc type. */ + assert (ELF32_R_TYPE (reloc->r_info) == R_386_JMP_SLOT); + *reloc_addr += l_addr; } #endif /* RESOLVE */ |