Patchwork [committed] Update dg-function-on-line for hppa*-*-*

login
register
mail settings
Submitter John David Anglin
Date Dec. 9, 2010, 2:49 p.m.
Message ID <20101209144913.B1B884E6A@hiauly1.hia.nrc.ca>
Download mbox | patch
Permalink /patch/74902/
State New
Headers show

Comments

John David Anglin - Dec. 9, 2010, 2:49 p.m.
The attached change fixes g++.dg/debug/dwarf2/lineno-simple1.C and
g++.dg/debug/dwarf2/pr44641.C on PA.  Tested on hppa-unknown-linux-gnu,
hppa64-hp-hpux11.11 and hppa2.0w-hp-hpux11.11.  Committed to trunk.

Dave

Patch

Index: lib/scanasm.exp
===================================================================
--- lib/scanasm.exp	(revision 167472)
+++ lib/scanasm.exp	(working copy)
@@ -339,8 +339,13 @@ 
 	}
     }
 
-    set pattern [format {%s:[^\t]*(\t.(fnstart|frame|mask|file)[^\t]*)*\t[^:]+:%d\n} \
-                 $symbol $line]
+    if { [istarget "hppa*-*-*"] } {
+	set pattern [format {\t;[^:]+:%d\n(\t[^\t]+\n)+%s:\n\t.PROC} \
+                     $line $symbol]
+    } else {
+	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
     # become part of the regex scan-assembler tries to match.