Tolerate some whitespace differences in readelf output.

12 files changed, 60 insertions, 60 deletions

diff --git a/ld/testsuite/ld-mips-elf/got-vers-1.sd b/ld/testsuite/ld-mips-elf/got-vers-1.sd
index 9c3a8c0..fac41d3 100644
--- a/ld/testsuite/ld-mips-elf/got-vers-1.sd
+++ b/ld/testsuite/ld-mips-elf/got-vers-1.sd
@@ -1,6 +1,6 @@
 # foo@@V2 must have index DT_MIPS_GOTSYM
 #...
- *3: .* 4 * OBJECT * GLOBAL * DEFAULT * [0-9]+ * foo@@V2
+ *3: .* 4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +foo@@V2
 
 Symbol table '\.symtab' contains .*:
 #pass
diff --git a/ld/testsuite/ld-mips-elf/mips16-pic-2.nd b/ld/testsuite/ld-mips-elf/mips16-pic-2.nd
index a2b67b6..94615b5 100644
--- a/ld/testsuite/ld-mips-elf/mips16-pic-2.nd
+++ b/ld/testsuite/ld-mips-elf/mips16-pic-2.nd
@@ -1,10 +1,10 @@
 # used8 should come before MIPS_GOTSYM.
 #...
-     4: 000405bc    36 FUNC    GLOBAL DEFAULT .* used8
-     5: .* _GLOBAL_OFFSET_TABLE_
-     6: 00040574    36 FUNC    GLOBAL DEFAULT .* used6
-     7: 00040598    36 FUNC    GLOBAL DEFAULT .* used7
-     8: 00040550    36 FUNC    GLOBAL DEFAULT .* used5
-     9: 0004052c    36 FUNC    GLOBAL DEFAULT .* used4
+ +4: 000405bc +36 +FUNC +GLOBAL +DEFAULT .* used8
+ +5: .* _GLOBAL_OFFSET_TABLE_
+ +6: 00040574 +36 +FUNC +GLOBAL +DEFAULT .* used6
+ +7: 00040598 +36 +FUNC +GLOBAL +DEFAULT .* used7
+ +8: 00040550 +36 +FUNC +GLOBAL +DEFAULT .* used5
+ +9: 0004052c +36 +FUNC +GLOBAL +DEFAULT .* used4
 
 #pass
diff --git a/ld/testsuite/ld-mips-elf/mips16-pic-4a.nd b/ld/testsuite/ld-mips-elf/mips16-pic-4a.nd
index 6eca610..3abf8aa 100644
--- a/ld/testsuite/ld-mips-elf/mips16-pic-4a.nd
+++ b/ld/testsuite/ld-mips-elf/mips16-pic-4a.nd
@@ -1,10 +1,10 @@
 
 Symbol table '\.dynsym' contains 6 entries:
-   Num:    Value  Size Type    Bind   Vis      Ndx Name
-     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00040400     0 SECTION LOCAL  DEFAULT   .* 
-     2: 00040420    12 FUNC    GLOBAL DEFAULT   .* f1@@V1
-     3: 00000000     0 OBJECT  GLOBAL DEFAULT  ABS V1
-     4: 00040408     8 FUNC    GLOBAL DEFAULT   .* f3@@V1
-     5: 00040400     8 FUNC    GLOBAL DEFAULT   .* f2@@V1
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 00040400 +0 +SECTION +LOCAL +DEFAULT +.* 
+ +2: 00040420 +12 +FUNC +GLOBAL +DEFAULT +.* f1@@V1
+ +3: 00000000 +0 +OBJECT +GLOBAL +DEFAULT +ABS V1
+ +4: 00040408 +8 +FUNC +GLOBAL +DEFAULT +.* f3@@V1
+ +5: 00040400 +8 +FUNC +GLOBAL +DEFAULT +.* f2@@V1
 #pass
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-1-rel.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-1-rel.nd
index c5f0b51..1d49c4e 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-1-rel.nd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-1-rel.nd
@@ -1,5 +1,5 @@
 #...
-.*: 00000030    14 FUNC    GLOBAL DEFAULT \[MIPS16\] .* f3
-.*: 00000040    24 FUNC    GLOBAL DEFAULT .* __start
-.*: 0000001c    20 FUNC    GLOBAL DEFAULT \[MIPS PIC\] .* f2
-.*: 00000000    28 FUNC    GLOBAL DEFAULT \[MIPS PIC\] .* f1
+.*: 00000030 +14 +FUNC +GLOBAL +DEFAULT +\[MIPS16\] .* f3
+.*: 00000040 +24 +FUNC +GLOBAL +DEFAULT +.* __start
+.*: 0000001c +20 +FUNC +GLOBAL +DEFAULT +\[MIPS PIC\] .* f2
+.*: 00000000 +28 +FUNC +GLOBAL +DEFAULT +\[MIPS PIC\] .* f1
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-1.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-1.nd
index 506685a..4fc9ae3 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-1.nd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-1.nd
@@ -1,9 +1,9 @@
 #...
