aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-11-23 00:24:21 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-11-23 00:24:21 +0000
commit02dc624e21bad3e1080d11b466ec0a927489330c (patch)
tree1eb5e5702855281ed05d4fca66ee5d21676dbc10 /gcc/go
parentf6f28ab80749be4d221fc866e5b92c0265725cc4 (diff)
downloadgcc-02dc624e21bad3e1080d11b466ec0a927489330c.zip
gcc-02dc624e21bad3e1080d11b466ec0a927489330c.tar.gz
gcc-02dc624e21bad3e1080d11b466ec0a927489330c.tar.bz2
cmd/go, go/internal/gccgoimporter: pass -X to ar on AIX
Reviewed-on: https://go-review.googlesource.com/72930 From-SVN: r255090
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 0bd1dab..8141a4e 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-1db7dc97d01ee230ff4874ce1c9775a24ffd16ac
+57adb928c3cc61ac8fa47554394670a1c455afc2
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.