Tolerate some whitespace differences in readelf output.

8 files changed, 92 insertions, 82 deletions

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index bbee66a..47bfcb3 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2009-09-23  Alan Modra  <amodra@bigpond.net.au>
+
+	* binutils-all/readelf.s: Tolerate some whitespace differences.
+	* binutils-all/readelf.s-64: Likewise.
+	* binutils-all/readelf.ss: Likewise.
+	* binutils-all/readelf.ss-64: Likewise.
+	* binutils-all/readelf.ss-mips: Likewise.
+	* binutils-all/readelf.ss-tmips: Likewise.
+	* binutils-all/strip-10.d: Likewise.
+
 2009-09-08  Alan Modra  <amodra@bigpond.net.au>
 
 	* binutils-all/objdump.exp (cpus_expected): Add ms1.
diff --git a/binutils/testsuite/binutils-all/readelf.s b/binutils/testsuite/binutils-all/readelf.s
index 985a48b..a925262 100644
--- a/binutils/testsuite/binutils-all/readelf.s
+++ b/binutils/testsuite/binutils-all/readelf.s
@@ -1,24 +1,24 @@
 There are .* section headers, starting at offset .*:
 
 Section Headers:
-  \[Nr\] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al
-  \[ 0\]                   NULL            00000000 000000 000000 00 +0 +0 +0
+ +\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
+ +\[ 0\] +NULL +00000000 000000 000000 00 +0 +0 +0
 # On the normal MIPS systems, sections must be aligned to 16 byte
 # boundaries. On IA64, text sections are aligned to 16 byte boundaries.
-  \[ 1\] .text             PROGBITS        00000000 0000(34|40) 0000(08|10) 00 +AX +0 +0 +(.|..)
-  \[ 2\] .rel.+text +REL. +0+ 0+.* 00000. 0. +. +1 +4
+ +\[ 1\] .text +PROGBITS +00000000 0000(34|40) 0000(08|10) 00 +AX +0 +0 +(.|..)
+ +\[ 2\] .rel.+text +REL. +0+ 0+.* 00000. 0. +. +1 +4
 # MIPS targets put .rela.text here.
 #...
-  \[ .\] .data             PROGBITS        00000000 0000(3c|48|50) 0000(04|10) 00  WA +0 +0 +(.|..)
-  \[ .\] .bss              NOBITS          00000000 0000(40|4c|60) 000000 00  WA +0 +0 +(.|..)
+ +\[ .\] .data +PROGBITS +00000000 0000(3c|48|50) 0000(04|10) 00 +WA +0 +0 +(.|..)
+ +\[ .\] .bss +NOBITS +00000000 0000(40|4c|60) 000000 00 +WA +0 +0 +(.|..)
 # MIPS targets put .reginfo and .mdebug here.
 # v850 targets put .call_table_data and .call_table_text here.
 #...
-  \[ .\] .shstrtab         STRTAB          00000000 0+.* 0+.* 00 +0 +0 +.
-  \[ .\] .symtab           SYMTAB          00000000 0+.* 0+.* 10 +.. +. +4
-  \[..\] .strtab           STRTAB          00000000 0+.* 0+.* 00 +0 +0 +1
+ +\[ .\] .shstrtab +STRTAB +00000000 0+.* 0+.* 00 +0 +0 +.
+ +\[ .\] .symtab +SYMTAB +00000000 0+.* 0+.* 10 +.. +. +4
+ +\[..\] .strtab +STRTAB +00000000 0+.* 0+.* 00 +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\)
 
diff --git a/binutils/testsuite/binutils-all/readelf.s-64 b/binutils/testsuite/binutils-all/readelf.s-64
index 5496b41..feeb959 100644
--- a/binutils/testsuite/binutils-all/readelf.s-64
+++ b/binutils/testsuite/binutils-all/readelf.s-64
@@ -1,25 +1,25 @@
 There are .* section headers, starting at offset .*:
 
 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
