* gas/mmix/bspec-2.d, gas/mmix/bspec-1.d, gas/mmix/comment-1.d:

	Prune and generalize, adjusting to generic ELF file layout changes.

4 files changed, 28 insertions, 90 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index c11f008..e1ffcca 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-11  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* gas/mmix/bspec-2.d, gas/mmix/bspec-1.d, gas/mmix/comment-1.d:
+	Prune and generalize, adjusting to generic ELF file layout changes.
+
 2001-11-04  Chris Demetriou  <cgd@broadcom.com>
 
 	* gas/mips/mips.exp (svr4pic): Set if target is *-*-netbsd*.
diff --git a/gas/testsuite/gas/mmix/bspec-1.d b/gas/testsuite/gas/mmix/bspec-1.d
index 9775b36..7855a9c 100644
--- a/gas/testsuite/gas/mmix/bspec-1.d
+++ b/gas/testsuite/gas/mmix/bspec-1.d
@@ -1,34 +1,12 @@
 #readelf: -Ssr -x1 -x4
-
-There are 9 section headers, starting at offset 0xa0:
-
-Section Headers:
-  \[Nr\] Name              Type             Address           Offset
-       Size              EntSize          Flags  Link  Info  Align
-  \[ 0\]                   NULL             0000000000000000  00000000
-       0000000000000000  0000000000000000           0     0     0
-  \[ 1\] \.text             PROGBITS         0000000000000000  00000040
-       0000000000000004  0000000000000000  AX       0     0     4
-  \[ 2\] \.data             PROGBITS         0000000000000000  00000044
-       0000000000000000  0000000000000000  WA       0     0     1
-  \[ 3\] \.bss              NOBITS           0000000000000000  00000044
-       0000000000000000  0000000000000000  WA       0     0     1
-  \[ 4\] \.MMIX\.spec_data\.2 PROGBITS         0000000000000000  00000044
-       0000000000000004  0000000000000000           0     0     4
-  \[ 5\] \.rela\.MMIX\.spec_d RELA             0000000000000000  00000378
-       0000000000000018  0000000000000018           7     4     8
-  \[ 6\] \.shstrtab         STRTAB           0000000000000000  00000048
-       0000000000000055  0000000000000000           0     0     1
-  \[ 7\] \.symtab           SYMTAB           0000000000000000  000002e0
-       0000000000000090  0000000000000018           8     5     8
-  \[ 8\] \.strtab           STRTAB           0000000000000000  00000370
-       0000000000000006  0000000000000000           0     0     1
-Key to Flags:
-  W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
-  I \(info\), L \(link order\), G \(group\), x \(unknown\)
-  O \(extra OS processing required\) o \(OS specific\), p \(processor specific\)
-
-Relocation section '\.rela\.MMIX\.spec_data\.2' at offset 0x378 contains 1 entries:
+There are 9 section headers, starting at offset 0x..:
+#...
+  \[ 4\] \.MMIX\.spec_data\.2 PROGBITS         0+  0+44
+       0+4  0+           0     0     4
+  \[ 5\] \.rela\.MMIX\.spec_d RELA             0+  .*
+       0+18  0+18           7     4     8
+#...
+Relocation section '\.rela\.MMIX\.spec_data\.2' at offset 0x... contains 1 entries:
 [ 	]+Offset[ 	]+Info[ 	]+Type[ 	]+Symbol's Value[ 	]+Symbol's Name[ 	]+Addend
 0+  0+500000004 R_MMIX_32             0+  forw                      \+ 0
 
@@ -42,7 +20,7 @@ Symbol table '\.symtab' contains 6 entries:
      5: 0+     0 NOTYPE  GLOBAL DEFAULT  UND forw
 
 Hex dump of section '\.text':
-  0x00000000 fd010203                            .*
+  0x0+ fd010203                            .*
 
 Hex dump of section '\.MMIX\.spec_data\.2':
-  0x00000000 00000000                            .*
+  0x0+ 00000000                            .*
diff --git a/gas/testsuite/gas/mmix/bspec-2.d b/gas/testsuite/gas/mmix/bspec-2.d
index aef2758..8da7a54 100644
--- a/gas/testsuite/gas/mmix/bspec-2.d
+++ b/gas/testsuite/gas/mmix/bspec-2.d
@@ -1,47 +1,26 @@
 #readelf: -Sr -x1 -x4
-There are 11 section headers, starting at offset 0xe0:
-
-Section Headers:
-  \[Nr\] Name              Type             Address           Offset
-       Size              EntSize          Flags  Link  Info  Align
-  \[ 0\]                   NULL             0+  0+
-       0+  0+           0     0     0
-  \[ 1\] \.text             PROGBITS         0+  0+40
-       0+4  0+  AX       0     0     4
-  \[ 2\] \.data             PROGBITS         0+  0+44
-       0+  0+  WA       0     0     1
-  \[ 3\] \.bss              NOBITS           0+  0+44
-       0+  0+  WA       0     0     1
+There are 11 section headers, starting at offset 0x..:
+#...
   \[ 4\] \.MMIX\.spec_data\.2 PROGBITS         0+  0+48
        0+10  0+           0     0     8
