From patchwork Tue Jun 5 05:33:13 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: 163006 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 56F69B6F62 for ; Tue, 5 Jun 2012 15:33:43 +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=1339479225; 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=raki8+FzmK3AI/laRGOvl9305fk=; b=kVl9Gbv0ISw0F4H 0mOkJoVT7Q3KeXPZTZ9t3oheZvknZ7UyoBcOiwNz1kdzgog4O6VWZghlk6R7MZMu EEZWAhR9vCgLADTH7J6TuKbcbXgFnkElJwiVMAE12aQ2UeCriBcOM7TFfFMWI0g2 XCiVbptrNCVvMeZmz4cTYAW9Dq9w= 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=fEZ4Zn6o7JO+1hFbrUii2zipDGGC8LYdtW5GJ1YP8lqMaN9HYDNKHxVxBplEhx QwlfCAhYWAURHX+cg+cK+Sod6NgmBVKBei87DLjzOp90GaWyQVIamYIphFpfiadQ QJ8OLIMcyEFNm4ULNEkvf1gJ8d1slGPmFqTYHr0NNgkys=; Received: (qmail 10932 invoked by alias); 5 Jun 2012 05:33:36 -0000 Received: (qmail 10922 invoked by uid 22791); 5 Jun 2012 05:33:35 -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; Tue, 05 Jun 2012 05:33:21 +0000 Received: by pbbrq2 with SMTP id rq2so6887059pbb.20 for ; Mon, 04 Jun 2012 22:33:21 -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=de1zwJeZ7pZMamK24u5U7QzsvJRDX7mvQajFScWah54=; b=eGC2cRxrmoEwqzHNa4gqa0uiWuROHam3nfXuD7noj6Di1T1hrU701PdETkNUGOC1JP TeHE0u+8i+SPzwOr+DtzfeOEZD7NgRwTfnjKFVd2vq6kh5T2jY+nZQyFvVJm4G8TXckv aHIVxcRytNioY/hRZ/M+ZZUb9uINhP7mbBMaBoGB9JAZDv9AhkIjdH9KPHW3TSe0l9ox Mvzjh1qc9jazRs7dmj7bJA4LR2682rfQMzMovmp/STwDLHRtKUHYSqAkkAkAiL7720mt Z2JTixNARbxKt11DT/mFdBD2+VIXBrbATLqShpCtWzQzKuwr0ZEBsIUgONgiJ8qE1lh9 juBA== Received: by 10.68.213.234 with SMTP id nv10mr30463719pbc.56.1338874401129; Mon, 04 Jun 2012 22:33:21 -0700 (PDT) Received: by 10.68.213.234 with SMTP id nv10mr30463711pbc.56.1338874401047; Mon, 04 Jun 2012 22:33:21 -0700 (PDT) Received: from coign.google.com ([216.239.45.130]) by mx.google.com with ESMTPS id z2sm1155667pbv.34.2012.06.04.22.33.19 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 04 Jun 2012 22:33:20 -0700 (PDT) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: libgo patch committed: Fix for changes to Date: Mon, 04 Jun 2012 22:33:13 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnMS+25aZnNmj8IZKNn88C007ucvckpsKTerq5MsxDueX1XuWIIw4eUW7r2QPnatJdzTV9NFa6N9tztMxAAcEqzeCoBp0WVODt09nknywJxQb0Ag5Cv9CQGJs/Sa4LTRjoyGe7Qn/OUSz6BODgBsZVcSTGd3Q== 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 Recently the version of in glibc changed to pick up some anonymous unions: http://sourceware.org/git/?p=glibc.git;a=blobdiff;f=sysdeps/unix/sysv/linux/bits/resource.h;h=62cb257410cb294799eddf83602fdd8de30f772f;hp=be852e52472e8f3cd721cc0201a275fcbea89558;hb=5e1a27a96de16ad0cd67a81e25741790b32e2c25;hpb=46259beccca5f4b3a6c64a1b84b2c09f079eb3ae Frankly I think it would have been better to simply add padding. But since the change was made, I have committed this patch to change mksysinfo to work with it. This patch is not fully tested, as I am not running the develoment version of glibc, but it appears to work in limited testing. Bootstrapped and committed on x86_64-unknown-linux-gnu running eglibc 2.11.1. Committed to mainline and 4.7 branch. Ian diff -r 292e3c15944d libgo/mksysinfo.sh --- a/libgo/mksysinfo.sh Sun Jun 03 22:32:46 2012 -0700 +++ b/libgo/mksysinfo.sh Mon Jun 04 22:29:50 2012 -0700 @@ -524,6 +524,8 @@ if test "$rusage" != ""; then rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'` rusage=`echo $rusage | sed -e 's/^ *//'` + # Remove anonymous unions from GNU/Linux . + rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'` nrusage= while test -n "$rusage"; do field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'`