diff options
| author | Vinson Lee <[email protected]> | 2014-08-19 23:17:40 -0700 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2014-08-20 15:24:44 +0900 |
| commit | c04a6d5c298f102469df45a7dbe81f40c6faed5f (patch) | |
| tree | bc2c2aefdf9827914f99a9e0a076f46e88f84a5c | |
| parent | a1853eaea7fa5caf59b52567cc49f964ce5293ec (diff) | |
gallivm: Fix build with LLVM >= 3.6 r215967.
This LLVM 3.6 commit changed EngineBuilder constructor.
commit 3f4ed32b4398eaf4fe0080d8001ba01e6c2f43c8
Author: Rafael Espindola <[email protected]>
Date: Tue Aug 19 04:04:25 2014 +0000
Make it explicit that ExecutionEngine takes ownership of the modules.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@215967 91177308-0d34-0410-b5e6-96231b3b80d8
Signed-off-by: Vinson Lee <[email protected]>
Reviewed-and-Tested-by: Michel Dänzer <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp index 6bea9648922..55aa8b9bda7 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp @@ -421,7 +421,11 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, using namespace llvm; std::string Error; +#if HAVE_LLVM >= 0x0306 + EngineBuilder builder(std::unique_ptr<Module>(unwrap(M))); +#else EngineBuilder builder(unwrap(M)); +#endif /** * LLVM 3.1+ haven't more "extern unsigned llvm::StackAlignmentOverride" and |