Tolerate some whitespace differences in readelf output.

7 files changed, 177 insertions, 177 deletions

diff --git a/ld/testsuite/ld-mmix/bspec1.d b/ld/testsuite/ld-mmix/bspec1.d
index 79d53d42f0..04c49fadda 100644
--- a/ld/testsuite/ld-mmix/bspec1.d
+++ b/ld/testsuite/ld-mmix/bspec1.d
@@ -6,34 +6,34 @@
 There are 6 section headers, starting at offset 0xb8:
 
 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+78
-       0+4  0+  AX       0     0     4
-  \[ 2\] \.MMIX\.spec_data\.2 PROGBITS         0+  0+7c
-       0+4  0+           0     0     4
-  \[ 3\] \.shstrtab         STRTAB           0+  0+80
-       0+33  0+           0     0     1
-  \[ 4\] \.symtab           SYMTAB           0+  0+238
-       0+d8  0+18           5     3     8
-  \[ 5\] \.strtab           STRTAB           0+  0+310
-       0+2d  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+78
+ +0+4 +0+ +AX +0 +0 +4
+ +\[ 2\] \.MMIX\.spec_data\.2 PROGBITS +0+ +0+7c
+ +0+4 +0+ +0 +0 +4
+ +\[ 3\] \.shstrtab +STRTAB +0+ +0+80
+ +0+33 +0+ +0 +0 +1
+ +\[ 4\] \.symtab +SYMTAB +0+ +0+238
+ +0+d8 +0+18 +5 +3 +8
+ +\[ 5\] \.strtab +STRTAB +0+ +0+310
+ +0+2d +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 9 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 FUNC    GLOBAL DEFAULT    1 Main
-     4: 0+     0 NOTYPE  GLOBAL DEFAULT    1 _start
+ +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 +FUNC +GLOBAL +DEFAULT +1 Main
+ +4: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +1 _start
 #...
 
 Hex dump of section '\.text':
diff --git a/ld/testsuite/ld-mmix/bspec2.d b/ld/testsuite/ld-mmix/bspec2.d
index 98296e729e..f636c908eb 100644
--- a/ld/testsuite/ld-mmix/bspec2.d
+++ b/ld/testsuite/ld-mmix/bspec2.d
@@ -9,38 +9,38 @@
 There are 7 section headers, starting at offset 0xd0:
 
 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+78
-       0+4  0+  AX       0     0     4
-  \[ 2\] \.MMIX\.spec_data\.2 PROGBITS         0+  0+7c
-       0+8  0+           0     0     4
-  \[ 3\] \.MMIX\.spec_data\.3 PROGBITS         0+  0+84
-       0+4  0+           0     0     4
-  \[ 4\] \.shstrtab         STRTAB           0+  0+88
-       0+45  0+           0     0     1
-  \[ 5\] \.symtab           SYMTAB           0+  0+290
-       0+108  0+18           6     4     8
-  \[ 6\] \.strtab           STRTAB           0+  0+398
-       0+32  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+78
+ +0+4 +0+ +AX +0 +0 +4
+ +\[ 2\] \.MMIX\.spec_data\.2 PROGBITS +0+ +0+7c
+ +0+8 +0+ +0 +0 +4
+ +\[ 3\] \.MMIX\.spec_data\.3 PROGBITS +0+ +0+84
+ +0+4 +0+ +0 +0 +4
+ +\[ 4\] \.shstrtab +STRTAB +0+ +0+88
+ +0+45 +0+ +0 +0 +1
+ +\[ 5\] \.symtab +SYMTAB +0+ +0+290
+ +0+108 +0+18 +6 +4 +8
+ +\[ 6\] \.strtab +STRTAB +0+ +0+398
+ +0+32 +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 11 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 FUNC    GLOBAL DEFAULT    1 Main
-     5: 0+fc     0 NOTYPE  GLOBAL DEFAULT  ABS ext1
-     6: 0+     0 NOTYPE  GLOBAL DEFAULT    1 _start
+ +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 +FUNC +GLOBAL +DEFAULT +1 Main
+ +5: 0+fc +0 +NOTYPE +GLOBAL +DEFAULT +ABS ext1
+ +6: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +1 _start
 #...
 
 Hex dump of section '\.text':
