1*4882a593SmuzhiyunFrom 909a9bdf7ab143e1f0baaf9736baebd3cd79aacf Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Marius Bakke <marius@gnu.org> 3*4882a593SmuzhiyunDate: Tue, 22 Dec 2020 11:04:26 +0000 4*4882a593SmuzhiyunSubject: [PATCH] sbc_primitives: Fix build on non-x86. 5*4882a593SmuzhiyunMIME-Version: 1.0 6*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8 7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunDon't call __builtin_cpu_init unless targeting i386 or x86_64. 10*4882a593SmuzhiyunOtherwise we get an error at link time: 11*4882a593Smuzhiyun 12*4882a593Smuzhiyun CC sbc/sbc_primitives.lo 13*4882a593Smuzhiyunsbc/sbc_primitives.c: In function ‘sbc_init_primitives_x86’: 14*4882a593Smuzhiyunsbc/sbc_primitives.c:596:2: warning: implicit declaration of function ‘__builtin_cpu_init’; did you mean ‘__builtin_irint’? [-Wimplicit-function-declaration] 15*4882a593Smuzhiyun[...] 16*4882a593Smuzhiyun CCLD src/sbcdec 17*4882a593Smuzhiyunld: sbc/.libs/libsbc-private.a(sbc_primitives.o): in function `sbc_init_primitives': 18*4882a593Smuzhiyunsbc_primitives.c:(.text+0x3a30): undefined reference to `__builtin_cpu_init' 19*4882a593Smuzhiyun 20*4882a593SmuzhiyunSigned-off-by: Pierre-Jean Texier <texier.pj2@gmail.com> 21*4882a593Smuzhiyun[Upstream status: backport from upstream commit 909a9bdf7ab143e1f0baaf9736baebd3cd79aacf] 22*4882a593Smuzhiyun 23*4882a593Smuzhiyun--- 24*4882a593Smuzhiyun sbc/sbc_primitives.c | 2 ++ 25*4882a593Smuzhiyun 1 file changed, 2 insertions(+) 26*4882a593Smuzhiyun 27*4882a593Smuzhiyundiff --git a/sbc/sbc_primitives.c b/sbc/sbc_primitives.c 28*4882a593Smuzhiyunindex 97a75be..09c214a 100644 29*4882a593Smuzhiyun--- a/sbc/sbc_primitives.c 30*4882a593Smuzhiyun+++ b/sbc/sbc_primitives.c 31*4882a593Smuzhiyun@@ -593,6 +593,7 @@ static int sbc_calc_scalefactors_j( 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun static void sbc_init_primitives_x86(struct sbc_encoder_state *state) 34*4882a593Smuzhiyun { 35*4882a593Smuzhiyun+#if defined(__x86_64__) || defined(__i386__) 36*4882a593Smuzhiyun __builtin_cpu_init(); 37*4882a593Smuzhiyun 38*4882a593Smuzhiyun #ifdef SBC_BUILD_WITH_MMX_SUPPORT 39*4882a593Smuzhiyun@@ -604,6 +605,7 @@ static void sbc_init_primitives_x86(struct sbc_encoder_state *state) 40*4882a593Smuzhiyun if (__builtin_cpu_supports("sse4.2")) 41*4882a593Smuzhiyun sbc_init_primitives_sse(state); 42*4882a593Smuzhiyun #endif 43*4882a593Smuzhiyun+#endif 44*4882a593Smuzhiyun } 45*4882a593Smuzhiyun 46*4882a593Smuzhiyun /* 47*4882a593Smuzhiyun-- 48*4882a593Smuzhiyun2.17.1 49*4882a593Smuzhiyun 50