Trailing spaces in objdump -r header

git commit 202be274a4 went a little wild in removing trailing spaces
in gas/testsuite/gas/i386/{secidx.d,secrel.d}, causing
x86_64-w64-mingw32  +FAIL: i386 secrel reloc
x86_64-w64-mingw32  +FAIL: i386 secidx reloc

I could have just replaced the trailing space, but let's fix the
objdump output instead.  Touches lots of testsuite files.

99 files changed, 99 insertions, 99 deletions

diff --git a/ld/testsuite/ld-arm/arm-app-abs32.r b/ld/testsuite/ld-arm/arm-app-abs32.r
index fd68a0c..8dedcb6 100644
--- a/ld/testsuite/ld-arm/arm-app-abs32.r
+++ b/ld/testsuite/ld-arm/arm-app-abs32.r
@@ -2,7 +2,7 @@
 tmpdir/arm-app-abs32:     file format elf32-(little|big)arm.*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 .* R_ARM_JUMP_SLOT   lib_func1
 
 
diff --git a/ld/testsuite/ld-arm/arm-app.r b/ld/testsuite/ld-arm/arm-app.r
index 1b5cef2..4c3b625 100644
--- a/ld/testsuite/ld-arm/arm-app.r
+++ b/ld/testsuite/ld-arm/arm-app.r
@@ -2,7 +2,7 @@
 tmpdir/arm-app.*:     file format elf32-(little|big)arm.*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 .* R_ARM_COPY        data_obj
 .* R_ARM_JUMP_SLOT   lib_func1
 
diff --git a/ld/testsuite/ld-arm/arm-lib-plt32.r b/ld/testsuite/ld-arm/arm-lib-plt32.r
index 3515539..f9c793c 100644
--- a/ld/testsuite/ld-arm/arm-lib-plt32.r
+++ b/ld/testsuite/ld-arm/arm-lib-plt32.r
@@ -2,7 +2,7 @@
 tmpdir/arm-lib-plt32.so:     file format elf32-(little|big)arm
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 .* R_ARM_JUMP_SLOT   app_func2
 
 
diff --git a/ld/testsuite/ld-arm/arm-lib.r b/ld/testsuite/ld-arm/arm-lib.r
index 48749d4..62a2019 100644
--- a/ld/testsuite/ld-arm/arm-lib.r
+++ b/ld/testsuite/ld-arm/arm-lib.r
@@ -2,7 +2,7 @@
 tmpdir/arm-lib.so:     file format elf32-(little|big)arm.*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 .* R_ARM_JUMP_SLOT   app_func2
 
 
diff --git a/ld/testsuite/ld-arm/arm-rel32.d b/ld/testsuite/ld-arm/arm-rel32.d
index ff26386..34930b7 100644
--- a/ld/testsuite/ld-arm/arm-rel32.d
+++ b/ld/testsuite/ld-arm/arm-rel32.d
@@ -2,7 +2,7 @@
 .*:     file format .*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET +TYPE +VALUE 
+OFFSET +TYPE +VALUE
 [^ ]+ R_ARM_REL32 +foo
 [^ ]+ R_ARM_REL32 +foo
 [^ ]+ R_ARM_JUMP_SLOT +foo
diff --git a/ld/testsuite/ld-arm/farcall-mixed-app.r b/ld/testsuite/ld-arm/farcall-mixed-app.r
index 910a361..ce724f2 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-app.r
+++ b/ld/testsuite/ld-arm/farcall-mixed-app.r
@@ -2,7 +2,7 @@
 tmpdir/farcall-mixed-app.*:     file format elf32-(little|big)arm
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 .* R_ARM_COPY        data_obj
 .* R_ARM_JUMP_SLOT   lib_func2
 .* R_ARM_JUMP_SLOT   lib_func1
diff --git a/ld/testsuite/ld-arm/farcall-mixed-app2.r b/ld/testsuite/ld-arm/farcall-mixed-app2.r
index 910a361..ce724f2 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-app2.r
+++ b/ld/testsuite/ld-arm/farcall-mixed-app2.r
@@ -2,7 +2,7 @@
 tmpdir/farcall-mixed-app.*:     file format elf32-(little|big)arm
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 .* R_ARM_COPY        data_obj
 .* R_ARM_JUMP_SLOT   lib_func2
 .* R_ARM_JUMP_SLOT   lib_func1
diff --git a/ld/testsuite/ld-arm/farcall-mixed-lib.r b/ld/testsuite/ld-arm/farcall-mixed-lib.r
index a44f83b..5b9d195 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-lib.r
+++ b/ld/testsuite/ld-arm/farcall-mixed-lib.r
@@ -2,7 +2,7 @@
 tmpdir/farcall-mixed-lib.so:     file format elf32-(little|big)arm
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 .* R_ARM_JUMP_SLOT   app_func2
 
 
diff --git a/ld/testsuite/ld-arm/fdpic-main.r b/ld/testsuite/ld-arm/fdpic-main.r
index ec012ff..f9f68df 100644
--- a/ld/testsuite/ld-arm/fdpic-main.r
+++ b/ld/testsuite/ld-arm/fdpic-main.r
@@ -2,7 +2,7 @@
 tmpdir/fdpic-main.*:     file format elf32-(little|big)arm
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 .* R_ARM_FUNCDESC    my_shared_func1
 .* R_ARM_FUNCDESC    my_shared_func1
 .* R_ARM_FUNCDESC_VALUE  my_shared_func1
diff --git a/ld/testsuite/ld-arm/fdpic-shared.r b/ld/testsuite/ld-arm/fdpic-shared.r
index 22b755e..df23239 100644
--- a/ld/testsuite/ld-arm/fdpic-shared.r
+++ b/ld/testsuite/ld-arm/fdpic-shared.r
@@ -2,7 +2,7 @@
 tmpdir/fdpic-shared.so:     file format elf32-(little|big)arm
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 .* R_ARM_FUNCDESC_VALUE  my_shared_func3
 
 
diff --git a/ld/testsuite/ld-arm/ifunc-gdesc.r b/ld/testsuite/ld-arm/ifunc-gdesc.r
index 20f5ccc..6feb7ade 100644
--- a/ld/testsuite/ld-arm/ifunc-gdesc.r
+++ b/ld/testsuite/ld-arm/ifunc-gdesc.r
@@ -1,6 +1,6 @@
 tmpdir/ifunc-gdesc.so:     file format elf32-(big|little)arm
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0001025c R_ARM_IRELATIVE   \*ABS\*
 00010248 R_ARM_TLS_DESC    \*ABS\*
 00010250 R_ARM_TLS_DESC    \*ABS\*
diff --git a/ld/testsuite/ld-arm/mixed-app.r b/ld/testsuite/ld-arm/mixed-app.r
index 648e92f..7e08093 100644
--- a/ld/testsuite/ld-arm/mixed-app.r
+++ b/ld/testsuite/ld-arm/mixed-app.r
@@ -2,7 +2,7 @@
 tmpdir/mixed-app.*:     file format elf32-(little|big)arm
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 .* R_ARM_COPY        data_obj
 .* R_ARM_JUMP_SLOT   lib_func2
 .* R_ARM_JUMP_SLOT   lib_func1
