aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorNikhil Benesch <nikhil.benesch@gmail.com>2020-10-10 00:06:36 +0000
committerIan Lance Taylor <iant@golang.org>2020-10-21 16:57:59 -0700
commit2ab1fc7a322e2582772f0e4ed916508c890175e3 (patch)
treea3c3c4cef165b2ec33f3bd8b5df5d4849fd3316a /gcc
parent3fd5876793ddf882994acafc9c5b28e3be8897bd (diff)
downloadgcc-2ab1fc7a322e2582772f0e4ed916508c890175e3.zip
gcc-2ab1fc7a322e2582772f0e4ed916508c890175e3.tar.gz
gcc-2ab1fc7a322e2582772f0e4ed916508c890175e3.tar.bz2
syscall: import upstream code for BSD sockets and sysctls
Import some missing upstream code for BSD sockets and sysctls and adapt it for gccgo. Updates golang/go#38538. Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/261137
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 fb7aa3e..aedaf46 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-b2be94556bbc98f565fc277e30a038c742bf28a4
+64c25b2365f7125a32b3146618b627f26a78c1fc
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.