Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Nov 2015 21:45:24 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r401214 - head/lang/go/files
Message-ID:  <201511102145.tAALjOem022514@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Tue Nov 10 21:45:23 2015
New Revision: 401214
URL: https://svnweb.freebsd.org/changeset/ports/401214

Log:
  lang/go: fix build on 11i386
  
  Approved by:	jlaffaye (maintainer)
  Obtained from:	https://github.com/golang/go/commit/26263354a3d607e1cc6c06be67530dad57f43074

Added:
  head/lang/go/files/patch-src_cmd_link_internal_ld_ldelf.go   (contents, props changed)
  head/lang/go/files/patch-src_cmd_link_internal_ld_lib.go   (contents, props changed)

Added: head/lang/go/files/patch-src_cmd_link_internal_ld_ldelf.go
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/go/files/patch-src_cmd_link_internal_ld_ldelf.go	Tue Nov 10 21:45:23 2015	(r401214)
@@ -0,0 +1,16 @@
+--- src/cmd/link/internal/ld/ldelf.go.orig	2015-09-09 01:24:01 UTC
++++ src/cmd/link/internal/ld/ldelf.go
+@@ -629,6 +629,13 @@ func ldelf(f *obj.Biobuf, pkg string, le
+ 			if strings.HasPrefix(sym.name, ".Linfo_string") { // clang does this
+ 				continue
+ 			}
++
++			if sym.name == "" && sym.type_ == 0 && sect.name == ".debug_str" {
++				// This reportedly happens with clang 3.7 on ARM.
++				// See issue 13139.
++				continue
++			}
++
+ 			Diag("%s: sym#%d: ignoring %s in section %d (type %d)", pn, i, sym.name, sym.shndx, sym.type_)
+ 			continue
+ 		}

Added: head/lang/go/files/patch-src_cmd_link_internal_ld_lib.go
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/go/files/patch-src_cmd_link_internal_ld_lib.go	Tue Nov 10 21:45:23 2015	(r401214)
@@ -0,0 +1,11 @@
+--- src/cmd/link/internal/ld/lib.go.orig	2015-09-09 01:24:02 UTC
++++ src/cmd/link/internal/ld/lib.go
+@@ -1765,7 +1765,7 @@ func genasmsym(put func(*LSym, string, i
+ 	}
+ 
+ 	for s := Ctxt.Allsym; s != nil; s = s.Allsym {
+-		if s.Hide != 0 || (s.Name[0] == '.' && s.Version == 0 && s.Name != ".rathole") {
++		if s.Hide != 0 || ((s.Name == "" || s.Name[0] == '.') && s.Version == 0 && s.Name != ".rathole") {
+ 			continue
+ 		}
+ 		switch s.Type & obj.SMASK {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511102145.tAALjOem022514>