Graham Stott <graham.st...@btinternet.com> writes:
> When micromips was added scanasm.exe wasn't updated this was causing a few
> tests
> which scanned the assembler output to start failing such as
> dg.c++/debiug/dwarf2/lineno-simple1.C.
>
> Fixed with the ollowing patch
Thanks. I think we should only conditionally match the micromips part,
just in case anyone is testing with an older assembler. Applied with
that tweak, as below.
Richard
gcc/testsuite/
2013-05-21 Graham Stott <graham.st...@btinternet.com>
* lib/scanasm.exp (dg-function-on-line): Make MIPS targets match
.set (no)?micromips
Index: gcc/testsuite/lib/scanasm.exp
===================================================================
--- gcc/testsuite/lib/scanasm.exp 2013-01-10 20:30:57.257009075 +0000
+++ gcc/testsuite/lib/scanasm.exp 2013-05-21 19:22:55.618268581 +0100
@@ -493,7 +493,7 @@ proc dg-function-on-line { args } {
set pattern [format {\t;[^:]+:%d\n(\t[^\t]+\n)+%s:\n\t.PROC} \
$line $symbol]
} 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} \
+ set pattern [format {\t\.loc [0-9]+ %d 0(
[^\n]*)?\n(\t.cfi_startproc[^\t]*\n)*\t\.set\t(no)?mips16\n\t(\.set\t(no)?micromips\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} \
