I've backported a change to the go tool to the GCC 6 branch. This
change came in on mainline as part of the update to Go 1.7 library,
and update that will not be made on GCC 6 branch. The original change
was https://golang.org/cl/21692. Backport bootstrapped and tested on
x86_64-pc-linux-gnu, and verified that it fixes
https://golang.org/issue/15547 (which is already fixed on mainline).
Committed to GCC 6 branch.
Ian
Index: go/cmd/go/build.go
===================================================================
--- go/cmd/go/build.go (revision 239431)
+++ go/cmd/go/build.go (working copy)
@@ -2632,10 +2632,9 @@ func (gccgoToolchain) pack(b *builder, p
func (tools gccgoToolchain) ld(b *builder, root *action, out string,
allactions []*action, mainpkg string, ofiles []string) error {
// gccgo needs explicit linking with all package dependencies,
// and all LDFLAGS from cgo dependencies.
- apackagesSeen := make(map[*Package]bool)
+ apackagePathsSeen := make(map[string]bool)
afiles := []string{}
shlibs := []string{}
- xfiles := []string{}
ldflags := b.gccArchArgs()
cgoldflags := []string{}
usesCgo := false
@@ -2647,9 +2646,18 @@ func (tools gccgoToolchain) ld(b *builde
if err != nil {
return err
}
+ const ldflagsPrefix = "_CGO_LDFLAGS="
for _, line := range strings.Split(string(flags), "\n") {
- if strings.HasPrefix(line, "_CGO_LDFLAGS=") {
- cgoldflags = append(cgoldflags,
strings.Fields(line[13:])...)
+ if strings.HasPrefix(line, ldflagsPrefix) {
+ newFlags :=
strings.Fields(line[len(ldflagsPrefix):])
+ for _, flag := range newFlags {
+ // Every _cgo_flags file has -g and -O2
in _CGO_LDFLAGS
+ // but they don't mean anything to the
linker so filter
+ // them out.
+ if flag != "-g" &&
!strings.HasPrefix(flag, "-O") {
+ cgoldflags = append(cgoldflags,
flag)
+ }
+ }
}
}
return nil
@@ -2714,10 +2722,10 @@ func (tools gccgoToolchain) ld(b *builde
// rather than the 'build' location (which may not
exist any
// more). We still need to traverse the dependencies of
the
// build action though so saying
- // if apackagesSeen[a.p] { return }
+ // if apackagePathsSeen[a.p.ImportPath] { return }
// doesn't work.
- if !apackagesSeen[a.p] {
- apackagesSeen[a.p] = true
+ if !apackagePathsSeen[a.p.ImportPath] {
+ apackagePathsSeen[a.p.ImportPath] = true
target := a.target
if len(a.p.CgoFiles) > 0 {
target, err =
readAndRemoveCgoFlags(target)
@@ -2725,17 +2733,7 @@ func (tools gccgoToolchain) ld(b *builde
return
}
}
- if a.p.fake && a.p.external {
- // external _tests, if present must
come before
- // internal _tests. Store these on a
separate list
- // and place them at the head after
this loop.
- xfiles = append(xfiles, target)
- } else if a.p.fake {
- // move _test files to the top of the
link order
- afiles = append([]string{target},
afiles...)
- } else {
- afiles = append(afiles, target)
- }
+ afiles = append(afiles, target)
}
}
if strings.HasSuffix(a.target, ".so") {
@@ -2755,7 +2753,6 @@ func (tools gccgoToolchain) ld(b *builde
return err
}
}
- afiles = append(xfiles, afiles...)
for _, a := range allactions {
// Gather CgoLDFLAGS, but not from standard packages.
