Tolerate some whitespace differences in readelf output.

10 files changed, 204 insertions, 204 deletions

diff --git a/gas/testsuite/gas/mmix/bspec-1.d b/gas/testsuite/gas/mmix/bspec-1.d
index c648a02f67..1d5269ea13 100644
--- a/gas/testsuite/gas/mmix/bspec-1.d
+++ b/gas/testsuite/gas/mmix/bspec-1.d
@@ -1,23 +1,23 @@
 #readelf: -Ssr -x1 -x4
 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
+ +\[ 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:
 .*
-0+  0+500000004 R_MMIX_32 +0+ +forw +\+ 0
+0+ +0+500000004 R_MMIX_32 +0+ +forw +\+ 0
 
 Symbol table '\.symtab' contains 6 entries:
-   Num:    Value          Size Type    Bind   Vis      Ndx Name
-     0: 0+     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 0+     0 SECTION LOCAL  DEFAULT    1 
-     2: 0+     0 SECTION LOCAL  DEFAULT    2 
-     3: 0+     0 SECTION LOCAL  DEFAULT    3 
-     4: 0+     0 SECTION LOCAL  DEFAULT    4 
-     5: 0+     0 NOTYPE  GLOBAL DEFAULT  UND forw
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 0+ +0 +SECTION +LOCAL +DEFAULT +1 
+ +2: 0+ +0 +SECTION +LOCAL +DEFAULT +2 
+ +3: 0+ +0 +SECTION +LOCAL +DEFAULT +3 
+ +4: 0+ +0 +SECTION +LOCAL +DEFAULT +4 
+ +5: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND forw
 
 Hex dump of section '\.text':
   0x0+ fd010203                            .*
diff --git a/gas/testsuite/gas/mmix/byte-1.d b/gas/testsuite/gas/mmix/byte-1.d
index 635c4c6c95..0bcf713c52 100644
--- a/gas/testsuite/gas/mmix/byte-1.d
+++ b/gas/testsuite/gas/mmix/byte-1.d
@@ -2,39 +2,39 @@
 There are 7 section headers, starting at offset 0x88:
 
 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
-       0000000000000016  0000000000000000  AX       0     0     4
-  \[ 2\] \.data             PROGBITS         0000000000000000  00000056
-       0000000000000000  0000000000000000  WA       0     0     1
-  \[ 3\] \.bss              NOBITS           0000000000000000  00000056
-       0000000000000000  0000000000000000  WA       0     0     1
-  \[ 4\] \.shstrtab         STRTAB           0000000000000000  00000056
-       000000000000002c  0000000000000000           0     0     1
-  \[ 5\] \.symtab           SYMTAB           0000000000000000  00000248
-       00000000000000c0  0000000000000018           6     7     8
-  \[ 6\] \.strtab           STRTAB           0000000000000000  00000308
-       0000000000000018  0000000000000000           0     0     1
+ +\[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
+ +0000000000000016 +0000000000000000 +AX +0 +0 +4
+ +\[ 2\] \.data +PROGBITS +0000000000000000 +00000056
+ +0000000000000000 +0000000000000000 +WA +0 +0 +1
+ +\[ 3\] \.bss +NOBITS +0000000000000000 +00000056
+ +0000000000000000 +0000000000000000 +WA +0 +0 +1
+ +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +00000056
+ +000000000000002c +0000000000000000 +0 +0 +1
+ +\[ 5\] \.symtab +SYMTAB +0000000000000000 +00000248
+ +00000000000000c0 +0000000000000018 +6 +7 +8
+ +\[ 6\] \.strtab +STRTAB +0000000000000000 +00000308
+ +0000000000000018 +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\)
+ +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\)
 
 There are no relocations in this file\.
 
 Symbol table '\.symtab' contains 8 entries:
