diff options
author | Ian Lance Taylor <iant@golang.org> | 2019-01-18 19:04:36 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-01-18 19:04:36 +0000 |
commit | 4f4a855d82a889cebcfca150a7a43909bcb6a346 (patch) | |
tree | f12bae0781920fa34669fe30b6f4615a86d9fb80 /libgo/go/internal/poll/writev.go | |
parent | 225220d668dafb8262db7012bced688acbe63b33 (diff) | |
download | gcc-4f4a855d82a889cebcfca150a7a43909bcb6a346.zip gcc-4f4a855d82a889cebcfca150a7a43909bcb6a346.tar.gz gcc-4f4a855d82a889cebcfca150a7a43909bcb6a346.tar.bz2 |
libgo: update to Go1.12beta2
Reviewed-on: https://go-review.googlesource.com/c/158019
gotools/:
* Makefile.am (go_cmd_vet_files): Update for Go1.12beta2 release.
(GOTOOLS_TEST_TIMEOUT): Increase to 600.
(check-runtime): Export LD_LIBRARY_PATH before computing GOARCH
and GOOS.
(check-vet): Copy golang.org/x/tools into check-vet-dir.
* Makefile.in: Regenerate.
gcc/testsuite/:
* go.go-torture/execute/names-1.go: Stop using debug/xcoff, which
is no longer externally visible.
From-SVN: r268084
Diffstat (limited to 'libgo/go/internal/poll/writev.go')
-rw-r--r-- | libgo/go/internal/poll/writev.go | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/libgo/go/internal/poll/writev.go b/libgo/go/internal/poll/writev.go index 4bf8804e..04e3522 100644 --- a/libgo/go/internal/poll/writev.go +++ b/libgo/go/internal/poll/writev.go @@ -9,7 +9,6 @@ package poll import ( "io" "syscall" - "unsafe" ) // Writev wraps the writev system call. @@ -54,24 +53,20 @@ func (fd *FD) Writev(v *[][]byte) (int64, error) { } fd.iovecs = &iovecs // cache - wrote, _, e0 := syscall.Syscall(syscall.SYS_WRITEV, - uintptr(fd.Sysfd), - uintptr(unsafe.Pointer(&iovecs[0])), - uintptr(len(iovecs))) + var wrote uintptr + wrote, err = writev(fd.Sysfd, iovecs) if wrote == ^uintptr(0) { wrote = 0 } TestHookDidWritev(int(wrote)) n += int64(wrote) consume(v, int64(wrote)) - if e0 == syscall.EAGAIN { - if err = fd.pd.waitWrite(fd.isFile); err == nil { - continue - } - } else if e0 != 0 { - err = syscall.Errno(e0) - } if err != nil { + if err.(syscall.Errno) == syscall.EAGAIN { + if err = fd.pd.waitWrite(fd.isFile); err == nil { + continue + } + } break } if n == 0 { |