diff options
| author | dim <dim@FreeBSD.org> | 2015-01-18 16:17:27 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-01-18 16:17:27 +0000 |
| commit | 081af4da16b9046c019ca40f64b1fb7ee8c6dca1 (patch) | |
| tree | 4abb9cbeecc7901726dd0b4a37369596c852e9ef /lib/ExecutionEngine/TargetSelect.cpp | |
| parent | 3c7e7a1538a873b0d3b012ef8811969ac4552c2a (diff) | |
| download | FreeBSD-src-081af4da16b9046c019ca40f64b1fb7ee8c6dca1.zip FreeBSD-src-081af4da16b9046c019ca40f64b1fb7ee8c6dca1.tar.gz | |
Vendor import of llvm RELEASE_360/rc1 tag r226102 (effectively, 3.6.0 RC1):
https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_360/rc1@226102
Diffstat (limited to 'lib/ExecutionEngine/TargetSelect.cpp')
| -rw-r--r-- | lib/ExecutionEngine/TargetSelect.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/ExecutionEngine/TargetSelect.cpp b/lib/ExecutionEngine/TargetSelect.cpp index b10d51f..e6679cf 100644 --- a/lib/ExecutionEngine/TargetSelect.cpp +++ b/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; |
