aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-08-29 21:56:31 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-08-29 21:56:31 +0000
commit53a36c2652910378a5fcce39cd905643d2df6316 (patch)
tree0f1758082cb36d6d37d8e1694b614b92a3c32ec1 /gcc/go
parent6222bddc8e082412d04c0775a3ea17d020c49a60 (diff)
downloadgcc-53a36c2652910378a5fcce39cd905643d2df6316.zip
gcc-53a36c2652910378a5fcce39cd905643d2df6316.tar.gz
gcc-53a36c2652910378a5fcce39cd905643d2df6316.tar.bz2
net/internal/socktest: build sys_unix.go on AIX
Reviewed-on: https://go-review.googlesource.com/59913 From-SVN: r251440
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 f1d198a..f49be92 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-930304ec98bfe8e9cccb34d340873958e14255df
+5674b5927d5336e20fbec455a9f7b0b8ed70166c
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.