diff --git a/ld/testsuite/ld-arm/mixed-lib.r b/ld/testsuite/ld-arm/mixed-lib.r
index 0137880..6af0bc3 100644
--- a/ld/testsuite/ld-arm/mixed-lib.r
+++ b/ld/testsuite/ld-arm/mixed-lib.r
@@ -2,7 +2,7 @@
 tmpdir/mixed-lib.so:     file format elf32-(little|big)arm
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 .* R_ARM_JUMP_SLOT   app_func2
 
 
diff --git a/ld/testsuite/ld-arm/tls-app.r b/ld/testsuite/ld-arm/tls-app.r
index 518c18c..a2daeb4 100644
--- a/ld/testsuite/ld-arm/tls-app.r
+++ b/ld/testsuite/ld-arm/tls-app.r
@@ -2,6 +2,6 @@
 .*:     file format elf32-.*arm.*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 [0-9a-f]+ R_ARM_TLS_DTPMOD32  lib_gd
 [0-9a-f]+ R_ARM_TLS_DTPOFF32  lib_gd
diff --git a/ld/testsuite/ld-arm/tls-descseq.r b/ld/testsuite/ld-arm/tls-descseq.r
index 23d4637..51d34ae 100644
--- a/ld/testsuite/ld-arm/tls-descseq.r
+++ b/ld/testsuite/ld-arm/tls-descseq.r
@@ -2,5 +2,5 @@
 .*:     file format elf32-.*arm
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 [0-9a-f]+ R_ARM_TLS_DESC    lib_gd2
diff --git a/ld/testsuite/ld-arm/tls-gdesc.r b/ld/testsuite/ld-arm/tls-gdesc.r
index 3de3ae8..c0b6a91 100644
--- a/ld/testsuite/ld-arm/tls-gdesc.r
+++ b/ld/testsuite/ld-arm/tls-gdesc.r
@@ -2,6 +2,6 @@
 .*:     file format elf32-.*arm
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 [0-9a-f]+ R_ARM_TLS_DESC    lib_gd2
 [0-9a-f]+ R_ARM_TLS_DESC    r0
diff --git a/ld/testsuite/ld-arm/tls-lib-loc.r b/ld/testsuite/ld-arm/tls-lib-loc.r
index ba54f61..50bee30 100644
--- a/ld/testsuite/ld-arm/tls-lib-loc.r
+++ b/ld/testsuite/ld-arm/tls-lib-loc.r
@@ -2,5 +2,5 @@
 .*:     file format elf32-.*arm
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 .* R_ARM_TLS_DESC    \*ABS\*
diff --git a/ld/testsuite/ld-arm/tls-lib.r b/ld/testsuite/ld-arm/tls-lib.r
index 3847f77..fbb61c8 100644
--- a/ld/testsuite/ld-arm/tls-lib.r
+++ b/ld/testsuite/ld-arm/tls-lib.r
@@ -2,7 +2,7 @@
 .*:     file format elf32-.*arm.*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 .* R_ARM_TLS_DTPMOD32  \*ABS\*
 .* R_ARM_TLS_DTPMOD32  lib_gd
 .* R_ARM_TLS_DTPOFF32  lib_gd
diff --git a/ld/testsuite/ld-arm/tls-mixed.r b/ld/testsuite/ld-arm/tls-mixed.r
index 02f9b02..90ebdfb 100644
--- a/ld/testsuite/ld-arm/tls-mixed.r
+++ b/ld/testsuite/ld-arm/tls-mixed.r
@@ -2,7 +2,7 @@
 .*:     file format elf32-.*arm.*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 [0-9a-f]+ R_ARM_TLS_DTPMOD32  lib_gd2
 [0-9a-f]+ R_ARM_TLS_DTPOFF32  lib_gd2
 [0-9a-f]+ R_ARM_TLS_DTPMOD32  lib_gd
diff --git a/ld/testsuite/ld-arm/unwind-4.d b/ld/testsuite/ld-arm/unwind-4.d
index 6bd4d91..ffc8725 100644
--- a/ld/testsuite/ld-arm/unwind-4.d
+++ b/ld/testsuite/ld-arm/unwind-4.d
@@ -5,7 +5,7 @@
 
 #...
 RELOCATION RECORDS FOR \[\.ARM\.exidx\]:
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 00000000 R_ARM_PREL31      \.text
 00000000 R_ARM_NONE        __aeabi_unwind_cpp_pr0
 00000008 R_ARM_PREL31      \.text
diff --git a/ld/testsuite/ld-cris/gotplt1.d b/ld/testsuite/ld-cris/gotplt1.d
index defba8a..163bb01 100644
--- a/ld/testsuite/ld-cris/gotplt1.d
+++ b/ld/testsuite/ld-cris/gotplt1.d
@@ -18,7 +18,7 @@
 .*:     file format elf32-cris
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 00082224 R_CRIS_JUMP_SLOT  dsofn
 
 Contents of section .*
diff --git a/ld/testsuite/ld-cris/gotplt2.d b/ld/testsuite/ld-cris/gotplt2.d
index 9f618d2..32d0f89 100644
--- a/ld/testsuite/ld-cris/gotplt2.d
+++ b/ld/testsuite/ld-cris/gotplt2.d
@@ -15,7 +15,7 @@
 .*:     file format elf32-cris
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 000021e4 R_CRIS_GLOB_DAT   dsofn
 
 Contents of section .*
diff --git a/ld/testsuite/ld-cris/gotplt3.d b/ld/testsuite/ld-cris/gotplt3.d
index 331626f..abc0192 100644
--- a/ld/testsuite/ld-cris/gotplt3.d
+++ b/ld/testsuite/ld-cris/gotplt3.d
@@ -12,7 +12,7 @@
 .*:     file format elf32-cris
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 000021e8 R_CRIS_GLOB_DAT   dsofn
 
 Contents of section .*
diff --git a/ld/testsuite/ld-cris/tls-gd-1.d b/ld/testsuite/ld-cris/tls-gd-1.d
index 4fbd79c..5156a27 100644
--- a/ld/testsuite/ld-cris/tls-gd-1.d
+++ b/ld/testsuite/ld-cris/tls-gd-1.d
@@ -41,7 +41,7 @@ DYNAMIC SYMBOL TABLE:
 #...
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0+2230 R_CRIS_DTP        x
 
 Contents of section \.hash:
diff --git a/ld/testsuite/ld-cris/tls-gd-1h.d b/ld/testsuite/ld-cris/tls-gd-1h.d
index b95cc2b..e012304 100644
--- a/ld/testsuite/ld-cris/tls-gd-1h.d
+++ b/ld/testsuite/ld-cris/tls-gd-1h.d
@@ -37,7 +37,7 @@ SYMBOL TABLE:
 #...
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0+2234 R_CRIS_DTP        \*ABS\*\+0x0+80
 
 Contents of section \.hash:
