aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2020-11-29 10:16:27 -0800
committerIan Lance Taylor <iant@golang.org>2020-11-30 12:17:01 -0800
commite848a83f46f15280ad654f05545cc5ec4f5b8e50 (patch)
tree0cf7f90e869839c7c62dbef720c4ecfde8a944b9 /gcc/go
parent5ba975e6680cc5f9c2be7ee34b1cacdba3eb3347 (diff)
downloadgcc-e848a83f46f15280ad654f05545cc5ec4f5b8e50.zip
gcc-e848a83f46f15280ad654f05545cc5ec4f5b8e50.tar.gz
gcc-e848a83f46f15280ad654f05545cc5ec4f5b8e50.tar.bz2
libgo: define SO_RCVTIMEO on 32-bit GNU/Linux
Fixes golang/go#42872 Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/273892
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 4124603..e8cf468 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-45461eeba1db1a3b4194dc8ecc331c0e92f5ad4c
+be1738f1fff0e817d921ed568791f9b0585a6982
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.