-       00000000000000..  0000000000000000  AX       0     0     .*
-  \[ 2\] .rel.+text +REL. +0+  0+.*
-       000000000000001.  000000000000001.           .     1     8
-  \[ 3\] .data             PROGBITS         0000000000000000  000000(48|50)
-       000000000000000[48]  0000000000000000  WA       0     0     .*
-  \[ 4\] .bss              NOBITS           0000000000000000  000000(4c|50|54|58)
-       0000000000000000  0000000000000000  WA       0     0     .*
-  \[ 5\] .shstrtab         STRTAB           0000000000000000  000000(4c|50|54|58)
-       00000000000000..  0000000000000000           0     0     .*
-  \[ 6\] .symtab           SYMTAB           0000000000000000  0+.*
-       0+.*  0000000000000018           7     6     8
-  \[ 7\] .strtab           STRTAB           0000000000000000  0+.*
-       0+.*  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
+ +00000000000000.. +0000000000000000 +AX +0 +0 +.*
+ +\[ 2\] .rel.+text +REL. +0+ +0+.*
+ +000000000000001. +000000000000001. +. +1 +8
+ +\[ 3\] .data +PROGBITS +0000000000000000 +000000(48|50)
+ +000000000000000[48] +0000000000000000 +WA +0 +0 +.*
+ +\[ 4\] .bss +NOBITS +0000000000000000 +000000(4c|50|54|58)
+ +0000000000000000 +0000000000000000 +WA +0 +0 +.*
+ +\[ 5\] .shstrtab +STRTAB +0000000000000000 +000000(4c|50|54|58)
+ +00000000000000.. +0000000000000000 +0 +0 +.*
+ +\[ 6\] .symtab +SYMTAB +0000000000000000 +0+.*
+ +0+.* +0000000000000018 +7 +6 +8
+ +\[ 7\] .strtab +STRTAB +0000000000000000 +0+.*
+ +0+.* +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\)
diff --git a/binutils/testsuite/binutils-all/readelf.ss b/binutils/testsuite/binutils-all/readelf.ss
index 1967795..9bb0f2e 100644
--- a/binutils/testsuite/binutils-all/readelf.ss
+++ b/binutils/testsuite/binutils-all/readelf.ss
@@ -1,18 +1,18 @@
 
 Symbol table '.symtab' contains .* entries:
-   Num:    Value  Size Type    Bind   Vis      Ndx Name
-     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00000000     0 SECTION LOCAL  DEFAULT    1 
-     2: 00000000     0 SECTION LOCAL  DEFAULT    [34] 
-     3: 00000000     0 SECTION LOCAL  DEFAULT    [45] 
-     4: 00000000     0 NOTYPE  LOCAL  DEFAULT    1 static_text_symbol
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 00000000 +0 +SECTION +LOCAL +DEFAULT +1 
+ +2: 00000000 +0 +SECTION +LOCAL +DEFAULT +[34] 
+ +3: 00000000 +0 +SECTION +LOCAL +DEFAULT +[45] 
+ +4: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +1 static_text_symbol
 # arm-elf targets add the $d mapping symbol here...
 #...
-     .: 00000000     0 NOTYPE  LOCAL  DEFAULT    [34] static_data_symbol
+ +.: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +[34] static_data_symbol
 # v850 targets include extra SECTION symbols here for the .call_table_data
 # and .call_table_text sections.
 #...
-.*   .: 00000000     0 NOTYPE  GLOBAL DEFAULT    1 text_symbol
-    ..: 00000000     0 NOTYPE  GLOBAL DEFAULT  UND external_symbol
-    ..: 00000000     0 NOTYPE  GLOBAL DEFAULT    [34] data_symbol
-    ..: 00000004     4 (COMMON|OBJECT)  GLOBAL DEFAULT ( COM|ANSI_COM) common_symbol
+ +.: 00000000 +0 +NOTYPE +GLOBAL +DEFAULT +1 text_symbol
+ +..: 00000000 +0 +NOTYPE +GLOBAL +DEFAULT +UND external_symbol
+ +..: 00000000 +0 +NOTYPE +GLOBAL +DEFAULT +[34] data_symbol
+ +..: 00000004 +4 +(COMMON|OBJECT) +GLOBAL +DEFAULT +(COM|ANSI_COM) common_symbol
diff --git a/binutils/testsuite/binutils-all/readelf.ss-64 b/binutils/testsuite/binutils-all/readelf.ss-64
index 54eea053..c100c14 100644
--- a/binutils/testsuite/binutils-all/readelf.ss-64
+++ b/binutils/testsuite/binutils-all/readelf.ss-64
@@ -1,13 +1,13 @@
 
 Symbol table '.symtab' contains .* entries:
