[lld] r249353 - Include existing addend when computing R_X86_64_RELATIVE.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Mon Oct  5 16:09:37 2015
New Revision: 249353

URL: http://llvm.org/viewvc/llvm-project?rev=249353&view=rev
Log:
Include existing addend when computing R_X86_64_RELATIVE.

Modified:
    lld/trunk/ELF/OutputSections.cpp
    lld/trunk/ELF/OutputSections.h
    lld/trunk/test/elf2/relative-dynamic-reloc.s

Modified: lld/trunk/ELF/OutputSections.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/OutputSections.cpp?rev=249353&r1=249352&r2=249353&view=diff
==============================================================================
--- lld/trunk/ELF/OutputSections.cpp (original)
+++ lld/trunk/ELF/OutputSections.cpp Mon Oct  5 16:09:37 2015
@@ -110,17 +110,23 @@ template <class ELFT> void RelocationSec
                           Target->getGotReloc(), IsMips64EL);
     } else {
       P->r_offset = RI.r_offset + C.getOutputSectionOff() + Out->getVA();
+      uintX_t Addent = 0;
+      if (IsRela)
+        Addent = static_cast<const Elf_Rela &>(RI).r_addend;
+
       if (Body && Body->isShared()) {
         P->setSymbolAndType(Body->getDynamicSymbolTableIndex(), Type,
                             IsMips64EL);
-        if (IsRela)
-          static_cast<Elf_Rela *>(P)->r_addend =
-              static_cast<const Elf_Rela &>(RI).r_addend;
       } else {
         P->setSymbolAndType(0, Target->getRelativeReloc(), IsMips64EL);
-        if (IsRela)
-          static_cast<Elf_Rela *>(P)->r_addend = P->r_offset;
+        if (IsRela) {
+          Addent += C.getOutputSectionOff() + Out->getVA();
+          if (Body)
+            Addent += cast<DefinedRegular<ELFT>>(Body)->Sym.st_value;
+        }
       }
+      if (IsRela)
+        static_cast<Elf_Rela *>(P)->r_addend = Addent;
     }
   }
 }

Modified: lld/trunk/ELF/OutputSections.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/OutputSections.h?rev=249353&r1=249352&r2=249353&view=diff
==============================================================================
--- lld/trunk/ELF/OutputSections.h (original)
+++ lld/trunk/ELF/OutputSections.h Mon Oct  5 16:09:37 2015
@@ -189,6 +189,7 @@ template <class ELFT>
 class RelocationSection final : public OutputSectionBase<ELFT::Is64Bits> {
   typedef typename llvm::object::ELFFile<ELFT>::Elf_Rel Elf_Rel;
   typedef typename llvm::object::ELFFile<ELFT>::Elf_Rela Elf_Rela;
+  typedef typename llvm::object::ELFFile<ELFT>::uintX_t uintX_t;
 
 public:
   RelocationSection(SymbolTableSection<ELFT> &DynSymSec,

Modified: lld/trunk/test/elf2/relative-dynamic-reloc.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/relative-dynamic-reloc.s?rev=249353&r1=249352&r2=249353&view=diff
==============================================================================
--- lld/trunk/test/elf2/relative-dynamic-reloc.s (original)
+++ lld/trunk/test/elf2/relative-dynamic-reloc.s Mon Oct  5 16:09:37 2015
@@ -9,6 +9,7 @@
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
 // CHECK-NEXT:     0x[[FOO_ADDR:.*]] R_X86_64_RELATIVE - 0x[[FOO_ADDR]]
 // CHECK-NEXT:     0x[[BAR_ADDR:.*]] R_X86_64_RELATIVE - 0x[[BAR_ADDR]]
+// CHECK-NEXT:     0x2010 R_X86_64_RELATIVE - 0x2009
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
@@ -38,3 +39,4 @@ foo:
         .global bar
 bar:
         .quad bar
+        .quad bar + 1