diff --git a/ld/testsuite/ld-cris/tls-gd-2.d b/ld/testsuite/ld-cris/tls-gd-2.d
index 1840a58..107687c 100644
--- a/ld/testsuite/ld-cris/tls-gd-2.d
+++ b/ld/testsuite/ld-cris/tls-gd-2.d
@@ -41,7 +41,7 @@ DYNAMIC SYMBOL TABLE:
 #...
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0+2254 R_CRIS_DTP        x
 
 Contents of section \.hash:
diff --git a/ld/testsuite/ld-cris/tls-gd-2h.d b/ld/testsuite/ld-cris/tls-gd-2h.d
index c881448..f5eaa8b 100644
--- a/ld/testsuite/ld-cris/tls-gd-2h.d
+++ b/ld/testsuite/ld-cris/tls-gd-2h.d
@@ -37,7 +37,7 @@ SYMBOL TABLE:
 #...
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0+2238 R_CRIS_DTP        \*ABS\*\+0x0+80
 
 Contents of section \.hash:
diff --git a/ld/testsuite/ld-cris/tls-ie-10.d b/ld/testsuite/ld-cris/tls-ie-10.d
index 432b864..0df1e9d 100644
--- a/ld/testsuite/ld-cris/tls-ie-10.d
+++ b/ld/testsuite/ld-cris/tls-ie-10.d
@@ -42,7 +42,7 @@ DYNAMIC SYMBOL TABLE:
 #...
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0+2260 R_CRIS_32_TPREL   x
 
 Contents of section \.hash:
diff --git a/ld/testsuite/ld-cris/tls-ie-11.d b/ld/testsuite/ld-cris/tls-ie-11.d
index c4ef790..3bd727a 100644
--- a/ld/testsuite/ld-cris/tls-ie-11.d
+++ b/ld/testsuite/ld-cris/tls-ie-11.d
@@ -46,7 +46,7 @@ DYNAMIC SYMBOL TABLE:
 #...
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0+2288 R_CRIS_32_TPREL   x2
 0+228c R_CRIS_32_TPREL   x1
 
diff --git a/ld/testsuite/ld-cris/tls-ie-78.d b/ld/testsuite/ld-cris/tls-ie-78.d
index 8a399ef..ae9862c 100644
--- a/ld/testsuite/ld-cris/tls-ie-78.d
+++ b/ld/testsuite/ld-cris/tls-ie-78.d
@@ -31,7 +31,7 @@ DYNAMIC SYMBOL TABLE:
 0+      D  \*UND\*	0+ x
 #...
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0+82278 R_CRIS_32_TPREL   x
 
 Contents of section .interp:
diff --git a/ld/testsuite/ld-cris/tls-ie-8.d b/ld/testsuite/ld-cris/tls-ie-8.d
index 29c46f0..4af78fb 100644
--- a/ld/testsuite/ld-cris/tls-ie-8.d
+++ b/ld/testsuite/ld-cris/tls-ie-8.d
@@ -42,7 +42,7 @@ DYNAMIC SYMBOL TABLE:
 #...
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0+2258 R_CRIS_32_TPREL   x
 
 Contents of section \.hash:
diff --git a/ld/testsuite/ld-cris/tls-ie-9.d b/ld/testsuite/ld-cris/tls-ie-9.d
index 0117b93..c1b5b1a 100644
--- a/ld/testsuite/ld-cris/tls-ie-9.d
+++ b/ld/testsuite/ld-cris/tls-ie-9.d
@@ -46,7 +46,7 @@ DYNAMIC SYMBOL TABLE:
 #...
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0+2284 R_CRIS_32_TPREL   x2
 0+2288 R_CRIS_32_TPREL   x1
 
diff --git a/ld/testsuite/ld-cris/tls-ld-4.d b/ld/testsuite/ld-cris/tls-ld-4.d
index a396a58..ea1fc29 100644
--- a/ld/testsuite/ld-cris/tls-ld-4.d
+++ b/ld/testsuite/ld-cris/tls-ld-4.d
@@ -37,7 +37,7 @@ SYMBOL TABLE:
 #...
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0+2234 R_CRIS_DTPMOD     \*ABS\*
 
 Contents of section \.hash:
diff --git a/ld/testsuite/ld-cris/tls-ld-5.d b/ld/testsuite/ld-cris/tls-ld-5.d
index 287b5ee..5d423aa 100644
--- a/ld/testsuite/ld-cris/tls-ld-5.d
+++ b/ld/testsuite/ld-cris/tls-ld-5.d
@@ -38,7 +38,7 @@ SYMBOL TABLE:
 #...
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0+223c R_CRIS_DTPMOD     \*ABS\*
 
 Contents of section \.hash:
diff --git a/ld/testsuite/ld-cris/tls-ld-6.d b/ld/testsuite/ld-cris/tls-ld-6.d
index 43bb17e..21dbabe 100644
--- a/ld/testsuite/ld-cris/tls-ld-6.d
+++ b/ld/testsuite/ld-cris/tls-ld-6.d
@@ -37,7 +37,7 @@ SYMBOL TABLE:
 #...
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0+2238 R_CRIS_DTPMOD     \*ABS\*
 
 Contents of section \.hash:
diff --git a/ld/testsuite/ld-cris/tls-ld-7.d b/ld/testsuite/ld-cris/tls-ld-7.d
index cd3a2f7..e0fb31e 100644
--- a/ld/testsuite/ld-cris/tls-ld-7.d
+++ b/ld/testsuite/ld-cris/tls-ld-7.d
@@ -38,7 +38,7 @@ SYMBOL TABLE:
 #...
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0+2240 R_CRIS_DTPMOD     \*ABS\*
 
 Contents of section \.hash:
diff --git a/ld/testsuite/ld-cris/tls-ldgd-14.d b/ld/testsuite/ld-cris/tls-ldgd-14.d
index 1c3ca02..0c1d486 100644
--- a/ld/testsuite/ld-cris/tls-ldgd-14.d
+++ b/ld/testsuite/ld-cris/tls-ldgd-14.d
@@ -54,7 +54,7 @@ DYNAMIC SYMBOL TABLE:
 #...
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0+22d4 R_CRIS_DTPMOD     \*ABS\*
 0+22dc R_CRIS_DTP        x
 0+22e4 R_CRIS_DTP        z
diff --git a/ld/testsuite/ld-cris/tls-ldgd-15.d b/ld/testsuite/ld-cris/tls-ldgd-15.d
index 32afffa..7916d31 100644
--- a/ld/testsuite/ld-cris/tls-ldgd-15.d
+++ b/ld/testsuite/ld-cris/tls-ldgd-15.d
@@ -54,7 +54,7 @@ DYNAMIC SYMBOL TABLE:
 #...
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0+22e0 R_CRIS_DTPMOD     \*ABS\*
 0+22e8 R_CRIS_DTP        x
 0+22f0 R_CRIS_DTP        z
diff --git a/ld/testsuite/ld-cris/tls-ldgdex-14.d b/ld/testsuite/ld-cris/tls-ldgdex-14.d
index 57f2262..86a8d4e 100644
--- a/ld/testsuite/ld-cris/tls-ldgdex-14.d
+++ b/ld/testsuite/ld-cris/tls-ldgdex-14.d
@@ -37,7 +37,7 @@ DYNAMIC SYMBOL TABLE:
 0+      D  \*UND\*	0+ z
 #...
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 000822b0 R_CRIS_DTP        x
 000822b8 R_CRIS_DTP        z
 
