From 0239db9272f141e7cdc0844eaf9cb7011e71ce24 Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Tue, 3 Jan 2012 20:21:50 +0000 Subject: [PATCH] scanasm.exp (dg-function-on-line): Always use a special format for all mips targets. 2012-01-03 Andrew Pinski * lib/scanasm.exp (dg-function-on-line): Always use a special format for all mips targets. Also allow an optional .cfi_startproc. From-SVN: r182855 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/lib/scanasm.exp | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b93924e094b..e7ad9005212 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-01-03 Andrew Pinski + + * lib/scanasm.exp (dg-function-on-line): Always use a special format + for all mips targets. Also allow an optional .cfi_startproc. + 2012-01-03 Uros Bizjak * gfortran.dg/typebound_operator_8.f03: Use dg-add-options ieee. diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp index 3ba22f9dad7..e03d241d93d 100644 --- a/gcc/testsuite/lib/scanasm.exp +++ b/gcc/testsuite/lib/scanasm.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2000, 2002, 2003, 2007, 2008, 2010, 2011 +# Copyright (C) 2000, 2002, 2003, 2007, 2008, 2010, 2011, 2012 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -474,8 +474,8 @@ proc dg-function-on-line { args } { 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} \