From 1c72513315c93a968acfdc5000b2f237480dbcba Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 4 May 2018 17:51:46 +0000 Subject: [PATCH] cmd/go: on AIX, pass -X64 first when invoking ar Reviewed-on: https://go-review.googlesource.com/111535 From-SVN: r259946 --- gcc/go/gofrontend/MERGE | 2 +- libgo/go/cmd/go/internal/work/gccgo.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 02bf62520cb..05ecf265d74 100644 --- 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 1ab7e4ef78a..e8dab191478 100644 --- 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 } -- 2.30.2