diff --git a/ld/testsuite/ld-cris/tls-ldgdex-15.d b/ld/testsuite/ld-cris/tls-ldgdex-15.d
index 677824d..0a4e527 100644
--- a/ld/testsuite/ld-cris/tls-ldgdex-15.d
+++ b/ld/testsuite/ld-cris/tls-ldgdex-15.d
@@ -37,7 +37,7 @@ DYNAMIC SYMBOL TABLE:
 0+      D  \*UND\*	0+ z
 #...
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 000822bc R_CRIS_DTP        x
 000822c4 R_CRIS_DTP        z
 
diff --git a/ld/testsuite/ld-cris/tls-ldgdx-14.d b/ld/testsuite/ld-cris/tls-ldgdx-14.d
index 0389fb6..a773522 100644
--- a/ld/testsuite/ld-cris/tls-ldgdx-14.d
+++ b/ld/testsuite/ld-cris/tls-ldgdx-14.d
@@ -38,7 +38,7 @@ DYNAMIC SYMBOL TABLE:
 0+      D  \*UND\*	0+ z
 #...
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 000022d0 R_CRIS_DTPMOD     \*ABS\*
 000022d8 R_CRIS_DTP        x
 000022e0 R_CRIS_DTP        z
diff --git a/ld/testsuite/ld-cris/tls-ldgdx-15.d b/ld/testsuite/ld-cris/tls-ldgdx-15.d
index 97f2351..e0b9a53 100644
--- a/ld/testsuite/ld-cris/tls-ldgdx-15.d
+++ b/ld/testsuite/ld-cris/tls-ldgdx-15.d
@@ -38,7 +38,7 @@ DYNAMIC SYMBOL TABLE:
 0+      D  \*UND\*	0+ z
 #...
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 000022dc R_CRIS_DTPMOD     \*ABS\*
 000022e4 R_CRIS_DTP        x
 000022ec R_CRIS_DTP        z
diff --git a/ld/testsuite/ld-cris/tls-legdx-16.d b/ld/testsuite/ld-cris/tls-legdx-16.d
index e8288bd..badbeb3 100644
--- a/ld/testsuite/ld-cris/tls-legdx-16.d
+++ b/ld/testsuite/ld-cris/tls-legdx-16.d
@@ -37,7 +37,7 @@ DYNAMIC SYMBOL TABLE:
 0+      D  \*UND\*	0+ z
 #...
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 000822b4 R_CRIS_DTP        x
 000822bc R_CRIS_DTP        z
 
diff --git a/ld/testsuite/ld-cris/tls-legdx-17.d b/ld/testsuite/ld-cris/tls-legdx-17.d
index 240812e..5b2c7ec 100644
--- a/ld/testsuite/ld-cris/tls-legdx-17.d
+++ b/ld/testsuite/ld-cris/tls-legdx-17.d
@@ -39,7 +39,7 @@ DYNAMIC SYMBOL TABLE:
 0+      D  \*UND\*	0+ z
 #...
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 000822ac R_CRIS_DTP        x
 000822b4 R_CRIS_DTP        z
 
diff --git a/ld/testsuite/ld-cris/tls-local-54.d b/ld/testsuite/ld-cris/tls-local-54.d
index 693f08d..0098e56 100644
--- a/ld/testsuite/ld-cris/tls-local-54.d
+++ b/ld/testsuite/ld-cris/tls-local-54.d
@@ -14,7 +14,7 @@ Program Header:
          filesz 0x00000080 memsz 0x00000080 flags r--
 #...
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 00002218 R_CRIS_DTP        \*ABS\*\+0x0000002a
 
 Contents of section .hash:
diff --git a/ld/testsuite/ld-cris/tls-local-60.d b/ld/testsuite/ld-cris/tls-local-60.d
index 2d99e93..ce64203 100644
--- a/ld/testsuite/ld-cris/tls-local-60.d
+++ b/ld/testsuite/ld-cris/tls-local-60.d
@@ -18,7 +18,7 @@ Program Header:
   FLAGS                0x00000010
 #...
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 000022b4 R_CRIS_32_TPREL   \*ABS\*\+0x0+4
 000022b8 R_CRIS_DTP        \*ABS\*\+0x0+4
 
diff --git a/ld/testsuite/ld-cris/tls-local-61.d b/ld/testsuite/ld-cris/tls-local-61.d
index 640056b..c902a87 100644
--- a/ld/testsuite/ld-cris/tls-local-61.d
+++ b/ld/testsuite/ld-cris/tls-local-61.d
@@ -17,7 +17,7 @@ Program Header:
   FLAGS                0x00000010
 #...
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0000229c R_CRIS_32_TPREL   \*ABS\*
 000022a0 R_CRIS_DTP        \*ABS\*
 
diff --git a/ld/testsuite/ld-cris/tls-ok-30.d b/ld/testsuite/ld-cris/tls-ok-30.d
index 77af273..b5f0f56 100644
--- a/ld/testsuite/ld-cris/tls-ok-30.d
+++ b/ld/testsuite/ld-cris/tls-ok-30.d
@@ -10,7 +10,7 @@
 .*:     file format elf32-cris
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 000b38a8 R_CRIS_DTP        x2814
 #...
 000b82e8 R_CRIS_DTP        x8190
diff --git a/ld/testsuite/ld-cris/tls-ok-32.d b/ld/testsuite/ld-cris/tls-ok-32.d
index e6f3992..6f7dab0 100644
--- a/ld/testsuite/ld-cris/tls-ok-32.d
+++ b/ld/testsuite/ld-cris/tls-ok-32.d
@@ -9,7 +9,7 @@
 .*:     file format elf32-cris
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0000a1b0 R_CRIS_DTPMOD     \*ABS\*
 
 Contents of section \.text:
diff --git a/ld/testsuite/ld-cris/tls-ok-34.d b/ld/testsuite/ld-cris/tls-ok-34.d
index 302d6bb..ec2f7ee 100644
--- a/ld/testsuite/ld-cris/tls-ok-34.d
+++ b/ld/testsuite/ld-cris/tls-ok-34.d
@@ -11,7 +11,7 @@
 .*:     file format elf32-cris
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 000b3808 R_CRIS_32_TPREL   x2814
 #...
 000b47f4 R_CRIS_32_TPREL   x8188
diff --git a/ld/testsuite/ld-cris/weakhiddso.d b/ld/testsuite/ld-cris/weakhiddso.d
index d884531..f4776d6 100644
--- a/ld/testsuite/ld-cris/weakhiddso.d
+++ b/ld/testsuite/ld-cris/weakhiddso.d
@@ -16,7 +16,7 @@ DYNAMIC SYMBOL TABLE:
 
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0+21b8 R_CRIS_32         xweakobj
 0+21bc R_CRIS_32         xregobj
 