-   Num:    Value          Size Type    Bind   Vis      Ndx Name
-     0: 0+     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 0+     0 SECTION LOCAL  DEFAULT    1 
-     2: 0+     0 SECTION LOCAL  DEFAULT    2 
-     3: 0+     0 SECTION LOCAL  DEFAULT    3 
-     4: 0+2a     0 NOTYPE  LOCAL  DEFAULT  ABS number
-     5: 0+4     0 NOTYPE  LOCAL  DEFAULT    1 label
-     6: 0+c     0 NOTYPE  LOCAL  DEFAULT    1 lab2
-     7: 0+     0 FUNC    GLOBAL DEFAULT    1 Main
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 0+ +0 +SECTION +LOCAL +DEFAULT +1 
+ +2: 0+ +0 +SECTION +LOCAL +DEFAULT +2 
+ +3: 0+ +0 +SECTION +LOCAL +DEFAULT +3 
+ +4: 0+2a +0 +NOTYPE +LOCAL +DEFAULT +ABS number
+ +5: 0+4 +0 +NOTYPE +LOCAL +DEFAULT +1 label
+ +6: 0+c +0 +NOTYPE +LOCAL +DEFAULT +1 lab2
+ +7: 0+ +0 +FUNC +GLOBAL +DEFAULT +1 Main
 
 Hex dump of section '\.text':
   0x00000000 fd2b2a29 73747269 6e670aff 8e007374 .*
diff --git a/gas/testsuite/gas/mmix/comment-1.d b/gas/testsuite/gas/mmix/comment-1.d
index 22ffdf5160..75b69bf894 100644
--- a/gas/testsuite/gas/mmix/comment-1.d
+++ b/gas/testsuite/gas/mmix/comment-1.d
@@ -2,33 +2,33 @@
 #readelf: -Ssrx1 -x6
 There are 10 section headers, starting at offset 0x...:
 #...
-  \[ 5\] \.MMIX\.spec_data\.4 PROGBITS         0+  0+c4
-       0+  0+           0     0     1
-  \[ 6\] \.MMIX\.reg_content PROGBITS         0+  0+c4
-       0+8  0+   W       0     0     1
+ +\[ 5\] \.MMIX\.spec_data\.4 +PROGBITS +0+ +0+c4
+ +0+ +0+ +0 +0 +1
+ +\[ 6\] \.MMIX\.reg_content +PROGBITS +0+ +0+c4
+ +0+8 +0+ +W +0 +0 +1
 #...
 Relocation section '\.rela\.text' at offset 0x... contains 5 entries:
 .*
-0+34  .* R_MMIX_ADDR19 +0+ +target +\+ 2c
-0+46  .* R_MMIX_16 +0+ +target2 +\+ 30
-0+48  .* R_MMIX_ADDR27 +0+ +target3 +\+ 38
-0+54  .* R_MMIX_ADDR19 +0+ +target3 +\+ 0
-0+78  .* R_MMIX_LOCAL +0+30
+0+34 +.* R_MMIX_ADDR19 +0+ +target +\+ 2c
+0+46 +.* R_MMIX_16 +0+ +target2 +\+ 30
+0+48 +.* R_MMIX_ADDR27 +0+ +target3 +\+ 38
+0+54 +.* R_MMIX_ADDR19 +0+ +target3 +\+ 0
+0+78 +.* R_MMIX_LOCAL +0+30
 
 Symbol table '\.symtab' contains 12 entries:
-   Num:    Value          Size Type    Bind   Vis      Ndx Name
-     0: 0+     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 0+     0 SECTION LOCAL  DEFAULT    1 
-     2: 0+     0 SECTION LOCAL  DEFAULT    3 
-     3: 0+     0 SECTION LOCAL  DEFAULT    4 
-     4: 0+18     0 NOTYPE  LOCAL  DEFAULT  ABS z
-     5: 0+80     0 NOTYPE  LOCAL  DEFAULT    1 x
-     6: 0+     0 SECTION LOCAL  DEFAULT    5 
-     7: 0+     0 SECTION LOCAL  DEFAULT    6 
-     8: 0+     0 FUNC    GLOBAL DEFAULT    1 Main
-     9: 0+     0 NOTYPE  GLOBAL DEFAULT  UND target
-    10: 0+     0 NOTYPE  GLOBAL DEFAULT  UND target2
-    11: 0+     0 NOTYPE  GLOBAL DEFAULT  UND target3
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 0+ +0 +SECTION +LOCAL +DEFAULT +1 
+ +2: 0+ +0 +SECTION +LOCAL +DEFAULT +3 
+ +3: 0+ +0 +SECTION +LOCAL +DEFAULT +4 
+ +4: 0+18 +0 +NOTYPE +LOCAL +DEFAULT +ABS z
+ +5: 0+80 +0 +NOTYPE +LOCAL +DEFAULT +1 x
+ +6: 0+ +0 +SECTION +LOCAL +DEFAULT +5 
+ +7: 0+ +0 +SECTION +LOCAL +DEFAULT +6 
+ +8: 0+ +0 +FUNC +GLOBAL +DEFAULT +1 Main
+ +9: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND target
+ +10: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND target2
+ +11: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +UND target3
 
 Hex dump of section '\.text':
  NOTE: This section has relocations against it, but these have NOT been applied to this dump.
diff --git a/gas/testsuite/gas/mmix/loc-1.d b/gas/testsuite/gas/mmix/loc-1.d
index 2dd8670583..92a690a1a0 100644
--- a/gas/testsuite/gas/mmix/loc-1.d
+++ b/gas/testsuite/gas/mmix/loc-1.d
@@ -3,39 +3,39 @@
 There are 7 section headers, starting at offset 0x90:
 
 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
-       0000000000000020  0000000000000000  AX       0     0     4
-  \[ 2\] \.data             PROGBITS         0000000000000000  00000060
-       0000000000000004  0000000000000000  WA       0     0     4
-  \[ 3\] \.bss              NOBITS           0000000000000000  00000064
-       0000000000000000  0000000000000000  WA       0     0     1
-  \[ 4\] \.shstrtab         STRTAB           0000000000000000  00000064
-       000000000000002c  0000000000000000           0     0     1
-  \[ 5\] \.symtab           SYMTAB           0000000000000000  00000250
-       00000000000000c0  0000000000000018           6     6     8
-  \[ 6\] \.strtab           STRTAB           0000000000000000  00000310
-       000000000000002a  0000000000000000           0     0     1
+ +\[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
+ +0000000000000020 +0000000000000000 +AX +0 +0 +4
+ +\[ 2\] \.data +PROGBITS +0000000000000000 +00000060
+ +0000000000000004 +0000000000000000 +WA +0 +0 +4
+ +\[ 3\] \.bss +NOBITS +0000000000000000 +00000064
+ +0000000000000000 +0000000000000000 +WA +0 +0 +1
+ +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +00000064
+ +000000000000002c +0000000000000000 +0 +0 +1
+ +\[ 5\] \.symtab +SYMTAB +0000000000000000 +00000250
+ +00000000000000c0 +0000000000000018 +6 +6 +8
+ +\[ 6\] \.strtab +STRTAB +0000000000000000 +00000310
+ +000000000000002a +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\)
+ +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\)
 
 There are no relocations in this file\.
 
 Symbol table '\.symtab' contains 8 entries:
-   Num:    Value          Size Type    Bind   Vis      Ndx Name
-     0: 0+     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 0+     0 SECTION LOCAL  DEFAULT    1 
-     2: 0+     0 SECTION LOCAL  DEFAULT    2 
-     3: 0+     0 SECTION LOCAL  DEFAULT    3 
-     4: 0+4     0 NOTYPE  LOCAL  DEFAULT    1 m2
-     5: 2000000000000000     0 NOTYPE  LOCAL  DEFAULT  ABS Data_Segment
-     6: 0+     0 FUNC    GLOBAL DEFAULT    1 Main
-     7: 2000000000000000     0 NOTYPE  GLOBAL DEFAULT  ABS __\.MMIX\.start\.\.data
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 0+ +0 +SECTION +LOCAL +DEFAULT +1 
+ +2: 0+ +0 +SECTION +LOCAL +DEFAULT +2 
+ +3: 0+ +0 +SECTION +LOCAL +DEFAULT +3 
+ +4: 0+4 +0 +NOTYPE +LOCAL +DEFAULT +1 m2
+ +5: 2000000000000000 +0 +NOTYPE +LOCAL +DEFAULT +ABS Data_Segment
+ +6: 0+ +0 +FUNC +GLOBAL +DEFAULT +1 Main
+ +7: 2000000000000000 +0 +NOTYPE +GLOBAL +DEFAULT +ABS __\.MMIX\.start\.\.data
 
 Hex dump of section '\.text':
   0x00000000 fd000000 00000000 00000000 00000000 .*
