aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-08-29 21:51:49 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-08-29 21:51:49 +0000
commit6222bddc8e082412d04c0775a3ea17d020c49a60 (patch)
tree26aa2c47aca6392849beb461901391e96d305b2f /gcc/go
parent88b811bd29063036fd4536ee1312b1269cade6ed (diff)
downloadgcc-6222bddc8e082412d04c0775a3ea17d020c49a60.zip
gcc-6222bddc8e082412d04c0775a3ea17d020c49a60.tar.gz
gcc-6222bddc8e082412d04c0775a3ea17d020c49a60.tar.bz2
libgo: netinet/icmp6.h require netinet/in.h on AIX
Reviewed-on: https://go-review.googlesource.com/59912 From-SVN: r251439
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 b224ba9e..f1d198a 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-03a2c6be0c6e2b8ef62a5a424c5518bfb7cce0b9
+930304ec98bfe8e9cccb34d340873958e14255df
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.