diff --git a/ld/testsuite/ld-csky/emit-relocs-1.d b/ld/testsuite/ld-csky/emit-relocs-1.d
index 3cc05ac..5da7257 100644
--- a/ld/testsuite/ld-csky/emit-relocs-1.d
+++ b/ld/testsuite/ld-csky/emit-relocs-1.d
@@ -7,7 +7,7 @@
 .*:     file format .*
 
 RELOCATION RECORDS FOR \[\.data\]:
-OFFSET   TYPE              VALUE *
+OFFSET +TYPE +VALUE
 00000000 R_CKCORE_ADDR32   \.data
 00000004 R_CKCORE_ADDR32   \.data\+0x00001000
 00000008 R_CKCORE_ADDR32   \.merge1\+0x00000002
diff --git a/ld/testsuite/ld-metag/shared.r b/ld/testsuite/ld-metag/shared.r
index b03f1af..5bcc056 100644
--- a/ld/testsuite/ld-metag/shared.r
+++ b/ld/testsuite/ld-metag/shared.r
@@ -2,7 +2,7 @@
 tmpdir/shared.so:     file format elf32-metag
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 .* R_METAG_GLOB_DAT  _var1
 .* R_METAG_JMP_SLOT  app_func2
 
diff --git a/ld/testsuite/ld-metag/stub_pic_app.r b/ld/testsuite/ld-metag/stub_pic_app.r
index 326f508..8de215c 100644
--- a/ld/testsuite/ld-metag/stub_pic_app.r
+++ b/ld/testsuite/ld-metag/stub_pic_app.r
@@ -2,7 +2,7 @@
 tmpdir/stub_pic_app:     file format elf32-metag
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 .* R_METAG_ADDR32    _lib_data
 .* R_METAG_JMP_SLOT  _lib_func
 
diff --git a/ld/testsuite/ld-metag/stub_shared.r b/ld/testsuite/ld-metag/stub_shared.r
index 8930c63..4c3d6a7 100644
--- a/ld/testsuite/ld-metag/stub_shared.r
+++ b/ld/testsuite/ld-metag/stub_shared.r
@@ -2,7 +2,7 @@
 tmpdir/stub_shared.so:     file format elf32-metag
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 .* R_METAG_JMP_SLOT  _far2
 
 
diff --git a/ld/testsuite/ld-mips-elf/emit-relocs-1.d b/ld/testsuite/ld-mips-elf/emit-relocs-1.d
index 86305d3..0de0729 100644
--- a/ld/testsuite/ld-mips-elf/emit-relocs-1.d
+++ b/ld/testsuite/ld-mips-elf/emit-relocs-1.d
@@ -7,7 +7,7 @@
 .*:     file format .*
 
 RELOCATION RECORDS FOR \[\.data\]:
-OFFSET   TYPE              VALUE *
+OFFSET +TYPE +VALUE
 00000000 R_MIPS_32         \.data
 00000004 R_MIPS_32         \.data\+0x00001000
 00000008 R_MIPS_32         \.merge1\+0x00000002
diff --git a/ld/testsuite/ld-mips-elf/reloc-estimate-1.d b/ld/testsuite/ld-mips-elf/reloc-estimate-1.d
index 1269cb1..fcca55a 100644
--- a/ld/testsuite/ld-mips-elf/reloc-estimate-1.d
+++ b/ld/testsuite/ld-mips-elf/reloc-estimate-1.d
@@ -7,7 +7,7 @@
 .*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 00000000 R_MIPS_NONE       \*ABS\*
 00010000 R_MIPS_REL32      foo@@V2
 
diff --git a/ld/testsuite/ld-mips-elf/tls-multi-got-1.got b/ld/testsuite/ld-mips-elf/tls-multi-got-1.got
index dc960c3..af1e027 100644
--- a/ld/testsuite/ld-mips-elf/tls-multi-got-1.got
+++ b/ld/testsuite/ld-mips-elf/tls-multi-got-1.got
@@ -2,7 +2,7 @@
 .*:     file format elf32-tradbigmips
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 00000000 R_MIPS_NONE       \*ABS\*
 0013f7f0 R_MIPS_TLS_DTPMOD32  \*ABS\*
 0014944c R_MIPS_TLS_DTPMOD32  \*ABS\*
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.got b/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.got
index 9160225..b3815de 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.got
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.got
@@ -2,7 +2,7 @@
 .*:     file format elf32-tradbigmips
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 00000000 R_MIPS_NONE       \*ABS\*
 1000002c R_MIPS_TLS_DTPMOD32  tlsvar_gd@VER_1
 10000030 R_MIPS_TLS_DTPREL32  tlsvar_gd@VER_1
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.got b/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.got
index c7bfec9..88d9fe9 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.got
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.got
@@ -2,7 +2,7 @@
 .*:     file format elf32-tradbigmips
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 00000000 R_MIPS_NONE       \*ABS\*
 1000002c R_MIPS_TLS_DTPMOD32  tlsvar_gd@VER_1
 10000030 R_MIPS_TLS_DTPREL32  tlsvar_gd@VER_1
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.got b/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.got
index 87b54f5..54cfe38 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.got
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.got
@@ -2,7 +2,7 @@
 .*:     file format elf32-tradbigmips
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 00000000 R_MIPS_NONE       \*ABS\*
 1000002c R_MIPS_TLS_DTPMOD32  tlsvar_gd@VER_1
 10000030 R_MIPS_TLS_DTPREL32  tlsvar_gd@VER_1
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32.got b/ld/testsuite/ld-mips-elf/tlsdyn-o32.got
index 7c8f93b..eb254ad 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32.got
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32.got
@@ -2,7 +2,7 @@
 tmpdir/tls-dynamic-o32:     file format elf32-tradbigmips
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 00000000 R_MIPS_NONE       \*ABS\*
 10000030 R_MIPS_TLS_DTPMOD32  tlsvar_gd
 10000034 R_MIPS_TLS_DTPREL32  tlsvar_gd
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-pie-o32.got b/ld/testsuite/ld-mips-elf/tlsdyn-pie-o32.got
index 2b75ce1..c5b778e 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-pie-o32.got
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-pie-o32.got
@@ -1,7 +1,7 @@
 .*:     file format elf32-tradbigmips
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 00000000 R_MIPS_NONE       \*ABS\*
 10000030 R_MIPS_TLS_DTPMOD32  tlsvar_gd
 10000034 R_MIPS_TLS_DTPREL32  tlsvar_gd
diff --git a/ld/testsuite/ld-mips-elf/tlslib-o32-hidden.got b/ld/testsuite/ld-mips-elf/tlslib-o32-hidden.got
index e8ed1ac..2a114e5 100644
--- a/ld/testsuite/ld-mips-elf/tlslib-o32-hidden.got
+++ b/ld/testsuite/ld-mips-elf/tlslib-o32-hidden.got
@@ -2,7 +2,7 @@
 .*:     file format elf32-tradbigmips
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 00000000 R_MIPS_NONE       \*ABS\*
 0004038c R_MIPS_TLS_TPREL32  \*ABS\*
 00040390 R_MIPS_TLS_DTPMOD32  \*ABS\*
