aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-01-19 04:27:38 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-01-19 04:27:38 +0000
commit219f9bad8306a8766e25b06116fece3f027cbeef (patch)
treeed13a0341d91886c26b29dcdc38cfd10d2859890 /gcc
parent549e4febc34ae8ef2ef13f621e7fe69cb73e1aee (diff)
downloadgcc-219f9bad8306a8766e25b06116fece3f027cbeef.zip
gcc-219f9bad8306a8766e25b06116fece3f027cbeef.tar.gz
gcc-219f9bad8306a8766e25b06116fece3f027cbeef.tar.bz2
cmd/go: recognize AIX objects and archives
Reviewed-on: https://go-review.googlesource.com/88275 From-SVN: r256873
Diffstat (limited to 'gcc')
-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 1a51e10..a16df7a 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-6b4f1391e2cd637fa5ed797bb3ab43d9ede61997
+cf33aedb66b5121708f5640443c1336080a47fe5
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.