X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-qk0-f169.google.com (mail-qk0-f169.google.com [209.85.220.169]) by lists.alpinelinux.org (Postfix) with ESMTP id 855EF5C52F7 for ; Sun, 9 Apr 2017 06:34:53 +0000 (GMT) Received: by mail-qk0-f169.google.com with SMTP id f133so71766377qke.2 for ; Sat, 08 Apr 2017 23:34:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flatglobe.org; s=google; h=from:to:subject:date:message-id; bh=Si25eMrd39IeIe06d37kZsqXYHisHZ3fTVisORq1Wmo=; b=NUJssabIEGkjT2ukpj8x2lsymHHHmfJG3Tm2YgeSVQ7z4OyERn+gFZSCQy6xDY03/w ydVwf0P8zHM8nqiwvzH9opSpvgIwrC52m+CzqkzxYzr67n6TQXqmODAGuF4x6ODofzyu Jp0cqrzrwy4+dzj3bTQxrM/aw4UbIeOJMYVE4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Si25eMrd39IeIe06d37kZsqXYHisHZ3fTVisORq1Wmo=; b=E5KyOm/LypGHoqSj8yZdULxywRFY271SgFtcDlla7KxEqVM+Xilogmuji4BEQR004Z 1i6WxsENLW3U7KXVZDKjG94vx5M0a2qrb5TzkGbzg9+so6APxEkWQ+WVdU/t8WvsZap3 8Xfu22ojwejYnM4ewOvEwgZwHgUecNX4oZIskEjHPrQtulSO+CDfhMKZoHtxiZ0DfP3b NdAbubKI2+5aCnfbQQRmrkaXsT7gXX7fKjwa+xielVF+PQz9+xgcZiQQxRTx+Wtn9R7X MA9842/p2nPx/KiLTSuakoPk+tF1x/EwIYMSAisIhsoNXM2cKNcZT0hKeKo0WPaJ4iLT 4y3g== X-Gm-Message-State: AFeK/H1rRnQypEciXnFgSvVHw0YrqPfnPpr438E/BoH3rVZzDaKhy+BamE+k7X6Zocl6qg== X-Received: by 10.55.54.144 with SMTP id d138mr23080932qka.207.1491719692936; Sat, 08 Apr 2017 23:34:52 -0700 (PDT) Received: from localhost.localdomain (cpe-204-210-151-44.hvc.res.rr.com. [204.210.151.44]) by smtp.gmail.com with ESMTPSA id k5sm6429223qtb.12.2017.04.08.23.34.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 08 Apr 2017 23:34:51 -0700 (PDT) From: "Tuan M. Hoang" To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] main/strace: fix temp bug in s390x Date: Sun, 9 Apr 2017 02:34:31 -0400 Message-Id: <1491719671-16183-1-git-send-email-tmhoang@flatglobe.org> X-Mailer: git-send-email 2.1.4 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- main/strace/APKBUILD | 6 ++++-- main/strace/s390x-signal-framesize.patch | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 main/strace/s390x-signal-framesize.patch diff --git a/main/strace/APKBUILD b/main/strace/APKBUILD index 0a7a7f0d..d5a66ad4 100644 --- a/main/strace/APKBUILD +++ b/main/strace/APKBUILD @@ -10,7 +10,8 @@ depends= makedepends="linux-headers" subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz - fix-ppc-pt-regs-collision.patch" + fix-ppc-pt-regs-collision.patch + s390x-signal-framesize.patch" builddir="$srcdir/$pkgname-$pkgver" prepare() { @@ -43,4 +44,5 @@ package() { } sha512sums="d1a7b782cb8196eb95b431b66f9b0eff7886869a7e3a4618d985f73b2eed7590ba73150b9c33e55ee5c65fc8f863588b64c5611dca7b5d7a4183110eaf4451d5 strace-4.16.tar.xz -b70cee89dd49a2b5a69dc2a56c3a11169d3306e1a73981155188b574486965c034aa52b4ac1c6edff5ef55c9d52f27750acb242fac095a8a9f69689b51b3fad1 fix-ppc-pt-regs-collision.patch" +b70cee89dd49a2b5a69dc2a56c3a11169d3306e1a73981155188b574486965c034aa52b4ac1c6edff5ef55c9d52f27750acb242fac095a8a9f69689b51b3fad1 fix-ppc-pt-regs-collision.patch +37bd35111f902b3785ee006b3e6e3a7b064125c411277c659c5f4e8e7b3c9b4249feaf4616cacff368616beed3414778f0e0e3592a524d890917681004885d6b 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 00000000..48a15d61 --- /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); -- 2.12.2 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---