From patchwork Wed Apr 8 14:10:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 459286 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5279614016A for ; Thu, 9 Apr 2015 00:10:18 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass reason="1024-bit key; unprotected key" header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=yOEh1FTm; dkim-adsp=none (unprotected policy); dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:references:date:in-reply-to:message-id :mime-version:content-type; q=dns; s=default; b=Yj2VG3+FHHWk6dMP X8/I4etR+s3PKuXFcIkZEUOoBtACZYIl6oc0qxdt0/ClfR6Ba/POmGxCgI8VjT6z GPEbAen6Bmxv7sOf6Sw5uAP4Wh9i9omPiYuJicGWGTRQ2Wj3k6cJKdjoP3nfuZYE 64CraMhMvtrXklf+swkQ2IVJ1Oc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:references:date:in-reply-to:message-id :mime-version:content-type; s=default; bh=cS5B6a6jtwIk3jIItzmxXr jSzUM=; b=yOEh1FTmWSBdX5WHhUSaJ7eZJXQiT7c+u43xGBLc9CEwDc+Qwim7D5 AZ1MoNb2j33DAmoPSiG52ahNUhbA7cDlrXeU8zhzwWnBRErlcbl+esfsqTSkSChB QalrqWvIf1mquabaiiHKmLSQm6KQITc+y5tETKL1eBIxSUeTbqNow= Received: (qmail 71690 invoked by alias); 8 Apr 2015 14:10:08 -0000 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 Received: (qmail 71678 invoked by uid 89); 8 Apr 2015 14:10:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: smtp-relay.CeBiTec.Uni-Bielefeld.DE Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 08 Apr 2015 14:10:07 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id CC99BB23; Wed, 8 Apr 2015 16:10:04 +0200 (CEST) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id R2G1rDfDh3of; Wed, 8 Apr 2015 16:10:02 +0200 (CEST) Received: from fuego.CeBiTec.Uni-Bielefeld.DE (p5487924D.dip0.t-ipconnect.de [84.135.146.77]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPSA id 2252AB22; Wed, 8 Apr 2015 16:10:02 +0200 (CEST) From: Rainer Orth To: Ian Lance Taylor Cc: gcc-patches , "gofrontend-dev\@googlegroups.com" Subject: Re: [libgo] Remove Solaris 11.1+ zone_net_addr_t treatment References: Date: Wed, 08 Apr 2015 16:10:00 +0200 In-Reply-To: (Ian Lance Taylor's message of "Wed, 8 Apr 2015 07:08:04 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes Ian Lance Taylor writes: > On Wed, Apr 8, 2015 at 6:48 AM, Rainer Orth wrote: >> Ian Lance Taylor writes: >> >>> On Mon, Nov 3, 2014 at 8:59 AM, Rainer Orth >>> wrote: >>>> >>>> The recent godump changes broke Solaris 11.1+ bootstrap in libgo: >>>> before, gen-sysinfo.so had >>>> >>>> type _zone_net_addr_t struct { zna_family uint16; zna_plen uint16; >>>> zna_addru struct { znau_addr6 _in6_addr; }; } >>>> >>>> which was filtered out by mksysinfo.sh due to the use of _in6_addr. >>>> >>>> After the change, there's now >>>> >>>> type _zone_net_addr_t struct { zna_family uint16; zna_plen uint16; >>>> zna_addru struct { znau_addr6 [16]byte; Godump_0_align [0]uint32; }; } >>>> >>>> instead, not filtered, but added a second time by the _zone_net_addr_t >>>> code in mksysinfo.sh, which leads to redefinition warnings/errors. >>>> >>>> Simply removing the old _zone_net_addr_t fragment fixes this and >>>> restores bootstrap. >>>> >>>> Bootstrapped without regressions on i386-pc-solaris2.1[01], ok for >>>> mainline? >>> >>> >>> I just got back to this. Committed to mainline. Thanks. >> >> Sorry for the late reply, but between the time I submitted the patch and >> you committing it, something changed and the mksysinfo.sh fragment >> became necessary again. In fact, without it Solaris 11 bootstrap is >> broken. > > To avoid any confusion, can you send me the patch I should apply to mainline? Sure: here's what I have in my tree. Thanks. Rainer # HG changeset patch # Parent fb5daa5b2c139aa02220feb898ac29bbafb1cb00 Handle Solaris 11 Update 1 zone_net_addr_t diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh --- a/libgo/mksysinfo.sh +++ b/libgo/mksysinfo.sh @@ -1065,4 +1065,9 @@ grep '^type _ipv6_member_t ' gen-sysinfo egrep '^const _(MIB2|EXPER)_' gen-sysinfo.go | \ sed -e 's/^\(const \)_\([^= ]*\)\(.*\)$/\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/' \ + >> ${OUT} + exit $?