diff --git a/ld/testsuite/ld-mips-elf/tlslib-o32-ver.got b/ld/testsuite/ld-mips-elf/tlslib-o32-ver.got
index b685e06..8381a68 100644
--- a/ld/testsuite/ld-mips-elf/tlslib-o32-ver.got
+++ b/ld/testsuite/ld-mips-elf/tlslib-o32-ver.got
@@ -2,7 +2,7 @@
 .*:     file format elf32-tradbigmips
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 00000000 R_MIPS_NONE       \*ABS\*
 000404a8 R_MIPS_TLS_DTPMOD32  \*ABS\*
 000404a0 R_MIPS_TLS_DTPMOD32  tlsvar_gd@@VER_1
diff --git a/ld/testsuite/ld-mips-elf/tlslib-o32.got b/ld/testsuite/ld-mips-elf/tlslib-o32.got
index 8f10e53..97d599e 100644
--- a/ld/testsuite/ld-mips-elf/tlslib-o32.got
+++ b/ld/testsuite/ld-mips-elf/tlslib-o32.got
@@ -2,7 +2,7 @@
 tmpdir/tlslib-o32.so:     file format elf32-tradbigmips
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 00000000 R_MIPS_NONE       \*ABS\*
 00040418 R_MIPS_TLS_DTPMOD32  \*ABS\*
 00040410 R_MIPS_TLS_DTPMOD32  tlsvar_gd
diff --git a/ld/testsuite/ld-mn10300/i112045-2.d b/ld/testsuite/ld-mn10300/i112045-2.d
index 9aa2d82..8ab64c3 100644
--- a/ld/testsuite/ld-mn10300/i112045-2.d
+++ b/ld/testsuite/ld-mn10300/i112045-2.d
@@ -2,5 +2,5 @@
 tmpdir/i112045-2.x:     file format elf32-.*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 [0-9a-f]+ R_MN10300_RELATIVE  \*ABS\*\+0x[0-9a-f]+
diff --git a/ld/testsuite/ld-nios2/emit-relocs-1.d b/ld/testsuite/ld-nios2/emit-relocs-1.d
index aba0a53..5fee105 100644
--- a/ld/testsuite/ld-nios2/emit-relocs-1.d
+++ b/ld/testsuite/ld-nios2/emit-relocs-1.d
@@ -7,7 +7,7 @@
 .*:     file format .*
 
 RELOCATION RECORDS FOR \[\.data\]:
-OFFSET   TYPE              VALUE *
+OFFSET +TYPE +VALUE
 00000000 R_NIOS2_BFD_RELOC32  \.data
 00000004 R_NIOS2_BFD_RELOC32  \.data\+0x00001000
 00000008 R_NIOS2_BFD_RELOC32  \.merge1\+0x00000002
diff --git a/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-32.drd b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-32.drd
index 71709eb..d0640a6 100644
--- a/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-32.drd
+++ b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-32.drd
@@ -2,7 +2,7 @@
 .*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET * TYPE * VALUE 
+OFFSET +TYPE +VALUE
 20000104 R_POS(|_32) * \.data
 20000108 R_POS(|_32) * foo
 20000114 R_POS(|_32) * \.data
diff --git a/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-32.rd b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-32.rd
index fdd0b15..ebc4ce4 100644
--- a/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-32.rd
+++ b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-32.rd
@@ -2,7 +2,7 @@
 .*
 
 RELOCATION RECORDS FOR \[\.data\]:
-OFFSET * TYPE * VALUE 
+OFFSET +TYPE +VALUE
 0+04 R_POS(|_32) * x-0x20000100
 0+08 R_POS(|_32) * foo
 0+14 R_POS(|_32) * x-0x20000110
diff --git a/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-64.drd b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-64.drd
index d484de2..04491ad 100644
--- a/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-64.drd
+++ b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-64.drd
@@ -2,7 +2,7 @@
 .*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET * TYPE * VALUE 
+OFFSET +TYPE +VALUE
 0*200001c4 R_POS(|_32) * \.data
 0*200001c8 R_POS(|_32) * foo
 0*200001d4 R_POS(|_32) * \.data
diff --git a/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-64.rd b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-64.rd
index b4e1396..bc65ea1 100644
--- a/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-64.rd
+++ b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-64.rd
@@ -2,7 +2,7 @@
 .*
 
 RELOCATION RECORDS FOR \[\.data\]:
-OFFSET * TYPE * VALUE 
+OFFSET +TYPE +VALUE
 0+04 R_POS(|_32) * x-0x0*200001c0
 0+08 R_POS(|_32) * foo
 0+14 R_POS(|_32) * x-0x0*200001d0
diff --git a/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-rel.rd b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-rel.rd
index 3e0e54b..ef549f6 100644
--- a/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-rel.rd
+++ b/ld/testsuite/ld-powerpc/aix-no-dup-syms-1-rel.rd
@@ -2,7 +2,7 @@
 .*
 
 RELOCATION RECORDS FOR \[\.data\]:
-OFFSET * TYPE * VALUE 
+OFFSET +TYPE +VALUE
 0+04 R_POS(|_32) * x
 0+08 R_POS(|_32) * foo
 0+14 R_POS(|_32) * x-0x0+10
diff --git a/ld/testsuite/ld-powerpc/aix-rel-1.od b/ld/testsuite/ld-powerpc/aix-rel-1.od
index 0d9f2bb..4315459 100644
--- a/ld/testsuite/ld-powerpc/aix-rel-1.od
+++ b/ld/testsuite/ld-powerpc/aix-rel-1.od
@@ -15,7 +15,7 @@ Sections:
  *3 \.debug * 0+0 .*
                   
 RELOCATION RECORDS FOR \[\.data\]:
-OFFSET * TYPE  * VALUE 
+OFFSET +TYPE +VALUE
 0+0 R_POS(|_32) * \.puts
 0+4 R_POS(|_32) * foobar
 
diff --git a/ld/testsuite/ld-powerpc/aix-weak-2c-32.od b/ld/testsuite/ld-powerpc/aix-weak-2c-32.od
index f05ac6a..2fcb3dd 100644
--- a/ld/testsuite/ld-powerpc/aix-weak-2c-32.od
+++ b/ld/testsuite/ld-powerpc/aix-weak-2c-32.od
@@ -2,7 +2,7 @@
 .*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET * TYPE * VALUE 
+OFFSET +TYPE +VALUE
 20000110 R_POS * d1
 20000118 R_POS * d3
 2000011c R_POS * d4
diff --git a/ld/testsuite/ld-powerpc/aix-weak-2c-64.od b/ld/testsuite/ld-powerpc/aix-weak-2c-64.od
index 40e1c7c..3058c1d 100644
--- a/ld/testsuite/ld-powerpc/aix-weak-2c-64.od
+++ b/ld/testsuite/ld-powerpc/aix-weak-2c-64.od
@@ -2,7 +2,7 @@
 .*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET * TYPE * VALUE 
+OFFSET +TYPE +VALUE
 0*200001d0 R_POS * d1
 0*200001d8 R_POS * d3
 0*200001dc R_POS * d4