-   Num:    Value          Size Type    Bind   Vis      Ndx Name
-     0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 0000000000000000     0 SECTION LOCAL  DEFAULT    1 
-     2: 0000000000000000     0 SECTION LOCAL  DEFAULT    3 
-     3: 0000000000000000     0 SECTION LOCAL  DEFAULT    4 
-     4: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT    1 static_text_symbol
-     5: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT    3 static_data_symbol
-.*   .: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT    1 text_symbol
-     .: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND external_symbol
-     .: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT    3 data_symbol
-     .: 0000000000000004     4 (COMMON|OBJECT)  GLOBAL DEFAULT  COM common_symbol
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 0000000000000000 +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 0000000000000000 +0 +SECTION +LOCAL +DEFAULT +1 
+ +2: 0000000000000000 +0 +SECTION +LOCAL +DEFAULT +3 
+ +3: 0000000000000000 +0 +SECTION +LOCAL +DEFAULT +4 
+ +4: 0000000000000000 +0 +NOTYPE +LOCAL +DEFAULT +1 static_text_symbol
+ +5: 0000000000000000 +0 +NOTYPE +LOCAL +DEFAULT +3 static_data_symbol
+.* +.: 0000000000000000 +0 +NOTYPE +GLOBAL +DEFAULT +1 text_symbol
+ +.: 0000000000000000 +0 +NOTYPE +GLOBAL +DEFAULT +UND external_symbol
+ +.: 0000000000000000 +0 +NOTYPE +GLOBAL +DEFAULT +3 data_symbol
+ +.: 0000000000000004 +4 +(COMMON|OBJECT) +GLOBAL +DEFAULT +COM common_symbol
diff --git a/binutils/testsuite/binutils-all/readelf.ss-mips b/binutils/testsuite/binutils-all/readelf.ss-mips
index 0c2b75e..fd97552 100644
--- a/binutils/testsuite/binutils-all/readelf.ss-mips
+++ b/binutils/testsuite/binutils-all/readelf.ss-mips
@@ -1,15 +1,15 @@
 
 Symbol table '.symtab' contains 12 entries:
-   Num:    Value  Size Type    Bind   Vis      Ndx Name
-     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00000000     0 SECTION LOCAL  DEFAULT    . (|\.text)
-     2: 00000000     0 SECTION LOCAL  DEFAULT    . (|\.data)
-     3: 00000000     0 SECTION LOCAL  DEFAULT    . (|\.bss)
-     4: 00000000     0 SECTION LOCAL  DEFAULT    . (|\.reginfo)
-     5: 00000000     0 SECTION LOCAL  DEFAULT    . (|\.pdr)
-     6: 00000000     0 OBJECT  GLOBAL DEFAULT    . text_symbol
-     7: 00000000     0 NOTYPE  LOCAL  DEFAULT    . static_text_symbol
-     8: 00000000     0 NOTYPE  GLOBAL DEFAULT  UND external_symbol
-     9: 00000000     0 OBJECT  GLOBAL DEFAULT    . data_symbol
-    10: 00000000     0 NOTYPE  LOCAL  DEFAULT    . static_data_symbol
-    11: 00000004     4 (COMMON|OBJECT)  GLOBAL DEFAULT  (PRC|COM) common_symbol
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 00000000 +0 +SECTION +LOCAL +DEFAULT +. (|\.text)
+ +2: 00000000 +0 +SECTION +LOCAL +DEFAULT +. (|\.data)
+ +3: 00000000 +0 +SECTION +LOCAL +DEFAULT +. (|\.bss)
+ +4: 00000000 +0 +SECTION +LOCAL +DEFAULT +. (|\.reginfo)
+ +5: 00000000 +0 +SECTION +LOCAL +DEFAULT +. (|\.pdr)
+ +6: 00000000 +0 +OBJECT +GLOBAL +DEFAULT +. text_symbol
+ +7: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +. static_text_symbol
+ +8: 00000000 +0 +NOTYPE +GLOBAL +DEFAULT +UND external_symbol
+ +9: 00000000 +0 +OBJECT +GLOBAL +DEFAULT +. data_symbol
+ +10: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +. static_data_symbol
+ +11: 00000004 +4 +(COMMON|OBJECT) +GLOBAL +DEFAULT +(PRC|COM) common_symbol
diff --git a/binutils/testsuite/binutils-all/readelf.ss-tmips b/binutils/testsuite/binutils-all/readelf.ss-tmips
index a76859b..1f87248 100644
--- a/binutils/testsuite/binutils-all/readelf.ss-tmips
+++ b/binutils/testsuite/binutils-all/readelf.ss-tmips
@@ -1,15 +1,15 @@
 
 Symbol table '.symtab' contains 12 entries:
