diff options
| author | Dylan Noblesmith <nobled@dreamwidth.org> | 2011-05-13 21:36:16 +0000 |
|---|---|---|
| committer | Dylan Noblesmith <nobled@dreamwidth.org> | 2011-05-13 21:36:16 +0000 |
| commit | 2ea29ba2a8ddd7ba4b946eb754f1a39304d9fc09 (patch) | |
| tree | e11ba257362183be99e1f003d1308d55df3c9f20 /lib/ExecutionEngine/JIT/JIT.cpp | |
| parent | 0cb356336320389725ced7664954905093ad9d4d (diff) | |
| download | llvm-2ea29ba2a8ddd7ba4b946eb754f1a39304d9fc09.tar.gz llvm-2ea29ba2a8ddd7ba4b946eb754f1a39304d9fc09.tar.bz2 llvm-2ea29ba2a8ddd7ba4b946eb754f1a39304d9fc09.tar.xz | |
ExecutionEngine: fix JIT/MCJIT selectTarget() duplication (v2)
This prepares for making JITCtor/MCJITCtor take a
TargetMachine* directly from clients like EngineBuilder.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@131316 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ExecutionEngine/JIT/JIT.cpp')
| -rw-r--r-- | lib/ExecutionEngine/JIT/JIT.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/ExecutionEngine/JIT/JIT.cpp b/lib/ExecutionEngine/JIT/JIT.cpp index d1f87acd61..3c04cd20a7 100644 --- a/lib/ExecutionEngine/JIT/JIT.cpp +++ b/lib/ExecutionEngine/JIT/JIT.cpp @@ -228,14 +228,21 @@ ExecutionEngine *JIT::createJIT(Module *M, StringRef MCPU, const SmallVectorImpl<std::string>& MAttrs) { // Try to register the program as a source of symbols to resolve against. + // + // FIXME: Don't do this here. sys::DynamicLibrary::LoadLibraryPermanently(0, NULL); // Pick a target either via -march or by guessing the native arch. - TargetMachine *TM = JIT::selectTarget(M, MArch, MCPU, MAttrs, ErrorStr); + // + // FIXME: This should be lifted out of here, it isn't something which should + // be part of the JIT policy, rather the burden for this selection should be + // pushed to clients. + TargetMachine *TM = + EngineBuilder::selectTarget(M, MArch, MCPU, MAttrs, ErrorStr); if (!TM || (ErrorStr && ErrorStr->length() > 0)) return 0; TM->setCodeModel(CMM); - // If the target supports JIT code generation, create a the JIT. + // If the target supports JIT code generation, create the JIT. if (TargetJITInfo *TJ = TM->getJITInfo()) { return new JIT(M, *TM, *TJ, JMM, OptLevel, GVsWithCode); } else { |