From patchwork Wed Sep 22 15:39:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Shawcroft X-Patchwork-Id: 65432 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 E6086B70DF for ; Thu, 23 Sep 2010 01:39:42 +1000 (EST) Received: (qmail 15643 invoked by alias); 22 Sep 2010 15:39:40 -0000 Received: (qmail 15544 invoked by uid 22791); 22 Sep 2010 15:39:39 -0000 X-SWARE-Spam-Status: No, hits=-1.0 required=5.0 tests=AWL, BAYES_00, MSGID_MULTIPLE_AT, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from cam-admin0.cambridge.arm.com (HELO cam-admin0.cambridge.arm.com) (217.140.96.50) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 22 Sep 2010 15:39:34 +0000 Received: from cam-owa2.Emea.Arm.com (cam-owa2.emea.arm.com [10.1.105.18]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id o8MFajF9006445 for ; Wed, 22 Sep 2010 16:36:45 +0100 (BST) Received: from e102573 ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 22 Sep 2010 16:39:31 +0100 From: "Marcus Shawcroft" To: Subject: [PATCH] Have dg-function-on-line understand ARM assembler quirks. Date: Wed, 22 Sep 2010 16:39:27 +0100 Message-ID: <000c01cb5a6c$57dfe590$079fb0b0$@shawcroft@arm.com> MIME-Version: 1.0 x-cr-hashedpuzzle: AZ4Z BapF BmTB B6uM B8bb CDUc Cnp5 DTDL Dmq4 EUFF EUJh EsWY Iehx Ifnj JvTN K+Sc; 1; ZwBjAGMALQBwAGEAdABjAGgAZQBzAEAAZwBjAGMALgBnAG4AdQAuAG8AcgBnAA==; Sosha1_v1; 7; {30A2579F-0C90-45D7-8250-E09591A6AC02}; bQBhAHIAYwB1AHMALgBzAGgAYQB3AGMAcgBvAGYAdABAAGEAcgBtAC4AYwBvAG0A; Wed, 22 Sep 2010 15:39:25 GMT; WwBQAEEAVABDAEgAXQAgAEgAYQB2AGUAIABkAGcALQBmAHUAbgBjAHQAaQBvAG4ALQBvAG4ALQBsAGkAbgBlACAAdQBuAGQAZQByAHMAdABhAG4AZAAgAEEAUgBNACAAYQBzAHMAZQBtAGIAbABlAHIAIABxAHUAaQByAGsAcwAuAA== x-cr-puzzleid: {30A2579F-0C90-45D7-8250-E09591A6AC02} 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, g++.dg/debug/dwarf2/lineno-simple1.C fails for ARM because the implementation of dg-function-on-line does not expect to see the ARM assembler directive .fnstart immediately after the function label. This patch generalizes the regexp used. 2010-09-22 Marcus Shawcroft * lib/scanasm.exp(dg-function-on-line): Permit .fnstart to appear in the regexp pattern between the expected label and location string. /Marcus diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp index cf8f8a7..71ea415 100644 --- a/gcc/testsuite/lib/scanasm.exp +++ b/gcc/testsuite/lib/scanasm.exp @@ -339,7 +339,7 @@ proc dg-function-on-line { args } { } } - set pattern [format {%s:[^\t]*(\t.(frame|mask|file)[^\t]*)*\t[^:]+:%d\n} \ + set pattern [format {%s:[^\t]*(\t.(fnstart|frame|mask|file)[^\t]*)*\t[^:]+:%d\n} \ $symbol $line] # The lack of spaces around $pattern is important, since they'd