From: Lang Hames <lhames@gmail.com>
Date: Fri, 18 Jul 2014 20:29:36 +0000 (+0000)
Subject: [MCJIT] [AArch64] Make sure to propegate ARM64_RELOC_ADDEND values into the
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b1a0fd7abac1b4a9031b55076b1b93fb695ceac;p=llvm

[MCJIT] [AArch64] Make sure to propegate ARM64_RELOC_ADDEND values into the
RelocationEntry.

No test case yet, as this primarily hits GOT entries, which RuntimeDyldChecker
can't examine yet. I'm actively working on features that will enable us to
test this.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@213408 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOAArch64.h b/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOAArch64.h
index 9f48e4439a5..775ed9ec363 100644
--- a/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOAArch64.h
+++ b/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOAArch64.h
@@ -59,8 +59,10 @@ public:
     RelocationValueRef Value(
         getRelocationValueRef(ObjImg, RelI, RE, ObjSectionToID, Symbols));
 
-    if (HasExplicitAddend)
+    if (HasExplicitAddend) {
+      RE.Addend = ExplicitAddend;
       Value.Addend = ExplicitAddend;
+    }
 
     bool IsExtern = Obj.getPlainRelocationExternal(RelInfo);
     if (!IsExtern && RE.IsPCRel)