Re: [PATCH v2] sbc_primitives: Fix build on non-x86.

[Marius Bakke <marius@gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 1366 bytes --]

Luiz Augusto von Dentz <luiz.dentz@gmail.com> skriver:

> Hi Marius,
>
> On Mon, Dec 21, 2020 at 10:45 AM <marius@gnu.org> wrote:
>>
>> From: Marius Bakke <marius@devup.no>
>>
>> Don't call __builtin_cpu_init unless targeting i386 or x86_64.
>> Otherwise we get an error at link time:
>>
>>   CC       sbc/sbc_primitives.lo
>> sbc/sbc_primitives.c: In function ‘sbc_init_primitives_x86’:
>> sbc/sbc_primitives.c:596:2: warning: implicit declaration of function ‘__builtin_cpu_init’; did you mean ‘__builtin_irint’? [-Wimplicit-function-declaration]
>> [...]
>>   CCLD     src/sbcdec
>> ld: sbc/.libs/libsbc-private.a(sbc_primitives.o): in function `sbc_init_primitives':
>> sbc_primitives.c:(.text+0x3a30): undefined reference to `__builtin_cpu_init'
>> ---
>>  sbc/sbc_primitives.c | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/sbc/sbc_primitives.c b/sbc/sbc_primitives.c
>> index 97a75be..d8e166a 100644
>> --- a/sbc/sbc_primitives.c
>> +++ b/sbc/sbc_primitives.c
>> @@ -593,7 +593,9 @@ static int sbc_calc_scalefactors_j(
>>
>>  static void sbc_init_primitives_x86(struct sbc_encoder_state *state)
>>  {
>> +#if defined(__x86_64__) || defined(__i386__)
>>         __builtin_cpu_init();
>
> I would probably have the entire function under the #if here.

That makes sense; v3 sent!

Thanks,
Marius

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]