diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2020-06-04 09:30:50 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-05 07:35:01 +0100 |
| commit | 66a4cc01f86da136b903a03502137ea40a669710 (patch) | |
| tree | e59a2cae4c7787f2637f23d88dca0b0c58c966a8 | |
| parent | ad404b2e51223625bd95f9a7da4c7a690c37bdfb (diff) | |
| download | openembedded-core-contrib-66a4cc01f86da136b903a03502137ea40a669710.tar.gz | |
libunwind: Fix build on aarch64/musl
Backport a patch from upstream
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/libunwind/libunwind/sigset_t.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-support/libunwind/libunwind_1.4.0.bb | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-support/libunwind/libunwind/sigset_t.patch b/meta/recipes-support/libunwind/libunwind/sigset_t.patch new file mode 100644 index 0000000000..6baaa77db5 --- /dev/null +++ b/meta/recipes-support/libunwind/libunwind/sigset_t.patch @@ -0,0 +1,28 @@ +From 5df1555828add4e256cb4bba49fffffc22127c34 Mon Sep 17 00:00:00 2001 +From: Dave Watson <dade.watson@gmail.com> +Date: Wed, 27 May 2020 08:21:04 -0700 +Subject: [PATCH] aarch64: Fix __sigset build issue on muslC + +Described in issue #176. Taken from Alpine Linux project. + +Change __sigset_t to sigset_t + +Upstream-Status: Backport [https://github.com/libunwind/libunwind/commit/5df1555828] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/libunwind-aarch64.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/libunwind-aarch64.h b/include/libunwind-aarch64.h +index db01a9f69..d1bd8708f 100644 +--- a/include/libunwind-aarch64.h ++++ b/include/libunwind-aarch64.h +@@ -202,7 +202,7 @@ typedef struct + unsigned long uc_flags; + struct ucontext *uc_link; + stack_t uc_stack; +- __sigset_t uc_sigmask; ++ sigset_t uc_sigmask; + struct unw_sigcontext uc_mcontext; + } unw_tdep_context_t; + diff --git a/meta/recipes-support/libunwind/libunwind_1.4.0.bb b/meta/recipes-support/libunwind/libunwind_1.4.0.bb index f50205f1b9..34c2249e91 100644 --- a/meta/recipes-support/libunwind/libunwind_1.4.0.bb +++ b/meta/recipes-support/libunwind/libunwind_1.4.0.bb @@ -7,6 +7,7 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV file://0004-Fix-build-on-mips-musl.patch \ file://0005-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ file://0006-Fix-for-X32.patch \ + file://sigset_t.patch \ " SRC_URI_append_libc-musl = " file://musl-header-conflict.patch" |