summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-01-02 23:21:21 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-03 22:35:48 +0000
commit17f102e36e6e909486296bed3024b820bce97d3d (patch)
tree3e8e0a7aee1d0f5feb018e5db8b029045551c3ff /meta/recipes-core
parentab8785cbe64845f15dcfe83cfefe8fb5e54e3c42 (diff)
downloadpoky-17f102e36e6e909486296bed3024b820bce97d3d.tar.gz
musl: Upgrade beyond 1.24
License-Change: Added ARM to copyright files [1] [2] [3] Detailed changes are here [4] [1] https://git.musl-libc.org/cgit/musl/commit/COPYRIGHT?id=db3cc9a319c788cf5241ea68d3fa86b43f35733e [2] https://git.musl-libc.org/cgit/musl/commit/?id=daa29e894c74d61296fe19d9b7c4be2f04037639 [3] https://git.musl-libc.org/cgit/musl/commit/?id=d3f7df235904439d48db041c7796e5b44be5b8e6 [4] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=2c2477da9a553c0b9b2fa18073a5dcdbe6d395af..70d80609558153a996833392999c69cdb74e1119 (From OE-Core rev: 222574d744b6605ad938e1b7c64834303bcbea92) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/musl/musl.inc2
-rw-r--r--meta/recipes-core/musl/musl/0001-riscv-Define-sigcontext-again.patch48
-rw-r--r--meta/recipes-core/musl/musl_git.bb5
3 files changed, 3 insertions, 52 deletions
diff --git a/meta/recipes-core/musl/musl.inc b/meta/recipes-core/musl/musl.inc
index 0683bf85ed..9aea2c39c8 100644
--- a/meta/recipes-core/musl/musl.inc
+++ b/meta/recipes-core/musl/musl.inc
@@ -9,7 +9,7 @@ standards-conformance and safety."
9HOMEPAGE = "http://www.musl-libc.org/" 9HOMEPAGE = "http://www.musl-libc.org/"
10LICENSE = "MIT" 10LICENSE = "MIT"
11SECTION = "libs" 11SECTION = "libs"
12LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d0fe2be17bc45ff4a42ade1c13ed6340" 12LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f95ee848a08ad253c04723da00cedb01"
13 13
14INHIBIT_DEFAULT_DEPS = "1" 14INHIBIT_DEFAULT_DEPS = "1"
15 15
diff --git a/meta/recipes-core/musl/musl/0001-riscv-Define-sigcontext-again.patch b/meta/recipes-core/musl/musl/0001-riscv-Define-sigcontext-again.patch
deleted file mode 100644
index fcb324e15f..0000000000
--- a/meta/recipes-core/musl/musl/0001-riscv-Define-sigcontext-again.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1commit a0993f8f0f161423ecdcb754f282ffd2fe47a7b5
2Author: Rich Felker <dalias@aerifal.cx>
3Date: Wed Oct 2 09:28:03 2019 -0400
4
5 reintroduce riscv64 struct sigcontext
6
7 commit ab3eb89a8b83353cdaab12ed017a67a7730f90e9 removed it as part of
8 correcting the mcontext_t definition, but there is still code using
9 struct sigcontext and expecting the member names present in it, most
10 notably libgcc_eh. almost all such usage is incorrect, but bring back
11 struct sigcontext at least for now so as not to introduce regressions.
12
13Upstream-Status: Pending
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15diff --git a/arch/riscv64/bits/signal.h b/arch/riscv64/bits/signal.h
16index 03fe48c1..2ff4be30 100644
17--- a/arch/riscv64/bits/signal.h
18+++ b/arch/riscv64/bits/signal.h
19@@ -6,12 +6,6 @@
20 # define SIGSTKSZ 8192
21 #endif
22
23-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
24-typedef unsigned long greg_t;
25-typedef unsigned long gregset_t[32];
26-typedef union __riscv_mc_fp_state fpregset_t;
27-#endif
28-
29 typedef unsigned long __riscv_mc_gp_state[32];
30
31 struct __riscv_mc_f_ext_state {
32@@ -41,6 +35,16 @@ typedef struct mcontext_t {
33 union __riscv_mc_fp_state __fpregs;
34 } mcontext_t;
35
36+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
37+typedef unsigned long greg_t;
38+typedef unsigned long gregset_t[32];
39+typedef union __riscv_mc_fp_state fpregset_t;
40+struct sigcontext {
41+ gregset_t gregs;
42+ fpregset_t fpregs;
43+};
44+#endif
45+
46 struct sigaltstack {
47 void *ss_sp;
48 int ss_flags;
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index aacff79f7c..92149b5632 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -4,9 +4,9 @@
4require musl.inc 4require musl.inc
5inherit linuxloader 5inherit linuxloader
6 6
7SRCREV = "2c2477da9a553c0b9b2fa18073a5dcdbe6d395af" 7SRCREV = "70d80609558153a996833392999c69cdb74e1119"
8 8
9BASEVER = "1.1.23" 9BASEVER = "1.1.24"
10 10
11PV = "${BASEVER}+git${SRCPV}" 11PV = "${BASEVER}+git${SRCPV}"
12 12
@@ -15,7 +15,6 @@ PV = "${BASEVER}+git${SRCPV}"
15SRC_URI = "git://git.musl-libc.org/musl \ 15SRC_URI = "git://git.musl-libc.org/musl \
16 file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ 16 file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \
17 file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ 17 file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \
18 file://0001-riscv-Define-sigcontext-again.patch \
19 " 18 "
20 19
21S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"