diff options
| author | Eric Christopher <echristo@gmail.com> | 2013-04-23 22:53:53 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@gmail.com> | 2013-04-23 22:53:53 +0000 |
| commit | 43dfffe890f58468e2fe01f312978d7aa5303801 (patch) | |
| tree | c9a2121f322a62702b4dc293d7352f8e386cca74 | |
| parent | 26b222e19ec9dfeb8dc9d558b3fe427219569887 (diff) | |
| download | llvm-43dfffe890f58468e2fe01f312978d7aa5303801.tar.gz llvm-43dfffe890f58468e2fe01f312978d7aa5303801.tar.bz2 llvm-43dfffe890f58468e2fe01f312978d7aa5303801.tar.xz | |
Fix dependency layering issues caused by r180112.
Patch by Tom Stellard. (Committed while he's afk per request)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@180157 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/llvm/ExecutionEngine/ExecutionEngine.h | 4 | ||||
| -rw-r--r-- | include/llvm/Wrap.h | 2 | ||||
| -rw-r--r-- | lib/ExecutionEngine/ExecutionEngineBindings.cpp | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/llvm/ExecutionEngine/ExecutionEngine.h b/include/llvm/ExecutionEngine/ExecutionEngine.h index 07135b6947..9800759484 100644 --- a/include/llvm/ExecutionEngine/ExecutionEngine.h +++ b/include/llvm/ExecutionEngine/ExecutionEngine.h @@ -15,6 +15,7 @@ #ifndef LLVM_EXECUTIONENGINE_EXECUTIONENGINE_H #define LLVM_EXECUTIONENGINE_EXECUTIONENGINE_H +#include "llvm-c/ExecutionEngine.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringRef.h" @@ -25,6 +26,7 @@ #include "llvm/Support/ValueHandle.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetOptions.h" +#include "llvm/Wrap.h" #include <map> #include <string> #include <vector> @@ -632,6 +634,8 @@ public: ExecutionEngine *create(TargetMachine *TM); }; +DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ExecutionEngine, LLVMExecutionEngineRef) + } // End llvm namespace #endif diff --git a/include/llvm/Wrap.h b/include/llvm/Wrap.h index 11ea6e46c4..79790d4ea9 100644 --- a/include/llvm/Wrap.h +++ b/include/llvm/Wrap.h @@ -12,7 +12,6 @@ //===----------------------------------------------------------------------===// #include "llvm-c/Core.h" -#include "llvm-c/ExecutionEngine.h" #include "llvm/IR/BasicBlock.h" #include "llvm/IR/IRBuilder.h" #include "llvm/IR/Module.h" @@ -68,7 +67,6 @@ namespace llvm { DEFINE_SIMPLE_CONVERSION_FUNCTIONS(MemoryBuffer, LLVMMemoryBufferRef ) DEFINE_SIMPLE_CONVERSION_FUNCTIONS(LLVMContext, LLVMContextRef ) DEFINE_SIMPLE_CONVERSION_FUNCTIONS(Use, LLVMUseRef ) - DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ExecutionEngine, LLVMExecutionEngineRef) DEFINE_STDCXX_CONVERSION_FUNCTIONS(PassManagerBase, LLVMPassManagerRef ) DEFINE_STDCXX_CONVERSION_FUNCTIONS(PassRegistry, LLVMPassRegistryRef ) diff --git a/lib/ExecutionEngine/ExecutionEngineBindings.cpp b/lib/ExecutionEngine/ExecutionEngineBindings.cpp index f18cb0de9c..3e6dcdf5ba 100644 --- a/lib/ExecutionEngine/ExecutionEngineBindings.cpp +++ b/lib/ExecutionEngine/ExecutionEngineBindings.cpp @@ -16,7 +16,6 @@ #include "llvm/ExecutionEngine/ExecutionEngine.h" #include "llvm/ExecutionEngine/GenericValue.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/Wrap.h" #include <cstring> using namespace llvm; |