aboutsummaryrefslogtreecommitdiff
path: root/gcc/go/gofrontend/MERGE
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2015-11-06 19:15:45 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2015-11-06 19:15:45 +0000
commited1545d899500a4c2e5c2688f06674033a0586f7 (patch)
tree3c89e373addb3b0abe146e923891ebbdfc72ced5 /gcc/go/gofrontend/MERGE
parentcd4fcdb8ff16ec2dad56f9e736ac4552f8f52001 (diff)
libgo: Solaris portability fixes.
Only build net/hook_cloexec.go on GNU/Linux and FreeBSD, because those are the only systems with accept4. Add syscall/libcall_bsd.go to define sendfile for *BSD and Solaris. Revert tcpsockopt_solaris.go back to the earlier version, so that it works on Solaris 10. Always pass the address of a Pid_t value to TIOCGPGRP and TIOCSPGRP. Include <unistd.h> in runtime/go-varargs.c. Reviewed-on: https://go-review.googlesource.com/16719 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@229880 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/go/gofrontend/MERGE')
-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 dc042d91656..b17ca93b24c 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-47f256e1ed527b2eb4041acf90d33e6abc5e1685
+10c1d6756ed1dcc814c49921c2a5e27f4677e0e6
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.