aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-01-18 03:37:52 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-01-18 03:37:52 +0000
commit49947b33ff2fc3982e6e5e0815d0daf3e46188eb (patch)
tree6eee4082ac9050dde854deba503306e29e078b66 /gcc/go
parent4cc0208ac8f44e826c983ec89c6ffbc4f4facc7a (diff)
downloadgcc-49947b33ff2fc3982e6e5e0815d0daf3e46188eb.zip
gcc-49947b33ff2fc3982e6e5e0815d0daf3e46188eb.tar.gz
gcc-49947b33ff2fc3982e6e5e0815d0daf3e46188eb.tar.bz2
syscall, golang_org/x/net/lif: fixes for gccgo on Solaris
Reviewed-on: https://go-review.googlesource.com/35390 From-SVN: r244563
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 375ce17..f989752 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-223cba75b947afc1ee5a13a60c15c66f6ff355c1
+2b3d389f961b8461b3fdf42318a628f68b56f8b1
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.