aboutsummaryrefslogtreecommitdiffstats
path: root/main/musl
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2017-03-25 05:38:50 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2017-03-25 05:38:50 +0000
commitc27731d79b8921c2bcd9a80ca285cb8f9ec8ed88 (patch)
treed6b76f1bb4949ef5a7c8d23ee262d3e99a5f13d8 /main/musl
parent817b8638e39ddf1cde9e7cf214de191863a1c7e9 (diff)
downloadaports-c27731d79b8921c2bcd9a80ca285cb8f9ec8ed88.tar.bz2
aports-c27731d79b8921c2bcd9a80ca285cb8f9ec8ed88.tar.xz
main/musl: give s390x a working sigcontext
Diffstat (limited to 'main/musl')
-rw-r--r--main/musl/0031-s390x-provide-a-working-sigcontext-struct-definition.patch32
-rw-r--r--main/musl/APKBUILD4
2 files changed, 35 insertions, 1 deletions
diff --git a/main/musl/0031-s390x-provide-a-working-sigcontext-struct-definition.patch b/main/musl/0031-s390x-provide-a-working-sigcontext-struct-definition.patch
new file mode 100644
index 0000000000..c65df2943a
--- /dev/null
+++ b/main/musl/0031-s390x-provide-a-working-sigcontext-struct-definition.patch
@@ -0,0 +1,32 @@
+From aaf0e610d839d82abde1da45d8ead9adbb71d2cb Mon Sep 17 00:00:00 2001
+From: William Pitcock <nenolod@dereferenced.org>
+Date: Sat, 25 Mar 2017 05:35:26 +0000
+Subject: [PATCH] s390x: provide a working sigcontext struct definition
+
+For some reason, struct sigcontext was not declared on s390x (even though it is declared on every
+other architecture). Provide a workable equivalent to the structure provided by the kernel.
+
+Signed-off-by: William Pitcock <nenolod@dereferenced.org>
+---
+ arch/s390x/bits/signal.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/arch/s390x/bits/signal.h b/arch/s390x/bits/signal.h
+index c8665832..832351ce 100644
+--- a/arch/s390x/bits/signal.h
++++ b/arch/s390x/bits/signal.h
+@@ -43,6 +43,11 @@ typedef struct {
+
+ #endif
+
++struct sigcontext {
++ unsigned long oldmask[1];
++ mcontext_t *sregs;
++};
++
+ struct sigaltstack {
+ void *ss_sp;
+ int ss_flags;
+--
+2.12.1
+
diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD
index 6987757653..a39d071f5f 100644
--- a/main/musl/APKBUILD
+++ b/main/musl/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=musl
pkgver=1.1.16
-pkgrel=6
+pkgrel=7
pkgdesc="the musl c library (libc) implementation"
url="http://www.musl-libc.org/"
arch="all"
@@ -47,6 +47,7 @@ source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz
0028-s390x-fix-fpreg_t-and-remove-unused-per_struct.patch
0029-fix-POSIX-format-TZ-dst-transition-times-for-souther.patch
0030-fix-dlopen-dlsym-regression-opening-libs-already-loa.patch
+ 0031-s390x-provide-a-working-sigcontext-struct-definition.patch
ldconfig
__stack_chk_fail_local.c
@@ -197,6 +198,7 @@ dad1ed979898ddaa0a49c601160a948ba229b251307210a14240e4ebf6230b16ffc0138f396fc226
0472694cdd5a95b8df9b0e585afc7171ae9138133832ad7c0fadae4ea0a742eaa09a4d4449197ccaaefeae99c3cb7ec784068243a3a2d434429a0455c396e6bb 0028-s390x-fix-fpreg_t-and-remove-unused-per_struct.patch
33c24b895bcf1b84d90a522328b39d5b0a4aff822d0701f2f9db07a6c44c49bb3a8b16a19150c550b4fe04fad40e9af43fdf5e1fda0201e9779a471088fe9f23 0029-fix-POSIX-format-TZ-dst-transition-times-for-souther.patch
adcb5b213ebd9fc5d50cc46d4444ed64a4f928a6b4767428d7d720c6a563ba1d4a3173d6546b41379356b155a26eaad652d7b831776cc3f31e942f155db9239d 0030-fix-dlopen-dlsym-regression-opening-libs-already-loa.patch
+15ad590306829d196ecdb076d0491a822f80a46fac8179c30e29ea6b9138ebf5e1501796c8b116f8182c4ad6d1216e9702d407b7d29aeff35479f6ef568638bc 0031-s390x-provide-a-working-sigcontext-struct-definition.patch
8d3a2d5315fc56fee7da9abb8b89bb38c6046c33d154c10d168fb35bfde6b0cf9f13042a3bceee34daf091bc409d699223735dcf19f382eeee1f6be34154f26f ldconfig
062bb49fa54839010acd4af113e20f7263dde1c8a2ca359b5fb2661ef9ed9d84a0f7c3bc10c25dcfa10bb3c5a4874588dff636ac43d5dbb3d748d75400756d0b __stack_chk_fail_local.c
0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d getconf.c