aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-12-05 01:11:02 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-12-05 01:11:02 +0000
commit9cf3cb7c2599ac56386b600146f494c2eb2370b3 (patch)
treea56e30aefb8fb77466cc2a27a28b9f8347559dbf /gcc
parent4526e5eccb78947d0d54c7470aa5b2e187bb515e (diff)
downloadgcc-9cf3cb7c2599ac56386b600146f494c2eb2370b3.zip
gcc-9cf3cb7c2599ac56386b600146f494c2eb2370b3.tar.gz
gcc-9cf3cb7c2599ac56386b600146f494c2eb2370b3.tar.bz2
syscall: remove Flock for aix/ppc64
CL 152397 removed it from gc's syscall package. Updates golang/go#29084 Reviewed-on: https://go-review.googlesource.com/c/152557 From-SVN: r266812
Diffstat (limited to 'gcc')
-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 558f713..7693242 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-7259d9a403db2784c7d03239c6a50e730062fc61
+d3a98b7a9ea8032be22ebb3ea2f389ce22669d53
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.