From patchwork Fri Jun 29 18:34:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 168246 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 68632B6EE6 for ; Sat, 30 Jun 2012 04:34:53 +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=1341599693; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Date:From:To:Cc:Subject:Message-ID:Reply-To: MIME-Version:Content-Type:Content-Disposition:User-Agent: Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:Sender:Delivered-To; bh=5vGwi1BFcd31JrKE8Y1i saNwVBM=; b=iNkDZJbJuYOxoGq2+UKKaqtR4uOdn7+kdj6vYinqjkIUmhLMjbCD 0IWRcDqEh338bZ9wP7PuIeE0vveg1cvtgY+po6pOQg6IgxiCE1PMpC+HF8AbHEMm T5jWOQ0BQN2m6gi3bfRUxAedZnfLHoNp/zcFAgzCMxpBiFQ877AwZtI= 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:Received:Received:Received:Date:From:To:Cc:Subject:Message-ID:Reply-To:MIME-Version:Content-Type:Content-Disposition:User-Agent:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=AlQuu6qfShMZsmEc8R8E0isNlfGcYKlQa6iJIRJf25SCwyL9Zt11nI5A6Vy5s1 qMaZJEC1uDCoEI1MuUsnlsRe4eLv4XBArk/IANyX3B85DDsuN8u3LeYYIeiWt7Hd Z8V+Wh928szrZeXR3txYUqDzJcUvr6c3JjQsE1H72mZAs=; Received: (qmail 10164 invoked by alias); 29 Jun 2012 18:34:49 -0000 Received: (qmail 9798 invoked by uid 22791); 29 Jun 2012 18:34:48 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 29 Jun 2012 18:34:34 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q5TIYXed027693 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 29 Jun 2012 14:34:33 -0400 Received: from zalov.redhat.com (vpn1-7-241.ams2.redhat.com [10.36.7.241]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q5TIYU8S002366 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 29 Jun 2012 14:34:32 -0400 Received: from zalov.cz (localhost [127.0.0.1]) by zalov.redhat.com (8.14.5/8.14.5) with ESMTP id q5TIYSIu015093; Fri, 29 Jun 2012 20:34:28 +0200 Received: (from jakub@localhost) by zalov.cz (8.14.5/8.14.5/Submit) id q5TIYSQQ015092; Fri, 29 Jun 2012 20:34:28 +0200 Date: Fri, 29 Jun 2012 20:34:27 +0200 From: Jakub Jelinek To: Ian Lance Taylor Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] Fix up mksysinfo.sh Message-ID: <20120629183427.GC20264@tucnak.redhat.com> Reply-To: Jakub Jelinek MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) 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 Hi! The recent mksysinfo.sh change for glibc 2.16 bits/resource.h unfortunately doesn't work, because the sed invocation two lines earlier removes the {}s this sed command is looking for. The following makes gcc 4.7 as well as trunk build in Fedora rawhide. Jakub --- libgo/mksysinfo.sh 2012-06-29 14:23:30.684708901 +0200 +++ libgo/mksysinfo.sh 2012-06-29 14:23:20.782761973 +0200 @@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go | # The rusage struct. rusage=`grep '^type _rusage struct' gen-sysinfo.go` 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'` + rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'` + rusage=`echo $rusage | sed -e 's/^ *//'` nrusage= while test -n "$rusage"; do field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'`