diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-05-04 17:51:46 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-05-04 17:51:46 +0000 |
| commit | 1c72513315c93a968acfdc5000b2f237480dbcba (patch) | |
| tree | b98d39c68ad40ddeca139acea92a8bedd05bf4f2 | |
| parent | f986735ac51029172a62e9e705a658cd0ee241e8 (diff) | |
| download | gcc-1c72513315c93a968acfdc5000b2f237480dbcba.zip gcc-1c72513315c93a968acfdc5000b2f237480dbcba.tar.gz gcc-1c72513315c93a968acfdc5000b2f237480dbcba.tar.bz2 | |
cmd/go: on AIX, pass -X64 first when invoking ar
Reviewed-on: https://go-review.googlesource.com/111535
From-SVN: r259946
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | 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 02bf625..05ecf26 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 1ab7e4e..e8dab19 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 } |