diff options
| author | Lang Hames <lhames@gmail.com> | 2019-12-18 15:13:35 -0800 |
|---|---|---|
| committer | Lang Hames <lhames@gmail.com> | 2019-12-18 15:13:35 -0800 |
| commit | 5ea91bea15dd0cda55b83d108686c3087b479284 (patch) | |
| tree | 2e66134b8b54bf6bbd1347d9d46461209ec9bc09 /llvm/lib/ExecutionEngine | |
| parent | 5094e6dad64c755be1bb797b0307c54dbae8871d (diff) | |
| download | bcm5719-llvm-5ea91bea15dd0cda55b83d108686c3087b479284.tar.gz bcm5719-llvm-5ea91bea15dd0cda55b83d108686c3087b479284.zip | |
Revert "[Orc][LLJIT] Use JITLink even if a custom JITTargetMachineBuilder is supplied."
This reverts commit 298e183e813c884dd22816383405bae3ef9ef278.
This commit caused some build failures -- reverting while I investigate.
Diffstat (limited to 'llvm/lib/ExecutionEngine')
| -rw-r--r-- | llvm/lib/ExecutionEngine/Orc/LLJIT.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp b/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp index 54473ab4642..5c393739f40 100644 --- a/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp +++ b/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp @@ -24,15 +24,11 @@ Error LLJITBuilderState::prepareForConstruction() { JTMB = std::move(*JTMBOrErr); else return JTMBOrErr.takeError(); - } - - // If the client didn't configure any linker options then auto-configure the - // JIT linker. - if (!CreateObjectLinkingLayer && JTMB->getCodeModel() == None && - JTMB->getRelocationModel() == None) { + // If no ObjectLinkingLayer creator was set and the target supports JITLink + // then configure for JITLink. auto &TT = JTMB->getTargetTriple(); - if (TT.isOSBinFormatMachO() && + if (!CreateObjectLinkingLayer && TT.isOSBinFormatMachO() && (TT.getArch() == Triple::aarch64 || TT.getArch() == Triple::x86_64)) { JTMB->setRelocationModel(Reloc::PIC_); |
