summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2014-12-03 07:48:26 +0000
committerJosé Fonseca <[email protected]>2014-12-03 07:49:47 +0000
commitef7e0b39a24966526b102643523feac765771842 (patch)
treee88c43095b8d4b6effa3546d19bcdc19fcc40968 /src/gallium/auxiliary
parent636db35c35d4420a308629cead3287c57458644d (diff)
gallivm: Update for RTDyldMemoryManager becoming an unique_ptr.
Trivial. Fixes https://bugs.freedesktop.org/show_bug.cgi?id=86958
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_misc.cpp4
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 fe3c7542166..5210acca427 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);