diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-03-06 19:09:41 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-03-06 19:16:28 +0000 |
| commit | fc5881ad73561860ad8006685f9abe49141428db (patch) | |
| tree | 397cf7049b32ca1e03505eb77eeb467168004b58 | |
| parent | 9508ca24f15e61eb7266a4358dde2f76bce17c10 (diff) | |
Revert "gallivm: Update for RTDyldMemoryManager becoming an unique_ptr."
This reverts commit 66a3f104a5b29dd4c4d5f1652dde994bf5b8878c.
The commit is likely insufficient for normal work with LLVM 3.6.
The full discussion and reason can be found at
http://lists.freedesktop.org/archives/mesa-dev/2015-March/078795.html
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp index 5210acca427..fe3c7542166 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp @@ -500,12 +500,8 @@ 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); |