[llvm] e429cff - [ORC] Always use ObjectLinkingLayer/JITLink for MachO on x86-64 and arm64.

[Lang Hames via llvm-commits]

Author: Lang Hames
Date: 2020-06-05T21:02:29-07:00
New Revision: e429cffd4f228f70c1d9df0e5d77c08590dd9766

URL: https://github.com/llvm/llvm-project/commit/e429cffd4f228f70c1d9df0e5d77c08590dd9766
DIFF: https://github.com/llvm/llvm-project/commit/e429cffd4f228f70c1d9df0e5d77c08590dd9766.diff

LOG: [ORC] Always use ObjectLinkingLayer/JITLink for MachO on x86-64 and arm64.

JITLink supports all code and relocation models, so there's no reason to
conditionalize using JITLink on the code or relocation model settings.

Clients wanting to use RTDyldObjectLinkingLayer/RuntimeDyld will now
need to use a custom object linking layer creator.

Added: 
    

Modified: 
    llvm/lib/ExecutionEngine/Orc/LLJIT.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp b/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp
index 0e51ba1dff35..713a48fbf3eb 100644
--- a/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp
@@ -965,9 +965,7 @@ Error LLJITBuilderState::prepareForConstruction() {
 
   // If the client didn't configure any linker options then auto-configure the
   // JIT linker.
-  if (!CreateObjectLinkingLayer && JTMB->getCodeModel() == None &&
-      JTMB->getRelocationModel() == None) {
-
+  if (!CreateObjectLinkingLayer) {
     auto &TT = JTMB->getTargetTriple();
     if (TT.isOSBinFormatMachO() &&
         (TT.getArch() == Triple::aarch64 || TT.getArch() == Triple::x86_64)) {