* gas/mips/mips16-dwarf2.d: Don't match anything but address and line

        number increments.  Adjust relocation address.
        * gas/mips/mips16-dwarf2-n32.d: Likewise.  Add "N32" to test name.

3 files changed, 27 insertions, 77 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 4ad55da..b195892 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2005-09-07  Richard Henderson  <rth@redhat.com>
 
+	* gas/mips/mips16-dwarf2.d: Don't match anything but address and line
+        number increments.  Adjust relocation address.
+	* gas/mips/mips16-dwarf2-n32.d: Likewise.  Add "N32" to test name.
+
+2005-09-07  Richard Henderson  <rth@redhat.com>
+
 	* gas/cris/rd-dw2-1.d: Don't match anything but address and line
 	number increments.
 	* gas/cris/rd-dw2-10.d, gas/cris/rd-dw2-11.d, gas/cris/rd-dw2-12.d,
diff --git a/gas/testsuite/gas/mips/mips16-dwarf2-n32.d b/gas/testsuite/gas/mips/mips16-dwarf2-n32.d
index 64087fc..d8996e3 100644
--- a/gas/testsuite/gas/mips/mips16-dwarf2-n32.d
+++ b/gas/testsuite/gas/mips/mips16-dwarf2-n32.d
@@ -1,5 +1,5 @@
 #readelf: -r -wl
-#name: MIPS16 DWARF2
+#name: MIPS16 DWARF2 N32
 #as: -march=mips3 -mabi=n32 -mips16 -no-mdebug -g0
 #source: mips16-dwarf2.s
 
@@ -12,47 +12,19 @@ Relocation section '\.rela\.debug_info' at offset .* contains 4 entries:
 
 Relocation section '\.rela\.debug_line' at offset .* contains 1 entries:
  *Offset * Info * Type * Sym\.Value * Sym\. Name \+ Addend
-0+0030 * 0+..02 * R_MIPS_32 * 0+0000 * .text \+ 1
-
-Dump of debug contents of section \.debug_line:
-
-  Length:                      64
-  DWARF Version:               2
-  Prologue Length:             35
-  Minimum Instruction Length:  1
-  Initial value of 'is_stmt':  1
-  Line Base:                   -5
-  Line Range:                  14
-  Opcode Base:                 10
-  \(Pointer size:               4\)
-
- Opcodes:
-  Opcode 1 has 0 args
-  Opcode 2 has 1 args
-  Opcode 3 has 1 args
-  Opcode 4 has 1 args
-  Opcode 5 has 1 args
-  Opcode 6 has 0 args
-  Opcode 7 has 0 args
-  Opcode 8 has 0 args
-  Opcode 9 has 1 args
-
- The Directory Table is empty\.
-
- The File Name Table:
-  Entry	Dir	Time	Size	Name
-  1	0	0	0	mips16-dwarf2\.s
+0+0033 * 0+..02 * R_MIPS_32 * 0+0000 * .text \+ 1
 
+#...
  Line Number Statements:
   Extended opcode 2: set Address to 0x0
-  Special opcode 5: advance Address by 0 to 0x0 and Line by 0 to 1
-  Special opcode 34: advance Address by 2 to 0x2 and Line by 1 to 2
-  Special opcode 34: advance Address by 2 to 0x4 and Line by 1 to 3
-  Special opcode 62: advance Address by 4 to 0x8 and Line by 1 to 4
-  Special opcode 34: advance Address by 2 to 0xa and Line by 1 to 5
-  Special opcode 62: advance Address by 4 to 0xe and Line by 1 to 6
-  Special opcode 62: advance Address by 4 to 0x12 and Line by 1 to 7
+  Copy
+  Special opcode .*: advance Address by 2 to 0x2 and Line by 1 to 2
+  Special opcode .*: advance Address by 2 to 0x4 and Line by 1 to 3
+  Special opcode .*: advance Address by 4 to 0x8 and Line by 1 to 4
+  Special opcode .*: advance Address by 2 to 0xa and Line by 1 to 5
+  Special opcode .*: advance Address by 4 to 0xe and Line by 1 to 6
+  Special opcode .*: advance Address by 4 to 0x12 and Line by 1 to 7
   Advance PC by 2286 to 900
-  Special opcode 6: advance Address by 0 to 0x900 and Line by 1 to 8
+  Special opcode .*: advance Address by 0 to 0x900 and Line by 1 to 8
   Advance PC by 15 to 90f
   Extended opcode 1: End of Sequence
diff --git a/gas/testsuite/gas/mips/mips16-dwarf2.d b/gas/testsuite/gas/mips/mips16-dwarf2.d
index 9718f71..6b8ec09 100644
--- a/gas/testsuite/gas/mips/mips16-dwarf2.d
+++ b/gas/testsuite/gas/mips/mips16-dwarf2.d
@@ -12,47 +12,19 @@ Relocation section '\.rel\.debug_info' at offset .* contains 4 entries:
 
 Relocation section '\.rel\.debug_line' at offset .* contains 1 entries:
  *Offset * Info * Type * Sym\.Value * Sym\. Name
-0+0030 * 0+..02 * R_MIPS_32 * 0+0000 * \.text
-
-Dump of debug contents of section \.debug_line:
-
-  Length:                      64
-  DWARF Version:               2
-  Prologue Length:             35
-  Minimum Instruction Length:  1
-  Initial value of 'is_stmt':  1
-  Line Base:                   -5
-  Line Range:                  14
-  Opcode Base:                 10
-  \(Pointer size:               4\)
-
- Opcodes:
-  Opcode 1 has 0 args
-  Opcode 2 has 1 args
-  Opcode 3 has 1 args
-  Opcode 4 has 1 args
-  Opcode 5 has 1 args
-  Opcode 6 has 0 args
-  Opcode 7 has 0 args
-  Opcode 8 has 0 args
-  Opcode 9 has 1 args
-
- The Directory Table is empty\.
-
- The File Name Table:
-  Entry	Dir	Time	Size	Name
-  1	0	0	0	mips16-dwarf2\.s
+0+0033 * 0+..02 * R_MIPS_32 * 0+0000 * \.text
 
+#...
  Line Number Statements:
   Extended opcode 2: set Address to 0x1
-  Special opcode 5: advance Address by 0 to 0x1 and Line by 0 to 1
-  Special opcode 34: advance Address by 2 to 0x3 and Line by 1 to 2
-  Special opcode 34: advance Address by 2 to 0x5 and Line by 1 to 3
-  Special opcode 62: advance Address by 4 to 0x9 and Line by 1 to 4
-  Special opcode 34: advance Address by 2 to 0xb and Line by 1 to 5
-  Special opcode 62: advance Address by 4 to 0xf and Line by 1 to 6
-  Special opcode 62: advance Address by 4 to 0x13 and Line by 1 to 7
+  Copy
+  Special opcode .*: advance Address by 2 to 0x3 and Line by 1 to 2
+  Special opcode .*: advance Address by 2 to 0x5 and Line by 1 to 3
+  Special opcode .*: advance Address by 4 to 0x9 and Line by 1 to 4
+  Special opcode .*: advance Address by 2 to 0xb and Line by 1 to 5
+  Special opcode .*: advance Address by 4 to 0xf and Line by 1 to 6
+  Special opcode .*: advance Address by 4 to 0x13 and Line by 1 to 7
   Advance PC by 2286 to 901
-  Special opcode 6: advance Address by 0 to 0x901 and Line by 1 to 8
+  Special opcode .*: advance Address by 0 to 0x901 and Line by 1 to 8
   Advance PC by 15 to 910
   Extended opcode 1: End of Sequence