Patchwork Have dg-function-on-line understand ARM assembler quirks.

login
register
mail settings
Submitter Marcus Shawcroft
Date Sept. 22, 2010, 3:39 p.m.
Message ID <000c01cb5a6c$57dfe590$079fb0b0$@shawcroft@arm.com>
Download mbox | patch
Permalink /patch/65432/
State New
Headers show

Comments

Marcus Shawcroft - Sept. 22, 2010, 3:39 p.m.
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  <marcus.shawcroft@arm.com>

	* lib/scanasm.exp(dg-function-on-line): Permit .fnstart to appear in
	the regexp pattern between the expected label and location string.


/Marcus
Richard Henderson - Sept. 22, 2010, 4:14 p.m.
On 09/22/2010 08:39 AM, Marcus Shawcroft wrote:
> 	* lib/scanasm.exp(dg-function-on-line): Permit .fnstart to appear in
> 	the regexp pattern between the expected label and location string.

Ok.


r~

Patch

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