diff options
author | Yvan Roux <yvan.roux@linaro.org> | 2015-09-16 10:57:42 +0200 |
---|---|---|
committer | Yvan Roux <yvan.roux@linaro.org> | 2015-09-16 10:57:42 +0200 |
commit | ac19ac6481a3f326d9f41403f5dadab548b2c8a6 (patch) | |
tree | b3e7e392d6f89138ab8343bd9a6157e284e756ae /libgo/go | |
parent | 15a6021253f2cc4c832fd7ddb1469d3f0b281c91 (diff) |
Merge branches/gcc-5-branch rev 227732.linaro-local/gcc-5-integration-branch-new
Change-Id: I2f59904b28323b1c72a8cf1bd62c9e460d95bcea
Diffstat (limited to 'libgo/go')
-rw-r--r-- | libgo/go/syscall/libcall_linux.go | 2 | ||||
-rw-r--r-- | libgo/go/syscall/socket_linux.go | 5 | ||||
-rw-r--r-- | libgo/go/syscall/socket_linux_ppc64x_type.go | 14 | ||||
-rw-r--r-- | libgo/go/syscall/socket_linux_type.go | 14 |
4 files changed, 28 insertions, 7 deletions
diff --git a/libgo/go/syscall/libcall_linux.go b/libgo/go/syscall/libcall_linux.go index d5bedd06aac..93137fc7fb7 100644 --- a/libgo/go/syscall/libcall_linux.go +++ b/libgo/go/syscall/libcall_linux.go @@ -223,7 +223,6 @@ func Getdents(fd int, buf []byte) (n int, err error) { } else { p = (*byte)(unsafe.Pointer(&_zero)) } - Entersyscall() s := SYS_GETDENTS64 if s == 0 { s = SYS_GETDENTS @@ -233,7 +232,6 @@ func Getdents(fd int, buf []byte) (n int, err error) { if n < 0 { err = errno } - Exitsyscall() return } diff --git a/libgo/go/syscall/socket_linux.go b/libgo/go/syscall/socket_linux.go index 8546abc3e06..5064e771221 100644 --- a/libgo/go/syscall/socket_linux.go +++ b/libgo/go/syscall/socket_linux.go @@ -136,11 +136,6 @@ type RawSockaddrNetlink struct { Groups uint32 } -type RawSockaddr struct { - Family uint16 - Data [14]int8 -} - // BindToDevice binds the socket associated with fd to device. func BindToDevice(fd int, device string) (err error) { return SetsockoptString(fd, SOL_SOCKET, SO_BINDTODEVICE, device) diff --git a/libgo/go/syscall/socket_linux_ppc64x_type.go b/libgo/go/syscall/socket_linux_ppc64x_type.go new file mode 100644 index 00000000000..8a707ce49da --- /dev/null +++ b/libgo/go/syscall/socket_linux_ppc64x_type.go @@ -0,0 +1,14 @@ +// socket_linux_ppc64x_type.go -- Socket handling specific to ppc64 GNU/Linux. + +// Copyright 2015 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package syscall + +// Type needed on ppc64le & ppc64 + +type RawSockaddr struct { + Family uint16 + Data [14]uint8 +} diff --git a/libgo/go/syscall/socket_linux_type.go b/libgo/go/syscall/socket_linux_type.go new file mode 100644 index 00000000000..45b8c6ec1d0 --- /dev/null +++ b/libgo/go/syscall/socket_linux_type.go @@ -0,0 +1,14 @@ +// socket_linux_type.go -- Socket handling specific to GNU/Linux. + +// Copyright 2015 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package syscall + +// Type needed if not on ppc64le or ppc64 + +type RawSockaddr struct { + Family uint16 + Data [14]int8 +} |