Skip to content

Commit

Permalink
syscall: RawSockaddr fix for ppc64, ppc64le
Browse files Browse the repository at this point in the history
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

Change-Id: I9964d4b04d63038a407580aa282129458201c2c1
Reviewed-on: https://go-review.googlesource.com/11946
Reviewed-by: Ian Lance Taylor <iant@golang.org>
  • Loading branch information
laboger authored and ianlancetaylor committed Aug 3, 2015
1 parent 7a60893 commit a850225
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 5 deletions.
11 changes: 11 additions & 0 deletions libgo/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -1676,7 +1676,17 @@ endif # !LIBGO_IS_LINUX
# Define socket sizes and types.
if LIBGO_IS_LINUX
syscall_socket_file = go/syscall/socket_linux.go epoll.go
if LIBGO_IS_PPC64LE
syscall_socket_type_file = go/syscall/socket_linux_ppc64x_type.go
else
if LIBGO_IS_PPC64
syscall_socket_type_file = go/syscall/socket_linux_ppc64x_type.go
else
syscall_socket_type_file = go/syscall/socket_linux_type.go
endif
endif
else
syscall_socket_type_file =
if LIBGO_IS_SOLARIS
syscall_socket_file = go/syscall/socket_solaris.go
else
Expand Down Expand Up @@ -1762,6 +1772,7 @@ go_base_syscall_files = \
$(syscall_size_file) \
$(syscall_socket_file) \
$(syscall_socket_os_file) \
$(syscall_socket_type_file) \
$(syscall_uname_file) \
$(syscall_netlink_file) \
$(syscall_lsf_file) \
Expand Down
5 changes: 5 additions & 0 deletions libgo/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -1848,6 +1848,10 @@ go_unicode_utf8_files = \

# Define socket sizes and types.
@LIBGO_IS_LINUX_TRUE@syscall_socket_file = go/syscall/socket_linux.go epoll.go
@LIBGO_IS_LINUX_FALSE@syscall_socket_type_file =
@LIBGO_IS_LINUX_TRUE@@LIBGO_IS_PPC64LE_FALSE@@LIBGO_IS_PPC64_FALSE@syscall_socket_type_file = go/syscall/socket_linux_type.go
@LIBGO_IS_LINUX_TRUE@@LIBGO_IS_PPC64LE_FALSE@@LIBGO_IS_PPC64_TRUE@syscall_socket_type_file = go/syscall/socket_linux_ppc64x_type.go
@LIBGO_IS_LINUX_TRUE@@LIBGO_IS_PPC64LE_TRUE@syscall_socket_type_file = go/syscall/socket_linux_ppc64x_type.go
@LIBGO_IS_SOLARIS_FALSE@syscall_socket_os_file = go/syscall/socket_posix.go

# Define socket functions.
Expand Down Expand Up @@ -1898,6 +1902,7 @@ go_base_syscall_files = \
$(syscall_size_file) \
$(syscall_socket_file) \
$(syscall_socket_os_file) \
$(syscall_socket_type_file) \
$(syscall_uname_file) \
$(syscall_netlink_file) \
$(syscall_lsf_file) \
Expand Down
5 changes: 0 additions & 5 deletions libgo/go/syscall/socket_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
14 changes: 14 additions & 0 deletions libgo/go/syscall/socket_linux_ppc64x_type.go
Original file line number Diff line number Diff line change
@@ -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
}
14 changes: 14 additions & 0 deletions libgo/go/syscall/socket_linux_type.go
Original file line number Diff line number Diff line change
@@ -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
}

0 comments on commit a850225

Please sign in to comment.