Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 1 | From f4a1224323e386090a44bf70ee0ac9877ba7fb0d Mon Sep 17 00:00:00 2001 |
| 2 | From: Marius Bakke <marius@gnu.org> |
| 3 | Date: Tue, 22 Dec 2020 11:04:26 +0000 |
| 4 | Subject: [PATCH] sbc_primitives: Fix build on non-x86. |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | Don't call __builtin_cpu_init unless targeting i386 or x86_64. |
| 10 | Otherwise we get an error at link time: |
| 11 | |
| 12 | CC sbc/sbc_primitives.lo |
| 13 | sbc/sbc_primitives.c: In function ‘sbc_init_primitives_x86’: |
| 14 | sbc/sbc_primitives.c:596:2: warning: implicit declaration of function ‘__builtin_cpu_init’; did you mean ‘__builtin_irint’? [-Wimplicit-function-declaration] |
| 15 | [...] |
| 16 | CCLD src/sbcdec |
| 17 | ld: sbc/.libs/libsbc-private.a(sbc_primitives.o): in function `sbc_init_primitives': |
| 18 | sbc_primitives.c:(.text+0x3a30): undefined reference to `__builtin_cpu_init' |
| 19 | |
| 20 | Upstream-Status: Backport |
| 21 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 22 | --- |
| 23 | sbc/sbc_primitives.c | 2 ++ |
| 24 | 1 file changed, 2 insertions(+) |
| 25 | |
| 26 | diff --git a/sbc/sbc_primitives.c b/sbc/sbc_primitives.c |
| 27 | index 97a75be..09c214a 100644 |
| 28 | --- a/sbc/sbc_primitives.c |
| 29 | +++ b/sbc/sbc_primitives.c |
| 30 | @@ -593,6 +593,7 @@ static int sbc_calc_scalefactors_j( |
| 31 | |
| 32 | static void sbc_init_primitives_x86(struct sbc_encoder_state *state) |
| 33 | { |
| 34 | +#if defined(__x86_64__) || defined(__i386__) |
| 35 | __builtin_cpu_init(); |
| 36 | |
| 37 | #ifdef SBC_BUILD_WITH_MMX_SUPPORT |
| 38 | @@ -604,6 +605,7 @@ static void sbc_init_primitives_x86(struct sbc_encoder_state *state) |
| 39 | if (__builtin_cpu_supports("sse4.2")) |
| 40 | sbc_init_primitives_sse(state); |
| 41 | #endif |
| 42 | +#endif |
| 43 | } |
| 44 | |
| 45 | /* |