Mesa (master): gallivm: Fix build with LLVM 3.3.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Thu Oct 23 09:42:26 UTC 2014


Module: Mesa
Branch: master
Commit: 75ad4fe78e15353344cdd606916b0d512ae382b7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=75ad4fe78e15353344cdd606916b0d512ae382b7

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Oct 23 10:42:12 2014 +0100

gallivm: Fix build with LLVM 3.3.

The setMCJITMemoryManager method doesn't exist in LLVM 3.3.

I thought I had tested the latest version of my earlier change with LLVM
3.3, but it looks I missed it.

Trivial.

---

 src/gallium/auxiliary/gallivm/lp_bld_misc.cpp |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index 776af47..6bc4d81 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -493,11 +493,13 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
 
    ShaderMemoryManager *MM;
    if (useMCJIT) {
+#if HAVE_LLVM > 0x0303
        BaseMemoryManager* JMM = reinterpret_cast<BaseMemoryManager*>(CMM);
        MM = new ShaderMemoryManager(JMM);
        *OutCode = MM->getGeneratedCode();
 
        builder.setMCJITMemoryManager(MM);
+#endif
    } else {
 #if HAVE_LLVM < 0x0306
        BaseMemoryManager* JMM = reinterpret_cast<BaseMemoryManager*>(CMM);




More information about the mesa-commit mailing list