[Mesa-dev] [PATCH] radeonsi: remove bogus r600-- triple

[Emil Velikov]

On 15 April 2015 at 10:24, Michel Dänzer <michel at daenzer.net> wrote:
> On 09.04.2015 03:27, Emil Velikov wrote:
>> As mentioned by Michel Dänzer for LLVM >= 3.6 we create the
>> LLVMTargetMachine (with triple amdgcn--), as we setup the radeonsi
>> context. For older LLVM or hardware (r600) the triple is always r600--
>> and is created at a later stage - radeon_llvm_compile()
>>
>> Cc: Michel Dänzer <michel.daenzer at amd.com>
>> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
>> ---
>>  src/gallium/drivers/radeonsi/si_pipe.c | 2 --
>>  1 file changed, 2 deletions(-)
>>
>> diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
>> index e761d20..5ea8868 100644
>> --- a/src/gallium/drivers/radeonsi/si_pipe.c
>> +++ b/src/gallium/drivers/radeonsi/si_pipe.c
>> @@ -85,8 +85,6 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, void *
>>       LLVMTargetRef r600_target;
>>  #if HAVE_LLVM >= 0x0306
>>       const char *triple = "amdgcn--";
>> -#else
>> -     const char *triple = "r600--";
>>  #endif
>>       int shader, i;
>
> r600_target should probably also be moved inside the
>
> #if HAVE_LLVM >= 0x0306
>
> as it's only used in that case. But that can be done in a separate
> patch. Either way, this patch is
>
> Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
>
Will keep the r600_target change in a separate patch. I have a few
patches which handle unused variables/used uninitialised warnings.

Thanks
Emil