Drop workaround for linker issue on s390x(BZ#1460254)

This commit is contained in:
Jakub Čajka 2017-07-18 18:12:15 +02:00
parent 2ee82274e4
commit 96c389d958
2 changed files with 0 additions and 22 deletions

View File

@ -140,8 +140,6 @@ 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
@ -274,8 +272,6 @@ Requires: %{name} = %{version}-%{release}
%patch219 -p1
%patch220 -p1
%patch221 -p1
cp %{SOURCE1} ./src/runtime/
# don't include chacha test vectors in buildID

View File

@ -1,18 +0,0 @@
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
}