aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2016-02-26 17:36:00 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2016-02-26 17:36:00 +0000
commit6b2cd37bd965bb51f2fd098c164f2441ad4f525c (patch)
treea5186cce77f730c3331fe4e1f4ce3afcff5ff594 /gcc
parent9ece21a6c56ee2b000f194d8fa591d7348b45afb (diff)
downloadgcc-6b2cd37bd965bb51f2fd098c164f2441ad4f525c.zip
gcc-6b2cd37bd965bb51f2fd098c164f2441ad4f525c.tar.gz
gcc-6b2cd37bd965bb51f2fd098c164f2441ad4f525c.tar.bz2
re PR go/69966 (libgo: Port syscall.SetsockoptUcred from golang)
PR go/69966 syscall: Add new Getsockopt functions. Add GetsockoptICMPv6Filter, GetsockoptIPv6MTUInfo, GetsockoptUcred as appropriate. These functions exist in the master library. For GCC PR 69966. Reviewed-on: https://go-review.googlesource.com/19960 From-SVN: r233747
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 9bebd30..07ae4d0 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-156f5f0152797ac2afe5f23803aeb3c7b8f8418e
+3de822d11255d439fac9717897b017aae2de18c2
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.