From patchwork Wed Feb 20 20:05:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 222141 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 0BDA82C0077 for ; Thu, 21 Feb 2013 07:05:53 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1361995554; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: From:To:Subject:Date:Message-ID:User-Agent:MIME-Version: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=0MFn6yy jyb3mdE5znRjHFQLl3Ic=; b=QAXUxjzzL881ZWHx6Z3Lex2s/VgsN60GaTBopzW tiq9HgAY37SWYPfn7HMKF1MGtBCnEHgFldP9Y5W7z9BYVBh40rxLf6u2WFOjrxoL qkfA44V15kvdPF05/lQYGKilc6lAepnBGkfPNwsvIO2qeV0+ar6/vfDYSi54CooP xIbM= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:X-Google-DKIM-Signature:X-Received:Received:From:To:Subject:Date:Message-ID:User-Agent:MIME-Version:Content-Type:X-Gm-Message-State:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=eSWjGgdF/zhPmLAuFZ3/B4LgPmwvBYOkU92xKwiwrwxCT036xg1m+uE4NPQgKr OvdBB7lTfYrJ+LbtRfGa2W4J8dl67c6a3lDOW9hI8rlyIZK3e8rLMHMzAzdTkufj FjEmv5viagR+YXoXWgv2YGi+Cr2PBjDiFT8is7o3oD5AE=; Received: (qmail 27541 invoked by alias); 20 Feb 2013 20:05:43 -0000 Received: (qmail 27494 invoked by uid 22791); 20 Feb 2013 20:05:41 -0000 X-SWARE-Spam-Status: No, hits=-4.7 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_NO, RCVD_IN_HOSTKARMA_YE, RP_MATCHES_RCVD, TW_CV, TW_VF, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from mail-ve0-f179.google.com (HELO mail-ve0-f179.google.com) (209.85.128.179) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 20 Feb 2013 20:05:34 +0000 Received: by mail-ve0-f179.google.com with SMTP id da11so7152226veb.38 for ; Wed, 20 Feb 2013 12:05:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:subject:date:message-id:user-agent:mime-version :content-type:x-gm-message-state; bh=/AhBqQ1jj9jKr67NuxspL2ru+0OvU+NYh758tPqm+nc=; b=TTW4FeV9Xx29e78aAxivjQq1HAQoce9Rq0x2F3dW88CD5M1m7IJcqfxbG4+e0bdE+5 WG9mmMX0L5FR/iRz3/iIqfUcPG8ADImw9BSsrv/70Glt8VEh0IDZzlmDUqMcdYNYEL4E 5NygFCAw0yshWZR0eQHoX+eJLRTt0s3LS9bJck7ivI//2BhAaKdo1v0M0AHHCVDiBKO2 UZy9Ni+AQz+O6V9NC8LT6timS3MxYM6mwnOLPQdJP/T1DUJI0mbSGr+aek1v+VcHUHOO TmHdVfeYz++qEynxLzyVP9mSBc56lDDzwOLzIZgoiare5QyFRFY1CtFUEHD4V5EV+ECl GM5A== X-Received: by 10.58.12.200 with SMTP id a8mr28082135vec.52.1361390733465; Wed, 20 Feb 2013 12:05:33 -0800 (PST) Received: from iant-glaptop.google.com (mdm2-66-243-204-138.pivot.net. [66.243.204.138]) by mx.google.com with ESMTPS id mj8sm108896814veb.8.2013.02.20.12.05.32 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 20 Feb 2013 12:05:32 -0800 (PST) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: libgo patch committed: Solaris net fixes Date: Wed, 20 Feb 2013 12:05:30 -0800 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQn719B8876MW3vDSrrxdND5R29IGvrzoBD9YSohWkpo6PoRjQ7TdjURtBMSpLvUUReNtILOYBE4lNT+eMiJ2NGa/FDsJP4NFYmqZK2GilIkcBf43nQpXXJmkIVGgSvG07X6D9c6/SArMqP9Gv7xOlARWeTEdWNHrLpj9GmZ4nHZxbaGT3VOW9yOtufwP75BSfOELMz9 X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org This patch, mainly from Rainer Orth, in PR 56171 fixes passing a file descriptor on Solaris. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian diff -r 3b1c3cceaf02 libgo/Makefile.am --- a/libgo/Makefile.am Wed Feb 20 11:41:05 2013 -0800 +++ b/libgo/Makefile.am Wed Feb 20 12:01:58 2013 -0800 @@ -1656,6 +1656,13 @@ endif endif +# Define socket functions. +if LIBGO_IS_SOLARIS +syscall_socket_os_file = go/syscall/socket_xnet.go +else +syscall_socket_os_file = go/syscall/socket_posix.go +endif + # Support for uname. if LIBGO_IS_SOLARIS if LIBGO_IS_386 @@ -1722,6 +1729,7 @@ $(syscall_errstr_file) \ $(syscall_size_file) \ $(syscall_socket_file) \ + $(syscall_socket_os_file) \ $(syscall_uname_file) \ $(syscall_netlink_file) \ $(syscall_lsf_file) \ @@ -1746,13 +1754,20 @@ go/syscall/passfd_test.go libcalls.go: s-libcalls; @true -s-libcalls: Makefile go/syscall/mksyscall.awk $(go_base_syscall_files) +s-libcalls: libcalls-list go/syscall/mksyscall.awk $(go_base_syscall_files) rm -f libcalls.go.tmp - files=`echo $^ | sed -e 's/Makefile//' -e 's|[^ ]*go/syscall/mksyscall.awk||'`; \ + files=`echo $^ | sed -e 's/libcalls-list//' -e 's|[^ ]*go/syscall/mksyscall.awk||'`; \ $(AWK) -f $(srcdir)/go/syscall/mksyscall.awk $${files} > libcalls.go.tmp $(SHELL) $(srcdir)/../move-if-change libcalls.go.tmp libcalls.go $(STAMP) $@ +libcalls-list: s-libcalls-list; @true +s-libcalls-list: Makefile + rm -f libcalls-list.tmp + echo $(go_base_syscall_files) > libcalls-list.tmp + $(SHELL) $(srcdir)/../move-if-change libcalls-list.tmp libcalls-list + $(STAMP) $@ + syscall_arch.go: s-syscall_arch; @true s-syscall_arch: Makefile rm -f syscall_arch.go.tmp diff -r 3b1c3cceaf02 libgo/go/syscall/sockcmsg_unix.go --- a/libgo/go/syscall/sockcmsg_unix.go Wed Feb 20 11:41:05 2013 -0800 +++ b/libgo/go/syscall/sockcmsg_unix.go Wed Feb 20 12:01:58 2013 -0800 @@ -8,7 +8,10 @@ package syscall -import "unsafe" +import ( + "runtime" + "unsafe" +) // Round the length of a raw sockaddr up to align it propery. func cmsgAlignOf(salen int) int { @@ -18,6 +21,11 @@ if darwinAMD64 { salign = 4 } + // NOTE: Solaris always uses 32-bit alignment, + // cf. _CMSG_DATA_ALIGNMENT in . + if runtime.GOOS == "solaris" { + salign = 4 + } if salen == 0 { return salign } diff -r 3b1c3cceaf02 libgo/go/syscall/socket.go --- a/libgo/go/syscall/socket.go Wed Feb 20 11:41:05 2013 -0800 +++ b/libgo/go/syscall/socket.go Wed Feb 20 12:01:58 2013 -0800 @@ -177,9 +177,6 @@ return anyToSockaddr(&rsa) } -//sys bind(fd int, sa *RawSockaddrAny, len Socklen_t) (err error) -//bind(fd _C_int, sa *RawSockaddrAny, len Socklen_t) _C_int - func Bind(fd int, sa Sockaddr) (err error) { ptr, n, err := sa.sockaddr() if err != nil { @@ -188,9 +185,6 @@ return bind(fd, ptr, n) } -//sys connect(s int, addr *RawSockaddrAny, addrlen Socklen_t) (err error) -//connect(s _C_int, addr *RawSockaddrAny, addrlen Socklen_t) _C_int - func Connect(fd int, sa Sockaddr) (err error) { ptr, n, err := sa.sockaddr() if err != nil { @@ -199,9 +193,6 @@ return connect(fd, ptr, n) } -//sysnb socket(domain int, typ int, proto int) (fd int, err error) -//socket(domain _C_int, typ _C_int, protocol _C_int) _C_int - func Socket(domain, typ, proto int) (fd int, err error) { if domain == AF_INET6 && SocketDisableIPv6 { return -1, EAFNOSUPPORT @@ -210,9 +201,6 @@ return } -//sysnb socketpair(domain int, typ int, proto int, fd *[2]_C_int) (err error) -//socketpair(domain _C_int, typ _C_int, protocol _C_int, fd *[2]_C_int) _C_int - func Socketpair(domain, typ, proto int) (fd [2]int, err error) { var fdx [2]_C_int err = socketpair(domain, typ, proto, &fdx) @@ -223,9 +211,6 @@ return } -//sys getsockopt(s int, level int, name int, val uintptr, vallen *Socklen_t) (err error) -//getsockopt(s _C_int, level _C_int, name _C_int, val *byte, vallen *Socklen_t) _C_int - func GetsockoptByte(fd, level, opt int) (value byte, err error) { var n byte vallen := Socklen_t(1) @@ -326,9 +311,6 @@ return } -//sys sendto(s int, buf []byte, flags int, to *RawSockaddrAny, tolen Socklen_t) (err error) -//sendto(s _C_int, buf *byte, len Size_t, flags _C_int, to *RawSockaddrAny, tolen Socklen_t) Ssize_t - func Sendto(fd int, p []byte, flags int, to Sockaddr) (err error) { ptr, n, err := to.sockaddr() if err != nil { @@ -337,9 +319,6 @@ return sendto(fd, p, flags, ptr, n) } -//sys recvmsg(s int, msg *Msghdr, flags int) (n int, err error) -//recvmsg(s _C_int, msg *Msghdr, flags _C_int) Ssize_t - func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) { var msg Msghdr var rsa RawSockaddrAny @@ -374,9 +353,6 @@ return } -//sys sendmsg(s int, msg *Msghdr, flags int) (err error) -//sendmsg(s _C_int, msg *Msghdr, flags _C_int) Ssize_t - func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) { var ptr *RawSockaddrAny var salen Socklen_t diff -r 3b1c3cceaf02 libgo/go/syscall/socket_posix.go --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgo/go/syscall/socket_posix.go Wed Feb 20 12:01:58 2013 -0800 @@ -0,0 +1,32 @@ +// socket_posix.go -- Socket handling for generic POSIX systems. + +// Copyright 2013 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 + +//sys bind(fd int, sa *RawSockaddrAny, len Socklen_t) (err error) +//bind(fd _C_int, sa *RawSockaddrAny, len Socklen_t) _C_int + +//sys connect(s int, addr *RawSockaddrAny, addrlen Socklen_t) (err error) +//connect(s _C_int, addr *RawSockaddrAny, addrlen Socklen_t) _C_int + +//sysnb socket(domain int, typ int, proto int) (fd int, err error) +//socket(domain _C_int, typ _C_int, protocol _C_int) _C_int + +//sysnb socketpair(domain int, typ int, proto int, fd *[2]_C_int) (err error) +//socketpair(domain _C_int, typ _C_int, protocol _C_int, fd *[2]_C_int) _C_int + +//sys getsockopt(s int, level int, name int, val uintptr, vallen *Socklen_t) (err error) +//getsockopt(s _C_int, level _C_int, name _C_int, val *byte, vallen *Socklen_t) _C_int + +//sys sendto(s int, buf []byte, flags int, to *RawSockaddrAny, tolen Socklen_t) (err error) +//sendto(s _C_int, buf *byte, len Size_t, flags _C_int, to *RawSockaddrAny, tolen Socklen_t) Ssize_t + +//sys recvmsg(s int, msg *Msghdr, flags int) (n int, err error) +//recvmsg(s _C_int, msg *Msghdr, flags _C_int) Ssize_t + +//sys sendmsg(s int, msg *Msghdr, flags int) (err error) +//sendmsg(s _C_int, msg *Msghdr, flags _C_int) Ssize_t + diff -r 3b1c3cceaf02 libgo/go/syscall/socket_xnet.go --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgo/go/syscall/socket_xnet.go Wed Feb 20 12:01:58 2013 -0800 @@ -0,0 +1,33 @@ +// socket_xnet.go -- Socket handling specific to Solaris. +// Enforce use of XPG 4.2 versions of socket functions. + +// Copyright 2013 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 + +//sys bind(fd int, sa *RawSockaddrAny, len Socklen_t) (err error) +//__xnet_bind(fd _C_int, sa *RawSockaddrAny, len Socklen_t) _C_int + +//sys connect(s int, addr *RawSockaddrAny, addrlen Socklen_t) (err error) +//__xnet_connect(s _C_int, addr *RawSockaddrAny, addrlen Socklen_t) _C_int + +//sysnb socket(domain int, typ int, proto int) (fd int, err error) +//__xnet_socket(domain _C_int, typ _C_int, protocol _C_int) _C_int + +//sysnb socketpair(domain int, typ int, proto int, fd *[2]_C_int) (err error) +//__xnet_socketpair(domain _C_int, typ _C_int, protocol _C_int, fd *[2]_C_int) _C_int + +//sys getsockopt(s int, level int, name int, val uintptr, vallen *Socklen_t) (err error) +//__xnet_getsockopt(s _C_int, level _C_int, name _C_int, val *byte, vallen *Socklen_t) _C_int + +//sys sendto(s int, buf []byte, flags int, to *RawSockaddrAny, tolen Socklen_t) (err error) +//__xnet_sendto(s _C_int, buf *byte, len Size_t, flags _C_int, to *RawSockaddrAny, tolen Socklen_t) Ssize_t + +//sys recvmsg(s int, msg *Msghdr, flags int) (n int, err error) +//__xnet_recvmsg(s _C_int, msg *Msghdr, flags _C_int) Ssize_t + +//sys sendmsg(s int, msg *Msghdr, flags int) (err error) +//__xnet_sendmsg(s _C_int, msg *Msghdr, flags _C_int) Ssize_t +