diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | elf/rtld.c | 2 | ||||
| -rw-r--r-- | sysdeps/i386/dl-machine.h | 11 | ||||
| -rw-r--r-- | sysdeps/x86_64/dl-machine.h | 9 |
4 files changed, 9 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog index 372f0304d0..11c9a18668 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +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. + 2005-01-25 Alan Modra <amodra@bigpond.net.au> * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela): Test diff --git a/elf/rtld.c b/elf/rtld.c index f1246899f8..f2118a958c 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -345,8 +345,6 @@ _dl_start (void *arg) #define RTLD_BOOTSTRAP #define RESOLVE_MAP(sym, version, flags) \ ((*(sym))->st_shndx == SHN_UNDEF ? 0 : &bootstrap_map) -#define RESOLVE(sym, version, flags) \ - ((*(sym))->st_shndx == SHN_UNDEF ? 0 : bootstrap_map.l_addr) #include "dynamic-link.h" if (HP_TIMING_INLINE && HP_TIMING_AVAIL) 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) { diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index 0ac109ebf8..bb0c77fd0b 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h @@ -282,18 +282,9 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, #ifndef RTLD_BOOTSTRAP const Elf64_Sym *const refsym = sym; #endif -#ifndef RTLD_BOOTSTRAP struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type); Elf64_Addr value = (sym == NULL ? 0 : (Elf64_Addr) sym_map->l_addr + sym->st_value); -#else - Elf64_Addr value = RESOLVE (&sym, version, r_type); - -# ifndef RTLD_BOOTSTRAP - if (sym != NULL) -# endif - value += sym->st_value; -#endif #if defined RTLD_BOOTSTRAP && !USE___THREAD assert (r_type == R_X86_64_GLOB_DAT || r_type == R_X86_64_JUMP_SLOT); |