-  \[ 5\] \.rela\.MMIX\.spec_d RELA             0+  0+470
+  \[ 5\] \.rela\.MMIX\.spec_d RELA             0+  0+4..
        0+30  0+18           9     4     8
   \[ 6\] \.MMIX\.spec_data\.3 PROGBITS         0+  0+58
        0+8  0+           0     0     8
-  \[ 7\] \.rela\.MMIX\.spec_d RELA             0+  0+4a0
+  \[ 7\] \.rela\.MMIX\.spec_d RELA             0+  0+4..
        0+18  0+18           9     6     8
-  \[ 8\] \.shstrtab         STRTAB           0+  0+60
-       0+7e  0+           0     0     1
-  \[ 9\] \.symtab           SYMTAB           0+  0+3a0
-       0+c0  0+18          10     6     8
-  \[10\] \.strtab           STRTAB           0+  0+460
-       0+c  0+           0     0     1
-Key to Flags:
-  W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
-  I \(info\), L \(link order\), G \(group\), x \(unknown\)
-  O \(extra OS processing required\) o \(OS specific\), p \(processor specific\)
-
-Relocation section '\.rela\.MMIX\.spec_data\.2' at offset 0x470 contains 2 entries:
+#...
+Relocation section '\.rela\.MMIX\.spec_data\.2' at offset 0x4.. contains 2 entries:
 [ 	]+Offset[ 	]+Info[ 	]+Type[ 	]+Symbol's Value[ 	]+Symbol's Name[ 	]+Addend
 0+  0+600000004 R_MMIX_32             0+  forw                      \+ 0
 0+8  0+700000005 R_MMIX_64             0+  other                     \+ 0
 
-Relocation section '\.rela\.MMIX\.spec_data\.3' at offset 0x4a0 contains 1 entries:
+Relocation section '\.rela\.MMIX\.spec_data\.3' at offset 0x4.. contains 1 entries:
 [ 	]+Offset[ 	]+Info[ 	]+Type[ 	]+Symbol's Value[ 	]+Symbol's Name[ 	]+Addend
 0+  0+700000005 R_MMIX_64             0+  other                     \+ 0
 
 Hex dump of section '\.text':
-  0x00000000 fd010203                            .*
+  0x0+ fd010203                            .*
 
 Hex dump of section '\.MMIX\.spec_data\.2':
-  0x00000000 00000000 0000002a 00000000 00000000 .*
+  0x0+ 00000000 0000002a 00000000 00000000 .*
diff --git a/gas/testsuite/gas/mmix/comment-1.d b/gas/testsuite/gas/mmix/comment-1.d
index 7c91eb9..9359262 100644
--- a/gas/testsuite/gas/mmix/comment-1.d
+++ b/gas/testsuite/gas/mmix/comment-1.d
@@ -1,37 +1,13 @@
 #as: -no-expand
 #readelf: -Ssrx1 -x6
-
-There are 10 section headers, starting at offset 0x130:
-
-Section Headers:
-  \[Nr\] Name              Type             Address           Offset
-       Size              EntSize          Flags  Link  Info  Align
-  \[ 0\]                   NULL             0+  0+
-       0+  0+           0     0     0
-  \[ 1\] \.text             PROGBITS         0+  0+40
-       0+88  0+  AX       0     0     8
-  \[ 2\] \.rela\.text        RELA             0+  0+4f8
-       0+78  0+18           8     1     8
-  \[ 3\] \.data             PROGBITS         0+  0+c8
-       0+  0+  WA       0     0     1
-  \[ 4\] \.bss              NOBITS           0+  0+c8
-       0+  0+  WA       0     0     1
+There are 10 section headers, starting at offset 0x...:
+#...
   \[ 5\] \.MMIX\.spec_data\.4 PROGBITS         0+  0+c8
        0+  0+           0     0     1
   \[ 6\] \.MMIX\.reg_content PROGBITS         0+  0+c8
        0+8  0+   W       0     0     1
-  \[ 7\] \.shstrtab         STRTAB           0+  0+d0
-       0+5d  0+           0     0     1
-  \[ 8\] \.symtab           SYMTAB           0+  0+3b0
-       0+120  0+18           9     8     8
-  \[ 9\] \.strtab           STRTAB           0+  0+4d0
-       0+21  0+           0     0     1
-Key to Flags:
-  W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
-  I \(info\), L \(link order\), G \(group\), x \(unknown\)
-  O \(extra OS processing required\) o \(OS specific\), p \(processor specific\)
-
-Relocation section '\.rela\.text' at offset 0x4f8 contains 5 entries:
+#...
+Relocation section '\.rela\.text' at offset 0x... contains 5 entries:
 [ 	]+Offset[ 	]+Info[ 	]+Type[ 	]+Symbol's Value[ 	]+Symbol's Name[ 	]+Addend
 0+34  0+90000001e R_MMIX_ADDR19         0+  target                    \+ 2c
 0+46  0+a00000002 R_MMIX_16             0+  target2                   \+ 30