From patchwork Tue Apr 3 23:45:16 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: 150568 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 ED53CB6FFA for ; Wed, 4 Apr 2012 09:45:40 +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=1334101541; 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=2NJHi4zq6q48KoAUAfLX3FBqvpg=; b=cyLT1bqLHPRE0Ci xClFj6jfeGPx6QD3MH7Ki/vlOPNQGkzFsaFFVxf6D6YrXw2em46RZ/DuHd/Hptp1 KpoMFW2PG8b58+iXNw0ZLeKdVqWdD4/PC9WrwTGaUdJaxQu5zaWWpiySQ1B12ZXi cxBZtHK7AVjAKioeNuHyK+YgFbhY= 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=mw8svtJM/QanPDmKbI1cTQy1vkMjmDAJWp3tlqKqRQ8afL/Twx733kCbJ7vfzo x70DWApZGwiyCaiITZqc26EKhoO97iqECfYPJR46M+5stImDpdISnr0O9OfuFiVg WRV/ALt//NFrN1i8Y6/V/n2eAhWoofMYDklBqEELWXhxk=; Received: (qmail 17535 invoked by alias); 3 Apr 2012 23:45:35 -0000 Received: (qmail 17523 invoked by uid 22791); 3 Apr 2012 23:45:33 -0000 X-SWARE-Spam-Status: No, hits=-4.5 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-pz0-f49.google.com (HELO mail-pz0-f49.google.com) (209.85.210.49) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 03 Apr 2012 23:45:19 +0000 Received: by dadq36 with SMTP id q36so235722dad.22 for ; Tue, 03 Apr 2012 16:45:19 -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=tzPoOVPS4bs2Fw2RfX1GmT/5o6tLckSxOUCOa5DE/Pk=; b=Tu5n9dyJzGTmjtuuWhHllNAdXiZtkV280QcYrjlJdDczwz6zVA5OXwdFoOFbKW0gyv uNv1JBHJpzdM3tpz7Ly/HmE0FxUx7MyXj1P8Oa4hJ5LK+NifsAUVvWCpYgVehTb3zUwM OmEuBZb0HlQM0eJLeJvYKKj7Js8pWyBlmW5i0RXLp3+vJOZRg7SQK52gcp/yOpOKR/QX STbnvzQ2AHRwVhfGQfkI3xyooPG4Q2/s5BbNeJEEEoUXHmjCrvMw99TfeidnaaOKd7u2 G6ukQPYFM0gR+gHidQlUvjR69Eyuy/XWFq5onrIlfpsFndV+6jeW4swUjZiKrYyP6tT0 6/cw== Received: by 10.68.136.69 with SMTP id py5mr32276410pbb.71.1333496719384; Tue, 03 Apr 2012 16:45:19 -0700 (PDT) Received: by 10.68.136.69 with SMTP id py5mr32276400pbb.71.1333496719310; Tue, 03 Apr 2012 16:45:19 -0700 (PDT) Received: from coign.google.com ([65.50.220.77]) by mx.google.com with ESMTPS id k9sm6994904pbf.65.2012.04.03.16.45.18 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 Apr 2012 16:45:18 -0700 (PDT) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: libgo patch committed: Fix GNU/Linux netlink code for big-endian Date: Tue, 03 Apr 2012 16:45:16 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkDRM7Peo1F7JCUiS7IrfncpOZfDdCKEGYOyQn0TEFKnuQKzKkwet06bSJLs2EsNZA+aOMEUodYxOFleyofh36qLdpDoj7G7ZxwjPj+P8gn6zJA0be0hupg7hcRrjUrxTqvbnvrTbXWG8wnXPOk4I9A+r3z8kmepld8SV3jn7yDyXiNhR0= 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 fixes the support for GNU/Linux netlink code, used to retrieve network interfaces, for big-endian systems. Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu. Committed to mainline and 4.7 branch. Ian diff -r a2de1f2e5bf8 libgo/Makefile.am --- a/libgo/Makefile.am Tue Apr 03 12:36:26 2012 -0700 +++ b/libgo/Makefile.am Tue Apr 03 16:41:49 2012 -0700 @@ -1559,6 +1559,7 @@ echo "package syscall" > syscall_arch.go.tmp echo 'const ARCH = "'$(GOARCH)'"' >> syscall_arch.go.tmp echo 'const OS = "'$(GOOS)'"' >> syscall_arch.go.tmp + echo 'const BigEndian = $(GO_BIGENDIAN)' >> syscall_arch.go.tmp $(SHELL) $(srcdir)/../move-if-change syscall_arch.go.tmp syscall_arch.go $(STAMP) $@ diff -r a2de1f2e5bf8 libgo/configure.ac --- a/libgo/configure.ac Tue Apr 03 12:36:26 2012 -0700 +++ b/libgo/configure.ac Tue Apr 03 16:41:49 2012 -0700 @@ -400,6 +400,12 @@ AC_SEARCH_LIBS([sched_yield], [rt]) AC_C_BIGENDIAN +case $ac_cv_c_bigendian in + yes) GO_BIGENDIAN=true ;; + no) GO_BIGENDIAN=false ;; + *) AC_MSG_ERROR([unknown endianness]) ;; +esac +AC_SUBST(GO_BIGENDIAN) GCC_CHECK_UNWIND_GETIPINFO diff -r a2de1f2e5bf8 libgo/go/net/interface_linux.go --- a/libgo/go/net/interface_linux.go Tue Apr 03 12:36:26 2012 -0700 +++ b/libgo/go/net/interface_linux.go Tue Apr 03 16:41:49 2012 -0700 @@ -64,7 +64,11 @@ case syscall.IFLA_IFNAME: ifi.Name = string(a.Value[:len(a.Value)-1]) case syscall.IFLA_MTU: - ifi.MTU = int(uint32(a.Value[3])<<24 | uint32(a.Value[2])<<16 | uint32(a.Value[1])<<8 | uint32(a.Value[0])) + if syscall.BigEndian { + ifi.MTU = int(uint32(a.Value[0])<<24 | uint32(a.Value[1])<<16 | uint32(a.Value[2])<<8 | uint32(a.Value[3])) + } else { + ifi.MTU = int(uint32(a.Value[3])<<24 | uint32(a.Value[2])<<16 | uint32(a.Value[1])<<8 | uint32(a.Value[0])) + } } } return ifi @@ -196,7 +200,12 @@ for i := 0; i+1 < len(f[0]); i += 2 { b[i/2], _ = xtoi2(f[0][i:i+2], 0) } - ifma := IPAddr{IP: IPv4(b[3], b[2], b[1], b[0])} + var ifma IPAddr + if syscall.BigEndian { + ifma = IPAddr{IP: IPv4(b[0], b[1], b[2], b[3])} + } else { + ifma = IPAddr{IP: IPv4(b[3], b[2], b[1], b[0])} + } ifmat = append(ifmat, ifma.toAddr()) } } diff -r a2de1f2e5bf8 libgo/go/syscall/netlink_linux.go --- a/libgo/go/syscall/netlink_linux.go Tue Apr 03 12:36:26 2012 -0700 +++ b/libgo/go/syscall/netlink_linux.go Tue Apr 03 16:41:49 2012 -0700 @@ -30,23 +30,43 @@ func (rr *NetlinkRouteRequest) toWireFormat() []byte { b := make([]byte, rr.Header.Len) - b[0] = byte(rr.Header.Len) - b[1] = byte(rr.Header.Len >> 8) - b[2] = byte(rr.Header.Len >> 16) - b[3] = byte(rr.Header.Len >> 24) - b[4] = byte(rr.Header.Type) - b[5] = byte(rr.Header.Type >> 8) - b[6] = byte(rr.Header.Flags) - b[7] = byte(rr.Header.Flags >> 8) - b[8] = byte(rr.Header.Seq) - b[9] = byte(rr.Header.Seq >> 8) - b[10] = byte(rr.Header.Seq >> 16) - b[11] = byte(rr.Header.Seq >> 24) - b[12] = byte(rr.Header.Pid) - b[13] = byte(rr.Header.Pid >> 8) - b[14] = byte(rr.Header.Pid >> 16) - b[15] = byte(rr.Header.Pid >> 24) - b[16] = byte(rr.Data.Family) + if BigEndian { + b[0] = byte(rr.Header.Len >> 24) + b[1] = byte(rr.Header.Len >> 16) + b[2] = byte(rr.Header.Len >> 8) + b[3] = byte(rr.Header.Len) + b[4] = byte(rr.Header.Type >> 8) + b[5] = byte(rr.Header.Type) + b[6] = byte(rr.Header.Flags >> 8) + b[7] = byte(rr.Header.Flags) + b[8] = byte(rr.Header.Seq >> 24) + b[9] = byte(rr.Header.Seq >> 16) + b[10] = byte(rr.Header.Seq >> 8) + b[11] = byte(rr.Header.Seq) + b[12] = byte(rr.Header.Pid >> 24) + b[13] = byte(rr.Header.Pid >> 16) + b[14] = byte(rr.Header.Pid >> 8) + b[15] = byte(rr.Header.Pid) + b[16] = byte(rr.Data.Family) + } else { + b[0] = byte(rr.Header.Len) + b[1] = byte(rr.Header.Len >> 8) + b[2] = byte(rr.Header.Len >> 16) + b[3] = byte(rr.Header.Len >> 24) + b[4] = byte(rr.Header.Type) + b[5] = byte(rr.Header.Type >> 8) + b[6] = byte(rr.Header.Flags) + b[7] = byte(rr.Header.Flags >> 8) + b[8] = byte(rr.Header.Seq) + b[9] = byte(rr.Header.Seq >> 8) + b[10] = byte(rr.Header.Seq >> 16) + b[11] = byte(rr.Header.Seq >> 24) + b[12] = byte(rr.Header.Pid) + b[13] = byte(rr.Header.Pid >> 8) + b[14] = byte(rr.Header.Pid >> 16) + b[15] = byte(rr.Header.Pid >> 24) + b[16] = byte(rr.Data.Family) + } return b }