From 04e46b6ae49e1748a200e3832447a0d35655d20b Mon Sep 17 00:00:00 2001
From: Owen Anderson <resistor@mac.com>
Date: Wed, 26 Oct 2011 17:10:22 +0000
Subject: Include the full 64 bits of relocation data in the type info for
 MachO relocations, so that we can recognize scattered relocations.

llvm-svn: 143033
---
 llvm/lib/Object/MachOObjectFile.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'llvm/lib/Object/MachOObjectFile.cpp')

diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp
index 9ed5445ddaa..82b9231ed8d 100644
--- a/llvm/lib/Object/MachOObjectFile.cpp
+++ b/llvm/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,
-- 
cgit v1.2.3