qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-17 00:14:50 -07:00
Code Releases Activity

cmd/link: fix file-local checks in xcoff

Browse Source 
The xcoff writer has several "ldr.SymVersion(s) != 0" checks. The
intent of these is to check for file-local (or static) symbols. Prior
to the introduction of symbol ABIs, this was indeed equivalent since
only file-local symbols has non-zero versions, but ABIs also use the
symbol version space. This still happened to work until much more
recently because we were only ever cgo-exporting version 0 symbols,
but CL 309341 changed this, causing these checks to fail on symbols
that were okay to export.

Replace these checks with ldr.IsFileLocal(s).

This should fix the AIX builder.

(Originally based on CL 309772.)

Fixes #45553.
Updates #40724.

Change-Id: I0a3a7f621ad8f9fe078d34e667286275257691ea
Reviewed-on: https://go-review.googlesource.com/c/go/+/310729
Trust: Austin Clements <austin@google.com>
Run-TryBot: Austin Clements <austin@google.com>
Reviewed-by: Than McIntosh <thanm@google.com>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
This commit is contained in:
Austin Clements 2021-04-15 22:27:37 -04:00
parent acb189ea59
commit 60abe01321
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/cmd/link/internal/ld/xcoff.go
View File

@ -825,7 +825,7 @@ func (f *xcoffFile) writeSymbolFunc(ctxt *Link, x loader.Sym) []xcoffSym {
Nnumaux: 2, Nnumaux: 2,
} }
if ldr.SymVersion(x) != 0 || ldr.AttrVisibilityHidden(x) || ldr.AttrLocal(x) { if ldr.IsFileLocal(x) || ldr.AttrVisibilityHidden(x) || ldr.AttrLocal(x) {
s.Nsclass = C_HIDEXT s.Nsclass = C_HIDEXT
} }
@ -914,7 +914,7 @@ func putaixsym(ctxt *Link, x loader.Sym, t SymbolType) {
Nnumaux: 1, Nnumaux: 1,
} }
if ldr.SymVersion(x) != 0 || ldr.AttrVisibilityHidden(x) || ldr.AttrLocal(x) { if ldr.IsFileLocal(x) || ldr.AttrVisibilityHidden(x) || ldr.AttrLocal(x) {
// There is more symbols in the case of a global data // There is more symbols in the case of a global data
// which are related to the assembly generated // which are related to the assembly generated
// to access such symbols. // to access such symbols.
@ -1318,19 +1318,14 @@ func (ctxt *Link) doxcoff() {
if !ldr.AttrCgoExport(s) { if !ldr.AttrCgoExport(s) {
continue continue
} }
if ldr.SymVersion(s) != 0 { // sanity check if ldr.IsFileLocal(s) {
panic("cgo_export on non-version 0 symbol") panic("cgo_export on static symbol")
} }
if ldr.SymType(s) == sym.STEXT || ldr.SymType(s) == sym.SABIALIAS { if ldr.SymType(s) == sym.STEXT || ldr.SymType(s) == sym.SABIALIAS {
// On AIX, a exported function must have two symbols: // On AIX, a exported function must have two symbols:
// - a .text symbol which must start with a ".". // - a .text symbol which must start with a ".".
// - a .data symbol which is a function descriptor. // - a .data symbol which is a function descriptor.
//
// CgoExport attribute should only be set on a version 0
// symbol, which can be TEXT or ABIALIAS.
// (before, setupdynexp copies the attribute from the
// alias to the aliased. Now we are before setupdynexp.)
name := ldr.SymExtname(s) name := ldr.SymExtname(s)
ldr.SetSymExtname(s, "."+name) ldr.SetSymExtname(s, "."+name)
@ -1787,8 +1782,8 @@ func xcoffCreateExportFile(ctxt *Link) (fname string) {
if !strings.HasPrefix(extname, "._cgoexp_") { if !strings.HasPrefix(extname, "._cgoexp_") {
continue continue
} }
if ldr.SymVersion(s) != 0 { if ldr.IsFileLocal(s) {
continue // Only export version 0 symbols. See the comment in doxcoff. continue // Only export non-static symbols
} }
// Retrieve the name of the initial symbol // Retrieve the name of the initial symbol