diff --git a/ld/testsuite/ld-powerpc/ppc476-shared2.d b/ld/testsuite/ld-powerpc/ppc476-shared2.d
index 48917fd..269e257 100644
--- a/ld/testsuite/ld-powerpc/ppc476-shared2.d
+++ b/ld/testsuite/ld-powerpc/ppc476-shared2.d
@@ -7,7 +7,7 @@
 .*:     file format .*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0001000[02] R_PPC_ADDR16_LO   \.text\+0x00050000
 0002000[02] R_PPC_ADDR16_LO   \.text\+0x00050000
 0003000[02] R_PPC_ADDR16_LO   \.text\+0x00050000
diff --git a/ld/testsuite/ld-powerpc/sdadyn.d b/ld/testsuite/ld-powerpc/sdadyn.d
index cbdfc1e..a6cc6d0 100644
--- a/ld/testsuite/ld-powerpc/sdadyn.d
+++ b/ld/testsuite/ld-powerpc/sdadyn.d
@@ -2,7 +2,7 @@
 .*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 #...
 .* R_PPC_COPY        lib_var
 #pass
diff --git a/ld/testsuite/ld-pru/emit-relocs-1.d b/ld/testsuite/ld-pru/emit-relocs-1.d
index 414234f..1d9d069 100644
--- a/ld/testsuite/ld-pru/emit-relocs-1.d
+++ b/ld/testsuite/ld-pru/emit-relocs-1.d
@@ -7,7 +7,7 @@
 .*:     file format .*
 
 RELOCATION RECORDS FOR \[\.data\]:
-OFFSET   TYPE              VALUE *
+OFFSET +TYPE +VALUE
 00000000 R_PRU_BFD_RELOC32  \.data
 00000004 R_PRU_BFD_RELOC32  \.data\+0x00001000
 00000008 R_PRU_BFD_RELOC32  \.merge1\+0x00000002
diff --git a/ld/testsuite/ld-size/size32-1-i386.d b/ld/testsuite/ld-size/size32-1-i386.d
index 43091c1..67c06ee 100644
--- a/ld/testsuite/ld-size/size32-1-i386.d
+++ b/ld/testsuite/ld-size/size32-1-i386.d
@@ -7,7 +7,7 @@
 .*: +file format .*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 [[:xdigit:]]+ R_386_SIZE32      xxx
 [[:xdigit:]]+ R_386_SIZE32      xxx
 [[:xdigit:]]+ R_386_SIZE32      xxx
diff --git a/ld/testsuite/ld-size/size32-1-x32.d b/ld/testsuite/ld-size/size32-1-x32.d
index 083f7b2..38c48bf 100644
--- a/ld/testsuite/ld-size/size32-1-x32.d
+++ b/ld/testsuite/ld-size/size32-1-x32.d
@@ -7,7 +7,7 @@
 .*: +file format .*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 [[:xdigit:]]+ R_X86_64_SIZE32   xxx
 [[:xdigit:]]+ R_X86_64_SIZE32   xxx-0x0000001e
 [[:xdigit:]]+ R_X86_64_SIZE32   xxx\+0x0000001e
diff --git a/ld/testsuite/ld-size/size32-1-x86-64.d b/ld/testsuite/ld-size/size32-1-x86-64.d
index a913dc2..f60bba7 100644
--- a/ld/testsuite/ld-size/size32-1-x86-64.d
+++ b/ld/testsuite/ld-size/size32-1-x86-64.d
@@ -7,7 +7,7 @@
 .*: +file format .*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET           TYPE              VALUE 
+OFFSET +TYPE +VALUE
 [[:xdigit:]]+ R_X86_64_SIZE32   xxx
 [[:xdigit:]]+ R_X86_64_SIZE32   xxx-0x000000000000001e
 [[:xdigit:]]+ R_X86_64_SIZE32   xxx\+0x000000000000001e
diff --git a/ld/testsuite/ld-size/size32-2-i386.d b/ld/testsuite/ld-size/size32-2-i386.d
index 636e87f..c488297 100644
--- a/ld/testsuite/ld-size/size32-2-i386.d
+++ b/ld/testsuite/ld-size/size32-2-i386.d
@@ -7,7 +7,7 @@
 .*: +file format .*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 [[:xdigit:]]+ R_386_SIZE32      xxx
 [[:xdigit:]]+ R_386_SIZE32      yyy
 [[:xdigit:]]+ R_386_SIZE32      zzz
diff --git a/ld/testsuite/ld-size/size32-2-x32.d b/ld/testsuite/ld-size/size32-2-x32.d
index c619a00..a810f32 100644
--- a/ld/testsuite/ld-size/size32-2-x32.d
+++ b/ld/testsuite/ld-size/size32-2-x32.d
@@ -7,7 +7,7 @@
 .*: +file format .*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 [[:xdigit:]]+ R_X86_64_SIZE32   xxx
 [[:xdigit:]]+ R_X86_64_SIZE32   yyy
 [[:xdigit:]]+ R_X86_64_SIZE32   zzz
diff --git a/ld/testsuite/ld-size/size32-2-x86-64.d b/ld/testsuite/ld-size/size32-2-x86-64.d
index 9091944..b4d3704 100644
--- a/ld/testsuite/ld-size/size32-2-x86-64.d
+++ b/ld/testsuite/ld-size/size32-2-x86-64.d
@@ -7,7 +7,7 @@
 .*: +file format .*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET           TYPE              VALUE 
+OFFSET +TYPE +VALUE
 [[:xdigit:]]+ R_X86_64_SIZE32   xxx
 [[:xdigit:]]+ R_X86_64_SIZE32   yyy
 [[:xdigit:]]+ R_X86_64_SIZE32   zzz
diff --git a/ld/testsuite/ld-size/size64-1-x32.d b/ld/testsuite/ld-size/size64-1-x32.d
index 3681591..e8d3210 100644
--- a/ld/testsuite/ld-size/size64-1-x32.d
+++ b/ld/testsuite/ld-size/size64-1-x32.d
@@ -7,7 +7,7 @@
 .*: +file format .*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 [[:xdigit:]]+ R_X86_64_SIZE32   xxx
 [[:xdigit:]]+ R_X86_64_SIZE64   xxx-0x0000001e
 [[:xdigit:]]+ R_X86_64_SIZE64   xxx\+0x0000001e
diff --git a/ld/testsuite/ld-size/size64-1-x86-64.d b/ld/testsuite/ld-size/size64-1-x86-64.d
index 36c2912..53ed741 100644
--- a/ld/testsuite/ld-size/size64-1-x86-64.d
+++ b/ld/testsuite/ld-size/size64-1-x86-64.d
@@ -7,7 +7,7 @@
 .*: +file format .*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET           TYPE              VALUE 
+OFFSET +TYPE +VALUE
 [[:xdigit:]]+ R_X86_64_SIZE64   xxx
 [[:xdigit:]]+ R_X86_64_SIZE64   xxx-0x000000000000001e
 [[:xdigit:]]+ R_X86_64_SIZE64   xxx\+0x000000000000001e
