Patchwork Fix dg-function-on-line for MIPS64-linux-gnu

login
register
mail settings
Submitter Andrew Pinski
Date Dec. 8, 2011, 8:16 p.m.
Message ID <CA+=Sn1kUMcSZQn7T0DSx5J9c5CjrO-Wky4DcXm8OX0THHt7Yhg@mail.gmail.com>
Download mbox | patch
Permalink /patch/130221/
State New
Headers show

Comments

Andrew Pinski - Dec. 8, 2011, 8:16 p.m.
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 .
Richard Sandiford - Dec. 19, 2011, 9:17 p.m.
Andrew Pinski <pinskia@gmail.com> writes:
> 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.

OK, thanks, and sorry for the slow response.

Richard

Patch

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} \