From: Owen Anderson <resistor@mac.com>
Date: Wed, 26 Oct 2011 17:10:22 +0000 (+0000)
Subject: Include the full 64 bits of relocation data in the type info for MachO relocations... 
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f8261e7d07a8994e08cdba9f0e336e645daf104c;p=oota-llvm.git

Include the full 64 bits of relocation data in the type info for MachO relocations, so that we can recognize scattered relocations.


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

diff --git a/lib/Object/MachOObjectFile.cpp b/lib/Object/MachOObjectFile.cpp
index 9ed5445ddaa..82b9231ed8d 100644
--- a/lib/Object/MachOObjectFile.cpp
+++ b/lib/Object/MachOObjectFile.cpp
@@ -637,7 +637,9 @@ error_code MachOObjectFile::getRelocationType(DataRefImpl Rel,
                                               uint64_t &Res) const {
   InMemoryStruct<macho::RelocationEntry> RE;
   getRelocation(Rel, RE);
-  Res = RE->Word1;
+  Res = RE->Word0;
+  Res <<= 32;
+  Res |= RE->Word1;
   return object_error::success;
 }
 error_code MachOObjectFile::getRelocationTypeName(DataRefImpl Rel,