diff options
| author | Eric Christopher <echristo@gmail.com> | 2014-09-02 22:28:02 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@gmail.com> | 2014-09-02 22:28:02 +0000 |
| commit | 79cc1e3ae7bc224fa948495ba2f1c02f4c0c84ea (patch) | |
| tree | b7044eef1251f66d6308e6868b0430ac6a8a7297 /llvm/lib/ExecutionEngine/TargetSelect.cpp | |
| parent | 981602a84c5e16871d23b946c8334cd830aceed2 (diff) | |
| download | bcm5719-llvm-79cc1e3ae7bc224fa948495ba2f1c02f4c0c84ea.tar.gz bcm5719-llvm-79cc1e3ae7bc224fa948495ba2f1c02f4c0c84ea.zip | |
Reinstate "Nuke the old JIT."
Approved by Jim Grosbach, Lang Hames, Rafael Espindola.
This reinstates commits r215111, 215115, 215116, 215117, 215136.
llvm-svn: 216982
Diffstat (limited to 'llvm/lib/ExecutionEngine/TargetSelect.cpp')
| -rw-r--r-- | llvm/lib/ExecutionEngine/TargetSelect.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/llvm/lib/ExecutionEngine/TargetSelect.cpp b/llvm/lib/ExecutionEngine/TargetSelect.cpp index b10d51f6486..e6679cfb7f7 100644 --- a/llvm/lib/ExecutionEngine/TargetSelect.cpp +++ b/llvm/lib/ExecutionEngine/TargetSelect.cpp @@ -30,7 +30,7 @@ TargetMachine *EngineBuilder::selectTarget() { // MCJIT can generate code for remote targets, but the old JIT and Interpreter // must use the host architecture. - if (UseMCJIT && WhichEngine != EngineKind::Interpreter && M) + if (WhichEngine != EngineKind::Interpreter && M) TT.setTriple(M->getTargetTriple()); return selectTarget(TT, MArch, MCPU, MAttrs); @@ -89,8 +89,7 @@ TargetMachine *EngineBuilder::selectTarget(const Triple &TargetTriple, } // FIXME: non-iOS ARM FastISel is broken with MCJIT. - if (UseMCJIT && - TheTriple.getArch() == Triple::arm && + if (TheTriple.getArch() == Triple::arm && !TheTriple.isiOS() && OptLevel == CodeGenOpt::None) { OptLevel = CodeGenOpt::Less; |
