From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 11 May 2012 02:24:54 +0000 (-0700)
Subject: Don't handle R_X86_64_RELATIVE64 in ld.so
X-Git-Tag: glibc-2.16-tps~381
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a10fb9eecc1f890cc247ae0dd4bdd4c20e7343e;p=thirdparty%2Fglibc.git

Don't handle R_X86_64_RELATIVE64 in ld.so
---

diff --git a/ChangeLog b/ChangeLog
index 2f0880257c7..b7a5055da35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86_64/dl-machine.h (elf_machine_rela_relative): Handle
+	R_X86_64_RELATIVE64 only if RTLD_BOOTSTRAP isn't defined.
+
 2012-05-10  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* elf/elf.h (R_X86_64_RELATIVE64): New.
diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h
index e3bab5f22d0..32814b14f74 100644
--- a/sysdeps/x86_64/dl-machine.h
+++ b/sysdeps/x86_64/dl-machine.h
@@ -487,11 +487,13 @@ elf_machine_rela_relative (ElfW(Addr) l_addr, const ElfW(Rela) *reloc,
 			   void *const reloc_addr_arg)
 {
   ElfW(Addr) *const reloc_addr = reloc_addr_arg;
+#if !defined RTLD_BOOTSTRAP
   /* l_addr + r_addend may be > 0xffffffff and R_X86_64_RELATIVE64
      relocation updates the whole 64-bit entry.  */
   if (__builtin_expect (ELFW(R_TYPE) (reloc->r_info) == R_X86_64_RELATIVE64, 0))
     *(Elf64_Addr *) reloc_addr = (Elf64_Addr) l_addr + reloc->r_addend;
   else
+#endif
     {
       assert (ELFW(R_TYPE) (reloc->r_info) == R_X86_64_RELATIVE);
       *reloc_addr = l_addr + reloc->r_addend;