diff --git a/gas/testsuite/gas/mmix/loc-2.d b/gas/testsuite/gas/mmix/loc-2.d
index 0f90c05a68..994cd6144b 100644
--- a/gas/testsuite/gas/mmix/loc-2.d
+++ b/gas/testsuite/gas/mmix/loc-2.d
@@ -3,37 +3,37 @@
 There are 7 section headers, starting at offset 0x78:
 
 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
-       0000000000000008  0000000000000000  AX       0     0     4
-  \[ 2\] \.data             PROGBITS         0000000000000000  00000048
-       0000000000000000  0000000000000000  WA       0     0     1
-  \[ 3\] \.bss              NOBITS           0000000000000000  00000048
-       0000000000000000  0000000000000000  WA       0     0     1
-  \[ 4\] \.shstrtab         STRTAB           0000000000000000  00000048
-       000000000000002c  0000000000000000           0     0     1
-  \[ 5\] \.symtab           SYMTAB           0000000000000000  00000238
-       0000000000000090  0000000000000018           6     4     8
-  \[ 6\] \.strtab           STRTAB           0000000000000000  000002c8
-       000000000000001a  0000000000000000           0     0     1
+ +\[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
+ +0000000000000008 +0000000000000000 +AX +0 +0 +4
+ +\[ 2\] \.data +PROGBITS +0000000000000000 +00000048
+ +0000000000000000 +0000000000000000 +WA +0 +0 +1
+ +\[ 3\] \.bss +NOBITS +0000000000000000 +00000048
+ +0000000000000000 +0000000000000000 +WA +0 +0 +1
+ +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +00000048
+ +000000000000002c +0000000000000000 +0 +0 +1
+ +\[ 5\] \.symtab +SYMTAB +0000000000000000 +00000238
+ +0000000000000090 +0000000000000018 +6 +4 +8
+ +\[ 6\] \.strtab +STRTAB +0000000000000000 +000002c8
+ +000000000000001a +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\)
+ +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\)
 
 There are no relocations in this file\.
 
 Symbol table '\.symtab' contains 6 entries:
-   Num:    Value          Size Type    Bind   Vis      Ndx Name
-     0: 0+     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 0+     0 SECTION LOCAL  DEFAULT    1 
-     2: 0+     0 SECTION LOCAL  DEFAULT    2 
-     3: 0+     0 SECTION LOCAL  DEFAULT    3 
-     4: 0+4     0 FUNC    GLOBAL DEFAULT    1 Main
-     5: 0+100     0 NOTYPE  GLOBAL DEFAULT  ABS __\.MMIX\.start\.\.text
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 0+ +0 +SECTION +LOCAL +DEFAULT +1 
+ +2: 0+ +0 +SECTION +LOCAL +DEFAULT +2 
+ +3: 0+ +0 +SECTION +LOCAL +DEFAULT +3 
+ +4: 0+4 +0 +FUNC +GLOBAL +DEFAULT +1 Main
+ +5: 0+100 +0 +NOTYPE +GLOBAL +DEFAULT +ABS __\.MMIX\.start\.\.text
 
 Hex dump of section '\.text':
   0x00000000 fd010102 fd000070                   .*
diff --git a/gas/testsuite/gas/mmix/loc-3.d b/gas/testsuite/gas/mmix/loc-3.d
index fa62639a21..0883965445 100644
--- a/gas/testsuite/gas/mmix/loc-3.d
+++ b/gas/testsuite/gas/mmix/loc-3.d
@@ -2,39 +2,39 @@
 There are 7 section headers, starting at offset 0x80:
 
 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
