diff options
| author | Andrew Wilkins <axwalk@gmail.com> | 2016-03-15 05:36:43 +0000 |
|---|---|---|
| committer | Andrew Wilkins <axwalk@gmail.com> | 2016-03-15 05:36:43 +0000 |
| commit | 6436a4abd7a2f3a60b230453295dba199d8a59c3 (patch) | |
| tree | 125aef80fc2cf46c5d1758a8ece1fde14e7b13fd /llgo/third_party/gofrontend/libgo/go/net/sys_cloexec.go | |
| parent | 36761bf92427846ce40fdd849615732c852e44dd (diff) | |
| download | bcm5719-llvm-6436a4abd7a2f3a60b230453295dba199d8a59c3.tar.gz bcm5719-llvm-6436a4abd7a2f3a60b230453295dba199d8a59c3.zip | |
[llgo] Roll gofrontend forward
Switch gofrontend to using go.googlesource.com, and
update to 81eb6a3f425b2158c67ee32c0cc973a72ce9d6be.
There are various changes required to update to the
go 1.5 runtime:
typemap.go is changed to accommodate the change in representation for equal/hash algorithms, and the removal of the zero value/type.
CMakeLists.txt is updated to add the build tree to the package search path, so internal packages, which are not installed, are found.
various files changes due to removal of __go_new_nopointers; the same change as in D11863, but with NoUnwindAttribute added to the added runtime functions which are called with "callOnly".
minor cleanups in ssa.go while investigating issues with unwinding/panic handling.
Differential Revisision: http://reviews.llvm.org/D15188
llvm-svn: 263536
Diffstat (limited to 'llgo/third_party/gofrontend/libgo/go/net/sys_cloexec.go')
| -rw-r--r-- | llgo/third_party/gofrontend/libgo/go/net/sys_cloexec.go | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/llgo/third_party/gofrontend/libgo/go/net/sys_cloexec.go b/llgo/third_party/gofrontend/libgo/go/net/sys_cloexec.go index 898fb7c0c2c..ba266e6534c 100644 --- a/llgo/third_party/gofrontend/libgo/go/net/sys_cloexec.go +++ b/llgo/third_party/gofrontend/libgo/go/net/sys_cloexec.go @@ -9,24 +9,27 @@ package net -import "syscall" +import ( + "os" + "syscall" +) // Wrapper around the socket system call that marks the returned file // descriptor as nonblocking and close-on-exec. func sysSocket(family, sotype, proto int) (int, error) { // See ../syscall/exec_unix.go for description of ForkLock. syscall.ForkLock.RLock() - s, err := syscall.Socket(family, sotype, proto) + s, err := socketFunc(family, sotype, proto) if err == nil { syscall.CloseOnExec(s) } syscall.ForkLock.RUnlock() if err != nil { - return -1, err + return -1, os.NewSyscallError("socket", err) } if err = syscall.SetNonblock(s, true); err != nil { - syscall.Close(s) - return -1, err + closeFunc(s) + return -1, os.NewSyscallError("setnonblock", err) } return s, nil } @@ -39,16 +42,16 @@ func accept(s int) (int, syscall.Sockaddr, error) { // because we have put fd.sysfd into non-blocking mode. // However, a call to the File method will put it back into // blocking mode. We can't take that risk, so no use of ForkLock here. - ns, sa, err := syscall.Accept(s) + ns, sa, err := acceptFunc(s) if err == nil { syscall.CloseOnExec(ns) } if err != nil { - return -1, nil, err + return -1, nil, os.NewSyscallError("accept", err) } if err = syscall.SetNonblock(ns, true); err != nil { - syscall.Close(ns) - return -1, nil, err + closeFunc(ns) + return -1, nil, os.NewSyscallError("setnonblock", err) } return ns, sa, nil } |

