diff options
| author | Jose Fonseca <[email protected]> | 2016-04-14 16:47:14 +0100 |
|---|---|---|
| committer | Jose Fonseca <[email protected]> | 2016-04-19 11:31:17 +0100 |
| commit | 969ba8bfa7de544d2782a96ff6b66fe912f5e290 (patch) | |
| tree | d04d8a7968d6350e52f4c068ce0b254eb75a01ad | |
| parent | cf4105740f0f94308644ec03a2cd74aeeaf7f4df (diff) | |
gallivm: Fix MCJIT with LLVM 3.3.
One needs to call setJITMemoryManager for LLVM 3.3, instead of
setMCJITMemoryManager.
This regressed in commits 065256df/75ad4fe7 when trying to make the
code to build with LLVM 3.6.
Tested MCJIT with LLVM 3.3 to 3.6.
Reviewed-by: Roland Scheidegger <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp index 77069efda38..e47146a7af7 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp @@ -602,7 +602,6 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, ShaderMemoryManager *MM = NULL; if (useMCJIT) { -#if HAVE_LLVM > 0x0303 BaseMemoryManager* JMM = reinterpret_cast<BaseMemoryManager*>(CMM); MM = new ShaderMemoryManager(JMM); *OutCode = MM->getGeneratedCode(); @@ -610,9 +609,10 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, #if HAVE_LLVM >= 0x0306 builder.setMCJITMemoryManager(std::unique_ptr<RTDyldMemoryManager>(MM)); MM = NULL; // ownership taken by std::unique_ptr -#else +#elif HAVE_LLVM > 0x0303 builder.setMCJITMemoryManager(MM); -#endif +#else + builder.setJITMemoryManager(MM); #endif } else { #if HAVE_LLVM < 0x0306 |