From b1f6d6b37b437feae9b6148142fdb0b8eaf9ccc0 Mon Sep 17 00:00:00 2001 From: "Tuan M. Hoang" Date: Sun, 9 Apr 2017 02:34:31 -0400 Subject: main/strace: fix temp bug in s390x --- main/strace/s390x-signal-framesize.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 main/strace/s390x-signal-framesize.patch (limited to 'main/strace/s390x-signal-framesize.patch') diff --git a/main/strace/s390x-signal-framesize.patch b/main/strace/s390x-signal-framesize.patch new file mode 100644 index 0000000000..48a15d61c7 --- /dev/null +++ b/main/strace/s390x-signal-framesize.patch @@ -0,0 +1,17 @@ +__SIGNAL_FRAMESIZE is defined in asm/sigcontext.h but including it would make +conflict with struct sigcontext since we compile with it in musl. This patch +is temporary till musl upstream has a proper solution for sigcontext. + +diff --git a/linux/s390/arch_sigreturn.c b/linux/s390/arch_sigreturn.c +index d1b8598..c0a4658 100644 +--- a/linux/s390/arch_sigreturn.c ++++ b/linux/s390/arch_sigreturn.c +@@ -2,7 +2,7 @@ static void + arch_sigreturn(struct tcb *tcp) + { + unsigned long mask[NSIG_BYTES / sizeof(long)]; +- const unsigned long addr = *s390_frame_ptr + __SIGNAL_FRAMESIZE; ++ const unsigned long addr = *s390_frame_ptr + 160; + + if (umove(tcp, addr, &mask) < 0) { + tprintf("{mask=%#lx}", addr); -- cgit v1.2.3