[OE-core] [PATCH v2] musl: fix build failure when ld-is-gold is in DISTRO_FEATURES
Steven Hung (洪于玉)
Steven.Hung at mediatek.com
Mon Apr 29 08:36:05 UTC 2019
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20190429/9ca6c369/attachment.html>
-------------- next part --------------
based on the solution: http://ffmpeg.org/pipermail/ffmpeg-devel/2018-April/228246.html
Signed-off-by: Steven Hung (洪于玉) <Steven.Hung at mediatek.com>
---
...branch-to-PLT-in-THUMB-2-not-support.patch | 34 +++++++++++++++++++
meta/recipes-core/musl/musl_git.bb | 1 +
2 files changed, 35 insertions(+)
create mode 100644 meta/recipes-core/musl/musl/0003-fix-conditional-branch-to-PLT-in-THUMB-2-not-support.patch
diff --git a/meta/recipes-core/musl/musl/0003-fix-conditional-branch-to-PLT-in-THUMB-2-not-support.patch b/meta/recipes-core/musl/musl/0003-fix-conditional-branch-to-PLT-in-THUMB-2-not-support.patch
new file mode 100644
index 0000000000..e1aa126b85
--- /dev/null
+++ b/meta/recipes-core/musl/musl/0003-fix-conditional-branch-to-PLT-in-THUMB-2-not-support.patch
@@ -0,0 +1,34 @@
+From ee3d6b0f35ec4e71cbc2ae4d1a7561f9cb27d51f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Steven=20Hung=20=28=E6=B4=AA=E4=BA=8E=E7=8E=89=29?=
+ <Steven.Hung at mediatek.com>
+Date: Mon, 29 Apr 2019 16:25:17 +0800
+Subject: [PATCH] fix conditional branch to PLT in THUMB-2 not supported yet.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+based on the solution: http://ffmpeg.org/pipermail/ffmpeg-devel/2018-April/228246.html
+
+Upstream-Status: Pending
+Signed-off-by: Steven Hung (洪于玉) <Steven.Hung at mediatek.com>
+---
+ src/signal/arm/sigsetjmp.s | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/signal/arm/sigsetjmp.s b/src/signal/arm/sigsetjmp.s
+index 318addba..1ac79293 100644
+--- a/src/signal/arm/sigsetjmp.s
++++ b/src/signal/arm/sigsetjmp.s
+@@ -6,6 +6,9 @@
+ sigsetjmp:
+ __sigsetjmp:
+ tst r1,r1
++#ifdef __thumb2__
++ it eq
++#endif
+ beq setjmp
+
+ str lr,[r0,#256]
+--
+2.18.0
+
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index 1e324804e1..779e1dc751 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -15,6 +15,7 @@ PV = "${BASEVER}+git${SRCPV}"
SRC_URI = "git://git.musl-libc.org/musl \
file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \
file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \
+ file://0003-fix-conditional-branch-to-PLT-in-THUMB-2-not-support.patch \
"
S = "${WORKDIR}/git"
--
2.18.0
More information about the Openembedded-core
mailing list