Rebase to 1.8.5

Re-apply workaround on s390x

golang.spec

@@ -95,11 +95,11 @@
 %endif
 
 %global go_api 1.8
-%global go_version 1.8.4
+%global go_version 1.8.5
 
 Name:           golang
-Version:        1.8.4
-Release:        2%{?dist}
+Version:        1.8.5
+Release:        1%{?dist}
 Summary:        The Go Programming Language
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
 License:        BSD and Public Domain
@@ -141,6 +141,8 @@ Patch219: s390x-expose-IfInfomsg-X__ifi_pad.patch
 # https://github.com/golang/go/commit/94aba76639cf4d5e30975d846bb0368db8202269
 Patch220: 31bit-OID-asn1.patch
 
+Patch221: s390x-ignore-L0syms.patch
+
 # Having documentation separate was broken
 Obsoletes:      %{name}-docs < 1.1-4
 
@@ -273,6 +275,8 @@ Requires:       %{name} = %{version}-%{release}
 %patch219 -p1
 %patch220 -p1
 
+%patch221 -p1
+
 cp %{SOURCE1} ./src/runtime/
 
 # don't include chacha test vectors in buildID
@@ -473,6 +477,7 @@ fi
 %exclude %{goroot}/src/
 %exclude %{goroot}/doc/
 %exclude %{goroot}/misc/
+%exclude %{goroot}/test/
 %{goroot}/*
 
 # ensure directory ownership, so they are cleaned up if empty
@@ -510,7 +515,11 @@ fi
 %endif
 
 %changelog
-* Thu Oct 07 2017 Jakub Čajka <jcajka@redhat.com> - 1.8.4-2
+* Tue Oct 31 2017 Jakub Čajka <jcajka@redhat.com> - 1.8.5-1
+- Rebase to 1.8.5
+- re-apply s390x workaround
+
+* Thu Oct 12 2017 Jakub Čajka <jcajka@redhat.com> - 1.8.4-2
 - add bcond for bootstrap
 
 * Fri Oct 06 2017 Jakub Čajka <jcajka@redhat.com> - 1.8.4-1

s390x-ignore-L0syms.patch

@@ -0,0 +1,18 @@
+diff --git a/src/cmd/link/internal/ld/ldelf.go b/src/cmd/link/internal/ld/ldelf.go
+index d4f9fc4..87dabaa 100644
+--- a/src/cmd/link/internal/ld/ldelf.go
++++ b/src/cmd/link/internal/ld/ldelf.go
+@@ -799,6 +799,13 @@ func ldelf(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) {
+ 				continue
+ 			}
+ 
++			if sect.name == ".debug_str" && sym.name == "L0
" && sym.type_ == 0 {
++				// introduced by https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=49fced1206db40c71208c201165d65f92c69cebe on s390x
++				// TODO investigate from where they are actually coming from, could be possible issue with elf parsing as seeing 0x1 in name is weird
++				// See issue 
++				continue
++			}
++
+ 			if strings.HasPrefix(sym.name, ".LASF") { // gcc on s390x does this
+ 				continue
+ 			}