-       000000000000000c  0000000000000000  AX       0     0     4
-  \[ 2\] \.data             PROGBITS         0000000000000000  0000004c
-       0000000000000008  0000000000000000  WA       0     0     4
-  \[ 3\] \.bss              NOBITS           0000000000000000  00000054
-       0000000000000000  0000000000000000  WA       0     0     1
-  \[ 4\] \.shstrtab         STRTAB           0000000000000000  00000054
-       000000000000002c  0000000000000000           0     0     1
-  \[ 5\] \.symtab           SYMTAB           0000000000000000  00000240
-       00000000000000c0  0000000000000018           6     5     8
-  \[ 6\] \.strtab           STRTAB           0000000000000000  00000300
-       0000000000000030  0000000000000000           0     0     1
+ +\[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
+ +000000000000000c +0000000000000000 +AX +0 +0 +4
+ +\[ 2\] \.data +PROGBITS +0000000000000000 +0000004c
+ +0000000000000008 +0000000000000000 +WA +0 +0 +4
+ +\[ 3\] \.bss +NOBITS +0000000000000000 +00000054
+ +0000000000000000 +0000000000000000 +WA +0 +0 +1
+ +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +00000054
+ +000000000000002c +0000000000000000 +0 +0 +1
+ +\[ 5\] \.symtab +SYMTAB +0000000000000000 +00000240
+ +00000000000000c0 +0000000000000018 +6 +5 +8
+ +\[ 6\] \.strtab +STRTAB +0000000000000000 +00000300
+ +0000000000000030 +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\)
+ +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\)
 
 There are no relocations in this file\.
 
 Symbol table '\.symtab' contains 8 entries:
-   Num:    Value          Size Type    Bind   Vis      Ndx Name
-     0: 0+     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 0+     0 SECTION LOCAL  DEFAULT    1 
-     2: 0+     0 SECTION LOCAL  DEFAULT    2 
-     3: 0+     0 SECTION LOCAL  DEFAULT    3 
-     4: 0+     0 NOTYPE  LOCAL  DEFAULT    2 a
-     5: 0+4     0 FUNC    GLOBAL DEFAULT    1 Main
-     6: 0+200     0 NOTYPE  GLOBAL DEFAULT  ABS __\.MMIX\.start\.\.text
-     7: 2000000000000000     0 NOTYPE  GLOBAL DEFAULT  ABS __\.MMIX\.start\.\.data
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 0+ +0 +SECTION +LOCAL +DEFAULT +1 
+ +2: 0+ +0 +SECTION +LOCAL +DEFAULT +2 
+ +3: 0+ +0 +SECTION +LOCAL +DEFAULT +3 
+ +4: 0+ +0 +NOTYPE +LOCAL +DEFAULT +2 a
+ +5: 0+4 +0 +FUNC +GLOBAL +DEFAULT +1 Main
+ +6: 0+200 +0 +NOTYPE +GLOBAL +DEFAULT +ABS __\.MMIX\.start\.\.text
+ +7: 2000000000000000 +0 +NOTYPE +GLOBAL +DEFAULT +ABS __\.MMIX\.start\.\.data
 
 Hex dump of section '\.text':
   0x00000000 fd00038f fd090101 fd000065          .*
diff --git a/gas/testsuite/gas/mmix/loc-4.d b/gas/testsuite/gas/mmix/loc-4.d
index 6259f9148b..b04c764c00 100644
--- a/gas/testsuite/gas/mmix/loc-4.d
+++ b/gas/testsuite/gas/mmix/loc-4.d
@@ -2,39 +2,39 @@
 There are 7 section headers, starting at offset 0x88:
 
 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
