1From 909a9bdf7ab143e1f0baaf9736baebd3cd79aacf Mon Sep 17 00:00:00 2001 2From: Marius Bakke <marius@gnu.org> 3Date: Tue, 22 Dec 2020 11:04:26 +0000 4Subject: [PATCH] sbc_primitives: Fix build on non-x86. 5MIME-Version: 1.0 6Content-Type: text/plain; charset=UTF-8 7Content-Transfer-Encoding: 8bit 8 9Don't call __builtin_cpu_init unless targeting i386 or x86_64. 10Otherwise we get an error at link time: 11 12 CC sbc/sbc_primitives.lo 13sbc/sbc_primitives.c: In function ‘sbc_init_primitives_x86’: 14sbc/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 17ld: sbc/.libs/libsbc-private.a(sbc_primitives.o): in function `sbc_init_primitives': 18sbc_primitives.c:(.text+0x3a30): undefined reference to `__builtin_cpu_init' 19 20Signed-off-by: Pierre-Jean Texier <texier.pj2@gmail.com> 21[Upstream status: backport from upstream commit 909a9bdf7ab143e1f0baaf9736baebd3cd79aacf] 22 23--- 24 sbc/sbc_primitives.c | 2 ++ 25 1 file changed, 2 insertions(+) 26 27diff --git a/sbc/sbc_primitives.c b/sbc/sbc_primitives.c 28index 97a75be..09c214a 100644 29--- a/sbc/sbc_primitives.c 30+++ b/sbc/sbc_primitives.c 31@@ -593,6 +593,7 @@ static int sbc_calc_scalefactors_j( 32 33 static void sbc_init_primitives_x86(struct sbc_encoder_state *state) 34 { 35+#if defined(__x86_64__) || defined(__i386__) 36 __builtin_cpu_init(); 37 38 #ifdef SBC_BUILD_WITH_MMX_SUPPORT 39@@ -604,6 +605,7 @@ static void sbc_init_primitives_x86(struct sbc_encoder_state *state) 40 if (__builtin_cpu_supports("sse4.2")) 41 sbc_init_primitives_sse(state); 42 #endif 43+#endif 44 } 45 46 /* 47-- 482.17.1 49 50