up to 1.6.2; mmap-cgo-stackalign.patch applied upstream

diff --git a/golang.spec b/golang.spec
index b53d79add2c946c52e511aff7c22cbc43eacac1f..7584e28080cbd8bb5b378b59e0b154db6fdef013 100644 (file)
--- a/golang.spec
+++ b/golang.spec
@@ -22,18 +22,17 @@
 Summary:       Go compiler and tools
 Summary(pl.UTF-8):     Kompilator języka Go i narzędzia
 Name:          golang
-Version:       1.6
+Version:       1.6.2
 Release:       1
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
 License:       BSD and Public Domain
 Group:         Development/Languages
 # Source0Download: https://golang.org/dl/
 Source0:       https://storage.googleapis.com/golang/go%{version}.src.tar.gz
-# Source0-md5: e67833ea37fbc002fbe38efe6c1bcd98
+# Source0-md5: d1b50fa98d9a71eeee829051411e6207
 Patch0:                ca-certs.patch
 Patch1:                %{name}-binutils.patch
 Patch2:                %{name}-1.2-verbose-build.patch
-Patch3:                mmap-cgo-stackalign.patch
 Patch4:                go1.5beta1-disable-TestGdbPython.patch
 Patch5:                go1.5-zoneinfo_testing_only.patch
 URL:           http://golang.org/
@@ -106,7 +105,6 @@ mv go/* .
 %patch0 -p1
 #%patch1 -p1 seems outdated, compiler rewritten in .go instead of .c
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 

diff --git a/mmap-cgo-stackalign.patch b/mmap-cgo-stackalign.patch
deleted file mode 100644 (file)
index 4f7f263..0000000
--- a/mmap-cgo-stackalign.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-# Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1304591
-# https://github.com/golang/go/issues/14384
-From 315f4c70f123cfbf061d097543af555547acd9c7 Mon Sep 17 00:00:00 2001
-From: Shenghou Ma <minux@golang.org>
-Date: Thu, 18 Feb 2016 16:29:39 -0500
-Subject: [PATCH] runtime: use correct psABI SP alignment before calling libc
- mmap
-
-Fixes #14384.
-
-Change-Id: Ib025cf2d20754b4c2db52f0a8a4717fd303371d6
-Reviewed-on: https://go-review.googlesource.com/19660
-Run-TryBot: Minux Ma <minux@golang.org>
-TryBot-Result: Gobot Gobot <gobot@golang.org>
-Reviewed-by: Ian Lance Taylor <iant@golang.org>
-Reviewed-by: Austin Clements <austin@google.com>
----
- src/runtime/sys_linux_amd64.s | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/runtime/sys_linux_amd64.s b/src/runtime/sys_linux_amd64.s
-index aed85cb..f407078 100644
---- a/src/runtime/sys_linux_amd64.s
-+++ b/src/runtime/sys_linux_amd64.s
-@@ -258,7 +258,7 @@ TEXT runtime·sysMmap(SB),NOSPLIT,$0
- 
- // Call the function stored in _cgo_mmap using the GCC calling convention.
- // This must be called on the system stack.
--TEXT runtime·callCgoMmap(SB),NOSPLIT,$0
-+TEXT runtime·callCgoMmap(SB),NOSPLIT,$16
-       MOVQ    addr+0(FP), DI
-       MOVQ    n+8(FP), SI
-       MOVL    prot+16(FP), DX
-@@ -266,7 +266,11 @@ TEXT runtime·callCgoMmap(SB),NOSPLIT,$0
-       MOVL    fd+24(FP), R8
-       MOVL    off+28(FP), R9
-       MOVQ    _cgo_mmap(SB), AX
-+      MOVQ    SP, BX
-+      ANDQ    $~15, SP        // alignment as per amd64 psABI
-+      MOVQ    BX, 0(SP)
-       CALL    AX
-+      MOVQ    0(SP), SP
-       MOVQ    AX, ret+32(FP)
-       RET
-