[release-branch.go1.5] cmd/link: link go.o first

Does not fix #12327 but nicer anyway.

Change-Id: I4ad730a4ca833d76957b7571895b3a08a6a530d4
Reviewed-on: https://go-review.googlesource.com/16964
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-on: https://go-review.googlesource.com/17126

diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
index 8ccbec9dd6342c35ae7e7482721bfc715de60299..a9ec3d2133c303430fdc7a8e2bafa0f7bd12e1c8 100644 (file)
--- a/src/cmd/link/internal/ld/lib.go
+++ b/src/cmd/link/internal/ld/lib.go
@@ -886,8 +886,8 @@ func archive() {
 
        mayberemoveoutfile()
        argv := []string{"ar", "-q", "-c", "-s", outfile}
-       argv = append(argv, hostobjCopy()...)
        argv = append(argv, fmt.Sprintf("%s/go.o", tmpdir))
+       argv = append(argv, hostobjCopy()...)
 
        if Debug['v'] != 0 {
                fmt.Fprintf(&Bso, "archive: %s\n", strings.Join(argv, " "))
@@ -1012,8 +1012,8 @@ func hostlink() {
                argv = append(argv, "-Qunused-arguments")
        }
 
-       argv = append(argv, hostobjCopy()...)
        argv = append(argv, fmt.Sprintf("%s/go.o", tmpdir))
+       argv = append(argv, hostobjCopy()...)
 
        if Linkshared {
                seenDirs := make(map[string]bool)