diff --git a/ld/testsuite/ld-mmix/local1.d b/ld/testsuite/ld-mmix/local1.d
index fc08da774f..31dbeda01e 100644
--- a/ld/testsuite/ld-mmix/local1.d
+++ b/ld/testsuite/ld-mmix/local1.d
@@ -13,34 +13,34 @@
 There are 6 section headers, starting at offset 0xc8:
 
 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+78
-       0+8  0+  AX       0     0     4
-  \[ 2\] \.MMIX\.reg_content PROGBITS         0+7e8  0+80
-       0+10  0+   W       0     0     1
-  \[ 3\] \.shstrtab         STRTAB           0+  0+90
-       0+34  0+           0     0     1
-  \[ 4\] \.symtab           SYMTAB           0+  0+248
-       0+108  0+18           5     5     8
-  \[ 5\] \.strtab           STRTAB           0+  0+350
-       0+32  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+78
+ +0+8 +0+ +AX +0 +0 +4
+ +\[ 2\] \.MMIX\.reg_content PROGBITS +0+7e8 +0+80
+ +0+10 +0+ +W +0 +0 +1
+ +\[ 3\] \.shstrtab +STRTAB +0+ +0+90
+ +0+34 +0+ +0 +0 +1
+ +\[ 4\] \.symtab +SYMTAB +0+ +0+248
+ +0+108 +0+18 +5 +5 +8
+ +\[ 5\] \.strtab +STRTAB +0+ +0+350
+ +0+32 +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\)
 
 Symbol table '\.symtab' contains 11 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+7e8     0 SECTION LOCAL  DEFAULT    2 
-     3: 0+fd     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
-     4: 0+fe     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
-     5: 0+fc     0 NOTYPE  GLOBAL DEFAULT PRC\[0xff00\] ext1
-     6: 0+4     0 NOTYPE  GLOBAL DEFAULT    1 _start
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 0+ +0 +SECTION +LOCAL +DEFAULT +1 
+ +2: 0+7e8 +0 +SECTION +LOCAL +DEFAULT +2 
+ +3: 0+fd +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
+ +4: 0+fe +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
+ +5: 0+fc +0 +NOTYPE +GLOBAL +DEFAULT +PRC\[0xff00\] ext1
+ +6: 0+4 +0 +NOTYPE +GLOBAL +DEFAULT +1 _start
 #...
 
 Hex dump of section '\.text':
diff --git a/ld/testsuite/ld-mmix/local3.d b/ld/testsuite/ld-mmix/local3.d
index 62db6c3424..f0b6a0e271 100644
--- a/ld/testsuite/ld-mmix/local3.d
+++ b/ld/testsuite/ld-mmix/local3.d
@@ -4,41 +4,41 @@
 #source: ext1.s
 #source: start.s
 #ld: -m elf64mmix
-#readelf:  -Ssx1 -x2
+#readelf: -Ssx1 -x2
 
 # Like local1, but ext1 is here a constant, not a global register.
 
 There are 6 section headers, starting at offset 0xc8:
 
 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+78
-       0+8  0+  AX       0     0     4
-  \[ 2\] \.MMIX\.reg_content PROGBITS         0+7e8  0+80
-       0+10  0+   W       0     0     1
-  \[ 3\] \.shstrtab         STRTAB           0+  0+90
-       0+34  0+           0     0     1
-  \[ 4\] \.symtab           SYMTAB           0+  0+248
-       0+108  0+18           5     5     8
-  \[ 5\] \.strtab           STRTAB           0+  0+350
-       0+32  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+78
+ +0+8 +0+ +AX +0 +0 +4
+ +\[ 2\] \.MMIX\.reg_content PROGBITS +0+7e8 +0+80
+ +0+10 +0+ +W +0 +0 +1
+ +\[ 3\] \.shstrtab +STRTAB +0+ +0+90
+ +0+34 +0+ +0 +0 +1
+ +\[ 4\] \.symtab +SYMTAB +0+ +0+248
+ +0+108 +0+18 +5 +5 +8
+ +\[ 5\] \.strtab +STRTAB +0+ +0+350
+ +0+32 +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\)
 
 Symbol table '\.symtab' contains 11 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+7e8     0 SECTION LOCAL  DEFAULT    2 
