workaround build issue on s390x

This commit is contained in:
Jakub Čajka 2017-07-12 15:39:29 +02:00
parent 45041c89fe
commit f28f703aec
2 changed files with 22 additions and 1 deletions

View File

@ -119,7 +119,7 @@ BuildRequires: hostname
BuildRequires: net-tools
%endif
# for tests
BuildRequires: pcre-devel, glibc-static, perl
BuildRequires: pcre-devel, glibc-static, perl, procps-ng
Provides: go = %{version}-%{release}
Requires: %{name}-bin = %{version}-%{release}
@ -140,6 +140,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
@ -513,6 +515,7 @@ fi
- bump to 1.8.3
- fix for CVE-2017-8932
- make possible to use 31bit OID in ASN1
- workaround build issue on s390x
- Resolves: BZ#1454978, BZ#1455191
* Fri Apr 21 2017 Jakub Čajka <jcajka@redhat.com> - 1.8.1-2

18
s390x-ignore-L0syms.patch Normal file
View File

@ -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" && strings.HasPrefix(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
+ // See issue
+ continue
+ }
+
if strings.HasPrefix(sym.name, ".LASF") { // gcc on s390x does this
continue
}