From patchwork Tue Jun 29 16:37:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 57290 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 827DCB6EEC for ; Wed, 30 Jun 2010 02:38:10 +1000 (EST) Received: (qmail 23285 invoked by alias); 29 Jun 2010 16:38:08 -0000 Received: (qmail 23253 invoked by uid 22791); 29 Jun 2010 16:38:07 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 29 Jun 2010 16:38:03 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 4F5B04A3 for ; Tue, 29 Jun 2010 18:38:00 +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 Ys1nam5tgb43 for ; Tue, 29 Jun 2010 18:37:58 +0200 (CEST) Received: from manam.CeBiTec.Uni-Bielefeld.DE (manam.CeBiTec.Uni-Bielefeld.DE [129.70.161.120]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id D45C24A2 for ; Tue, 29 Jun 2010 18:37:58 +0200 (CEST) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.3+Sun/8.14.3/Submit) id o5TGbwrf021495; Tue, 29 Jun 2010 18:37:58 +0200 (MEST) From: Rainer Orth To: gcc-patches@gcc.gnu.org Subject: [testsuite, lto] Accomodate changed quoting in Sun ld messages Date: Tue, 29 Jun 2010 18:37:58 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (usg-unix-v) MIME-Version: 1.0 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 In OpenSolaris build 135, the quotes used in ld messages changed from ld: warning: symbol `j' has differing sizes: to ld: warning: symbol 'j' has differing sizes: Note the differing open quote. The following patch is needed to accomodate this change when pruning ld messages. Bootstrapped without regressions on i386-pc-solaris2.10 and i386-pc-solaris2.11. Commited as obvious to mainline and 4.5 branch. Rainer diff -r 13f91e702ed3 gcc/testsuite/lib/lto.exp --- a/gcc/testsuite/lib/lto.exp Sat Jun 26 12:29:20 2010 +0200 +++ b/gcc/testsuite/lib/lto.exp Sat Jun 26 12:33:24 2010 +0200 @@ -32,7 +32,7 @@ # Sun ld warns about common symbols with differing sizes. Unlike GNU ld # --warn-common (off by default), they cannot be disabled. - regsub -all "(^|\n)ld: warning: symbol `\[^\n\]*' has differing sizes:" $text "" text + regsub -all "(^|\n)ld: warning: symbol \[`'\]\[^\n\]*' has differing sizes:" $text "" text regsub -all "(^|\n)\[ \t\]*\[\(\]file \[^\n\]* value=\[^\n\]*; file \[^\n\]* value=\[^\n\]*\[)\];" $text "" text regsub -all "(^|\n)\[ \t\]*\[^\n\]* definition taken" $text "" text