-     3: 0+fd     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
-     4: 0+fe     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
-     5: 0+fc     0 NOTYPE  GLOBAL DEFAULT  ABS ext1
-     6: 0+4     0 NOTYPE  GLOBAL DEFAULT    1 _start
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 0+ +0 +SECTION +LOCAL +DEFAULT +1 
+ +2: 0+7e8 +0 +SECTION +LOCAL +DEFAULT +2 
+ +3: 0+fd +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
+ +4: 0+fe +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
+ +5: 0+fc +0 +NOTYPE +GLOBAL +DEFAULT +ABS ext1
+ +6: 0+4 +0 +NOTYPE +GLOBAL +DEFAULT +1 _start
 #...
 
 Hex dump of section '\.text':
diff --git a/ld/testsuite/ld-mmix/local5.d b/ld/testsuite/ld-mmix/local5.d
index 955c3fada7..164e5c8006 100644
--- a/ld/testsuite/ld-mmix/local5.d
+++ b/ld/testsuite/ld-mmix/local5.d
@@ -5,41 +5,41 @@
 #source: regext1.s
 #source: start.s
 #ld: -m elf64mmix
-#readelf:  -Ssx1 -x2
+#readelf: -Ssx1 -x2
 
 # Like local1, but with two checks for a local register.
 
 There are 6 section headers, starting at offset 0xc8:
 
 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+78
-       0+c  0+  AX       0     0     4
-  \[ 2\] \.MMIX\.reg_content PROGBITS         0+7e8  0+84
-       0+10  0+   W       0     0     1
-  \[ 3\] \.shstrtab         STRTAB           0+  0+94
-       0+34  0+           0     0     1
-  \[ 4\] \.symtab           SYMTAB           0+  0+248
-       0+108  0+18           5     5     8
-  \[ 5\] \.strtab           STRTAB           0+  0+350
-       0+32  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+78
+ +0+c +0+ +AX +0 +0 +4
+ +\[ 2\] \.MMIX\.reg_content PROGBITS +0+7e8 +0+84
+ +0+10 +0+ +W +0 +0 +1
+ +\[ 3\] \.shstrtab +STRTAB +0+ +0+94
+ +0+34 +0+ +0 +0 +1
+ +\[ 4\] \.symtab +SYMTAB +0+ +0+248
+ +0+108 +0+18 +5 +5 +8
+ +\[ 5\] \.strtab +STRTAB +0+ +0+350
+ +0+32 +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\)
 
 Symbol table '\.symtab' contains 11 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+7e8     0 SECTION LOCAL  DEFAULT    2 
-     3: 0+fd     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
-     4: 0+fe     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
-     5: 0+fc     0 NOTYPE  GLOBAL DEFAULT PRC\[0xff00\] ext1
-     6: 0+8     0 NOTYPE  GLOBAL DEFAULT    1 _start
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 0+ +0 +SECTION +LOCAL +DEFAULT +1 
+ +2: 0+7e8 +0 +SECTION +LOCAL +DEFAULT +2 
+ +3: 0+fd +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
+ +4: 0+fe +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
+ +5: 0+fc +0 +NOTYPE +GLOBAL +DEFAULT +PRC\[0xff00\] ext1
+ +6: 0+8 +0 +NOTYPE +GLOBAL +DEFAULT +1 _start
 #...
 
 Hex dump of section '\.text':
diff --git a/ld/testsuite/ld-mmix/local7.d b/ld/testsuite/ld-mmix/local7.d
index 0109d13800..d112d501f9 100644
--- a/ld/testsuite/ld-mmix/local7.d
+++ b/ld/testsuite/ld-mmix/local7.d
@@ -5,7 +5,7 @@
 #source: ext1.s
 #source: start.s
 #ld: -m elf64mmix
-#readelf:  -Ssx1 -x2
+#readelf: -Ssx1 -x2
 
 # Like local1, but ext1 is here a constant, not a global register and two
 # local-register checks.
@@ -13,34 +13,34 @@
 There are 6 section headers, starting at offset 0xc8:
 
 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+78
