diff options
| author | Eric Christopher <echristo@gmail.com> | 2014-08-07 22:02:54 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@gmail.com> | 2014-08-07 22:02:54 +0000 |
| commit | b9fd9ed37ebf24d0935fe597cc8ea13f77288636 (patch) | |
| tree | 6d3bd604747981f5dcc37bcb3509f1c793287e59 /llvm/lib/ExecutionEngine/TargetSelect.cpp | |
| parent | b5220dc77963e8172cfe0ea7aeeacc76b3da8413 (diff) | |
| download | bcm5719-llvm-b9fd9ed37ebf24d0935fe597cc8ea13f77288636.tar.gz bcm5719-llvm-b9fd9ed37ebf24d0935fe597cc8ea13f77288636.zip | |
Temporarily Revert "Nuke the old JIT." as it's not quite ready to
be deleted. This will be reapplied as soon as possible and before
the 3.6 branch date at any rate.
Approved by Jim Grosbach, Lang Hames, Rafael Espindola.
This reverts commits r215111, 215115, 215116, 215117, 215136.
llvm-svn: 215154
Diffstat (limited to 'llvm/lib/ExecutionEngine/TargetSelect.cpp')
| -rw-r--r-- | llvm/lib/ExecutionEngine/TargetSelect.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/ExecutionEngine/TargetSelect.cpp b/llvm/lib/ExecutionEngine/TargetSelect.cpp index e6679cfb7f7..b10d51f6486 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 (WhichEngine != EngineKind::Interpreter && M) + if (UseMCJIT && WhichEngine != EngineKind::Interpreter && M) TT.setTriple(M->getTargetTriple()); return selectTarget(TT, MArch, MCPU, MAttrs); @@ -89,7 +89,8 @@ TargetMachine *EngineBuilder::selectTarget(const Triple &TargetTriple, } // FIXME: non-iOS ARM FastISel is broken with MCJIT. - if (TheTriple.getArch() == Triple::arm && + if (UseMCJIT && + TheTriple.getArch() == Triple::arm && !TheTriple.isiOS() && OptLevel == CodeGenOpt::None) { OptLevel = CodeGenOpt::Less; |
