Skip to contentSkip to conversation

package/libunwind: disable for x86 with musl

PATCH New Romain Naour 3 participants 3 messages Apr 17, 2017 – May 4, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libunwind: disable for x86 with musl

libunwind use sigreturn() and setcontext() while building for x86 [1] but this function is not available with musl [2].

This throw a warning during libunwind build:
In file included from x86/Los-linux.c:4:0:
x86/Gos-linux.c: In function ?_ULx86_local_resume?:
x86/Gos-linux.c:298:7: warning: implicit declaration of function ?sigreturn? [-Wimplicit-function-declaration]

      sigreturn (sc);
      ^

But any program trying to link against libunwind-generic.so or libunwind.so fail to build:
[...]/usr/lib/libunwind-generic.so: undefined reference to sigreturn' [...]/usr/lib/libunwind-generic.so: undefined reference to setcontext'
collect2: error: ld returned 1 exit status

Disable libunwind for x86 target when musl is used.

Reported upstream by Waldemar [3]

[1] http://git.savannah.gnu.org/gitweb/?p=libunwind.git;a=blob;f=src/x86/Gos-linux.c;h=17aebc2974af50eb0bf8292689b2ed22a4c97866;hb=HEAD#l299
[2] http://openwall.com/lists/musl/2016/02/04/3
[3] http://lists.nongnu.org/archive/html/libunwind-devel/2017-04/msg00030.html

Cc "Yann E. MORIN" <[email protected]>
Cc Waldemar Brodkorb <[email protected]>

---
Patch rebased after http://patchwork.ozlabs.org/patch/751402/

---
 package/libunwind/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libunwind/Config.in +1 -1
index 2003e96..1a25317 100644
@@ -16,7 +16,7 @@ config BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS
 		(BR2_ARM_CPU_HAS_ARM || BR2_mips || BR2_mipsel || \
 		 BR2_mips64 || BR2_mips64el || BR2_x86_64)
 	default y if BR2_TOOLCHAIN_USES_MUSL && \
-		(BR2_ARM_CPU_HAS_ARM || BR2_i386 || BR2_x86_64)
+		(BR2_ARM_CPU_HAS_ARM || BR2_x86_64)
 
 config BR2_PACKAGE_LIBUNWIND
 	bool "libunwind"
Signature · 1 line
2.9.3
#1 lore raw

PATCH 1/1 package/libunwind: disable for x86 with musl

Romain, All,

On 2017-04-17 19:37 +0200, Romain Naour spake thusly:

Quoted 19 lines

libunwind use sigreturn() and setcontext() while building for x86 [1] but this function is not available with musl [2].

This throw a warning during libunwind build:
In file included from x86/Los-linux.c:4:0:
x86/Gos-linux.c: In function ?_ULx86_local_resume?:
x86/Gos-linux.c:298:7: warning: implicit declaration of function ?sigreturn? [-Wimplicit-function-declaration]

      sigreturn (sc);
      ^

But any program trying to link against libunwind-generic.so or libunwind.so fail to build:
[...]/usr/lib/libunwind-generic.so: undefined reference to sigreturn' [...]/usr/lib/libunwind-generic.so: undefined reference to setcontext'
collect2: error: ld returned 1 exit status

Disable libunwind for x86 target when musl is used.

Reported upstream by Waldemar [3]

Quoted 7 lines

[1] http://git.savannah.gnu.org/gitweb/?p=libunwind.git;a=blob;f=src/x86/Gos-linux.c;h=17aebc2974af50eb0bf8292689b2ed22a4c97866;hb=HEAD#l299
[2] http://openwall.com/lists/musl/2016/02/04/3
[3] http://lists.nongnu.org/archive/html/libunwind-devel/2017-04/msg00030.html

Cc "Yann E. MORIN" <[email protected]>
Cc Waldemar Brodkorb <[email protected]>

Regards,
Yann E. MORIN.

Quoted 22 lines

---
Patch rebased after http://patchwork.ozlabs.org/patch/751402/

---
 package/libunwind/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libunwind/Config.in +1 -1
index 2003e96..1a25317 100644
@@ -16,7 +16,7 @@ config BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS
 		(BR2_ARM_CPU_HAS_ARM || BR2_mips || BR2_mipsel || \
 		 BR2_mips64 || BR2_mips64el || BR2_x86_64)
 	default y if BR2_TOOLCHAIN_USES_MUSL && \
-		(BR2_ARM_CPU_HAS_ARM || BR2_i386 || BR2_x86_64)
+		(BR2_ARM_CPU_HAS_ARM || BR2_x86_64)
 
 config BR2_PACKAGE_LIBUNWIND
 	bool "libunwind"
Signature · 1 line
2.9.3
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/libunwind: disable for x86 with musl

In reply to Romain Naour

Hello,

Quoted 23 lines · Romain Naour

libunwind use sigreturn() and setcontext() while building for x86 [1] but this function is not available with musl [2].

This throw a warning during libunwind build:
In file included from x86/Los-linux.c:4:0:
x86/Gos-linux.c: In function ?_ULx86_local_resume?:
x86/Gos-linux.c:298:7: warning: implicit declaration of function ?sigreturn? [-Wimplicit-function-declaration]

      sigreturn (sc);
      ^

But any program trying to link against libunwind-generic.so or libunwind.so fail to build:
[...]/usr/lib/libunwind-generic.so: undefined reference to sigreturn' [...]/usr/lib/libunwind-generic.so: undefined reference to setcontext'
collect2: error: ld returned 1 exit status

Disable libunwind for x86 target when musl is used.

Reported upstream by Waldemar [3]

[1] http://git.savannah.gnu.org/gitweb/?p=libunwind.git;a=blob;f=src/x86/Gos-linux.c;h=17aebc2974af50eb0bf8292689b2ed22a4c97866;hb=HEAD#l299
[2] http://openwall.com/lists/musl/2016/02/04/3
[3] http://lists.nongnu.org/archive/html/libunwind-devel/2017-04/msg00030.html

Quoted 8 lines
Cc "Yann E. MORIN" <[email protected]>
Cc Waldemar Brodkorb <[email protected]>

---
Patch rebased after http://patchwork.ozlabs.org/patch/751402/

---
 package/libunwind/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com