diff options
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/lib/scanasm.exp | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 303d40b..6cbd7ae 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-12-09 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> + + PR c++/44641 + * lib/scanasm.exp (dg-function-on-line): Add match pattern for + hppa*-*-*. + 2010-12-08 Jason Merrill <jason@redhat.com> PR c++/46348 diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp index 71ea415..66c5223 100644 --- a/gcc/testsuite/lib/scanasm.exp +++ b/gcc/testsuite/lib/scanasm.exp @@ -339,8 +339,13 @@ proc dg-function-on-line { args } { } } - 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. |