about summary refs log tree commit diff
path: root/sysdeps/sh/dl-machine.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-02-08 08:25:22 +0000
committerUlrich Drepper <drepper@redhat.com>2005-02-08 08:25:22 +0000
commit606832e6e59fc9771c1c9b2de8666bdfb0b344de (patch)
tree6485492e9feef23990d57bfd6b15a548df6ba287 /sysdeps/sh/dl-machine.h
parentdbfc1e02671b7ed137272af79751b534613a9326 (diff)
downloadglibc-606832e6e59fc9771c1c9b2de8666bdfb0b344de.tar.gz
glibc-606832e6e59fc9771c1c9b2de8666bdfb0b344de.tar.xz
glibc-606832e6e59fc9771c1c9b2de8666bdfb0b344de.zip
* sysdeps/sh/dl-machine.h (elf_machine_rela): Remove code using
	RESOLVE.

2005-02-07  Ulrich Drepper  <drepper@redhat.com>

	* elf/dl-load.c (_dl_map_object_from_fd): Makre sure registers are
	set correctly.

	* sysdeps/unix/sysv/linux/i386/sysdep.h (check_consistency): Define.
Diffstat (limited to 'sysdeps/sh/dl-machine.h')
-rw-r--r--sysdeps/sh/dl-machine.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h
index 2b21f1b08e..b66b4f0e42 100644
--- a/sysdeps/sh/dl-machine.h
+++ b/sysdeps/sh/dl-machine.h
@@ -323,15 +323,9 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
   else
     {
       const Elf32_Sym *const refsym = sym;
-#ifndef RTLD_BOOTSTRAP
       struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);
 
-      value = sym == NULL ? 0 : sym_map->l_addr + sym->st_value;
-#else
-
-      value = RESOLVE (&sym, version, r_type);
-      value += sym->st_value;
-#endif
+      value = sym_map == NULL ? 0 : sym_map->l_addr + sym->st_value;
       value += reloc->r_addend;
 
       switch (r_type)