Skip to contentSkip to conversation

sbc_primitives: Fix build on non-x86.

PATCH In review [email protected] 3 participants 5 messages Dec 21, 2020 – Dec 22, 2020 1 message not in the archive Bluetooth drivers

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): PH0PR11MB51269918A2B84A3120EBD8E4D3C00@PH0PR11MB5126.namprd11.prod.outlook.com

#1 lore raw

PATCH v2 1/1 sbc_primitives: Fix build on non-x86.

From: Marius Bakke <[email protected]>

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(+)
sbc/sbc_primitives.c +2 -0
index 97a75be..d8e166a 100644
@@ -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();
+#endif
 
 #ifdef SBC_BUILD_WITH_MMX_SUPPORT
 	if (__builtin_cpu_supports("mmx"))
Signature · 1 line
2.29.2
#2 lore raw

Hi Marius,

Quoted 22 lines · On Mon, Dec 21, 2020 at 10:45 AM <[email protected]> wrote:

From: Marius Bakke <[email protected]>

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(+)
sbc/sbc_primitives.c +0 -0
index 97a75be..d8e166a 100644

sbc/sbc_primitives.c static int sbc_calc_scalefactors_j( · line 597

Quoted 5 lines
sbc/sbc_primitives.c +1 -0
@@ -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.

Quoted 7 lines
sbc/sbc_primitives.c +1 -1
+#endif
 
 #ifdef SBC_BUILD_WITH_MMX_SUPPORT
        if (__builtin_cpu_supports("mmx"))
--

2.29.2

Signature · 1 line
Luiz Augusto von Dentz
#3 lore raw

PATCH v3 1/1 sbc_primitives: Fix build on non-x86.

From: Marius Bakke <[email protected]>

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(+)
sbc/sbc_primitives.c +2 -0
index 97a75be..09c214a 100644
@@ -593,6 +593,7 @@ 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();
 
 #ifdef SBC_BUILD_WITH_MMX_SUPPORT
@@ -604,6 +605,7 @@ static void sbc_init_primitives_x86(struct sbc_encoder_state *state)
 	if (__builtin_cpu_supports("sse4.2"))
 		sbc_init_primitives_sse(state);
 #endif
+#endif
 }
 
 /*
Signature · 1 line
2.29.2
maintainer Applied
#4 lore raw

Hi Marius,

Quoted 38 lines · Marius Bakke

From: Marius Bakke <[email protected]>

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(+)
sbc/sbc_primitives.c +2 -1
index 97a75be..09c214a 100644
@@ -593,6 +593,7 @@ 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();
 
 #ifdef SBC_BUILD_WITH_MMX_SUPPORT
@@ -604,6 +605,7 @@ static void sbc_init_primitives_x86(struct sbc_encoder_state *state)
        if (__builtin_cpu_supports("sse4.2"))
                sbc_init_primitives_sse(state);
 #endif
+#endif
 }
 
 /*
--
Quoted 1 line

2.29.2

Applied, thanks.

Signature · 1 line
Luiz Augusto von Dentz
#5 lore raw
In reply to Luiz Augusto von Dentz

Luiz Augusto von Dentz <[email protected]> skriver:

Quoted 26 lines

Hi Marius,

Quoted 23 lines · On Mon, Dec 21, 2020 at 10:45 AM <[email protected]> wrote:

From: Marius Bakke <[email protected]>

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(+)
sbc/sbc_primitives.c +0 -0
index 97a75be..d8e166a 100644
@@ -593,7 +593,9 @@ static int sbc_calc_scalefactors_j(
 
Quoted 6 lines

sbc/sbc_primitives.c static int sbc_calc_scalefactors_j( · line 597

Quoted 4 lines
sbc/sbc_primitives.c +1 -0
 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