cmd/go: on AIX, pass -X64 first when invoking ar

    Reviewed-on: https://go-review.googlesource.com/111535

From-SVN: r259946

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 02bf62520cbc2bcd6b6dfce835a306b18a336102..05ecf265d74d02ba64809171f39bd59eeba44d16 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-0c9b7a1ca4c6308345ea2a276cf820ff52513592
+6b0355769edd9543e6c5f2270b26b140bb96e9aa
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

diff --git a/libgo/go/cmd/go/internal/work/gccgo.go b/libgo/go/cmd/go/internal/work/gccgo.go
index 1ab7e4ef78abca047fe856bdfac19518e5252b27..e8dab19147839f3ecc7d651ac53b67f016dac511 100644 (file)
--- a/libgo/go/cmd/go/internal/work/gccgo.go
+++ b/libgo/go/cmd/go/internal/work/gccgo.go
@@ -198,7 +198,7 @@ func (gccgoToolchain) pack(b *Builder, a *Action, afile string, ofiles []string)
                        // AIX "ar" command does not know D option.
                        arArgs = append(arArgs, "-X64")
                }
-               return b.run(a, p.Dir, p.ImportPath, nil, "ar", "rc", arArgs, absAfile, absOfiles)
+               return b.run(a, p.Dir, p.ImportPath, nil, "ar", arArgs, "rc", absAfile, absOfiles)
        }
        return nil
 }