Magellan Linux

Annotation of /trunk/mesa/patches/mesa-10.4.6-llvm36.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2702 - (hide annotations) (download)
Wed Sep 23 15:10:35 2015 UTC (8 years, 9 months ago) by niro
File size: 1035 byte(s)
-fix build with llvm-3.6
1 niro 2702 From ef7e0b39a24966526b102643523feac765771842 Mon Sep 17 00:00:00 2001
2     From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
3     Date: Wed, 3 Dec 2014 07:48:26 +0000
4     Subject: gallivm: Update for RTDyldMemoryManager becoming an unique_ptr.
5    
6     Trivial.
7    
8     Fixes https://bugs.freedesktop.org/show_bug.cgi?id=86958
9    
10     diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
11     index fe3c754..5210acc 100644
12     --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
13     +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
14     @@ -500,8 +500,12 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
15     MM = new ShaderMemoryManager(JMM);
16     *OutCode = MM->getGeneratedCode();
17    
18     +#if HAVE_LLVM >= 0x0306
19     + builder.setMCJITMemoryManager(std::unique_ptr<RTDyldMemoryManager>(MM));
20     +#else
21     builder.setMCJITMemoryManager(MM);
22     #endif
23     +#endif
24     } else {
25     #if HAVE_LLVM < 0x0306
26     BaseMemoryManager* JMM = reinterpret_cast<BaseMemoryManager*>(CMM);
27     --
28     cgit v0.10.2
29