-.*: 00041018     8 FUNC    LOCAL  DEFAULT .* .pic.f1
-.*: 00041000    16 FUNC    LOCAL  DEFAULT .* .pic.f2
-.*: 00000000     0 OBJECT  GLOBAL DEFAULT  UND _gp_disp
-.*: 00068000     0 NOTYPE  GLOBAL DEFAULT  ABS _gp
-.*: 00041050    14 FUNC    GLOBAL DEFAULT \[MIPS16\] .* f3
-.*: 00041060    24 FUNC    GLOBAL DEFAULT .* __start
-.*: 0004103c    20 FUNC    GLOBAL DEFAULT .* f2
-.*: 00041020    28 FUNC    GLOBAL DEFAULT .* f1
+.*: 00041018 +8 +FUNC +LOCAL +DEFAULT .* .pic.f1
+.*: 00041000 +16 +FUNC +LOCAL +DEFAULT .* .pic.f2
+.*: 00000000 +0 +OBJECT +GLOBAL +DEFAULT +UND _gp_disp
+.*: 00068000 +0 +NOTYPE +GLOBAL +DEFAULT +ABS _gp
+.*: 00041050 +14 +FUNC +GLOBAL +DEFAULT +\[MIPS16\] .* f3
+.*: 00041060 +24 +FUNC +GLOBAL +DEFAULT .* __start
+.*: 0004103c +20 +FUNC +GLOBAL +DEFAULT .* f2
+.*: 00041020 +28 +FUNC +GLOBAL +DEFAULT .* f1
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.nd
index f115be5..09c9411 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.nd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.nd
@@ -1,9 +1,9 @@
 
 Symbol table '\.dynsym' contains .*:
 #...
-.*: 00000000 * 0 * FUNC * GLOBAL * DEFAULT * UND * foo
+.*: 00000000 +0 +FUNC +GLOBAL +DEFAULT +UND +foo
 # The index on the next line should correspond to MIPS_GOTSYM.
 #...
- *7: 00044030 * 0 * FUNC * GLOBAL * DEFAULT * UND * bar
+ *7: 00044030 +0 +FUNC +GLOBAL +DEFAULT +UND +bar
 
 #pass
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.nd
index d63426c..047d569 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.nd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.nd
@@ -2,11 +2,11 @@
 Symbol table '\.dynsym' contains .*:
 # The order of the next two symbols is not important.
 #...
-.*: 000a2000 * 8 * OBJECT * GLOBAL * DEFAULT * [0-9]+ * obj1
+.*: 000a2000 +8 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +obj1
 #...
-.*: 000a2008 * 4 * OBJECT * GLOBAL * DEFAULT * [0-9]+ * obj2
+.*: 000a2008 +4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +obj2
 # The index on the next line should correspond to MIPS_GOTSYM.
 #...
- *7: 0+ * 0 * OBJECT * GLOBAL * DEFAULT * UND * obj3
+ *7: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +obj3
 
 #pass
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.nd
index 5622f91..a7648d7 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.nd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.nd
@@ -1,10 +1,10 @@
 
 Symbol table '\.dynsym' contains .*:
 #...
-.*: 00043060 * 0 * FUNC * GLOBAL * DEFAULT * \[MIPS PLT\] * UND * foo
+.*: 00043060 +0 +FUNC +GLOBAL +DEFAULT +\[MIPS PLT\] +UND +foo
 # The index on the next line should correspond to MIPS_GOTSYM.
 #...
- *8: 0+ * 0 * OBJECT * GLOBAL * DEFAULT * UND * obj2
- *9: 0+ * 0 * FUNC * GLOBAL * DEFAULT * UND * bar
+ *8: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +obj2
+ *9: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +bar
 
 #pass
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.nd
index 8b0d0a6..7afd67d 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.nd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.nd
@@ -1,17 +1,17 @@
 
 Symbol table '\.dynsym' contains .*:
 #...
-.*: 00000000 * 0 * FUNC * GLOBAL * DEFAULT * UND * extf5
+.*: 00000000 +0 +FUNC +GLOBAL +DEFAULT +UND +extf5
 # The index on the next line should correspond to MIPS_GOTSYM,
 # and the remaining symbols should have the same order as the
 # GOT layout given in the *.dd dump.
 #...
