summaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-12-16 01:49:54 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-12-16 01:49:54 +0000
commitbe528ae9aa5a04611019c42f4d94fed7e4727dad (patch)
treefab1cf2de0b37122b65e594768c9975400a13a7d /gcc/go
parentfe6272cc446f327c8e72c0c99aebd69fe9672c21 (diff)
downloadgcc-be528ae9aa5a04611019c42f4d94fed7e4727dad.tar.gz
os: pass -s to hostname on AIX
Reviewed-on: https://go-review.googlesource.com/79375 From-SVN: r255738
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 35a2d0a38d2..b54038f82e0 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-d1f90c9b77baca5c33a398ab844fb4440c6a5ee7
+97eb3f61cf1c2cc01b9db6ed20e39bc04573c207
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.