[Pkg-golang-commits] [golang] 01/01: Add upstream patch for s390x FTBFS

[Tianon Gravi]

This is an automated email from the git hooks/post-receive script.

tianon pushed a commit to branch golang-1.7
in repository golang.

commit c27ca291b3a40664685bae1df8f1250b16c91f0f
Author: Tianon Gravi <tianon at debian.org>
Date:   Fri Sep 9 09:37:09 2016 -0700

    Add upstream patch for s390x FTBFS
---
 debian/changelog              |  6 ++++++
 debian/patches/cl-28850.patch | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 41 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 47592f2..f67427e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+golang-1.7 (1.7.1-2) UNRELEASED; urgency=medium
+
+  * Add upstream patch for s390x FTBFS
+
+ -- Tianon Gravi <tianon at debian.org>  Fri, 09 Sep 2016 09:36:32 -0700
+
 golang-1.7 (1.7.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/cl-28850.patch b/debian/patches/cl-28850.patch
new file mode 100644
index 0000000..f663470
--- /dev/null
+++ b/debian/patches/cl-28850.patch
@@ -0,0 +1,34 @@
+From d38d59ffb5d56c838b1ed7cc346b8d63398b5452 Mon Sep 17 00:00:00 2001
+From: Michael Munday <munday at ca.ibm.com>
+Date: Thu, 8 Sep 2016 19:27:24 -0400
+Subject: [PATCH] runtime: fix SIGILL in checkvectorfacility on s390x
+Origin: https://golang.org/cl/28850
+Bug: https://golang.org/issue/17032
+Applied-Upstream: 1.7.2
+
+STFLE does not necessarily write to all the double-words that are
+requested. It is therefore necessary to clear the target memory
+before calling STFLE in order to ensure that the facility list does
+not contain false positives.
+
+Fixes #17032.
+
+Change-Id: I7bec9ade7103e747b72f08562fe57e6f091bd89f
+Reviewed-on: https://go-review.googlesource.com/28850
+Reviewed-by: Brad Fitzpatrick <bradfitz at golang.org>
+---
+ src/runtime/asm_s390x.s | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/runtime/asm_s390x.s b/src/runtime/asm_s390x.s
+index cf0ed1a..928fe37 100644
+--- a/src/runtime/asm_s390x.s
++++ b/src/runtime/asm_s390x.s
+@@ -20,6 +20,7 @@ TEXT runtime·checkvectorfacility(SB),NOSPLIT,$32-0
+ 	MOVD    $2, R0
+ 	MOVD	R1, tmp-32(SP)
+ 	MOVD    $x-24(SP), R1
++	XC	$24, 0(R1), 0(R1)
+ //      STFLE   0(R1)
+ 	WORD    $0xB2B01000
+ 	MOVBZ   z-8(SP), R1
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..c29a62c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+cl-28850.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-golang/golang.git