Commit 3ce1677a authored by Dave Cheney's avatar Dave Cheney

cmd/go: ensure external test files are presented to the linker first

Fixes #7627.

CL 61970044 changed the order in which .a files are passed to gccgo's link phase. However by reversing the order it caused gccgo to complain if both internal (liba.a) and external (liba_test.a) versions of a package were presented as the former would not contain all the necessary symbols, and the latter would duplicate symbols already defined.

This change ensures that all 'fake' targets remain at the top of the final link order which should be fine as a package compiled as an external test is a superset of its internal sibling.

Looking at how gcToolchain links tests I think this change now accurately mirrors those actions which present $WORK/_test before $WORK in the link order.

LGTM=iant
R=rsc, iant
CC=golang-codereviews, michael.hudson
https://golang.org/cl/80300043
parent aa139194
...@@ -1867,10 +1867,15 @@ func (tools gccgoToolchain) ld(b *builder, p *Package, out string, allactions [] ...@@ -1867,10 +1867,15 @@ func (tools gccgoToolchain) ld(b *builder, p *Package, out string, allactions []
if !a.p.Standard { if !a.p.Standard {
if a.p != nil && !apackagesSeen[a.p] { if a.p != nil && !apackagesSeen[a.p] {
apackagesSeen[a.p] = true apackagesSeen[a.p] = true
if a.p.fake {
// move _test files to the top of the link order
afiles = append([]string{a.target}, afiles...)
} else {
afiles = append(afiles, a.target) afiles = append(afiles, a.target)
} }
} }
} }
}
for _, a := range allactions { for _, a := range allactions {
if a.p != nil { if a.p != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment