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-09 13:13:59 +0100 |
commit | 75fbaa9fb1d5f7970e06a144a0fd6fb20674103b (patch) | |
tree | 4ff90575058d8bc2dab15a6018db097ea390dfba /meta/recipes-support | |
parent | a067139de005d2f3f86488bcc5d67b99270630b5 (diff) | |
download | poky-75fbaa9fb1d5f7970e06a144a0fd6fb20674103b.tar.gz |
libunwind: Fix build on aarch64/musl
Backport a patch from upstream
(From OE-Core rev: 66a4cc01f86da136b903a03502137ea40a669710)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-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 @@ | |||
1 | From 5df1555828add4e256cb4bba49fffffc22127c34 Mon Sep 17 00:00:00 2001 | ||
2 | From: Dave Watson <dade.watson@gmail.com> | ||
3 | Date: Wed, 27 May 2020 08:21:04 -0700 | ||
4 | Subject: [PATCH] aarch64: Fix __sigset build issue on muslC | ||
5 | |||
6 | Described in issue #176. Taken from Alpine Linux project. | ||
7 | |||
8 | Change __sigset_t to sigset_t | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/libunwind/libunwind/commit/5df1555828] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | include/libunwind-aarch64.h | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/include/libunwind-aarch64.h b/include/libunwind-aarch64.h | ||
17 | index db01a9f69..d1bd8708f 100644 | ||
18 | --- a/include/libunwind-aarch64.h | ||
19 | +++ b/include/libunwind-aarch64.h | ||
20 | @@ -202,7 +202,7 @@ typedef struct | ||
21 | unsigned long uc_flags; | ||
22 | struct ucontext *uc_link; | ||
23 | stack_t uc_stack; | ||
24 | - __sigset_t uc_sigmask; | ||
25 | + sigset_t uc_sigmask; | ||
26 | struct unw_sigcontext uc_mcontext; | ||
27 | } unw_tdep_context_t; | ||
28 | |||
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 | |||
7 | file://0004-Fix-build-on-mips-musl.patch \ | 7 | file://0004-Fix-build-on-mips-musl.patch \ |
8 | file://0005-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ | 8 | file://0005-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ |
9 | file://0006-Fix-for-X32.patch \ | 9 | file://0006-Fix-for-X32.patch \ |
10 | file://sigset_t.patch \ | ||
10 | " | 11 | " |
11 | SRC_URI_append_libc-musl = " file://musl-header-conflict.patch" | 12 | SRC_URI_append_libc-musl = " file://musl-header-conflict.patch" |
12 | 13 | ||