-       0000000000000018  0000000000000000  AX       0     0     4
-  \[ 2\] \.data             PROGBITS         0000000000000000  00000058
-       0000000000000004  0000000000000000  WA       0     0     4
-  \[ 3\] \.bss              NOBITS           0000000000000000  0000005c
-       0000000000000000  0000000000000000  WA       0     0     1
-  \[ 4\] \.shstrtab         STRTAB           0000000000000000  0000005c
-       000000000000002c  0000000000000000           0     0     1
-  \[ 5\] \.symtab           SYMTAB           0000000000000000  00000248
-       00000000000000c0  0000000000000018           6     5     8
-  \[ 6\] \.strtab           STRTAB           0000000000000000  00000308
-       000000000000003b  0000000000000000           0     0     1
+ +\[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
+ +0000000000000018 +0000000000000000 +AX +0 +0 +4
+ +\[ 2\] \.data +PROGBITS +0000000000000000 +00000058
+ +0000000000000004 +0000000000000000 +WA +0 +0 +4
+ +\[ 3\] \.bss +NOBITS +0000000000000000 +0000005c
+ +0000000000000000 +0000000000000000 +WA +0 +0 +1
+ +\[ 4\] \.shstrtab +STRTAB +0000000000000000 +0000005c
+ +000000000000002c +0000000000000000 +0 +0 +1
+ +\[ 5\] \.symtab +SYMTAB +0000000000000000 +00000248
+ +00000000000000c0 +0000000000000018 +6 +5 +8
+ +\[ 6\] \.strtab +STRTAB +0000000000000000 +00000308
+ +000000000000003b +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\)
+ +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\)
 
 There are no relocations in this file\.
 
 Symbol table '\.symtab' contains 8 entries:
-   Num:    Value          Size Type    Bind   Vis      Ndx Name
-     0: 0+     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 0+     0 SECTION LOCAL  DEFAULT    1 
-     2: 0+     0 SECTION LOCAL  DEFAULT    2 
-     3: 0+     0 SECTION LOCAL  DEFAULT    3 
-     4: 2000000000000000     0 NOTYPE  LOCAL  DEFAULT  ABS Data_Segment
-     5: 0+14     0 FUNC    GLOBAL DEFAULT    1 Main
-     6: 0+     0 NOTYPE  GLOBAL DEFAULT  ABS __\.MMIX\.start\.\.text
-     7: 2000000000000000     0 NOTYPE  GLOBAL DEFAULT  ABS __\.MMIX\.start\.\.data
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 0+ +0 +SECTION +LOCAL +DEFAULT +1 
+ +2: 0+ +0 +SECTION +LOCAL +DEFAULT +2 
+ +3: 0+ +0 +SECTION +LOCAL +DEFAULT +3 
+ +4: 2000000000000000 +0 +NOTYPE +LOCAL +DEFAULT +ABS Data_Segment
+ +5: 0+14 +0 +FUNC +GLOBAL +DEFAULT +1 Main
+ +6: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +ABS __\.MMIX\.start\.\.text
+ +7: 2000000000000000 +0 +NOTYPE +GLOBAL +DEFAULT +ABS __\.MMIX\.start\.\.data
 
 Hex dump of section '\.text':
   0x00000000 fd001807 00000000 00000000 00000000 .*
diff --git a/gas/testsuite/gas/mmix/loc-5.d b/gas/testsuite/gas/mmix/loc-5.d
index 7f632f3be1..03d3d63d0e 100644
--- a/gas/testsuite/gas/mmix/loc-5.d
+++ b/gas/testsuite/gas/mmix/loc-5.d
@@ -2,39 +2,39 @@
 There are 7 section headers, starting at offset 0x98:
 
 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+8  0+  AX       0     0     4
