From patchwork Sun Apr 22 20:05:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 154302 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 6750CB6FD8 for ; Mon, 23 Apr 2012 06:05:52 +1000 (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=1335729953; h=Comment: DomainKey-Signature:Received:Received: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=qMI8MErPo/goeh15v5tPkU5oPeY=; b=WnHAzXUFUt1uCSG m2KH30qp3xKebtL4iymVITL1k7T3VP5Dv2+//O9hcN4+1VnLjvXGts9WlmTLZvnF d+2kzT/MjQkeZIOjXP7WR/sO3qdbynsywQ8R2MVrAIrLNTL1St+3Rxnh7bFEWeOO qeQ+LhVZ5IwX+pQ4WH0AI86ZjEOM= 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:Received: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=Vy0iQvEX0D6r2PjQvD3vYNQJycrzoDtvsDtGEhTaE7+Es62I5xBnKzIJ3FAZMq vXWJ4QhIhclAgDf3QSABHmTn0hEi0u8/mwneMejgZToEN9RiNxUOx7Bq14f1Ql+b pTXJIAEVFnCXHBjDSlnXt57hO0PaBQMKECsWfQEqcoVNc=; Received: (qmail 15946 invoked by alias); 22 Apr 2012 20:05:47 -0000 Received: (qmail 15935 invoked by uid 22791); 22 Apr 2012 20:05:43 -0000 X-SWARE-Spam-Status: No, hits=-4.4 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, T_RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from mail-pb0-f47.google.com (HELO mail-pb0-f47.google.com) (209.85.160.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 22 Apr 2012 20:05:30 +0000 Received: by pbcum15 with SMTP id um15so2803686pbc.20 for ; Sun, 22 Apr 2012 13:05:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:date:message-id:user-agent:mime-version :content-type:x-gm-message-state; bh=a+iNeRNOTlir7Jui4ph7YN8vAp/rcpf1sqXorCVR+Q4=; b=IrK2x2STwP3UX4BQTubbeKF+IhhwJJGyv/5mNGV/VyMwDJPcSCHU3SiCWn7luGiMuH 9nI5ZnCWuFqKQgVKe5fqKwCcIll57gnDyFS4+5UT8Pk7iQ0y3XAFGVULi5DddatnObMt sYKZ71K9T7FBDxZsY3P2cBGNTrmS7jQJkIzlK9fsEg5N/4KTmIhRMTU1UV0GjKM3CvYS wzFMrHaVLoyw+Tljtqh/yJ9eZkvFH/oQQZi5lpGFpd3I74kCpUTdd8Q1M7WX60SEw/j0 4v3I1XQRde/ia9FE2cxICBmDnOm+veF09E4xK73VLAfqgTb94sPdR1MdOwoI4AWuEUNM VVWw== Received: by 10.68.224.194 with SMTP id re2mr660080pbc.48.1335125129989; Sun, 22 Apr 2012 13:05:29 -0700 (PDT) Received: by 10.68.224.194 with SMTP id re2mr660059pbc.48.1335125129862; Sun, 22 Apr 2012 13:05:29 -0700 (PDT) Received: from coign.google.com ([216.239.45.130]) by mx.google.com with ESMTPS id nm5sm5071129pbc.6.2012.04.22.13.05.28 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 22 Apr 2012 13:05:29 -0700 (PDT) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: libgo patch committed: Define more structs in syscall package Date: Sun, 22 Apr 2012 13:05:27 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmtM5hmtZTvGJMt5ozz6QCM6QsZm7QsqEkBIRu77/MM4vSixIE2S1ZC1vxy/eT43Ls11fwZUTyJWxiEiFr03e7JZGFb83CM4lkqaU5DUC2CDXiUsKzW7cbVzC6yDdg37uvvUtUAD2Y2SkqL8I7RCoD1HomjPqCnp67o+o6MOEUqeRJ8iBE= 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 to libgo defines more structs in the syscall package, corresponding to structs defined in the master library. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to trunk and 4.7 branch. Ian diff -r c7f1cc64c45f -r 8d768cdf12ce libgo/mksysinfo.sh --- a/libgo/mksysinfo.sh Sun Apr 22 11:48:26 2012 -0700 +++ b/libgo/mksysinfo.sh Sun Apr 22 12:25:44 2012 -0700 @@ -785,6 +785,22 @@ -e 's/rta_type/Type/' \ >> ${OUT} +# The in_pktinfo struct. +grep '^type _in_pktinfo ' gen-sysinfo.go | \ + sed -e 's/_in_pktinfo/Inet4Pktinfo/' \ + -e 's/ipi_ifindex/Ifindex/' \ + -e 's/ipi_spec_dst/Spec_dst/' \ + -e 's/ipi_addr/Addr/' \ + >> ${OUT} + +# The in6_pktinfo struct. +grep '^type _in6_pktinfo ' gen-sysinfo.go | \ + sed -e 's/_in6_pktinfo/Inet6Pktinfo/' \ + -e 's/ipi6_addr/Addr/' \ + -e 's/ipi6_ifindex/Ifindex/' \ + -e 's/_in6_addr/[16]byte/' \ + >> ${OUT} + # The termios struct. grep '^type _termios ' gen-sysinfo.go | \ sed -e 's/_termios/Termios/' \ @@ -962,6 +978,29 @@ grep '^const _BPF_' gen-sysinfo.go | \ sed -e 's/^\(const \)_\(BPF_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} +# The GNU/Linux nlattr struct. +grep '^type _nlattr ' gen-sysinfo.go | \ + sed -e 's/_nlattr/NlAttr/' \ + -e 's/nla_len/Len/' \ + -e 's/nla_type/Type/' \ + >> ${OUT} + +# The GNU/Linux nlmsgerr struct. +grep '^type _nlmsgerr ' gen-sysinfo.go | \ + sed -e 's/_nlmsgerr/NlMsgerr/' \ + -e 's/error/Error/' \ + -e 's/msg/Msg/' \ + >> ${OUT} + +# The GNU/Linux rtnexthop struct. +grep '^type _rtnexthop ' gen-sysinfo.go | \ + sed -e 's/_rtnexthop/RtNexthop/' \ + -e 's/rtnh_len/Len/' \ + -e 's/rtnh_flags/Flags/' \ + -e 's/rtnh_hops/Hops/' \ + -e 's/rtnh_ifindex/Ifindex/' \ + >> ${OUT} + # The GNU/Linux netlink flags. grep '^const _NETLINK_' gen-sysinfo.go | \ sed -e 's/^\(const \)_\(NETLINK_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} @@ -970,6 +1009,17 @@ grep '^const _PACKET_' gen-sysinfo.go | \ sed -e 's/^\(const \)_\(PACKET_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} +# The GNU/Linux inotify_event struct. +grep '^type _inotify_event ' gen-sysinfo.go | \ + sed -e 's/_inotify_event/InotifyEvent/' \ + -e 's/wd/Wd/' \ + -e 's/mask/Mask/' \ + -e 's/cookie/Cookie/' \ + -e 's/len/Len/' \ + -e 's/name/Name/' \ + -e 's/\[\]/[0]/' \ + >> ${OUT} + # The Solaris 11 Update 1 _zone_net_addr_t struct. grep '^type _zone_net_addr_t ' gen-sysinfo.go | \ sed -e 's/_in6_addr/[16]byte/' \