aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2019-03-05 22:40:21 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2019-03-05 22:40:21 +0000
commitb211cd1b4639a0ee3be5f643bde10b1c1683bb58 (patch)
treeda7675a55880f51e117ece129430bd7006188e8b /gcc/go
parent507318f109624f58d4bf554c3ad284cdf09324e3 (diff)
downloadgcc-b211cd1b4639a0ee3be5f643bde10b1c1683bb58.zip
gcc-b211cd1b4639a0ee3be5f643bde10b1c1683bb58.tar.gz
gcc-b211cd1b4639a0ee3be5f643bde10b1c1683bb58.tar.bz2
cmd/go: pass -X64 to ar on aix/ppc64
On aix/ppc64, ar tool must always have -X64 argument if it aims to create 64 bits archives. Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/165317 From-SVN: r269404
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 b800330..3315957 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-3ae3024cae07fe7e85968ad2583add350616b296
+14e48e756af205a68374c872f3bd03d62ccd70bb
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.