libgo/go/syscall: add SockAddrDatalink on AIX

    This patch is required in order to build golang.org/x/net. The
    corresponding Go Toolchain patch is CL 170537.

    Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/172898

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@270458 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 6007b4f750a800154112e90455843530f559e62b..f5e8bd7b636b60e4002855736eb85042e799cd1b 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-ecbd6562aff604b9559f63d714e922a0c9c2a77f
+1d2b98a4af0188f3f1d4a3eaae928e1db8383a63
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

diff --git a/libgo/go/syscall/socket_aix.go b/libgo/go/syscall/socket_aix.go
index 40cf42365e2c819f88997bc66e8eeb937801f2db..aaa1419fc9e1c5e8cf47b72924a86a11037b2465 100644 (file)
--- a/libgo/go/syscall/socket_aix.go
+++ b/libgo/go/syscall/socket_aix.go
@@ -11,6 +11,7 @@ import "unsafe"
 const SizeofSockaddrInet4 = 16
 const SizeofSockaddrInet6 = 28
 const SizeofSockaddrUnix = 1025
+const SizeofSockaddrDatalink = 128
 
 type RawSockaddrInet4 struct {
        Len    uint8
@@ -87,3 +88,26 @@ func GetsockoptIPv6MTUInfo(fd, level, opt int) (*IPv6MTUInfo, error) {
        err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
        return &value, err
 }
+
+type SockaddrDatalink struct {
+       Len    uint8
+       Family uint8
+       Index  uint16
+       Type   uint8
+       Nlen   uint8
+       Alen   uint8
+       Slen   uint8
+       Data   [120]uint8
+       raw    RawSockaddrDatalink
+}
+
+type RawSockaddrDatalink struct {
+       Len    uint8
+       Family uint8
+       Index  uint16
+       Type   uint8
+       Nlen   uint8
+       Alen   uint8
+       Slen   uint8
+       Data   [120]uint8
+}