Revert "[Orc] Directly emit machine code for the x86 resolver block and trampolines."

[oota-llvm.git] / lib / ExecutionEngine / Orc / OrcCBindings.cpp

diff --git a/lib/ExecutionEngine/Orc/OrcCBindings.cpp b/lib/ExecutionEngine/Orc/OrcCBindings.cpp
index d2379cd441d5bd9d959a7c83cdf21a5f70cb186b..d3effeec97e8f9ee0418762d6bc39f41daa4baf8 100644 (file)
--- a/lib/ExecutionEngine/Orc/OrcCBindings.cpp
+++ b/lib/ExecutionEngine/Orc/OrcCBindings.cpp
@@ -12,18 +12,20 @@
 
 using namespace llvm;
 
-LLVMOrcJITStackRef LLVMOrcCreateInstance(LLVMTargetMachineRef TM) {
+LLVMOrcJITStackRef LLVMOrcCreateInstance(LLVMTargetMachineRef TM,
+                                         LLVMContextRef Context) {
   TargetMachine *TM2(unwrap(TM));
+  LLVMContext &Ctx = *unwrap(Context);
 
   Triple T(TM2->getTargetTriple());
 
-  auto CompileCallbackMgr = OrcCBindingsStack::createCompileCallbackMgr(T);
+  auto CallbackMgrBuilder = OrcCBindingsStack::createCallbackManagerBuilder(T);
   auto IndirectStubsMgrBuilder =
     OrcCBindingsStack::createIndirectStubsMgrBuilder(T);
 
   OrcCBindingsStack *JITStack =
-    new OrcCBindingsStack(*TM2, std::move(CompileCallbackMgr),
-                         IndirectStubsMgrBuilder);
+    new OrcCBindingsStack(*TM2, Ctx, CallbackMgrBuilder,
+                          IndirectStubsMgrBuilder);
 
   return wrap(JITStack);
 }