diff options
author | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-08-03 21:18:56 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2015-08-03 21:18:56 +0000 |
commit | 1ca95ba067db107e360f79acc95fd987ecb7b37b (patch) | |
tree | 91bb0c10eb34456977a82dcf78aec4e8f864cddb /libgo/go | |
parent | ab977fd881b81c9a03ea709fee8b02fb34cd3897 (diff) | |
download | gcc-1ca95ba067db107e360f79acc95fd987ecb7b37b.zip gcc-1ca95ba067db107e360f79acc95fd987ecb7b37b.tar.gz gcc-1ca95ba067db107e360f79acc95fd987ecb7b37b.tar.bz2 |
syscall: RawSockaddr fix for ppc64, ppc64le
The struct RawSockaddr contains a field Data which
should be uint8 on ppc64 and ppc64le, but is declared
as int8 in gccgo. This change adds a two new files
which contain the structure declaration for
RawSockaddr, one with the correct types for for ppc64
and ppc64le, and the other for non-ppc64 platforms.
Fixes golang/go#11469
Reviewed-on: https://go-review.googlesource.com/11946
From-SVN: r226533
Diffstat (limited to 'libgo/go')
-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 |
3 files changed, 28 insertions, 5 deletions
diff --git a/libgo/go/syscall/socket_linux.go b/libgo/go/syscall/socket_linux.go index 8546abc..5064e77 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 0000000..8a707ce --- /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 0000000..45b8c6e --- /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 +} |