diff options
| author | swills <swills@FreeBSD.org> | 2015-11-11 05:45:23 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2015-11-11 05:45:23 +0800 |
| commit | f391816b10f5a453970f89712c4c3a938dd20828 (patch) | |
| tree | 93c1ef03ac6e4912ced490f9feadf7cc2372c206 /lang | |
| parent | 7ac68de9e8e1bead4c68b073f877f13a32e56929 (diff) | |
| download | freebsd-ports-gnome-f391816b10f5a453970f89712c4c3a938dd20828.tar.gz freebsd-ports-gnome-f391816b10f5a453970f89712c4c3a938dd20828.tar.zst freebsd-ports-gnome-f391816b10f5a453970f89712c4c3a938dd20828.zip | |
lang/go: fix build on 11i386
Approved by: jlaffaye (maintainer)
Obtained from: https://github.com/golang/go/commit/26263354a3d607e1cc6c06be67530dad57f43074
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/go/files/patch-src_cmd_link_internal_ld_ldelf.go | 16 | ||||
| -rw-r--r-- | lang/go/files/patch-src_cmd_link_internal_ld_lib.go | 11 |
2 files changed, 27 insertions, 0 deletions
diff --git a/lang/go/files/patch-src_cmd_link_internal_ld_ldelf.go b/lang/go/files/patch-src_cmd_link_internal_ld_ldelf.go new file mode 100644 index 000000000000..a877cbd0aa2e --- /dev/null +++ b/lang/go/files/patch-src_cmd_link_internal_ld_ldelf.go @@ -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 + } diff --git a/lang/go/files/patch-src_cmd_link_internal_ld_lib.go b/lang/go/files/patch-src_cmd_link_internal_ld_lib.go new file mode 100644 index 000000000000..42ccc1831277 --- /dev/null +++ b/lang/go/files/patch-src_cmd_link_internal_ld_lib.go @@ -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 { |