aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-04-17 20:10:49 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-04-17 20:10:49 +0000
commitaa4ec2cdff98cdeec085fa14af4267a51e4e1052 (patch)
treea5c9195c263f5964ae5d1c203fe7a8922d435989 /gcc/go
parent1a013c9442553813a6a8f76de9360edc028639fe (diff)
downloadgcc-aa4ec2cdff98cdeec085fa14af4267a51e4e1052.zip
gcc-aa4ec2cdff98cdeec085fa14af4267a51e4e1052.tar.gz
gcc-aa4ec2cdff98cdeec085fa14af4267a51e4e1052.tar.bz2
gccgo: suppress "ar rcD" and "-zdefs" on AIX
Reviewed-on: https://go-review.googlesource.com/100955 From-SVN: r259445
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 76b5aca..f85a667 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-3aa5fc91094c5f24b26747ec176ad44cde784fc7
+2c7093358e5f5ebeb102d44d1036ca0a807d46a5
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.