aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-05-04 17:51:46 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-05-04 17:51:46 +0000
commit1c72513315c93a968acfdc5000b2f237480dbcba (patch)
treeb98d39c68ad40ddeca139acea92a8bedd05bf4f2 /gcc/go
parentf986735ac51029172a62e9e705a658cd0ee241e8 (diff)
downloadgcc-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
Diffstat (limited to 'gcc/go')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 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.