diff --git a/ld/testsuite/ld-size/size64-2-x32.d b/ld/testsuite/ld-size/size64-2-x32.d
index f9f31b5..38bf64c 100644
--- a/ld/testsuite/ld-size/size64-2-x32.d
+++ b/ld/testsuite/ld-size/size64-2-x32.d
@@ -7,7 +7,7 @@
 .*: +file format .*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 [[:xdigit:]]+ R_X86_64_SIZE32   xxx
 [[:xdigit:]]+ R_X86_64_SIZE32   yyy
 [[:xdigit:]]+ R_X86_64_SIZE32   zzz
diff --git a/ld/testsuite/ld-size/size64-2-x86-64.d b/ld/testsuite/ld-size/size64-2-x86-64.d
index 099c8ab..6ee29d2 100644
--- a/ld/testsuite/ld-size/size64-2-x86-64.d
+++ b/ld/testsuite/ld-size/size64-2-x86-64.d
@@ -7,7 +7,7 @@
 .*: +file format .*
 
 DYNAMIC RELOCATION RECORDS
-OFFSET           TYPE              VALUE 
+OFFSET +TYPE +VALUE
 [[:xdigit:]]+ R_X86_64_SIZE64   xxx
 [[:xdigit:]]+ R_X86_64_SIZE64   yyy
 [[:xdigit:]]+ R_X86_64_SIZE64   zzz
diff --git a/ld/testsuite/ld-tic6x/data-reloc-local-r-rel.d b/ld/testsuite/ld-tic6x/data-reloc-local-r-rel.d
index 18f23f9..7cb03c9 100644
--- a/ld/testsuite/ld-tic6x/data-reloc-local-r-rel.d
+++ b/ld/testsuite/ld-tic6x/data-reloc-local-r-rel.d
@@ -8,7 +8,7 @@
 .*: *file format elf32-tic6x-le
 
 RELOCATION RECORDS FOR \[\.data\]:
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0+ R_C6000_ABS32     \.data
 0+4 R_C6000_ABS32     \.data
 0+8 R_C6000_ABS32     \.data
diff --git a/ld/testsuite/ld-tic6x/data-reloc-local-r.d b/ld/testsuite/ld-tic6x/data-reloc-local-r.d
index 0f5567b..4b5ec3e 100644
--- a/ld/testsuite/ld-tic6x/data-reloc-local-r.d
+++ b/ld/testsuite/ld-tic6x/data-reloc-local-r.d
@@ -8,7 +8,7 @@
 .*: *file format elf32-tic6x-le
 
 RELOCATION RECORDS FOR \[\.data\]:
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 0+ R_C6000_ABS32     \.data
 0+4 R_C6000_ABS32     \.data\+0x00000004
 0+8 R_C6000_ABS32     \.data\+0x0000000c
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1.od b/ld/testsuite/ld-tic6x/shlib-app-1.od
index f2f5cab..88e883a 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1.od
+++ b/ld/testsuite/ld-tic6x/shlib-app-1.od
@@ -2,7 +2,7 @@
 tmpdir/shlib-dynapp-1:     file format elf32-tic6x-le
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 100000b8 R_C6000_ABS32     b
 100000bc R_C6000_ABS32     a
 100000c4 R_C6000_ABS32     g1
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1b.od b/ld/testsuite/ld-tic6x/shlib-app-1b.od
index 4a9c60b..8e61322 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1b.od
+++ b/ld/testsuite/ld-tic6x/shlib-app-1b.od
@@ -2,7 +2,7 @@
 tmpdir/shlib-dynapp-1b:     file format elf32-tic6x-be
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 100000b8 R_C6000_ABS32     b
 100000bc R_C6000_ABS32     a
 100000c4 R_C6000_ABS32     g1
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1r.od b/ld/testsuite/ld-tic6x/shlib-app-1r.od
index 15c2973..7e22ba6 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1r.od
+++ b/ld/testsuite/ld-tic6x/shlib-app-1r.od
@@ -2,7 +2,7 @@
 tmpdir/shlib-dynapp-1r:     file format elf32-tic6x-le
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 100000b8 R_C6000_ABS32     b
 100000bc R_C6000_ABS32     a
 100000c4 R_C6000_COPY      a
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1rb.od b/ld/testsuite/ld-tic6x/shlib-app-1rb.od
index c313ed7..b37cacc 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1rb.od
+++ b/ld/testsuite/ld-tic6x/shlib-app-1rb.od
@@ -2,7 +2,7 @@
 tmpdir/shlib-dynapp-1rb:     file format elf32-tic6x-be
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 100000b8 R_C6000_ABS32     b
 100000bc R_C6000_ABS32     a
 100000c4 R_C6000_COPY      a
diff --git a/ld/testsuite/ld-tic6x/static-app-1.od b/ld/testsuite/ld-tic6x/static-app-1.od
index d07cd6e..3c60f6e 100644
--- a/ld/testsuite/ld-tic6x/static-app-1.od
+++ b/ld/testsuite/ld-tic6x/static-app-1.od
@@ -2,7 +2,7 @@
 tmpdir/static-app-1:     file format elf32-tic6x-le
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 100000d8 R_C6000_ABS32     \.bss
 100000d4 R_C6000_ABS32     b
 100000dc R_C6000_ABS32     a
diff --git a/ld/testsuite/ld-tic6x/static-app-1b.od b/ld/testsuite/ld-tic6x/static-app-1b.od
index a35d194..72fab59 100644
--- a/ld/testsuite/ld-tic6x/static-app-1b.od
+++ b/ld/testsuite/ld-tic6x/static-app-1b.od
@@ -2,7 +2,7 @@
 tmpdir/static-app-1b:     file format elf32-tic6x-be
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 100000d8 R_C6000_ABS32     \.bss
 100000d4 R_C6000_ABS32     b
 100000dc R_C6000_ABS32     a
diff --git a/ld/testsuite/ld-tic6x/static-app-1r.od b/ld/testsuite/ld-tic6x/static-app-1r.od
index 06f8d50..ddd9a79 100644
--- a/ld/testsuite/ld-tic6x/static-app-1r.od
+++ b/ld/testsuite/ld-tic6x/static-app-1r.od
@@ -2,7 +2,7 @@
 tmpdir/static-app-1r:     file format elf32-tic6x-le
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 100000d8 R_C6000_ABS32     \.bss
 100000d4 R_C6000_ABS32     b
 100000dc R_C6000_ABS32     a
diff --git a/ld/testsuite/ld-tic6x/static-app-1rb.od b/ld/testsuite/ld-tic6x/static-app-1rb.od
index 13d4255..d55f5a5 100644
--- a/ld/testsuite/ld-tic6x/static-app-1rb.od
+++ b/ld/testsuite/ld-tic6x/static-app-1rb.od
@@ -2,7 +2,7 @@
 tmpdir/static-app-1rb:     file format elf32-tic6x-be
 
 DYNAMIC RELOCATION RECORDS
-OFFSET   TYPE              VALUE 
+OFFSET +TYPE +VALUE
 100000d8 R_C6000_ABS32     \.bss
 100000d4 R_C6000_ABS32     b
 100000dc R_C6000_ABS32     a