aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-08-01 00:05:05 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-08-01 00:05:05 +0000
commit67e7721491ab525d66eed8c33bb96c7b3712514d (patch)
treeeeea64bb9d3b1e7030223a6519f0e3eef198e105 /gcc/go
parente182158261869320bc6fb1e972fd5a142359965e (diff)
downloadgcc-67e7721491ab525d66eed8c33bb96c7b3712514d.zip
gcc-67e7721491ab525d66eed8c33bb96c7b3712514d.tar.gz
gcc-67e7721491ab525d66eed8c33bb96c7b3712514d.tar.bz2
runtime: use poll rather than pollset for netpoll on AIX
Updates golang/go#26634 Reviewed-on: https://go-review.googlesource.com/126857 From-SVN: r263186
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 95b6bcc..776a0a8 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-a2e0ad16555b2698df8e71f4c0fe02e185715bc1
+8997a3afcc746824cb70b48b32d9c86b4814807d
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.