Module: Mesa Branch: 10.4 Commit: fc5881ad73561860ad8006685f9abe49141428db URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc5881ad73561860ad8006685f9abe49141428db
Author: Emil Velikov <[email protected]> Date: Fri Mar 6 19:09:41 2015 +0000 Revert "gallivm: Update for RTDyldMemoryManager becoming an unique_ptr." This reverts commit 66a3f104a5b29dd4c4d5f1652dde994bf5b8878c. The commit is likely insufficient for normal work with LLVM 3.6. The full discussion and reason can be found at http://lists.freedesktop.org/archives/mesa-dev/2015-March/078795.html --- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp index 5210acc..fe3c754 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp @@ -500,12 +500,8 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, MM = new ShaderMemoryManager(JMM); *OutCode = MM->getGeneratedCode(); -#if HAVE_LLVM >= 0x0306 - builder.setMCJITMemoryManager(std::unique_ptr<RTDyldMemoryManager>(MM)); -#else builder.setMCJITMemoryManager(MM); #endif -#endif } else { #if HAVE_LLVM < 0x0306 BaseMemoryManager* JMM = reinterpret_cast<BaseMemoryManager*>(CMM); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
