commit da99df366d04cafb044d8fc2c56155017b24c3a8
author Rafael Espindola <rafael.espindola@gmail.com> Wed Mar 30 12:40:38 2016 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Wed Mar 30 12:40:38 2016 +0000
tree b8ba73be030a7c09b8591ccdac9f9c1217aa0633
parent b0145960473403c112d4cd06185f1874544d6a98

Fix handling of addends on i386.

Because of merge sections it is not sufficient to just add them while
applying a relocation.

llvm-svn: 264863

lld/ELF/InputSection.cpp

diff --git a/lld/ELF/InputSection.cpp b/lld/ELF/InputSection.cpp
index d79aad8..119367a 100644
--- a/lld/ELF/InputSection.cpp
+++ b/lld/ELF/InputSection.cpp
@@ -274,6 +274,8 @@
       continue;
     }
 
+    if (!RelTy::IsRela)
+      A += Target->getImplicitAddend(BufLoc, Type);
     uintX_t SymVA = Body.getVA<ELFT>(A);
     if (Config->EMachine == EM_MIPS)
       A += findMipsPairedAddend(Buf, BufLoc, Body, &RI, Rels.end());