From patchwork Tue Apr 3 19:42:44 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: 150536 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 78DA0B6FE3 for ; Wed, 4 Apr 2012 05:43:07 +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=1334086987; 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=ovTQttS3lTLJCMSTQ500sezuPpA=; b=nJD85Lctu2k6q32 enhCohRP/f2ixQ5+crWEf8LwoWKs6OvS3U7WEb/Zo1+3FcbSlEoHAyH4ojzlwyQ8 Ju3EEYixAAi8KuA1Fbct86lPuvIJ2Ak1cLCTTCWakeiHqLwdYfatEPqf9aSO9C3J 8Sbz1/nbSedn/SbJnBzoLXmqX9GQ= 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=lPqH2Yl2x3Ob97JxXI6gjq61j+V/p2ll8lRtpdL/HMeWANGu539wan+wnkZAgl Mp2G6zgNXbdh1ufwo1LdrqUVRrjGEtRf0uFKZLYXE+N0Ea5Fhr5VGbMYtbxhlTzi 8GaXF3vnX3L5wgkurPCP4eTZ1kcAIOJhUutQpe/0IoIDY=; Received: (qmail 23155 invoked by alias); 3 Apr 2012 19:43:03 -0000 Received: (qmail 23144 invoked by uid 22791); 3 Apr 2012 19:43:02 -0000 X-SWARE-Spam-Status: No, hits=-4.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, TW_CC, T_RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from mail-iy0-f175.google.com (HELO mail-iy0-f175.google.com) (209.85.210.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 03 Apr 2012 19:42:48 +0000 Received: by iaag37 with SMTP id g37so86896iaa.20 for ; Tue, 03 Apr 2012 12:42:48 -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=3LcKwgJiih+42LBoy2N0m6/XXb8NPzkawYjxdwR3HfI=; b=avo49vRp+cz0q8+PNgJxCpX9dcXThanObkWieaPANcNuRjnNNY7bnUVmo4aznmCdJL /0FUgENi+MTVZVEbBkwlGNJ2XtUvL38NGdJTxHMiZ7JtC0b8eilIfk+WUJCNvaq6GpWy TGZwIMdDaZMYyAZ+vx9NWhn3Y5pO50PW3BsEH+BFdXdiEpPE/PSwDNS5jwm0tayuEc8k Qc/EUR4ctQPHwFzzwE++UBcqzP1/tKHM1YUwN8Il/J5cK3M4GNIPp8j9xEuEna1jG6F4 pK2EvDvc83nqGJTAEqpP4iX6s3doWKE6Z7BHvLtbkPfCSp6jPiUsJVY8VXnPTw+11/1P fLdg== Received: by 10.50.88.161 with SMTP id bh1mr10197063igb.64.1333482168260; Tue, 03 Apr 2012 12:42:48 -0700 (PDT) Received: by 10.50.88.161 with SMTP id bh1mr10197049igb.64.1333482168139; Tue, 03 Apr 2012 12:42:48 -0700 (PDT) Received: from coign.google.com ([2620:0:1000:2301:f2de:f1ff:fe40:72a8]) by mx.google.com with ESMTPS id gs4sm16353046igc.8.2012.04.03.12.42.45 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 Apr 2012 12:42:46 -0700 (PDT) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: libgo patch committed: Add some more networking constants Date: Tue, 03 Apr 2012 12:42:44 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnQizbmf+3zZGNIM8Y0u0g9ejda0EfcfTKpbkEML94QLNbB9XdO/k6V2lB+LqDHR1hy4d5llpBWZ01GCwEU/KkkVjYKAJVbTuPxioNdkG/jzhSYjBOTwCslOV1LaoWjAGAJaUYB734KzEIxPQeMgEEXFPENwaO2g+gQLDaX/HCvV4SgCKc= 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 libgo patch changes mksysinfo.sh to add some more networking constants. This is really just a snapshot, there are more to come, based on differences between gccgo and the master Go library. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline. Ian diff -r 888f1f45a4aa libgo/configure.ac --- a/libgo/configure.ac Tue Apr 03 10:56:09 2012 -0700 +++ b/libgo/configure.ac Tue Apr 03 12:33:57 2012 -0700 @@ -453,7 +453,7 @@ ;; esac -AC_CHECK_HEADERS(sys/mman.h syscall.h sys/epoll.h sys/ptrace.h sys/syscall.h sys/user.h sys/utsname.h sys/select.h sys/socket.h net/if.h sys/prctl.h sys/mount.h sys/vfs.h sys/statfs.h sys/timex.h sys/sysinfo.h utime.h linux/reboot.h) +AC_CHECK_HEADERS(sys/mman.h syscall.h sys/epoll.h sys/ptrace.h sys/syscall.h sys/user.h sys/utsname.h sys/select.h sys/socket.h net/if.h net/if_arp.h sys/prctl.h sys/mount.h sys/vfs.h sys/statfs.h sys/timex.h sys/sysinfo.h utime.h linux/reboot.h) AC_CHECK_HEADERS([linux/filter.h linux/netlink.h linux/rtnetlink.h], [], [], [#ifdef HAVE_SYS_SOCKET_H diff -r 888f1f45a4aa libgo/mksysinfo.sh --- a/libgo/mksysinfo.sh Tue Apr 03 10:56:09 2012 -0700 +++ b/libgo/mksysinfo.sh Tue Apr 03 12:33:57 2012 -0700 @@ -94,6 +94,9 @@ #if defined(HAVE_NET_IF_H) #include #endif +#if defined(HAVE_NET_IF_ARP_H) +#include +#endif #if defined(HAVE_SYS_MOUNT_H) #include #endif @@ -211,7 +214,7 @@ fi # Networking constants. -egrep '^const _(AF|SOCK|SOL|SO|IPPROTO|TCP|IP|IPV6)_' gen-sysinfo.go | +egrep '^const _(AF|ARPHRD|SOCK|SOL|SO|IPPROTO|TCP|IP|IPV6)_' gen-sysinfo.go | sed -e 's/^\(const \)_\([^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} grep '^const _SOMAXCONN' gen-sysinfo.go | sed -e 's/^\(const \)_\(SOMAXCONN[^= ]*\)\(.*\)$/\1\2 = _\2/' \ @@ -710,6 +713,10 @@ # The routing message flags. grep '^const _RTA' gen-sysinfo.go | \ sed -e 's/^\(const \)_\(RTA[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} +grep '^const _RTF' gen-sysinfo.go | \ + sed -e 's/^\(const \)_\(RTF[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} +grep '^const _RTCF' gen-sysinfo.go | \ + sed -e 's/^\(const \)_\(RTCF[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} grep '^const _RTM' gen-sysinfo.go | \ sed -e 's/^\(const \)_\(RTM[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} @@ -938,6 +945,10 @@ -e 's/_sock_filter/SockFilter/' \ >> ${OUT} +# The GNU/Linux filter flags. +grep '^const _BPF_' gen-sysinfo.go | \ + sed -e 's/^\(const \)_\(BPF_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${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/' \