diff options
author | Lang Hames <lhames@gmail.com> | 2013-08-09 00:57:01 +0000 |
---|---|---|
committer | Lang Hames <lhames@gmail.com> | 2013-08-09 00:57:01 +0000 |
commit | 623f2025a7a32de68a5ab402aa2b50ca3e3a6958 (patch) | |
tree | bf132ebc3600b1c8ec424db1718650f57692a72e /lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp | |
parent | 128ce319ec47c46dc7da16aa3a75185899878745 (diff) | |
download | llvm-623f2025a7a32de68a5ab402aa2b50ca3e3a6958.tar.gz llvm-623f2025a7a32de68a5ab402aa2b50ca3e3a6958.tar.bz2 llvm-623f2025a7a32de68a5ab402aa2b50ca3e3a6958.tar.xz |
Optimistically ignore scattered relocations in MachO in RuntimeDyld. This
un-breaks simple use cases while I work on more general support.
<rdar://problem/14487667>
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188044 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp')
-rw-r--r-- | lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp index 0384b32262..5d5ff3a2c4 100644 --- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp +++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp @@ -287,6 +287,16 @@ void RuntimeDyldMachO::processRelocationRef(unsigned SectionID, macho::RelocationEntry RE = MachO->getRelocation(RelI.getRawDataRefImpl()); uint32_t RelType = MachO->getAnyRelocationType(RE); + + // FIXME: Properly handle scattered relocations. + // For now, optimistically skip these: they can often be ignored, as + // the static linker will already have applied the relocation, and it + // only needs to be reapplied if symbols move relative to one another. + // Note: This will fail horribly where the relocations *do* need to be + // applied, but that was already the case. + if (MachO->isRelocationScattered(RE)) + return; + RelocationValueRef Value; SectionEntry &Section = Sections[SectionID]; |