aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-08-16 20:58:26 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-08-16 20:58:26 +0000
commit098c21726725c699533d39d6d4133acd45503d7e (patch)
treecc34bf64f3bee80c10d284a97cc18426ee21de3b /gcc
parent8cca6c95d2b196afbb85f69c0798f3061169fb12 (diff)
downloadgcc-098c21726725c699533d39d6d4133acd45503d7e.zip
gcc-098c21726725c699533d39d6d4133acd45503d7e.tar.gz
gcc-098c21726725c699533d39d6d4133acd45503d7e.tar.bz2
runtime: better implementation of netpoll for AIX
Reviewed-on: https://go-review.googlesource.com/54170 From-SVN: r251133
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 52fe064..3490c56 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-f02183eb66f5718769f3f6541dcc6744ae1771c0
+152164a7249ecc5c2bfd4a091450dc7c2855f609
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.