summaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-12-16 01:45:45 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-12-16 01:45:45 +0000
commitfe6272cc446f327c8e72c0c99aebd69fe9672c21 (patch)
tree6f28e29ad1612736e6c4437ac5d5a215b6fc05dd /gcc/go
parentdead5b9978dc169e846a726a6538b165a5c00274 (diff)
downloadgcc-fe6272cc446f327c8e72c0c99aebd69fe9672c21.tar.gz
syscall: emulate Flock on AIX
Reviewed-on: https://go-review.googlesource.com/79095 From-SVN: r255737
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 14baef5f6c2..35a2d0a38d2 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-c02de8ca63f52a2475ce8645edee3203a3c908ac
+d1f90c9b77baca5c33a398ab844fb4440c6a5ee7
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.