about summary refs log tree commit diff
path: root/sysdeps/alpha
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-10-02 20:24:21 +0000
committerUlrich Drepper <drepper@redhat.com>2002-10-02 20:24:21 +0000
commitb5bf92e22a169a5831a4c0f1c23be752edff5878 (patch)
treef675263b663f556b4254269897616482f77bd90f /sysdeps/alpha
parentdc312cba4b6e6f90571773783f048e840f216c65 (diff)
downloadglibc-b5bf92e22a169a5831a4c0f1c23be752edff5878.tar.gz
glibc-b5bf92e22a169a5831a4c0f1c23be752edff5878.tar.xz
glibc-b5bf92e22a169a5831a4c0f1c23be752edff5878.zip
Temporarily enable R_*_NONE relocs in ld.so.
Diffstat (limited to 'sysdeps/alpha')
-rw-r--r--sysdeps/alpha/dl-machine.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/sysdeps/alpha/dl-machine.h b/sysdeps/alpha/dl-machine.h
index 2b15e33518..05d988274b 100644
--- a/sysdeps/alpha/dl-machine.h
+++ b/sysdeps/alpha/dl-machine.h
@@ -522,7 +522,7 @@ elf_machine_rela (struct link_map *map,
       if (map != &GL(dl_rtld_map))
 # endif
 	{
-	  /* XXX Make some timings.  Maybe it's preverable to test for
+	  /* XXX Make some timings.  Maybe it's preferable to test for
 	     unaligned access and only do it the complex way if necessary.  */
 	  void *reloc_addr_1 = reloc_addr;
 	  Elf64_Addr reloc_addr_val;
@@ -535,12 +535,11 @@ elf_machine_rela (struct link_map *map,
 	  memcpy (reloc_addr_1, &reloc_addr_val, 8);
 	}
     }
-# ifndef RTLD_BOOTSTRAP
-  else if (__builtin_expect (r_type == R_ALPHA_NONE, 0))
-    return;
-# endif
   else
 #endif
+    if (__builtin_expect (r_type == R_ALPHA_NONE, 0))
+      return;
+  else
     {
       Elf64_Addr loadbase, sym_value;