[Mesa-stable] [Mesa-dev] [PATCH] clover: Fix build against LLVM 3.8 SVN >= r255078

[Ilia Mirkin]

On Wed, Dec 9, 2015 at 5:30 AM, Francisco Jerez <currojerez at riseup.net> wrote:
> Michel Dänzer <michel at daenzer.net> writes:
>
>> From: Michel Dänzer <michel.daenzer at amd.com>
>>
>> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
>
> Looks OK to me,
> Reviewed-by: Francisco Jerez <currojerez at riseup.net>
>
>> ---
>>  src/gallium/state_trackers/clover/llvm/invocation.cpp | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
>> index 3b37f08..4d11c24 100644
>> --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
>> +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
>> @@ -661,7 +661,11 @@ namespace {
>>
>>        if (dump_asm) {
>>           LLVMSetTargetMachineAsmVerbosity(tm, true);
>> +#if HAVE_LLVM >= 0x0308
>> +         LLVMModuleRef debug_mod = wrap(llvm::CloneModule(mod).release());
>> +#else
>>           LLVMModuleRef debug_mod = wrap(llvm::CloneModule(mod));
>> +#endif
>>           emit_code(tm, debug_mod, LLVMAssemblyFile, &out_buffer, r_log);
>>           buffer_size = LLVMGetBufferSize(out_buffer);
>>           buffer_data = LLVMGetBufferStart(out_buffer);

Emil, consider cherry-picking this into 11.1 and perhaps even 11.0 to
save people from unnecessary compilation trouble. This is commit
b4a03e7f8f upstream.

Cheers,

  -ilia