based on the solution: http://ffmpeg.org/pipermail/ffmpeg-devel/2018-April/228246.html Signed-off-by: Steven Hung (洪于玉) <Steven.Hung@mediatek.com> --- ...branch-to-PLT-in-THUMB-2-not-support.patch | 28 +++++++++++++++++++ meta/recipes-core/musl/musl_git.bb | 1 + 2 files changed, 29 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..02b4a7a2e7 --- /dev/null +++ b/meta/recipes-core/musl/musl/0003-fix-conditional-branch-to-PLT-in-THUMB-2-not-support.patch @@ -0,0 +1,28 @@ +From fbfc3a6ad1e7f844ca4b9736330f28ced2f2a7d8 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@mediatek.com> +Date: Mon, 29 Apr 2019 14:28:52 +0800 +Subject: [PATCH] fix conditional branch to PLT in THUMB-2 not supported yet. + +based on the solution: http://ffmpeg.org/pipermail/ffmpeg-devel/2018-April/228246.html +--- + 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
************* MEDIATEK Confidentiality Notice ******************** The information contained in this e-mail message (including any attachments) may be confidential, proprietary, privileged, or otherwise exempt from disclosure under applicable laws. It is intended to be conveyed only to the designated recipient(s). Any use, dissemination, distribution, printing, retaining or copying of this e-mail (including its attachments) by unintended recipient(s) is strictly prohibited and may be unlawful. If you are not an intended recipient of this e-mail, or believe that you have received this e-mail in error, please notify the sender immediately (by replying to this e-mail), delete any and all copies of this e-mail (including any attachments) from your system, and do not disclose the content of this e-mail to any other person. Thank you!