- *7: 0+ * 0 * FUNC * GLOBAL * DEFAULT * UND * extf2
- *8: 0+ * 0 * * FUNC * GLOBAL * DEFAULT * UND * extf3
- *9: 0+a2000 * 24 * OBJECT * GLOBAL * DEFAULT * [0-9]+ * extd2
- *10: 0+440a0 * 0 * FUNC * GLOBAL * DEFAULT * UND * extf1
- *11: 0+ * 0 * OBJECT * GLOBAL * DEFAULT * UND * extd1
- *12: 0+ * 0 * FUNC * GLOBAL * DEFAULT * UND * extf4
- *13: 0+ * 0 * OBJECT * GLOBAL * DEFAULT * UND * extd4
+ *7: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf2
+ *8: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf3
+ *9: 0+a2000 +24 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +extd2
+ *10: 0+440a0 +0 +FUNC +GLOBAL +DEFAULT +UND +extf1
+ *11: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +extd1
+ *12: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf4
+ *13: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +extd4
 
 #pass
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.nd
index 8ee90e4..e735a45 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.nd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.nd
@@ -1,17 +1,17 @@
 
 Symbol table '\.dynsym' contains .*:
 #...
-.*: 0+ * 0 * FUNC * GLOBAL * DEFAULT * UND * extf5
+.*: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf5
 # The index on the next line should correspond to MIPS_GOTSYM,
 # and the remaining symbols should have the same order as the
 # GOT layout given in the *.dd dump.
 #...
- *7: 0+ * 0 * FUNC * GLOBAL * DEFAULT * UND * extf2
- *8: 0+ * 0 * FUNC * GLOBAL * DEFAULT * UND * extf3
- *9: 0+a2000 * 24 * OBJECT * GLOBAL * DEFAULT * [0-9]+ * extd2
- *10: 0+440a0 * 0 * FUNC * GLOBAL * DEFAULT * UND * extf1
- *11: 0+ * 0 * OBJECT * GLOBAL * DEFAULT * UND * extd1
- *12: 0+ * 0 * FUNC * GLOBAL * DEFAULT * UND * extf4
- *13: 0+ * 0 * OBJECT * GLOBAL * DEFAULT * UND * extd4
+ *7: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf2
+ *8: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf3
+ *9: 0+a2000 +24 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +extd2
+ *10: 0+440a0 +0 +FUNC +GLOBAL +DEFAULT +UND +extf1
+ *11: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +extd1
+ *12: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf4
+ *13: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +extd4
 
 #pass
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.nd
index 15ace17..7afd67d 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.nd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.nd
@@ -1,17 +1,17 @@
 
 Symbol table '\.dynsym' contains .*:
 #...
-.*: 00000000 * 0 * FUNC * GLOBAL * DEFAULT * UND * extf5
+.*: 00000000 +0 +FUNC +GLOBAL +DEFAULT +UND +extf5
 # The index on the next line should correspond to MIPS_GOTSYM,
 # and the remaining symbols should have the same order as the
 # GOT layout given in the *.dd dump.
 #...
- *7: 0+ * 0 * FUNC * GLOBAL * DEFAULT * UND * extf2
- *8: 0+ * 0 * FUNC * GLOBAL * DEFAULT * UND * extf3
- *9: 0+a2000 * 24 * OBJECT * GLOBAL * DEFAULT * [0-9]+ * extd2
- *10: 0+440a0 * 0 * FUNC * GLOBAL * DEFAULT * UND * extf1
- *11: 0+ * 0 * OBJECT * GLOBAL * DEFAULT * UND * extd1
- *12: 0+ * 0 * FUNC * GLOBAL * DEFAULT * UND * extf4
- *13: 0+ * 0 * OBJECT * GLOBAL * DEFAULT * UND * extd4
+ *7: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf2
+ *8: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf3
+ *9: 0+a2000 +24 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +extd2
+ *10: 0+440a0 +0 +FUNC +GLOBAL +DEFAULT +UND +extf1
+ *11: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +extd1
+ *12: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf4
+ *13: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +extd4
 
 #pass
diff --git a/ld/testsuite/ld-mips-elf/vxworks1-lib.nd b/ld/testsuite/ld-mips-elf/vxworks1-lib.nd
index adbf7d7..c5f31a7 100644
--- a/ld/testsuite/ld-mips-elf/vxworks1-lib.nd
+++ b/ld/testsuite/ld-mips-elf/vxworks1-lib.nd
@@ -1,9 +1,9 @@
 #...
 Symbol table '\.dynsym' .*:
 #...
-.*: 00081410 * 0 * OBJECT * GLOBAL * DEFAULT * [0-9]+ _GLOBAL_OFFSET_TABLE_
+.*: 00081410 +0 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _GLOBAL_OFFSET_TABLE_
 #...
 Symbol table '\.symtab' .*:
 #...
-.*: 00081410 * 0 * OBJECT * GLOBAL * DEFAULT * [0-9]+ _GLOBAL_OFFSET_TABLE_
+.*: 00081410 +0 +OBJECT +GLOBAL +DEFAULT +[0-9]+ _GLOBAL_OFFSET_TABLE_
 #pass