From patchwork Thu Dec 8 20:16:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 130221 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 669601007D1 for ; Fri, 9 Dec 2011 07:17:12 +1100 (EST) Received: (qmail 27653 invoked by alias); 8 Dec 2011 20:17:10 -0000 Received: (qmail 27638 invoked by uid 22791); 8 Dec 2011 20:17:09 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from mail-vw0-f47.google.com (HELO mail-vw0-f47.google.com) (209.85.212.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 08 Dec 2011 20:16:55 +0000 Received: by vbbfc21 with SMTP id fc21so1900111vbb.20 for ; Thu, 08 Dec 2011 12:16:55 -0800 (PST) MIME-Version: 1.0 Received: by 10.52.26.179 with SMTP id m19mr2686433vdg.95.1323375414802; Thu, 08 Dec 2011 12:16:54 -0800 (PST) Received: by 10.220.229.66 with HTTP; Thu, 8 Dec 2011 12:16:54 -0800 (PST) Date: Thu, 8 Dec 2011 12:16:54 -0800 Message-ID: Subject: [PATCH] Fix dg-function-on-line for MIPS64-linux-gnu From: Andrew Pinski To: GCC Patches 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 problem here is mips64-linux-gnu produces similar output like IRIX does except there might be some .cfi_startproc there. This patch fixes it by allow an optional .cfi_startproc and by always using that format for mips*-*-* . OK? Tested on mips64-linux-gnu. Thanks, Andrew Pinski testsuite/ChangeLog: * lib/scanasm.exp (dg-function-on-line): Always use a special format for all mips targets. Also allow an optional .cfi_startproc . Index: scanasm.exp =================================================================== --- scanasm.exp (revision 182096) +++ scanasm.exp (working copy) @@ -474,8 +474,8 @@ if { [istarget hppa*-*-*] } { set pattern [format {\t;[^:]+:%d\n(\t[^\t]+\n)+%s:\n\t.PROC} \ $line $symbol] - } elseif { [istarget mips-sgi-irix*] } { - set pattern [format {\t\.loc [0-9]+ %d 0( [^\n]*)?\n\t\.set\t(no)?mips16\n\t\.ent\t%s\n\t\.type\t%s, @function\n%s:\n} \ + } elseif { [istarget mips*-*-*] } { + set pattern [format {\t\.loc [0-9]+ %d 0( [^\n]*)?\n(\t.cfi_startproc[^\t]*\n)*\t\.set\t(no)?mips16\n\t\.ent\t%s\n\t\.type\t%s, @function\n%s:\n} \ $line $symbol $symbol $symbol] } else { set pattern [format {%s:[^\t]*(\t.(fnstart|frame|mask|file)[^\t]*)*\t[^:]+:%d\n} \