[Mesa-dev] [PATCH] gallivm: Fix build with LLVM 3.6

[Jose Fonseca]

On 03/12/14 04:50, Tom Stellard wrote:
> As of r223183 EngineBuilder::setMCJITMemoryManager() takes a unique_ptr.
> ---
>   src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 5 +++++
>   1 file changed, 5 insertions(+)
>
> diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
> index fe3c754..5c01f53 100644
> --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
> +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
> @@ -500,8 +500,13 @@ 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<ShaderMemoryManager>(MM));
> +#else
>          builder.setMCJITMemoryManager(MM);
>   #endif
> +
> +#endif
>      } else {
>   #if HAVE_LLVM < 0x0306
>          BaseMemoryManager* JMM = reinterpret_cast<BaseMemoryManager*>(CMM);
>

Sorry Tom, I missed your review request and pushed an identical patch.

Feel free to push this sort of trivial update next time.  We just run 
llvmpipe unit tests with LLVM 3.6 for sanity checking at the moment, as 
the bulk of our testing is with LLVM 3.3. So I imagine build breakages 
affect you more than us.

And yes, the ideal would be to update LLVM C bindings so we don't need 
to use C++ directly... Just need the time to pursue it.

Jose