projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[X86][Haswell][SchedModel] Add architecture specific scheduling models.
[oota-llvm.git]
/
lib
/
ExecutionEngine
/
TargetSelect.cpp
diff --git
a/lib/ExecutionEngine/TargetSelect.cpp
b/lib/ExecutionEngine/TargetSelect.cpp
index e6679cfb7f740af0f1b826b16dd16edfee50b194..b10d51f648628866bd917c8f658828ba008ad1cc 100644
(file)
--- 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.
// 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);
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.
}
// 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;
!TheTriple.isiOS() &&
OptLevel == CodeGenOpt::None) {
OptLevel = CodeGenOpt::Less;