Mesa (10.4): gallivm: Update for RTDyldMemoryManager becoming an unique_ptr.
Emil Velikov
evelikov at kemper.freedesktop.org
Wed Mar 4 02:02:53 UTC 2015
Module: Mesa
Branch: 10.4
Commit: 66a3f104a5b29dd4c4d5f1652dde994bf5b8878c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=66a3f104a5b29dd4c4d5f1652dde994bf5b8878c
Author: José Fonseca <jfonseca at vmware.com>
Date: Wed Dec 3 07:48:26 2014 +0000
gallivm: Update for RTDyldMemoryManager becoming an unique_ptr.
Trivial.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=86958
(cherry picked from commit ef7e0b39a24966526b102643523feac765771842)
Nominated-by: Sedat Dilek <sedat.dilek at gmail.com>
---
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 fe3c754..5210acc 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -500,8 +500,12 @@ 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);
More information about the mesa-commit
mailing list