From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 1 Aug 2018 00:05:05 +0000 (+0000)
Subject:     runtime: use poll rather than pollset for netpoll on AIX
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=067172f1ece4a9ca71c7d3db4588d52a4815b75d;p=thirdparty%2Fgcc.git

runtime: use poll rather than pollset for netpoll on AIX

    Updates golang/go#26634

    Reviewed-on: https://go-review.googlesource.com/126857


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@263186 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 95b6bcc77138..776a0a8c893b 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.