diff options
| author | Tuan M. Hoang <tmhoang@flatglobe.org> | 2017-05-20 12:45:35 -0400 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2017-05-23 22:25:16 +0000 |
| commit | 3fe0df8ba95e1f631674c79ac11150fc914dfe43 (patch) | |
| tree | 2338417b55ff6fdd2971a08efd4f3eeadcf93daf /main/musl/0031-s390x-provide-a-working-sigcontext-struct-definition.patch | |
| parent | 245c7809b92e2423c41ce71180c80f671e13dc12 (diff) | |
| download | aports-3fe0df8ba95e1f631674c79ac11150fc914dfe43.tar.bz2 aports-3fe0df8ba95e1f631674c79ac11150fc914dfe43.tar.xz | |
main/musl: update upstream s390x patch
With this update, ocaml built good but ocaml-findlib still
segfault
Diffstat (limited to 'main/musl/0031-s390x-provide-a-working-sigcontext-struct-definition.patch')
| -rw-r--r-- | main/musl/0031-s390x-provide-a-working-sigcontext-struct-definition.patch | 47 |
1 files changed, 29 insertions, 18 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 index c65df2943a..359da6fe97 100644 --- a/main/musl/0031-s390x-provide-a-working-sigcontext-struct-definition.patch +++ b/main/musl/0031-s390x-provide-a-working-sigcontext-struct-definition.patch @@ -1,32 +1,43 @@ -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 +From 555504166852a9b9c56ac4e1fb5bb1bf20cbf8ad Mon Sep 17 00:00:00 2001 +From: Bobby Bingham <koorogi@koorogi.info> +Date: Sun, 26 Mar 2017 14:50:37 -0500 +Subject: s390x: provide 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. +This structure was missed when creating the s390x port. -Signed-off-by: William Pitcock <nenolod@dereferenced.org> +This is based on the report and patch from William Pitcock, but with a +modified structure defintion to more closely match the kernel's +definition. --- - arch/s390x/bits/signal.h | 5 +++++ - 1 file changed, 5 insertions(+) + arch/s390x/bits/signal.h | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) diff --git a/arch/s390x/bits/signal.h b/arch/s390x/bits/signal.h -index c8665832..832351ce 100644 +index c866583..e5aca4b 100644 --- a/arch/s390x/bits/signal.h +++ b/arch/s390x/bits/signal.h -@@ -43,6 +43,11 @@ typedef struct { - - #endif +@@ -33,6 +33,21 @@ typedef struct + fpregset_t fpregs; + } mcontext_t; +struct sigcontext { + unsigned long oldmask[1]; -+ mcontext_t *sregs; ++ struct { ++ struct { ++ __psw_t psw; ++ unsigned long gprs[16]; ++ unsigned acrs[16]; ++ } regs; ++ struct { ++ unsigned fpc; ++ double fprs[16]; ++ } fpregs; ++ } *sregs; +}; + - struct sigaltstack { - void *ss_sp; - int ss_flags; + #else + + typedef struct { -- -2.12.1 +cgit v0.11.2 |