-   Num:    Value  Size Type    Bind   Vis      Ndx Name
-     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00000000     0 SECTION LOCAL  DEFAULT    1 
-     2: 00000000     0 SECTION LOCAL  DEFAULT    3 
-     3: 00000000     0 SECTION LOCAL  DEFAULT    4 
-     4: 00000000     0 NOTYPE  LOCAL  DEFAULT    1 static_text_symbol
-     5: 00000000     0 NOTYPE  LOCAL  DEFAULT    3 static_data_symbol
-     6: 00000000     0 SECTION LOCAL  DEFAULT    5 
-     7: 00000000     0 SECTION LOCAL  DEFAULT    6 
-     8: 00000000     0 OBJECT  GLOBAL DEFAULT    1 text_symbol
-     9: 00000000     0 NOTYPE  GLOBAL DEFAULT  UND external_symbol
-    10: 00000000     0 OBJECT  GLOBAL DEFAULT    3 data_symbol
-    11: 00000004     4 (COMMON|OBJECT)  GLOBAL DEFAULT  (PRC|COM) common_symbol
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 00000000 +0 +SECTION +LOCAL +DEFAULT +1 
+ +2: 00000000 +0 +SECTION +LOCAL +DEFAULT +3 
+ +3: 00000000 +0 +SECTION +LOCAL +DEFAULT +4 
+ +4: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +1 static_text_symbol
+ +5: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +3 static_data_symbol
+ +6: 00000000 +0 +SECTION +LOCAL +DEFAULT +5 
+ +7: 00000000 +0 +SECTION +LOCAL +DEFAULT +6 
+ +8: 00000000 +0 +OBJECT +GLOBAL +DEFAULT +1 text_symbol
+ +9: 00000000 +0 +NOTYPE +GLOBAL +DEFAULT +UND external_symbol
+ +10: 00000000 +0 +OBJECT +GLOBAL +DEFAULT +3 data_symbol
+ +11: 00000004 +4 +(COMMON|OBJECT) +GLOBAL +DEFAULT +(PRC|COM) common_symbol
diff --git a/binutils/testsuite/binutils-all/strip-10.d b/binutils/testsuite/binutils-all/strip-10.d
index 1f5e4a3..588c7d1 100644
--- a/binutils/testsuite/binutils-all/strip-10.d
+++ b/binutils/testsuite/binutils-all/strip-10.d
@@ -5,4 +5,4 @@
 #name: strip on STB_GNU_UNIQUE
 
 #...
-[ 	]+[0-9]+:[ 	]+[0-9a-f]+[ 	]+[0-9]+[ 	]+OBJECT[	 ]+(UNIQUE|<OS specific>: 10) DEFAULT[ 	]+[1-9] foo
+ +[0-9]+: +[0-9a-f]+ +[0-9]+ +OBJECT +(UNIQUE|<OS specific>: 10) +DEFAULT +[1-9] foo