-       0+c  0+  AX       0     0     4
-  \[ 2\] \.MMIX\.reg_content PROGBITS         0+7e8  0+84
-       0+10  0+   W       0     0     1
-  \[ 3\] \.shstrtab         STRTAB           0+  0+94
-       0+34  0+           0     0     1
-  \[ 4\] \.symtab           SYMTAB           0+  0+248
-       0+108  0+18           5     5     8
-  \[ 5\] \.strtab           STRTAB           0+  0+350
-       0+32  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+78
+ +0+c +0+ +AX +0 +0 +4
+ +\[ 2\] \.MMIX\.reg_content PROGBITS +0+7e8 +0+84
+ +0+10 +0+ +W +0 +0 +1
+ +\[ 3\] \.shstrtab +STRTAB +0+ +0+94
+ +0+34 +0+ +0 +0 +1
+ +\[ 4\] \.symtab +SYMTAB +0+ +0+248
+ +0+108 +0+18 +5 +5 +8
+ +\[ 5\] \.strtab +STRTAB +0+ +0+350
+ +0+32 +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\)
 
 Symbol table '\.symtab' contains 11 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+7e8     0 SECTION LOCAL  DEFAULT    2 
-     3: 0+fd     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
-     4: 0+fe     0 NOTYPE  LOCAL  DEFAULT PRC\[0xff00\] lsym
-     5: 0+fc     0 NOTYPE  GLOBAL DEFAULT  ABS ext1
-     6: 0+8     0 NOTYPE  GLOBAL DEFAULT    1 _start
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 0+ +0 +SECTION +LOCAL +DEFAULT +1 
+ +2: 0+7e8 +0 +SECTION +LOCAL +DEFAULT +2 
+ +3: 0+fd +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
+ +4: 0+fe +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
+ +5: 0+fc +0 +NOTYPE +GLOBAL +DEFAULT +ABS ext1
+ +6: 0+8 +0 +NOTYPE +GLOBAL +DEFAULT +1 _start
 #...
 
 Hex dump of section '\.text':
diff --git a/ld/testsuite/ld-mmix/undef-3.d b/ld/testsuite/ld-mmix/undef-3.d
index 5b3ce98ea7..5f659bcb88 100644
--- a/ld/testsuite/ld-mmix/undef-3.d
+++ b/ld/testsuite/ld-mmix/undef-3.d
@@ -5,30 +5,30 @@
 There are 5 section headers, starting at offset 0xa0:
 
 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+78
-       0+4  0+  AX       0     0     4
-  \[ 2\] \.shstrtab         STRTAB           0+  0+7c
-       0+21  0+           0     0     1
-  \[ 3\] \.symtab           SYMTAB           0+  0+1e0
-       0+c0  0+18           4     2     8
-  \[ 4\] \.strtab           STRTAB           0+  0+2a0
-       0+2f  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+78
+ +0+4 +0+ +AX +0 +0 +4
+ +\[ 2\] \.shstrtab +STRTAB +0+ +0+7c
+ +0+21 +0+ +0 +0 +1
+ +\[ 3\] \.symtab +SYMTAB +0+ +0+1e0
+ +0+c0 +0+18 +4 +2 +8
+ +\[ 4\] \.strtab +STRTAB +0+ +0+2a0
+ +0+2f +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\)
 
 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 NOTYPE  GLOBAL DEFAULT  UND undefd
-     3: 0+     0 NOTYPE  GLOBAL DEFAULT    1 _start
-     4: 2000000000000000     0 NOTYPE  GLOBAL DEFAULT  ABS __bss_start
-     5: 2000000000000000     0 NOTYPE  GLOBAL DEFAULT  ABS _edata
-     6: 2000000000000000     0 NOTYPE  GLOBAL DEFAULT  ABS _end
-     7: 0+     0 NOTYPE  GLOBAL DEFAULT    1 _start\.
+ +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 +NOTYPE +GLOBAL +DEFAULT +UND undefd
+ +3: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +1 _start
+ +4: 2000000000000000 +0 +NOTYPE +GLOBAL +DEFAULT +ABS __bss_start
+ +5: 2000000000000000 +0 +NOTYPE +GLOBAL +DEFAULT +ABS _edata
+ +6: 2000000000000000 +0 +NOTYPE +GLOBAL +DEFAULT +ABS _end
+ +7: 0+ +0 +NOTYPE +GLOBAL +DEFAULT +1 _start\.