Mesa: add patch to fix build with llvm-3.6 support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2015-03-01 18:44:57 +01:00
parent b7597df191
commit d97cc4e98e

View File

@ -0,0 +1,29 @@
From ef7e0b39a24966526b102643523feac765771842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
Date: Wed, 3 Dec 2014 07:48:26 +0000
Subject: gallivm: Update for RTDyldMemoryManager becoming an unique_ptr.
Trivial.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=86958
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);
--
cgit v0.10.2