diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-01-25 11:42:24 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-01-25 11:42:24 +0000 |
| commit | 1f25bddd621e1cad0d655ea9cedf3a718d6fdabb (patch) | |
| tree | fb2d0ec8f16db08895d18b889d87c87e4d3f545c /sysdeps/i386 | |
| parent | cb7c7a9fb44e86de4ecbd28c83a8b84037d444f9 (diff) | |
| download | glibc-1f25bddd621e1cad0d655ea9cedf3a718d6fdabb.tar.gz glibc-1f25bddd621e1cad0d655ea9cedf3a718d6fdabb.tar.xz glibc-1f25bddd621e1cad0d655ea9cedf3a718d6fdabb.zip | |
Update.
2005-01-25 Ulrich Drepper <drepper@redhat.com> * sysdeps/i386/dl-machine.h (elf_machine_rel): Remove code using RESOLVE. * sysdeps/x86_64/dl-machine.h (elf_machine_rela): Remove code using RESOLVE. * elf/rtld.c (_dl_start): Remove RESOLVE definition.
Diffstat (limited to 'sysdeps/i386')
| -rw-r--r-- | sysdeps/i386/dl-machine.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index fa65473573..78c083f6ab 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -344,17 +344,8 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, #endif /* !RTLD_BOOTSTRAP and have no -z combreloc */ { const Elf32_Sym *const refsym = sym; -#ifndef RTLD_BOOTSTRAP struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type); - Elf32_Addr value = sym == NULL ? 0 : sym_map->l_addr + sym->st_value; -#else - Elf32_Addr value = RESOLVE (&sym, version, r_type); - -# ifndef RTLD_BOOTSTRAP - if (sym != NULL) -# endif - value += sym->st_value; -#endif /* use TLS and !RTLD_BOOTSTRAP */ + Elf32_Addr value = sym_map == NULL ? 0 : sym_map->l_addr + sym->st_value; switch (r_type) { |