-  \[ 2\] \.data             PROGBITS         0+  0+48
-       0+24  0+  WA       0     0     4
-  \[ 3\] \.bss              NOBITS           0+  0+6c
-       0+  0+  WA       0     0     1
-  \[ 4\] \.shstrtab         STRTAB           0+  0+6c
-       0+2c  0+           0     0     1
-  \[ 5\] \.symtab           SYMTAB           0+  0+258
-       0+c0  0+18           6     6     8
-  \[ 6\] \.strtab           STRTAB           0+  0+318
-       0+29  0+           0     0     1
+ +\[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+8 +0+ +AX +0 +0 +4
+ +\[ 2\] \.data +PROGBITS +0+ +0+48
+ +0+24 +0+ +WA +0 +0 +4
+ +\[ 3\] \.bss +NOBITS +0+ +0+6c
+ +0+ +0+ +WA +0 +0 +1
+ +\[ 4\] \.shstrtab +STRTAB +0+ +0+6c
+ +0+2c +0+ +0 +0 +1
+ +\[ 5\] \.symtab +SYMTAB +0+ +0+258
+ +0+c0 +0+18 +6 +6 +8
+ +\[ 6\] \.strtab +STRTAB +0+ +0+318
+ +0+29 +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\)
+ +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\)
 
 There are no relocations in this file\.
 
 Symbol table '\.symtab' contains 8 entries:
-   Num:    Value          Size Type    Bind   Vis      Ndx Name
-     0: 0+     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 0+     0 SECTION LOCAL  DEFAULT    1 
-     2: 0+     0 SECTION LOCAL  DEFAULT    2 
-     3: 0+     0 SECTION LOCAL  DEFAULT    3 
-     4: 0+     0 NOTYPE  LOCAL  DEFAULT    1 t
-     5: 2000000000000000     0 NOTYPE  LOCAL  DEFAULT  ABS Data_Segment
-     6: 0+4     0 FUNC    GLOBAL DEFAULT    1 Main
-     7: 2000000000000000     0 NOTYPE  GLOBAL DEFAULT  ABS __\.MMIX\.start\.\.data
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 0+ +0 +SECTION +LOCAL +DEFAULT +1 
+ +2: 0+ +0 +SECTION +LOCAL +DEFAULT +2 
+ +3: 0+ +0 +SECTION +LOCAL +DEFAULT +3 
+ +4: 0+ +0 +NOTYPE +LOCAL +DEFAULT +1 t
+ +5: 2000000000000000 +0 +NOTYPE +LOCAL +DEFAULT +ABS Data_Segment
+ +6: 0+4 +0 +FUNC +GLOBAL +DEFAULT +1 Main
+ +7: 2000000000000000 +0 +NOTYPE +GLOBAL +DEFAULT +ABS __\.MMIX\.start\.\.data
 
 Hex dump of section '\.text':
   0x0+ fd001807 fd090101                   .*
diff --git a/gas/testsuite/gas/mmix/loc-6.d b/gas/testsuite/gas/mmix/loc-6.d
index 8303e2189a..23a4a6b098 100644
--- a/gas/testsuite/gas/mmix/loc-6.d
+++ b/gas/testsuite/gas/mmix/loc-6.d
@@ -2,9 +2,9 @@
 There are no relocations in this file\.
 
 Symbol table '\.symtab' contains . entries:
-   Num:    Value          Size Type    Bind   Vis      Ndx Name
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
 #...
-     .: 8000000000000000     0 NOTYPE  GLOBAL DEFAULT  ABS __\.MMIX\.start\.\.text
+ +.: 8000000000000000 +0 +NOTYPE +GLOBAL +DEFAULT +ABS __\.MMIX\.start\.\.text
 
 Hex dump of section '\.text':
   0x0+ f4000000   .*
diff --git a/gas/testsuite/gas/mmix/loc-7.d b/gas/testsuite/gas/mmix/loc-7.d
index 1341274498..bd53351db9 100644
--- a/gas/testsuite/gas/mmix/loc-7.d
+++ b/gas/testsuite/gas/mmix/loc-7.d
@@ -2,9 +2,9 @@
 There are no relocations in this file\.
 
 Symbol table '\.symtab' contains . entries:
-   Num:    Value          Size Type    Bind   Vis      Ndx Name
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
 #...
-     .: 8000000000042000     0 NOTYPE  GLOBAL DEFAULT  ABS __\.MMIX\.start\.\.text
+ +.: 8000000000042000 +0 +NOTYPE +GLOBAL +DEFAULT +ABS __\.MMIX\.start\.\.text
 
 Hex dump of section '\.text':
   0x0+ f4000000 00000000 00000000 00000000 .*