aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2016-10-18 14:38:29 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2016-10-18 14:38:29 +0000
commit812ba636c7b12f2c503e34aaf9e2da50d5777b82 (patch)
treec81659977f9a532c5d4b53872301ba5e67c4166f /gcc
parentf5de494c59532fdad30097af4185b2ce74700984 (diff)
downloadgcc-812ba636c7b12f2c503e34aaf9e2da50d5777b82.zip
gcc-812ba636c7b12f2c503e34aaf9e2da50d5777b82.tar.gz
gcc-812ba636c7b12f2c503e34aaf9e2da50d5777b82.tar.bz2
runtime: copy netpoll code from Go 1.7 runtime
Reviewed-on: https://go-review.googlesource.com/31325 From-SVN: r241307
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 c13c10d..40f91ce 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-0a49b1dadd862215bdd38b9725a6e193b0d8fd0b
+68bb6a9875499037d3eccb79a1f92e1c7a476d58
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.