From 67e7721491ab525d66eed8c33bb96c7b3712514d Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 1 Aug 2018 00:05:05 +0000 Subject: [PATCH] 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 --- gcc/go/gofrontend/MERGE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 95b6bcc7713..776a0a8c893 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. -- 2.30.2