Module: Mesa Branch: 10.2 Commit: 3fe59905fc684f64508982d405031771e273e656 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3fe59905fc684f64508982d405031771e273e656
Author: Vinson Lee <[email protected]> Date: Tue Aug 19 23:17:40 2014 -0700 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]> (cherry picked from commit c04a6d5c298f102469df45a7dbe81f40c6faed5f) Nominated-by: Marek Olšák <[email protected]> --- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp index 65c02d8..d85adfb 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp @@ -266,7 +266,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 _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
