[llvm-commits] [llvm] r143033 - /llvm/trunk/lib/Object/MachOObjectFile.cpp

[Owen Anderson]

Author: resistor
Date: Wed Oct 26 12:10:22 2011
New Revision: 143033

URL: http://llvm.org/viewvc/llvm-project?rev=143033&view=rev
Log:
Include the full 64 bits of relocation data in the type info for MachO relocations, so that we can recognize scattered relocations.

Modified:
    llvm/trunk/lib/Object/MachOObjectFile.cpp

Modified: llvm/trunk/lib/Object/MachOObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/MachOObjectFile.cpp?rev=143033&r1=143032&r2=143033&view=diff
==============================================================================
--- llvm/trunk/lib/Object/MachOObjectFile.cpp (original)
+++ llvm/trunk/lib/Object/MachOObjectFile.cpp Wed Oct 26 12:10:22 2011
@@ -637,7 +637,9 @@
                                               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,