aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/sparc/sparc64/dl-machine.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-08-30 23:09:38 +0000
committerUlrich Drepper <drepper@redhat.com>2001-08-30 23:09:38 +0000
commitee0cb67ec23814094bdc7ef973bd48f2ae7c649d (patch)
tree08a94635f325f31d0413f9c76975c98cc13cd90f /sysdeps/sparc/sparc64/dl-machine.h
parent628880cb788d64728f192a960a7f6c18e72862fc (diff)
downloadglibc-ee0cb67ec23814094bdc7ef973bd48f2ae7c649d.tar
glibc-ee0cb67ec23814094bdc7ef973bd48f2ae7c649d.tar.gz
glibc-ee0cb67ec23814094bdc7ef973bd48f2ae7c649d.tar.bz2
glibc-ee0cb67ec23814094bdc7ef973bd48f2ae7c649d.zip
Update.
2001-08-30 Jakub Jelinek <jakub@redhat.com> * sysdeps/alpha/dl-machine.h (elf_machine_rela): Don't handle R_ALPHA_RELATIVE if RTLD_BOOTSTRAP and HAVE_Z_COMBRELOC. Only check for rtld map if RTLD_BOOTSTRAP nor HAVE_Z_COMBRELOC is defined. * sysdeps/i386/dl-machine.h (elf_machine_rel): Similarly. * sysdeps/ia64/dl-machine.h (elf_machine_rel): Similarly. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rel): Similarly. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rel): Similarly.
Diffstat (limited to 'sysdeps/sparc/sparc64/dl-machine.h')
-rw-r--r--sysdeps/sparc/sparc64/dl-machine.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h
index 431e38b695..1ef11fdafb 100644
--- a/sysdeps/sparc/sparc64/dl-machine.h
+++ b/sysdeps/sparc/sparc64/dl-machine.h
@@ -199,13 +199,15 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc,
{
const unsigned long int r_type = ELF64_R_TYPE_ID (reloc->r_info);
+#if !defined RTLD_BOOTSTRAP || !defined HAVE_Z_COMBRELOC
if (__builtin_expect (r_type == R_SPARC_RELATIVE, 0))
*reloc_addr = map->l_addr + reloc->r_addend;
-#ifndef RTLD_BOOTSTRAP
+# ifndef RTLD_BOOTSTRAP
else if (r_type == R_SPARC_NONE) /* Who is Wilbur? */
return;
-#endif
+# endif
else
+#endif
{
#ifndef RTLD_BOOTSTRAP
const Elf64_Sym *const refsym = sym;