[binutils-gdb] Trailing spaces in objdump -r header
Alan Modra
amodra@sourceware.org
Tue May 31 03:53:13 GMT 2022
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=99f647e200a9a329e80fe813bc708e89927ea5ad
commit 99f647e200a9a329e80fe813bc708e89927ea5ad
Author: Alan Modra <amodra@gmail.com>
Date: Tue May 31 11:07:37 2022 +0930
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.
Diff:
---
binutils/objdump.c | 2 +-
gas/testsuite/gas/all/fwdexp.d | 2 +-
gas/testsuite/gas/all/weakref1.d | 2 +-
gas/testsuite/gas/alpha/elf-reloc-1.d | 2 +-
gas/testsuite/gas/alpha/elf-reloc-4.d | 2 +-
gas/testsuite/gas/alpha/elf-reloc-7.d | 6 +++---
gas/testsuite/gas/alpha/elf-reloc-8.d | 8 ++++----
gas/testsuite/gas/alpha/elf-tls-1.d | 2 +-
gas/testsuite/gas/arm/local_function.d | 2 +-
gas/testsuite/gas/arm/thumbrel.d | 2 +-
gas/testsuite/gas/arm/unwind.d | 4 ++--
gas/testsuite/gas/arm/unwind_vxworks.d | 4 ++--
gas/testsuite/gas/avr/diffreloc_withrelax.d | 4 ++--
gas/testsuite/gas/avr/noreloc_withoutrelax.d | 2 +-
gas/testsuite/gas/avr/pc-relative-reloc.d | 2 +-
gas/testsuite/gas/bfin/reloc.d | 4 ++--
gas/testsuite/gas/cfi/cfi-alpha-2.d | 2 +-
gas/testsuite/gas/cfi/reloc-pe-i386.d | 2 +-
gas/testsuite/gas/cris/rd-dtpoffd1.d | 2 +-
gas/testsuite/gas/cris/x-to-dcr1-sreg.d | 2 +-
gas/testsuite/gas/elf/equ-reloc.d | 2 +-
gas/testsuite/gas/elf/missing-build-notes.d | 2 +-
gas/testsuite/gas/i386/ilp32/elf/equ-reloc.d | 2 +-
gas/testsuite/gas/i386/ilp32/quad.d | 2 +-
gas/testsuite/gas/i386/rela.d | 2 +-
gas/testsuite/gas/i386/size-5b.d | 2 +-
gas/testsuite/gas/i386/wrap32-data.d | 2 +-
gas/testsuite/gas/ia64/ltoff22x-1.d | 2 +-
gas/testsuite/gas/ia64/ltoff22x-2.d | 2 +-
gas/testsuite/gas/ia64/ltoff22x-3.d | 2 +-
gas/testsuite/gas/ia64/ltoff22x-4.d | 2 +-
gas/testsuite/gas/ia64/ltoff22x-5.d | 2 +-
gas/testsuite/gas/ia64/order.d | 4 ++--
gas/testsuite/gas/m32r/rel32-pic.d | 2 +-
gas/testsuite/gas/m32r/rel32.d | 2 +-
gas/testsuite/gas/mips/compact-eh-eb-1.d | 2 +-
gas/testsuite/gas/mips/compact-eh-eb-2.d | 6 +++---
gas/testsuite/gas/mips/compact-eh-eb-3.d | 2 +-
gas/testsuite/gas/mips/compact-eh-eb-4.d | 2 +-
gas/testsuite/gas/mips/compact-eh-eb-5.d | 6 +++---
gas/testsuite/gas/mips/compact-eh-eb-6.d | 2 +-
gas/testsuite/gas/mips/compact-eh-eb-7.d | 4 ++--
gas/testsuite/gas/mips/compact-eh-el-1.d | 2 +-
gas/testsuite/gas/mips/compact-eh-el-2.d | 6 +++---
gas/testsuite/gas/mips/compact-eh-el-3.d | 2 +-
gas/testsuite/gas/mips/compact-eh-el-4.d | 2 +-
gas/testsuite/gas/mips/compact-eh-el-5.d | 6 +++---
gas/testsuite/gas/mips/compact-eh-el-6.d | 2 +-
gas/testsuite/gas/mips/compact-eh-el-7.d | 4 ++--
gas/testsuite/gas/mips/e32-rel2.d | 2 +-
gas/testsuite/gas/mips/e32el-rel2.d | 2 +-
gas/testsuite/gas/mips/ehword.d | 2 +-
gas/testsuite/gas/mips/elf-rel.d | 2 +-
gas/testsuite/gas/mips/elf-rel2.d | 2 +-
gas/testsuite/gas/mips/elf-rel3.d | 2 +-
gas/testsuite/gas/mips/elfel-rel.d | 2 +-
gas/testsuite/gas/mips/elfel-rel2.d | 2 +-
gas/testsuite/gas/mips/elfel-rel3.d | 2 +-
gas/testsuite/gas/mips/jalr3-n64.d | 2 +-
gas/testsuite/gas/mips/jalr3.d | 2 +-
gas/testsuite/gas/mips/micromips@elf-rel2.d | 2 +-
gas/testsuite/gas/mips/micromips@elfel-rel2.d | 2 +-
gas/testsuite/gas/mips/mips16-e.d | 2 +-
gas/testsuite/gas/mips/mips16-f.d | 2 +-
gas/testsuite/gas/mips/mips16-hilo-match.d | 4 ++--
gas/testsuite/gas/mips/mipsel16-e.d | 2 +-
gas/testsuite/gas/mips/mipsel16-f.d | 2 +-
gas/testsuite/gas/mips/pcrel-4-32.d | 2 +-
gas/testsuite/gas/mips/pcrel-4-64.d | 2 +-
gas/testsuite/gas/mips/pcrel-4-n32.d | 2 +-
gas/testsuite/gas/mips/tmips16-e.d | 2 +-
gas/testsuite/gas/mips/tmips16-f.d | 2 +-
gas/testsuite/gas/mips/tmipsel16-e.d | 2 +-
gas/testsuite/gas/mips/tmipsel16-f.d | 2 +-
gas/testsuite/gas/mmix/basep-10.d | 4 ++--
gas/testsuite/gas/mmix/basep-11.d | 2 +-
gas/testsuite/gas/mmix/basep-9.d | 4 ++--
gas/testsuite/gas/mmix/comment-3.d | 2 +-
gas/testsuite/gas/mmix/fb-1.d | 2 +-
gas/testsuite/gas/mmix/fb-2.d | 4 ++--
gas/testsuite/gas/mmix/greg1.d | 2 +-
gas/testsuite/gas/mmix/greg1a.d | 2 +-
gas/testsuite/gas/mmix/greg2.d | 2 +-
gas/testsuite/gas/mmix/greg2a.d | 2 +-
gas/testsuite/gas/mmix/greg3.d | 4 ++--
gas/testsuite/gas/mmix/greg4.d | 4 ++--
gas/testsuite/gas/mmix/greg5.d | 2 +-
gas/testsuite/gas/mmix/greg6.d | 4 ++--
gas/testsuite/gas/mmix/greg7.d | 2 +-
gas/testsuite/gas/mmix/greg8.d | 4 ++--
gas/testsuite/gas/mmix/local-1.d | 2 +-
gas/testsuite/gas/mmix/odd-1.d | 2 +-
gas/testsuite/gas/mmix/op-0-1.d | 2 +-
gas/testsuite/gas/mmix/op-0-1s.d | 2 +-
gas/testsuite/gas/mmix/op-0-2.d | 2 +-
gas/testsuite/gas/mmix/pr25331.d | 2 +-
gas/testsuite/gas/mmix/prefix1.d | 2 +-
gas/testsuite/gas/mmix/prefix3.d | 4 ++--
gas/testsuite/gas/mmix/weak1-s.d | 2 +-
gas/testsuite/gas/mmix/weak1.d | 2 +-
gas/testsuite/gas/mn10300/relax.d | 12 ++++++------
gas/testsuite/gas/or1k/reloc-1.d | 2 +-
gas/testsuite/gas/tic6x/data-reloc.d | 2 +-
gas/testsuite/gas/vax/elf-rel.d | 4 ++--
gas/testsuite/gas/xstormy16/reloc-1.d | 2 +-
gas/testsuite/gas/xtensa/pcrel.d | 4 ++--
gas/testsuite/gas/xtensa/weak-call.d | 2 +-
ld/testsuite/ld-arm/arm-app-abs32.r | 2 +-
ld/testsuite/ld-arm/arm-app.r | 2 +-
ld/testsuite/ld-arm/arm-lib-plt32.r | 2 +-
ld/testsuite/ld-arm/arm-lib.r | 2 +-
ld/testsuite/ld-arm/arm-rel32.d | 2 +-
ld/testsuite/ld-arm/farcall-mixed-app.r | 2 +-
ld/testsuite/ld-arm/farcall-mixed-app2.r | 2 +-
ld/testsuite/ld-arm/farcall-mixed-lib.r | 2 +-
ld/testsuite/ld-arm/fdpic-main.r | 2 +-
ld/testsuite/ld-arm/fdpic-shared.r | 2 +-
ld/testsuite/ld-arm/ifunc-gdesc.r | 2 +-
ld/testsuite/ld-arm/mixed-app.r | 2 +-
ld/testsuite/ld-arm/mixed-lib.r | 2 +-
ld/testsuite/ld-arm/tls-app.r | 2 +-
ld/testsuite/ld-arm/tls-descseq.r | 2 +-
ld/testsuite/ld-arm/tls-gdesc.r | 2 +-
ld/testsuite/ld-arm/tls-lib-loc.r | 2 +-
ld/testsuite/ld-arm/tls-lib.r | 2 +-
ld/testsuite/ld-arm/tls-mixed.r | 2 +-
ld/testsuite/ld-arm/unwind-4.d | 2 +-
ld/testsuite/ld-cris/gotplt1.d | 2 +-
ld/testsuite/ld-cris/gotplt2.d | 2 +-
ld/testsuite/ld-cris/gotplt3.d | 2 +-
ld/testsuite/ld-cris/tls-gd-1.d | 2 +-
ld/testsuite/ld-cris/tls-gd-1h.d | 2 +-
ld/testsuite/ld-cris/tls-gd-2.d | 2 +-
ld/testsuite/ld-cris/tls-gd-2h.d | 2 +-
ld/testsuite/ld-cris/tls-ie-10.d | 2 +-
ld/testsuite/ld-cris/tls-ie-11.d | 2 +-
ld/testsuite/ld-cris/tls-ie-78.d | 2 +-
ld/testsuite/ld-cris/tls-ie-8.d | 2 +-
ld/testsuite/ld-cris/tls-ie-9.d | 2 +-
ld/testsuite/ld-cris/tls-ld-4.d | 2 +-
ld/testsuite/ld-cris/tls-ld-5.d | 2 +-
ld/testsuite/ld-cris/tls-ld-6.d | 2 +-
ld/testsuite/ld-cris/tls-ld-7.d | 2 +-
ld/testsuite/ld-cris/tls-ldgd-14.d | 2 +-
ld/testsuite/ld-cris/tls-ldgd-15.d | 2 +-
ld/testsuite/ld-cris/tls-ldgdex-14.d | 2 +-
ld/testsuite/ld-cris/tls-ldgdex-15.d | 2 +-
ld/testsuite/ld-cris/tls-ldgdx-14.d | 2 +-
ld/testsuite/ld-cris/tls-ldgdx-15.d | 2 +-
ld/testsuite/ld-cris/tls-legdx-16.d | 2 +-
ld/testsuite/ld-cris/tls-legdx-17.d | 2 +-
ld/testsuite/ld-cris/tls-local-54.d | 2 +-
ld/testsuite/ld-cris/tls-local-60.d | 2 +-
ld/testsuite/ld-cris/tls-local-61.d | 2 +-
ld/testsuite/ld-cris/tls-ok-30.d | 2 +-
ld/testsuite/ld-cris/tls-ok-32.d | 2 +-
ld/testsuite/ld-cris/tls-ok-34.d | 2 +-
ld/testsuite/ld-cris/weakhiddso.d | 2 +-
ld/testsuite/ld-csky/emit-relocs-1.d | 2 +-
ld/testsuite/ld-metag/shared.r | 2 +-
ld/testsuite/ld-metag/stub_pic_app.r | 2 +-
ld/testsuite/ld-metag/stub_shared.r | 2 +-
ld/testsuite/ld-mips-elf/emit-relocs-1.d | 2 +-
ld/testsuite/ld-mips-elf/reloc-estimate-1.d | 2 +-
ld/testsuite/ld-mips-elf/tls-multi-got-1.got | 2 +-
ld/testsuite/ld-mips-elf/tlsdyn-o32-1.got | 2 +-
ld/testsuite/ld-mips-elf/tlsdyn-o32-2.got | 2 +-
ld/testsuite/ld-mips-elf/tlsdyn-o32-3.got | 2 +-
ld/testsuite/ld-mips-elf/tlsdyn-o32.got | 2 +-
ld/testsuite/ld-mips-elf/tlsdyn-pie-o32.got | 2 +-
ld/testsuite/ld-mips-elf/tlslib-o32-hidden.got | 2 +-
ld/testsuite/ld-mips-elf/tlslib-o32-ver.got | 2 +-
ld/testsuite/ld-mips-elf/tlslib-o32.got | 2 +-
ld/testsuite/ld-mn10300/i112045-2.d | 2 +-
ld/testsuite/ld-nios2/emit-relocs-1.d | 2 +-
ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-32.drd | 2 +-
ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-32.rd | 2 +-
ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-64.drd | 2 +-
ld/testsuite/ld-powerpc/aix-no-dup-syms-1-dso-64.rd | 2 +-
ld/testsuite/ld-powerpc/aix-no-dup-syms-1-rel.rd | 2 +-
ld/testsuite/ld-powerpc/aix-rel-1.od | 2 +-
ld/testsuite/ld-powerpc/aix-weak-2c-32.od | 2 +-
ld/testsuite/ld-powerpc/aix-weak-2c-64.od | 2 +-
ld/testsuite/ld-powerpc/ppc476-shared2.d | 2 +-
ld/testsuite/ld-powerpc/sdadyn.d | 2 +-
ld/testsuite/ld-pru/emit-relocs-1.d | 2 +-
ld/testsuite/ld-size/size32-1-i386.d | 2 +-
ld/testsuite/ld-size/size32-1-x32.d | 2 +-
ld/testsuite/ld-size/size32-1-x86-64.d | 2 +-
ld/testsuite/ld-size/size32-2-i386.d | 2 +-
ld/testsuite/ld-size/size32-2-x32.d | 2 +-
ld/testsuite/ld-size/size32-2-x86-64.d | 2 +-
ld/testsuite/ld-size/size64-1-x32.d | 2 +-
ld/testsuite/ld-size/size64-1-x86-64.d | 2 +-
ld/testsuite/ld-size/size64-2-x32.d | 2 +-
ld/testsuite/ld-size/size64-2-x86-64.d | 2 +-
ld/testsuite/ld-tic6x/data-reloc-local-r-rel.d | 2 +-
ld/testsuite/ld-tic6x/data-reloc-local-r.d | 2 +-
ld/testsuite/ld-tic6x/shlib-app-1.od | 2 +-
ld/testsuite/ld-tic6x/shlib-app-1b.od | 2 +-
ld/testsuite/ld-tic6x/shlib-app-1r.od | 2 +-
ld/testsuite/ld-tic6x/shlib-app-1rb.od | 2 +-
ld/testsuite/ld-tic6x/static-app-1.od | 2 +-
ld/testsuite/ld-tic6x/static-app-1b.od | 2 +-
ld/testsuite/ld-tic6x/static-app-1r.od | 2 +-
ld/testsuite/ld-tic6x/static-app-1rb.od | 2 +-
206 files changed, 242 insertions(+), 242 deletions(-)
diff --git a/binutils/objdump.c b/binutils/objdump.c
index f585c1b8d18..e8fa8ca154e 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -4901,7 +4901,7 @@ dump_reloc_set (bfd *abfd, asection *sec, arelent **relpp, long relcount)
bfd_sprintf_vma (abfd, buf, (bfd_vma) -1);
width = strlen (buf) - 7;
}
- printf ("OFFSET %*s TYPE %*s VALUE \n", width, "", 12, "");
+ printf ("OFFSET %*s TYPE %*s VALUE\n", width, "", 12, "");
}
last_filename = NULL;
diff --git a/gas/testsuite/gas/all/fwdexp.d b/gas/testsuite/gas/all/fwdexp.d
index 211ab9f1c8b..e83d05a9a94 100644
--- a/gas/testsuite/gas/all/fwdexp.d
+++ b/gas/testsuite/gas/all/fwdexp.d
@@ -4,7 +4,7 @@
.*: .*
RELOCATION RECORDS FOR .*
-OFFSET +TYPE +VALUE
+OFFSET +TYPE +VALUE
0+ .*(\.data|label_i)(|\+0xf+e|\+0xf+c|\+0xf+8|-0x0*2|-0x0*4|-0x0*8)
Contents of section .*
diff --git a/gas/testsuite/gas/all/weakref1.d b/gas/testsuite/gas/all/weakref1.d
index 4c2516409e3..a2640036a3f 100644
--- a/gas/testsuite/gas/all/weakref1.d
+++ b/gas/testsuite/gas/all/weakref1.d
@@ -9,7 +9,7 @@
#...
RELOCATION RECORDS FOR \[(\.text|\$CODE\$)\]:
-OFFSET +TYPE +VALUE *
+OFFSET +TYPE +VALUE
# the rest of this file is generated with the following script:
# # script begin
# echo \#...
diff --git a/gas/testsuite/gas/alpha/elf-reloc-1.d b/gas/testsuite/gas/alpha/elf-reloc-1.d
index 69a16b72d74..89ecadf9d59 100644
--- a/gas/testsuite/gas/alpha/elf-reloc-1.d
+++ b/gas/testsuite/gas/alpha/elf-reloc-1.d
@@ -4,7 +4,7 @@
.*: file format elf64-alpha.*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0*0000004 ELF_LITERAL a
0*0000000 LITUSE \.text\+0x0*0000002
0*000000c LITUSE \.text\+0x0*0000001
diff --git a/gas/testsuite/gas/alpha/elf-reloc-4.d b/gas/testsuite/gas/alpha/elf-reloc-4.d
index 29b32e2abdb..b9f5f88768d 100644
--- a/gas/testsuite/gas/alpha/elf-reloc-4.d
+++ b/gas/testsuite/gas/alpha/elf-reloc-4.d
@@ -4,7 +4,7 @@
.*: file format elf64-alpha.*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0*0000000 ELF_LITERAL a
0*0000004 LITUSE \.text\+0x0*0000001
0*0000008 LITUSE \.text\+0x0*0000002
diff --git a/gas/testsuite/gas/alpha/elf-reloc-7.d b/gas/testsuite/gas/alpha/elf-reloc-7.d
index c51b6674fe6..c8fd75acc93 100644
--- a/gas/testsuite/gas/alpha/elf-reloc-7.d
+++ b/gas/testsuite/gas/alpha/elf-reloc-7.d
@@ -4,18 +4,18 @@
.*: file format elf64-alpha.*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0*0000008 BRADDR bar
RELOCATION RECORDS FOR \[\.data\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0*0000004 SREL32 \.data2\+0x0*0000004
0*0000008 SREL32 BAR
RELOCATION RECORDS FOR \[\.text2\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0*0000004 BRADDR \.text\+0x0*0000010
0*0000008 BRADDR bar
diff --git a/gas/testsuite/gas/alpha/elf-reloc-8.d b/gas/testsuite/gas/alpha/elf-reloc-8.d
index 8ba78c3c122..0f51cca5167 100644
--- a/gas/testsuite/gas/alpha/elf-reloc-8.d
+++ b/gas/testsuite/gas/alpha/elf-reloc-8.d
@@ -4,7 +4,7 @@
.*: file format elf64-alpha.*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET *TYPE *VALUE
+OFFSET +TYPE +VALUE
0*0000000 GPDISP \.text\+0x0*0000004
0*0000014 GPRELHIGH \.bss\+0x0*0000040
0*0000018 ELF_LITERAL ROOT_DEV
@@ -57,7 +57,7 @@ OFFSET *TYPE *VALUE
RELOCATION RECORDS FOR \[\.init\.text\]:
-OFFSET *TYPE *VALUE
+OFFSET +TYPE +VALUE
0*0000000 GPDISP \.init\.text\+0x0*0000004
0*0000008 ELF_LITERAL simple_strtol
0*000001c LITUSE \.init\.text\+0x0*0000003
@@ -294,7 +294,7 @@ OFFSET *TYPE *VALUE
RELOCATION RECORDS FOR \[\.init\.setup\]:
-OFFSET *TYPE *VALUE
+OFFSET +TYPE +VALUE
0*0000000 REFQUAD \.init\.data\+0x0*0000004
0*0000008 REFQUAD \.init\.text
0*0000010 REFQUAD \.init\.data\+0x0*0000012
@@ -310,7 +310,7 @@ OFFSET *TYPE *VALUE
RELOCATION RECORDS FOR \[\.eh_frame\]:
-OFFSET *TYPE *VALUE
+OFFSET +TYPE +VALUE
0*000001c SREL32 \.init\.text
0*0000034 SREL32 \.init\.text\+0x0*0000050
0*0000048 SREL32 \.init\.text\+0x0*0000080
diff --git a/gas/testsuite/gas/alpha/elf-tls-1.d b/gas/testsuite/gas/alpha/elf-tls-1.d
index 7dee62a81f0..ebc783fc17e 100644
--- a/gas/testsuite/gas/alpha/elf-tls-1.d
+++ b/gas/testsuite/gas/alpha/elf-tls-1.d
@@ -4,7 +4,7 @@
.*: file format elf64-alpha.*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0*0000004 TLSGD a
0*0000000 ELF_LITERAL __tls_get_addr
0*0000008 LITUSE \.text\+0x0*0000004
diff --git a/gas/testsuite/gas/arm/local_function.d b/gas/testsuite/gas/arm/local_function.d
index 2c473c0c51e..450154f6348 100644
--- a/gas/testsuite/gas/arm/local_function.d
+++ b/gas/testsuite/gas/arm/local_function.d
@@ -7,5 +7,5 @@
.*: file format.*
RELOCATION RECORDS FOR \[.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_ARM_(CALL|PC24) bar
diff --git a/gas/testsuite/gas/arm/thumbrel.d b/gas/testsuite/gas/arm/thumbrel.d
index bc8644be20c..1875115b058 100644
--- a/gas/testsuite/gas/arm/thumbrel.d
+++ b/gas/testsuite/gas/arm/thumbrel.d
@@ -6,7 +6,7 @@
.*: file format.*
RELOCATION RECORDS FOR \[.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000004 R_ARM_REL32 b
Contents of section .text:
diff --git a/gas/testsuite/gas/arm/unwind.d b/gas/testsuite/gas/arm/unwind.d
index 3588a278b6d..9e7046f5c17 100644
--- a/gas/testsuite/gas/arm/unwind.d
+++ b/gas/testsuite/gas/arm/unwind.d
@@ -9,12 +9,12 @@
.*: file format.*
RELOCATION RECORDS FOR \[.ARM.extab\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0000000c R_ARM_PREL31 .text
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/gas/testsuite/gas/arm/unwind_vxworks.d b/gas/testsuite/gas/arm/unwind_vxworks.d
index 36c3b59705c..e33c996c1d5 100644
--- a/gas/testsuite/gas/arm/unwind_vxworks.d
+++ b/gas/testsuite/gas/arm/unwind_vxworks.d
@@ -7,12 +7,12 @@
.*: file format.*
RELOCATION RECORDS FOR \[.ARM.extab\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0000000c R_ARM_PREL31 .text
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.*\+0x00000004
diff --git a/gas/testsuite/gas/avr/diffreloc_withrelax.d b/gas/testsuite/gas/avr/diffreloc_withrelax.d
index 9d59e054ec4..8d1ef54c746 100644
--- a/gas/testsuite/gas/avr/diffreloc_withrelax.d
+++ b/gas/testsuite/gas/avr/diffreloc_withrelax.d
@@ -7,10 +7,10 @@
.*: file format elf32-avr
RELOCATION RECORDS FOR \[.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_AVR_CALL L1
RELOCATION RECORDS FOR \[.data\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_AVR_DIFF16 L2
diff --git a/gas/testsuite/gas/avr/noreloc_withoutrelax.d b/gas/testsuite/gas/avr/noreloc_withoutrelax.d
index 7ec7d32066d..b386c1b9e92 100644
--- a/gas/testsuite/gas/avr/noreloc_withoutrelax.d
+++ b/gas/testsuite/gas/avr/noreloc_withoutrelax.d
@@ -7,5 +7,5 @@
.*: file format elf32-avr
RELOCATION RECORDS FOR \[.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_AVR_CALL .text
diff --git a/gas/testsuite/gas/avr/pc-relative-reloc.d b/gas/testsuite/gas/avr/pc-relative-reloc.d
index 30d0df6202a..dc8d42b288d 100644
--- a/gas/testsuite/gas/avr/pc-relative-reloc.d
+++ b/gas/testsuite/gas/avr/pc-relative-reloc.d
@@ -11,7 +11,7 @@ RELOCATION RECORDS FOR \[.text.main\]:
RELOCATION RECORDS FOR \[.debug_line\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_AVR_32_PCREL .Ldebug_line_end-0x00000004
diff --git a/gas/testsuite/gas/bfin/reloc.d b/gas/testsuite/gas/bfin/reloc.d
index c42060ab1f9..4e70edecfe7 100644
--- a/gas/testsuite/gas/bfin/reloc.d
+++ b/gas/testsuite/gas/bfin/reloc.d
@@ -3,7 +3,7 @@
.*: +file format .*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0*0004 R_BFIN_PCREL24 _call_data1
0*0008 R_BFIN_RIMM16 .data
0*000a R_BFIN_PCREL12_JUMP_S .text\+0x00000018
@@ -14,7 +14,7 @@ OFFSET TYPE VALUE
RELOCATION RECORDS FOR \[\.data\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0*0006 R_BFIN_BYTE_DATA load_extern1
diff --git a/gas/testsuite/gas/cfi/cfi-alpha-2.d b/gas/testsuite/gas/cfi/cfi-alpha-2.d
index cd7c9dd1498..6a04141df4c 100644
--- a/gas/testsuite/gas/cfi/cfi-alpha-2.d
+++ b/gas/testsuite/gas/cfi/cfi-alpha-2.d
@@ -4,6 +4,6 @@
.*: file format elf64-alpha.*
RELOCATION RECORDS FOR \[\.eh_frame\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0*000001c SREL32 \.text
0*0000030 SREL32 \.text\+0x0*0000004
diff --git a/gas/testsuite/gas/cfi/reloc-pe-i386.d b/gas/testsuite/gas/cfi/reloc-pe-i386.d
index dc12629f372..0e79b4a0888 100644
--- a/gas/testsuite/gas/cfi/reloc-pe-i386.d
+++ b/gas/testsuite/gas/cfi/reloc-pe-i386.d
@@ -2,7 +2,7 @@
#name: reloc-pe-i386
#...
RELOCATION RECORDS FOR \[.debug_frame\]:
-OFFSET .* TYPE .* VALUE
+OFFSET +TYPE +VALUE
0.* (secrel32|IMAGE_REL_AMD64_SECREL) .* .debug_frame
0.* .* .text
diff --git a/gas/testsuite/gas/cris/rd-dtpoffd1.d b/gas/testsuite/gas/cris/rd-dtpoffd1.d
index 16fc9bcfdb4..b5c657313aa 100644
--- a/gas/testsuite/gas/cris/rd-dtpoffd1.d
+++ b/gas/testsuite/gas/cris/rd-dtpoffd1.d
@@ -6,7 +6,7 @@
.*: file format .*-cris
RELOCATION RECORDS FOR \[.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+4 R_CRIS_32_DTPREL extsym\+0x0000002a
0+c R_CRIS_32_DTPREL x\+0x00000002
diff --git a/gas/testsuite/gas/cris/x-to-dcr1-sreg.d b/gas/testsuite/gas/cris/x-to-dcr1-sreg.d
index 533f1721e7b..d7edf2dbe6c 100644
--- a/gas/testsuite/gas/cris/x-to-dcr1-sreg.d
+++ b/gas/testsuite/gas/cris/x-to-dcr1-sreg.d
@@ -4,7 +4,7 @@
.*: file format .*-cris
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET[ ]+TYPE[ ]+VALUE
+OFFSET +TYPE +VALUE
0+70 (R_CRIS_)?16[ ]+externalsym
0+284 (R_CRIS_)?32[ ]+externalsym
0+28c (R_CRIS_)?32[ ]+\.text
diff --git a/gas/testsuite/gas/elf/equ-reloc.d b/gas/testsuite/gas/elf/equ-reloc.d
index e4e7d47f47a..871d1d61c6d 100644
--- a/gas/testsuite/gas/elf/equ-reloc.d
+++ b/gas/testsuite/gas/elf/equ-reloc.d
@@ -4,7 +4,7 @@
.*: +file format .*
RELOCATION RECORDS FOR \[.*\]:
-OFFSET *TYPE *VALUE
+OFFSET +TYPE +VALUE
0*0 [^ ]+ +(\.bss(\+0x0*4)?|y1)
0*4 [^ ]+ +(\.bss(\+0x0*8)?|y2)
#...
diff --git a/gas/testsuite/gas/elf/missing-build-notes.d b/gas/testsuite/gas/elf/missing-build-notes.d
index 0cfb11024dd..95071baefa7 100644
--- a/gas/testsuite/gas/elf/missing-build-notes.d
+++ b/gas/testsuite/gas/elf/missing-build-notes.d
@@ -6,7 +6,7 @@
#...
RELOCATION RECORDS FOR \[.gnu.build.attributes\]:
-OFFSET[ ]+TYPE[ ]+VALUE
+OFFSET +TYPE +VALUE
0+014 .*[ ]+.*
0+0(18|1c) .*[ ]+.*
0+0(30|38) .*[ ]+.*
diff --git a/gas/testsuite/gas/i386/ilp32/elf/equ-reloc.d b/gas/testsuite/gas/i386/ilp32/elf/equ-reloc.d
index 91b5ea77755..e1edbfc16ed 100644
--- a/gas/testsuite/gas/i386/ilp32/elf/equ-reloc.d
+++ b/gas/testsuite/gas/i386/ilp32/elf/equ-reloc.d
@@ -5,7 +5,7 @@
.*: +file format .*
RELOCATION RECORDS FOR \[.*\]:
-OFFSET *TYPE *VALUE
+OFFSET +TYPE +VALUE
0*0 [^ ]+ +(\.bss(\+0x0*4)?|y1)
0*4 [^ ]+ +(\.bss(\+0x0*8)?|y2)
#...
diff --git a/gas/testsuite/gas/i386/ilp32/quad.d b/gas/testsuite/gas/i386/ilp32/quad.d
index 13f5d750134..03dcf851dac 100644
--- a/gas/testsuite/gas/i386/ilp32/quad.d
+++ b/gas/testsuite/gas/i386/ilp32/quad.d
@@ -5,7 +5,7 @@
.*: +file format .*
RELOCATION RECORDS FOR \[.data\]:
-OFFSET +TYPE +VALUE
+OFFSET +TYPE +VALUE
0+ R_X86_64_64 +foo
0+10 R_X86_64_64 +bar
0+20 R_X86_64_64 +foo
diff --git a/gas/testsuite/gas/i386/rela.d b/gas/testsuite/gas/i386/rela.d
index 198f71238c9..413bc27bd27 100644
--- a/gas/testsuite/gas/i386/rela.d
+++ b/gas/testsuite/gas/i386/rela.d
@@ -5,7 +5,7 @@
RELOCATION RECORDS FOR \[\.data\]:
-OFFSET +TYPE +VALUE *
+OFFSET +TYPE +VALUE
0*0 R_X86_64_64 *q
0*8 R_X86_64_32 *l
diff --git a/gas/testsuite/gas/i386/size-5b.d b/gas/testsuite/gas/i386/size-5b.d
index 8439801daaa..968bb3a3145 100644
--- a/gas/testsuite/gas/i386/size-5b.d
+++ b/gas/testsuite/gas/i386/size-5b.d
@@ -6,7 +6,7 @@
RELOCATION RECORDS FOR \[\.data\]:
-OFFSET +TYPE +VALUE *
+OFFSET +TYPE +VALUE
0*18 R_386_SIZE32 *ext
0*1c R_386_SIZE32 *ext
diff --git a/gas/testsuite/gas/i386/wrap32-data.d b/gas/testsuite/gas/i386/wrap32-data.d
index a58f349ceef..ba0a340bebd 100644
--- a/gas/testsuite/gas/i386/wrap32-data.d
+++ b/gas/testsuite/gas/i386/wrap32-data.d
@@ -6,7 +6,7 @@
RELOCATION RECORDS FOR \[\.data\]:
-OFFSET +TYPE +VALUE *
+OFFSET +TYPE +VALUE
0*10 (R_386_|dir)?32 *sym
0*14 (R_386_|dir)?32 *sym
0*18 (R_386_|dir)?32 *sym
diff --git a/gas/testsuite/gas/ia64/ltoff22x-1.d b/gas/testsuite/gas/ia64/ltoff22x-1.d
index f15565d7ce9..94b2a20867b 100644
--- a/gas/testsuite/gas/ia64/ltoff22x-1.d
+++ b/gas/testsuite/gas/ia64/ltoff22x-1.d
@@ -4,7 +4,7 @@
.*: +file format .*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET[ ]+TYPE[ ]+VALUE
+OFFSET +TYPE +VALUE
0+000 LTOFF22X foo
diff --git a/gas/testsuite/gas/ia64/ltoff22x-2.d b/gas/testsuite/gas/ia64/ltoff22x-2.d
index 8a2dbda120d..a16ddf376ed 100644
--- a/gas/testsuite/gas/ia64/ltoff22x-2.d
+++ b/gas/testsuite/gas/ia64/ltoff22x-2.d
@@ -4,7 +4,7 @@
.*: +file format .*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET[ ]+TYPE[ ]+VALUE
+OFFSET +TYPE +VALUE
0+000 LTOFF22X foo
0+010 LDXMOV foo
diff --git a/gas/testsuite/gas/ia64/ltoff22x-3.d b/gas/testsuite/gas/ia64/ltoff22x-3.d
index 724cc59d23b..e30551e6fd3 100644
--- a/gas/testsuite/gas/ia64/ltoff22x-3.d
+++ b/gas/testsuite/gas/ia64/ltoff22x-3.d
@@ -4,7 +4,7 @@
.*: +file format .*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET[ ]+TYPE[ ]+VALUE
+OFFSET +TYPE +VALUE
0+000 LTOFF22X foo
0+010 LDXMOV foo
diff --git a/gas/testsuite/gas/ia64/ltoff22x-4.d b/gas/testsuite/gas/ia64/ltoff22x-4.d
index feedbae63cb..29f17b8951a 100644
--- a/gas/testsuite/gas/ia64/ltoff22x-4.d
+++ b/gas/testsuite/gas/ia64/ltoff22x-4.d
@@ -4,7 +4,7 @@
.*: +file format .*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET[ ]+TYPE[ ]+VALUE
+OFFSET +TYPE +VALUE
0+000 LTOFF22X foo
0+010 LDXMOV foo
diff --git a/gas/testsuite/gas/ia64/ltoff22x-5.d b/gas/testsuite/gas/ia64/ltoff22x-5.d
index e6081b45ce2..e9016cd62b5 100644
--- a/gas/testsuite/gas/ia64/ltoff22x-5.d
+++ b/gas/testsuite/gas/ia64/ltoff22x-5.d
@@ -4,7 +4,7 @@
.*: +file format .*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET[ ]+TYPE[ ]+VALUE
+OFFSET +TYPE +VALUE
0+000 LTOFF22X foo
0+010 LDXMOV foo
diff --git a/gas/testsuite/gas/ia64/order.d b/gas/testsuite/gas/ia64/order.d
index 45887d884ac..c28bc661a9b 100644
--- a/gas/testsuite/gas/ia64/order.d
+++ b/gas/testsuite/gas/ia64/order.d
@@ -4,7 +4,7 @@
.*: +file format .*
RELOCATION RECORDS FOR \[.foo\]:
-OFFSET[ ]+TYPE[ ]+VALUE
+OFFSET +TYPE +VALUE
0+00008 DIR64MSB foo
0+00018 DIR64MSB foo
0+00028 DIR64LSB foo
@@ -12,7 +12,7 @@ OFFSET[ ]+TYPE[ ]+VALUE
RELOCATION RECORDS FOR \[.bar\]:
-OFFSET[ ]+TYPE[ ]+VALUE
+OFFSET +TYPE +VALUE
0+00010 DIR64LSB foo
0+00040 DIR64LSB foo
0+00058 DIR64MSB foo
diff --git a/gas/testsuite/gas/m32r/rel32-pic.d b/gas/testsuite/gas/m32r/rel32-pic.d
index 9a27fe9058d..d5f3d9f0328 100644
--- a/gas/testsuite/gas/m32r/rel32-pic.d
+++ b/gas/testsuite/gas/m32r/rel32-pic.d
@@ -5,7 +5,7 @@
.*: +file format .*
RELOCATION RECORDS FOR \[.text2\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_M32R_REL32 .text\+0x00000004
00000008 R_M32R_REL32 .text\+0x00000008
0000000c R_M32R_REL32 .text
diff --git a/gas/testsuite/gas/m32r/rel32.d b/gas/testsuite/gas/m32r/rel32.d
index abfe1363e6c..ed0165bfde6 100644
--- a/gas/testsuite/gas/m32r/rel32.d
+++ b/gas/testsuite/gas/m32r/rel32.d
@@ -5,7 +5,7 @@
.*: +file format .*
RELOCATION RECORDS FOR \[.text2\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_M32R_REL32 .text\+0x00000004
00000008 R_M32R_REL32 .text\+0x00000008
0000000c R_M32R_REL32 .text
diff --git a/gas/testsuite/gas/mips/compact-eh-eb-1.d b/gas/testsuite/gas/mips/compact-eh-eb-1.d
index 2a233d6d79c..c4121629f46 100644
--- a/gas/testsuite/gas/mips/compact-eh-eb-1.d
+++ b/gas/testsuite/gas/mips/compact-eh-eb-1.d
@@ -7,7 +7,7 @@
RELOCATION RECORDS FOR \[.eh_frame_entry\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_PC32 .text.*
diff --git a/gas/testsuite/gas/mips/compact-eh-eb-2.d b/gas/testsuite/gas/mips/compact-eh-eb-2.d
index feefafa8809..e0885864bc5 100644
--- a/gas/testsuite/gas/mips/compact-eh-eb-2.d
+++ b/gas/testsuite/gas/mips/compact-eh-eb-2.d
@@ -7,17 +7,17 @@
RELOCATION RECORDS FOR \[.data.DW.ref.__gnu_compact_pr2\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_32 __gnu_compact_pr2
RELOCATION RECORDS FOR \[.gnu_extab\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000001 R_MIPS_PC32 DW.ref.__gnu_compact_pr2
RELOCATION RECORDS FOR \[.eh_frame_entry\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_PC32 .text.*
00000004 R_MIPS_PC32 .gnu_extab
diff --git a/gas/testsuite/gas/mips/compact-eh-eb-3.d b/gas/testsuite/gas/mips/compact-eh-eb-3.d
index 6782d2b2a26..2f0e8447fc2 100644
--- a/gas/testsuite/gas/mips/compact-eh-eb-3.d
+++ b/gas/testsuite/gas/mips/compact-eh-eb-3.d
@@ -7,7 +7,7 @@
RELOCATION RECORDS FOR \[.eh_frame_entry\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_PC32 .text.*
00000004 R_MIPS_PC32 .gnu_extab
diff --git a/gas/testsuite/gas/mips/compact-eh-eb-4.d b/gas/testsuite/gas/mips/compact-eh-eb-4.d
index b9fe3c01733..4ca4a24bc19 100644
--- a/gas/testsuite/gas/mips/compact-eh-eb-4.d
+++ b/gas/testsuite/gas/mips/compact-eh-eb-4.d
@@ -7,7 +7,7 @@
RELOCATION RECORDS FOR \[.eh_frame_entry\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_PC32 .text.*
00000004 R_MIPS_PC32 .gnu_extab
diff --git a/gas/testsuite/gas/mips/compact-eh-eb-5.d b/gas/testsuite/gas/mips/compact-eh-eb-5.d
index 79a65bb31c2..298d2831a9d 100644
--- a/gas/testsuite/gas/mips/compact-eh-eb-5.d
+++ b/gas/testsuite/gas/mips/compact-eh-eb-5.d
@@ -7,17 +7,17 @@
RELOCATION RECORDS FOR \[.data.DW.ref.__gnu_compact_pr2\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_32 __gnu_compact_pr2
RELOCATION RECORDS FOR \[.gnu_extab\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000001 R_MIPS_PC32 DW.ref.__gnu_compact_pr2
RELOCATION RECORDS FOR \[.eh_frame_entry\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_PC32 .text.*
00000004 R_MIPS_PC32 .gnu_extab
diff --git a/gas/testsuite/gas/mips/compact-eh-eb-6.d b/gas/testsuite/gas/mips/compact-eh-eb-6.d
index 496be17afda..3766ecb7432 100644
--- a/gas/testsuite/gas/mips/compact-eh-eb-6.d
+++ b/gas/testsuite/gas/mips/compact-eh-eb-6.d
@@ -7,7 +7,7 @@
RELOCATION RECORDS FOR \[.eh_frame_entry\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_PC32 .text.*
00000004 R_MIPS_PC32 .gnu_extab
diff --git a/gas/testsuite/gas/mips/compact-eh-eb-7.d b/gas/testsuite/gas/mips/compact-eh-eb-7.d
index 2daae3fb7a4..8c891237fee 100644
--- a/gas/testsuite/gas/mips/compact-eh-eb-7.d
+++ b/gas/testsuite/gas/mips/compact-eh-eb-7.d
@@ -7,12 +7,12 @@
RELOCATION RECORDS FOR \[.eh_frame\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0000001c R_MIPS_PC32 .text.*
RELOCATION RECORDS FOR \[.eh_frame_entry\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_PC32 .text.*
00000004 R_MIPS_PC32 .eh_frame.*
diff --git a/gas/testsuite/gas/mips/compact-eh-el-1.d b/gas/testsuite/gas/mips/compact-eh-el-1.d
index 64abfbaeb8c..7046dd4cfde 100644
--- a/gas/testsuite/gas/mips/compact-eh-el-1.d
+++ b/gas/testsuite/gas/mips/compact-eh-el-1.d
@@ -7,7 +7,7 @@
RELOCATION RECORDS FOR \[.eh_frame_entry\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_PC32 .text.*
diff --git a/gas/testsuite/gas/mips/compact-eh-el-2.d b/gas/testsuite/gas/mips/compact-eh-el-2.d
index f5fe968d2e5..3573670880c 100644
--- a/gas/testsuite/gas/mips/compact-eh-el-2.d
+++ b/gas/testsuite/gas/mips/compact-eh-el-2.d
@@ -7,17 +7,17 @@
RELOCATION RECORDS FOR \[.data.DW.ref.__gnu_compact_pr2\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_32 __gnu_compact_pr2
RELOCATION RECORDS FOR \[.gnu_extab\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000001 R_MIPS_PC32 DW.ref.__gnu_compact_pr2
RELOCATION RECORDS FOR \[.eh_frame_entry\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_PC32 .text.*
00000004 R_MIPS_PC32 .gnu_extab
diff --git a/gas/testsuite/gas/mips/compact-eh-el-3.d b/gas/testsuite/gas/mips/compact-eh-el-3.d
index aacfac2115d..b426ec96566 100644
--- a/gas/testsuite/gas/mips/compact-eh-el-3.d
+++ b/gas/testsuite/gas/mips/compact-eh-el-3.d
@@ -7,7 +7,7 @@
RELOCATION RECORDS FOR \[.eh_frame_entry\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_PC32 .text.*
00000004 R_MIPS_PC32 .gnu_extab
diff --git a/gas/testsuite/gas/mips/compact-eh-el-4.d b/gas/testsuite/gas/mips/compact-eh-el-4.d
index d3d85e1c49d..67d85926331 100644
--- a/gas/testsuite/gas/mips/compact-eh-el-4.d
+++ b/gas/testsuite/gas/mips/compact-eh-el-4.d
@@ -7,7 +7,7 @@
RELOCATION RECORDS FOR \[.eh_frame_entry\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_PC32 .text.*
00000004 R_MIPS_PC32 .gnu_extab
diff --git a/gas/testsuite/gas/mips/compact-eh-el-5.d b/gas/testsuite/gas/mips/compact-eh-el-5.d
index aa8433290de..623cc067dbd 100644
--- a/gas/testsuite/gas/mips/compact-eh-el-5.d
+++ b/gas/testsuite/gas/mips/compact-eh-el-5.d
@@ -6,17 +6,17 @@
.*: file format.*
RELOCATION RECORDS FOR \[.data.DW.ref.__gnu_compact_pr2\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_32 __gnu_compact_pr2
RELOCATION RECORDS FOR \[.gnu_extab\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000001 R_MIPS_PC32 DW.ref.__gnu_compact_pr2
RELOCATION RECORDS FOR \[.eh_frame_entry\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_PC32 .text.*
00000004 R_MIPS_PC32 .gnu_extab
diff --git a/gas/testsuite/gas/mips/compact-eh-el-6.d b/gas/testsuite/gas/mips/compact-eh-el-6.d
index 802a946a843..7d5e2dd15c3 100644
--- a/gas/testsuite/gas/mips/compact-eh-el-6.d
+++ b/gas/testsuite/gas/mips/compact-eh-el-6.d
@@ -7,7 +7,7 @@
RELOCATION RECORDS FOR \[.eh_frame_entry\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_PC32 .text.*
00000004 R_MIPS_PC32 .gnu_extab
diff --git a/gas/testsuite/gas/mips/compact-eh-el-7.d b/gas/testsuite/gas/mips/compact-eh-el-7.d
index c3c585ef753..7296c606e01 100644
--- a/gas/testsuite/gas/mips/compact-eh-el-7.d
+++ b/gas/testsuite/gas/mips/compact-eh-el-7.d
@@ -7,12 +7,12 @@
RELOCATION RECORDS FOR \[.eh_frame\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0000001c R_MIPS_PC32 .text.*
RELOCATION RECORDS FOR \[.eh_frame_entry\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_PC32 .text.*
00000004 R_MIPS_PC32 .eh_frame.*
diff --git a/gas/testsuite/gas/mips/e32-rel2.d b/gas/testsuite/gas/mips/e32-rel2.d
index 74edeb58e3a..5583e48ed88 100644
--- a/gas/testsuite/gas/mips/e32-rel2.d
+++ b/gas/testsuite/gas/mips/e32-rel2.d
@@ -10,7 +10,7 @@
.*: file format .*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
0+0000000 R_MIPS_LITERAL \.lit8
0+0000004 R_MIPS_LITERAL \.lit8
0+0000008 R_MIPS_LITERAL \.lit8
diff --git a/gas/testsuite/gas/mips/e32el-rel2.d b/gas/testsuite/gas/mips/e32el-rel2.d
index abfcc57eb21..5418aaec3bd 100644
--- a/gas/testsuite/gas/mips/e32el-rel2.d
+++ b/gas/testsuite/gas/mips/e32el-rel2.d
@@ -10,7 +10,7 @@
.*: file format .*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
0+0000000 R_MIPS_LITERAL \.lit8
0+0000004 R_MIPS_LITERAL \.lit8
0+0000008 R_MIPS_LITERAL \.lit8
diff --git a/gas/testsuite/gas/mips/ehword.d b/gas/testsuite/gas/mips/ehword.d
index 4cbef123c90..3b368bea424 100644
--- a/gas/testsuite/gas/mips/ehword.d
+++ b/gas/testsuite/gas/mips/ehword.d
@@ -5,5 +5,5 @@
.*: +file format .*mips.*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_EH _ZTI5myExc
diff --git a/gas/testsuite/gas/mips/elf-rel.d b/gas/testsuite/gas/mips/elf-rel.d
index 6208fac23e4..bb7077eb771 100644
--- a/gas/testsuite/gas/mips/elf-rel.d
+++ b/gas/testsuite/gas/mips/elf-rel.d
@@ -7,7 +7,7 @@
.*: file format .*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
0+0000000 R_MIPS_HI16 \.text
0+0000018 R_MIPS_LO16 \.text
0+000000c R_MIPS_HI16 \.text
diff --git a/gas/testsuite/gas/mips/elf-rel2.d b/gas/testsuite/gas/mips/elf-rel2.d
index 8ca682f28c2..69356ec3311 100644
--- a/gas/testsuite/gas/mips/elf-rel2.d
+++ b/gas/testsuite/gas/mips/elf-rel2.d
@@ -9,7 +9,7 @@
.*: file format .*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
0+0000000 R_MIPS_LITERAL \.lit8
0+0000004 R_MIPS_LITERAL \.lit8
0+0000008 R_MIPS_LITERAL \.lit8
diff --git a/gas/testsuite/gas/mips/elf-rel3.d b/gas/testsuite/gas/mips/elf-rel3.d
index bfa9c40335b..51b1b833e12 100644
--- a/gas/testsuite/gas/mips/elf-rel3.d
+++ b/gas/testsuite/gas/mips/elf-rel3.d
@@ -5,7 +5,7 @@
.*: file format .*
RELOCATION RECORDS FOR \[\.data\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
0+0000004 R_MIPS_32 b
0+0000008 R_MIPS_32 .data
diff --git a/gas/testsuite/gas/mips/elfel-rel.d b/gas/testsuite/gas/mips/elfel-rel.d
index bac44edbef8..7a9a3b92bfb 100644
--- a/gas/testsuite/gas/mips/elfel-rel.d
+++ b/gas/testsuite/gas/mips/elfel-rel.d
@@ -8,7 +8,7 @@
.*: file format .*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
0+0000000 R_MIPS_HI16 \.text
0+0000018 R_MIPS_LO16 \.text
0+000000c R_MIPS_HI16 \.text
diff --git a/gas/testsuite/gas/mips/elfel-rel2.d b/gas/testsuite/gas/mips/elfel-rel2.d
index 5f90a0d6866..62a7f44b055 100644
--- a/gas/testsuite/gas/mips/elfel-rel2.d
+++ b/gas/testsuite/gas/mips/elfel-rel2.d
@@ -10,7 +10,7 @@
.*: file format .*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
0+0000000 R_MIPS_LITERAL \.lit8
0+0000004 R_MIPS_LITERAL \.lit8
0+0000008 R_MIPS_LITERAL \.lit8
diff --git a/gas/testsuite/gas/mips/elfel-rel3.d b/gas/testsuite/gas/mips/elfel-rel3.d
index d6cda0ac7ce..4f021fbd52c 100644
--- a/gas/testsuite/gas/mips/elfel-rel3.d
+++ b/gas/testsuite/gas/mips/elfel-rel3.d
@@ -6,7 +6,7 @@
.*: file format .*
RELOCATION RECORDS FOR \[\.data\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
0+0000004 R_MIPS_32 b
0+0000008 R_MIPS_32 .data
diff --git a/gas/testsuite/gas/mips/jalr3-n64.d b/gas/testsuite/gas/mips/jalr3-n64.d
index 001e7f1f8d1..2b5ffffd2bf 100644
--- a/gas/testsuite/gas/mips/jalr3-n64.d
+++ b/gas/testsuite/gas/mips/jalr3-n64.d
@@ -6,7 +6,7 @@
.*: +file format .*mips.*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0000000000000000 R_MIPS_JALR \$bar
0000000000000000 R_MIPS_NONE \*ABS\*
0000000000000000 R_MIPS_NONE \*ABS\*
diff --git a/gas/testsuite/gas/mips/jalr3.d b/gas/testsuite/gas/mips/jalr3.d
index 73ce08a9c7a..0966650abd7 100644
--- a/gas/testsuite/gas/mips/jalr3.d
+++ b/gas/testsuite/gas/mips/jalr3.d
@@ -6,6 +6,6 @@
.*: +file format .*mips.*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_JALR \$bar
00000008 R_MIPS_JALR \$bar
diff --git a/gas/testsuite/gas/mips/micromips@elf-rel2.d b/gas/testsuite/gas/mips/micromips@elf-rel2.d
index da4dd6952de..ca4977640d8 100644
--- a/gas/testsuite/gas/mips/micromips@elf-rel2.d
+++ b/gas/testsuite/gas/mips/micromips@elf-rel2.d
@@ -10,7 +10,7 @@
.*: +file format .*mips.*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
0+0000000 R_MICROMIPS_LITERAL \.lit8
0+0000004 R_MICROMIPS_LITERAL \.lit8
0+0000008 R_MICROMIPS_LITERAL \.lit8
diff --git a/gas/testsuite/gas/mips/micromips@elfel-rel2.d b/gas/testsuite/gas/mips/micromips@elfel-rel2.d
index f771e7932e7..84fdd624850 100644
--- a/gas/testsuite/gas/mips/micromips@elfel-rel2.d
+++ b/gas/testsuite/gas/mips/micromips@elfel-rel2.d
@@ -10,7 +10,7 @@
.*: +file format .*mips.*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
0+0000000 R_MICROMIPS_LITERAL \.lit8
0+0000004 R_MICROMIPS_LITERAL \.lit8
0+0000008 R_MICROMIPS_LITERAL \.lit8
diff --git a/gas/testsuite/gas/mips/mips16-e.d b/gas/testsuite/gas/mips/mips16-e.d
index f2eb31e26d5..d64b882c81c 100644
--- a/gas/testsuite/gas/mips/mips16-e.d
+++ b/gas/testsuite/gas/mips/mips16-e.d
@@ -21,7 +21,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[foo\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
0+0000000 R_MIPS_32 l1
0+0000004 R_MIPS_32 l1
0+0000008 R_MIPS_32 \.L1.*1
diff --git a/gas/testsuite/gas/mips/mips16-f.d b/gas/testsuite/gas/mips/mips16-f.d
index 6ca5bb99286..9605b6f183e 100644
--- a/gas/testsuite/gas/mips/mips16-f.d
+++ b/gas/testsuite/gas/mips/mips16-f.d
@@ -19,7 +19,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[foo\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
0+0000000 R_MIPS_32 l1
diff --git a/gas/testsuite/gas/mips/mips16-hilo-match.d b/gas/testsuite/gas/mips/mips16-hilo-match.d
index 4a86bbc8e2d..76ad7b39cdd 100644
--- a/gas/testsuite/gas/mips/mips16-hilo-match.d
+++ b/gas/testsuite/gas/mips/mips16-hilo-match.d
@@ -5,7 +5,7 @@
.*: +file format .*mips.*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000010 R_MIPS_HI16 var4
00000018 R_MIPS_LO16 var4
00000008 R_MIPS_HI16 __var1
@@ -34,7 +34,7 @@ OFFSET TYPE VALUE
RELOCATION RECORDS FOR \[\.pdr\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_32 _pinit
00000020 R_MIPS_32 pdelt
diff --git a/gas/testsuite/gas/mips/mipsel16-e.d b/gas/testsuite/gas/mips/mipsel16-e.d
index c8206589d9a..2e4e8417dfb 100644
--- a/gas/testsuite/gas/mips/mipsel16-e.d
+++ b/gas/testsuite/gas/mips/mipsel16-e.d
@@ -22,7 +22,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[foo\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
0+0000000 R_MIPS_32 l1
0+0000004 R_MIPS_32 l1
0+0000008 R_MIPS_32 \.L1.*1
diff --git a/gas/testsuite/gas/mips/mipsel16-f.d b/gas/testsuite/gas/mips/mipsel16-f.d
index 21756bdf0c0..57db1a7955b 100644
--- a/gas/testsuite/gas/mips/mipsel16-f.d
+++ b/gas/testsuite/gas/mips/mipsel16-f.d
@@ -20,7 +20,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[foo\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
0+0000000 R_MIPS_32 l1
diff --git a/gas/testsuite/gas/mips/pcrel-4-32.d b/gas/testsuite/gas/mips/pcrel-4-32.d
index 06bc52b79cb..8e94cb336ff 100644
--- a/gas/testsuite/gas/mips/pcrel-4-32.d
+++ b/gas/testsuite/gas/mips/pcrel-4-32.d
@@ -6,7 +6,7 @@
.*: file format .*
RELOCATION RECORDS FOR \[\.data\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_PC32 foo
00000004 R_MIPS_PC32 foo
00000008 R_MIPS_PC32 foo
diff --git a/gas/testsuite/gas/mips/pcrel-4-64.d b/gas/testsuite/gas/mips/pcrel-4-64.d
index 931ff966546..e6159246fdd 100644
--- a/gas/testsuite/gas/mips/pcrel-4-64.d
+++ b/gas/testsuite/gas/mips/pcrel-4-64.d
@@ -6,7 +6,7 @@
.*: file format .*
RELOCATION RECORDS FOR \[\.data\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+000 R_MIPS_PC32 foo
0+000 R_MIPS_NONE \*ABS\*
0+000 R_MIPS_NONE \*ABS\*
diff --git a/gas/testsuite/gas/mips/pcrel-4-n32.d b/gas/testsuite/gas/mips/pcrel-4-n32.d
index 56ec6efe87a..e7dab8a3485 100644
--- a/gas/testsuite/gas/mips/pcrel-4-n32.d
+++ b/gas/testsuite/gas/mips/pcrel-4-n32.d
@@ -6,7 +6,7 @@
.*: file format .*
RELOCATION RECORDS FOR \[\.data\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_MIPS_PC32 foo
00000004 R_MIPS_PC32 foo\+0x00000004
00000008 R_MIPS_PC32 foo\+0x00000008
diff --git a/gas/testsuite/gas/mips/tmips16-e.d b/gas/testsuite/gas/mips/tmips16-e.d
index 6d3a618cb39..bcf3de0cab2 100644
--- a/gas/testsuite/gas/mips/tmips16-e.d
+++ b/gas/testsuite/gas/mips/tmips16-e.d
@@ -22,7 +22,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[foo\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
0+0000000 R_MIPS_32 l1
0+0000004 R_MIPS_32 l1
0+0000008 R_MIPS_32 \.L1.*1
diff --git a/gas/testsuite/gas/mips/tmips16-f.d b/gas/testsuite/gas/mips/tmips16-f.d
index cb09276f42e..95bb5647a09 100644
--- a/gas/testsuite/gas/mips/tmips16-f.d
+++ b/gas/testsuite/gas/mips/tmips16-f.d
@@ -20,7 +20,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[foo\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
0+0000000 R_MIPS_32 l1
diff --git a/gas/testsuite/gas/mips/tmipsel16-e.d b/gas/testsuite/gas/mips/tmipsel16-e.d
index 8c98d05083d..95d473c054c 100644
--- a/gas/testsuite/gas/mips/tmipsel16-e.d
+++ b/gas/testsuite/gas/mips/tmipsel16-e.d
@@ -22,7 +22,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[foo\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
0+0000000 R_MIPS_32 l1
0+0000004 R_MIPS_32 l1
0+0000008 R_MIPS_32 \.L1.*1
diff --git a/gas/testsuite/gas/mips/tmipsel16-f.d b/gas/testsuite/gas/mips/tmipsel16-f.d
index 503f8be57aa..5639bb0b16d 100644
--- a/gas/testsuite/gas/mips/tmipsel16-f.d
+++ b/gas/testsuite/gas/mips/tmipsel16-f.d
@@ -20,7 +20,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[foo\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
0+0000000 R_MIPS_32 l1
diff --git a/gas/testsuite/gas/mmix/basep-10.d b/gas/testsuite/gas/mmix/basep-10.d
index 07c990c2928..d7991bb50b9 100644
--- a/gas/testsuite/gas/mmix/basep-10.d
+++ b/gas/testsuite/gas/mmix/basep-10.d
@@ -15,14 +15,14 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+6 R_MMIX_BASE_PLUS_OFFSET w1
0+a R_MMIX_REG \.MMIX\.reg_contents
0+e R_MMIX_REG \.MMIX\.reg_contents\+0x0+8
0+12 R_MMIX_REG \.MMIX\.reg_contents\+0x0+8
RELOCATION RECORDS FOR \[\.MMIX\.reg_contents\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+ R_MMIX_64 w3
0+8 R_MMIX_64 \.text\+0x0+4
diff --git a/gas/testsuite/gas/mmix/basep-11.d b/gas/testsuite/gas/mmix/basep-11.d
index dc03ca46492..b07a6245447 100644
--- a/gas/testsuite/gas/mmix/basep-11.d
+++ b/gas/testsuite/gas/mmix/basep-11.d
@@ -13,7 +13,7 @@ SYMBOL TABLE:
0+8 w \.text 0+ w3
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+6 R_MMIX_BASE_PLUS_OFFSET w1
0+a R_MMIX_BASE_PLUS_OFFSET w3
0+e R_MMIX_BASE_PLUS_OFFSET \.text\+0x0+10
diff --git a/gas/testsuite/gas/mmix/basep-9.d b/gas/testsuite/gas/mmix/basep-9.d
index 148c899b0cd..905054d68a5 100644
--- a/gas/testsuite/gas/mmix/basep-9.d
+++ b/gas/testsuite/gas/mmix/basep-9.d
@@ -12,13 +12,13 @@ SYMBOL TABLE:
0+4 O \*COM\* 0+4 comm_symbol1
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+2 R_MMIX_REG \.MMIX\.reg_contents\+0x0+8
0+6 R_MMIX_REG \.MMIX\.reg_contents
0+a R_MMIX_REG \.MMIX\.reg_contents
RELOCATION RECORDS FOR \[\.MMIX\.reg_contents\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+ R_MMIX_64 \.bss
0+8 R_MMIX_64 comm_symbol1
diff --git a/gas/testsuite/gas/mmix/comment-3.d b/gas/testsuite/gas/mmix/comment-3.d
index 19922b84918..b0df1d0b96a 100644
--- a/gas/testsuite/gas/mmix/comment-3.d
+++ b/gas/testsuite/gas/mmix/comment-3.d
@@ -11,7 +11,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[\.MMIX\.reg_contents\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0000000000000000 R_MMIX_64 \.text
diff --git a/gas/testsuite/gas/mmix/fb-1.d b/gas/testsuite/gas/mmix/fb-1.d
index c7f1d12c0d4..a25c7b337a7 100644
--- a/gas/testsuite/gas/mmix/fb-1.d
+++ b/gas/testsuite/gas/mmix/fb-1.d
@@ -10,7 +10,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+2 R_MMIX_REG \.MMIX\.reg_contents
diff --git a/gas/testsuite/gas/mmix/fb-2.d b/gas/testsuite/gas/mmix/fb-2.d
index 74eb71fd139..7a0db527055 100644
--- a/gas/testsuite/gas/mmix/fb-2.d
+++ b/gas/testsuite/gas/mmix/fb-2.d
@@ -11,14 +11,14 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+2a R_MMIX_REG \.MMIX\.reg_contents
0+30 R_MMIX_64 \.text\+0x0+28
0+38 R_MMIX_64 \.text\+0x0+40
RELOCATION RECORDS FOR \[\.MMIX\.reg_contents\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+ R_MMIX_64 \.text\+0x0+5a
diff --git a/gas/testsuite/gas/mmix/greg1.d b/gas/testsuite/gas/mmix/greg1.d
index fe3b5487533..96152eb41f9 100644
--- a/gas/testsuite/gas/mmix/greg1.d
+++ b/gas/testsuite/gas/mmix/greg1.d
@@ -20,7 +20,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[\.MMIX\.reg_contents\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+ R_MMIX_64 \.text\+0x0+8
0+10 R_MMIX_64 \.text\+0x0+1c
0+20 R_MMIX_64 \.text
diff --git a/gas/testsuite/gas/mmix/greg1a.d b/gas/testsuite/gas/mmix/greg1a.d
index 86ab5726055..75038bff693 100644
--- a/gas/testsuite/gas/mmix/greg1a.d
+++ b/gas/testsuite/gas/mmix/greg1a.d
@@ -22,7 +22,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[\.MMIX\.reg_contents\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+ R_MMIX_64 \.text\+0x0+8
0+10 R_MMIX_64 \.text\+0x0+8
0+18 R_MMIX_64 \.text\+0x0+8
diff --git a/gas/testsuite/gas/mmix/greg2.d b/gas/testsuite/gas/mmix/greg2.d
index fe3b5487533..96152eb41f9 100644
--- a/gas/testsuite/gas/mmix/greg2.d
+++ b/gas/testsuite/gas/mmix/greg2.d
@@ -20,7 +20,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[\.MMIX\.reg_contents\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+ R_MMIX_64 \.text\+0x0+8
0+10 R_MMIX_64 \.text\+0x0+1c
0+20 R_MMIX_64 \.text
diff --git a/gas/testsuite/gas/mmix/greg2a.d b/gas/testsuite/gas/mmix/greg2a.d
index ea8cb1e0f26..9f6d1569222 100644
--- a/gas/testsuite/gas/mmix/greg2a.d
+++ b/gas/testsuite/gas/mmix/greg2a.d
@@ -22,7 +22,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[\.MMIX\.reg_contents\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+ R_MMIX_64 \.text\+0x0+8
0+10 R_MMIX_64 \.text\+0x0+8
0+18 R_MMIX_64 \.text\+0x0+8
diff --git a/gas/testsuite/gas/mmix/greg3.d b/gas/testsuite/gas/mmix/greg3.d
index fcaa4393c29..d80746d6560 100644
--- a/gas/testsuite/gas/mmix/greg3.d
+++ b/gas/testsuite/gas/mmix/greg3.d
@@ -13,13 +13,13 @@ SYMBOL TABLE:
0+c g F \.text 0+ Main
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+2 R_MMIX_REG \.MMIX\.reg_contents
0+7 R_MMIX_REG_OR_BYTE \.MMIX\.reg_contents
0+a R_MMIX_REG \.MMIX\.reg_contents
RELOCATION RECORDS FOR \[\.MMIX\.reg_contents\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+ R_MMIX_64 \.text\+0x0+10
Contents of section \.text:
diff --git a/gas/testsuite/gas/mmix/greg4.d b/gas/testsuite/gas/mmix/greg4.d
index fb5560523ee..6a2305306a0 100644
--- a/gas/testsuite/gas/mmix/greg4.d
+++ b/gas/testsuite/gas/mmix/greg4.d
@@ -13,12 +13,12 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+a R_MMIX_REG \.MMIX\.reg_contents
RELOCATION RECORDS FOR \[\.MMIX\.reg_contents\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+ R_MMIX_64 \.text
diff --git a/gas/testsuite/gas/mmix/greg5.d b/gas/testsuite/gas/mmix/greg5.d
index 5d4bbba126e..c14dc1c5157 100644
--- a/gas/testsuite/gas/mmix/greg5.d
+++ b/gas/testsuite/gas/mmix/greg5.d
@@ -18,7 +18,7 @@ SYMBOL TABLE:
2000000000000008 g \*ABS\* 0+ __\.MMIX\.start\.\.data
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+2 R_MMIX_REG \.MMIX\.reg_contents
Contents of section \.text:
diff --git a/gas/testsuite/gas/mmix/greg6.d b/gas/testsuite/gas/mmix/greg6.d
index e66e38f1e88..53de22bda4f 100644
--- a/gas/testsuite/gas/mmix/greg6.d
+++ b/gas/testsuite/gas/mmix/greg6.d
@@ -19,12 +19,12 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+2 R_MMIX_REG \.MMIX\.reg_contents
RELOCATION RECORDS FOR \[\.MMIX\.reg_contents\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+ R_MMIX_64 \.data
diff --git a/gas/testsuite/gas/mmix/greg7.d b/gas/testsuite/gas/mmix/greg7.d
index f4cae1886e0..022e39c9a04 100644
--- a/gas/testsuite/gas/mmix/greg7.d
+++ b/gas/testsuite/gas/mmix/greg7.d
@@ -18,7 +18,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+a R_MMIX_REG \.MMIX\.reg_contents
Contents of section \.text:
diff --git a/gas/testsuite/gas/mmix/greg8.d b/gas/testsuite/gas/mmix/greg8.d
index c244919dc62..cdbf035e1d9 100644
--- a/gas/testsuite/gas/mmix/greg8.d
+++ b/gas/testsuite/gas/mmix/greg8.d
@@ -18,12 +18,12 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+a R_MMIX_REG \.MMIX\.reg_contents
RELOCATION RECORDS FOR \[\.MMIX\.reg_contents\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+ R_MMIX_64 \.text
Contents of section \.text:
diff --git a/gas/testsuite/gas/mmix/local-1.d b/gas/testsuite/gas/mmix/local-1.d
index ecca83775fe..cf94ec666a4 100644
--- a/gas/testsuite/gas/mmix/local-1.d
+++ b/gas/testsuite/gas/mmix/local-1.d
@@ -24,7 +24,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+ R_MMIX_LOCAL extreg
0+ R_MMIX_LOCAL reghere
0+ R_MMIX_LOCAL consthere
diff --git a/gas/testsuite/gas/mmix/odd-1.d b/gas/testsuite/gas/mmix/odd-1.d
index b59e85729bb..4f7c4113684 100644
--- a/gas/testsuite/gas/mmix/odd-1.d
+++ b/gas/testsuite/gas/mmix/odd-1.d
@@ -14,7 +14,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+7 R_MMIX_8 \.MMIX\.reg_contents
0+f R_MMIX_REG \.MMIX\.reg_contents
0+15 R_MMIX_REG \.MMIX\.reg_contents
diff --git a/gas/testsuite/gas/mmix/op-0-1.d b/gas/testsuite/gas/mmix/op-0-1.d
index 0344af330ac..ea58107d307 100644
--- a/gas/testsuite/gas/mmix/op-0-1.d
+++ b/gas/testsuite/gas/mmix/op-0-1.d
@@ -14,7 +14,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+ R_MMIX_JMP \*ABS\*
0+14 R_MMIX_GETA \*ABS\*
0+24 R_MMIX_PUSHJ \*ABS\*
diff --git a/gas/testsuite/gas/mmix/op-0-1s.d b/gas/testsuite/gas/mmix/op-0-1s.d
index d64ced85bb0..797e2834398 100644
--- a/gas/testsuite/gas/mmix/op-0-1s.d
+++ b/gas/testsuite/gas/mmix/op-0-1s.d
@@ -12,7 +12,7 @@ SYMBOL TABLE:
0+ l \*ABS\* 0+ zero2
0+ g F \.text 0+ Main
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+ R_MMIX_JMP \*ABS\*
0+14 R_MMIX_GETA \*ABS\*
0+24 R_MMIX_PUSHJ_STUBBABLE \*ABS\*
diff --git a/gas/testsuite/gas/mmix/op-0-2.d b/gas/testsuite/gas/mmix/op-0-2.d
index c0fb4de2f49..943a62fc84f 100644
--- a/gas/testsuite/gas/mmix/op-0-2.d
+++ b/gas/testsuite/gas/mmix/op-0-2.d
@@ -15,7 +15,7 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+ R_MMIX_ADDR27 \*ABS\*
0+4 R_MMIX_ADDR19 \*ABS\*
0+8 R_MMIX_ADDR19 \*ABS\*
diff --git a/gas/testsuite/gas/mmix/pr25331.d b/gas/testsuite/gas/mmix/pr25331.d
index cabb05841ad..cb7e0343706 100644
--- a/gas/testsuite/gas/mmix/pr25331.d
+++ b/gas/testsuite/gas/mmix/pr25331.d
@@ -8,7 +8,7 @@
.*: file format elf64-mmix
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+2a R_MMIX_BASE_PLUS_OFFSET __stack_chk_guard
0+13a R_MMIX_BASE_PLUS_OFFSET \.data\+0x0+8
0+1a2 R_MMIX_BASE_PLUS_OFFSET \.data\+0x0+8
diff --git a/gas/testsuite/gas/mmix/prefix1.d b/gas/testsuite/gas/mmix/prefix1.d
index b7741935590..39ebee51d5f 100644
--- a/gas/testsuite/gas/mmix/prefix1.d
+++ b/gas/testsuite/gas/mmix/prefix1.d
@@ -25,7 +25,7 @@ SYMBOL TABLE:
0+ \*UND\* 0+ aprefix:d
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+ R_MMIX_32 b
0+4 R_MMIX_32 \.text\+0x0+24
0+8 R_MMIX_32 preb
diff --git a/gas/testsuite/gas/mmix/prefix3.d b/gas/testsuite/gas/mmix/prefix3.d
index 2ecbcc19f18..14311b61c2d 100644
--- a/gas/testsuite/gas/mmix/prefix3.d
+++ b/gas/testsuite/gas/mmix/prefix3.d
@@ -15,13 +15,13 @@ SYMBOL TABLE:
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+2 R_MMIX_REG \.MMIX\.reg_contents\+0x0+8
0+6 R_MMIX_REG \.MMIX\.reg_contents
RELOCATION RECORDS FOR \[\.MMIX\.reg_contents\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+8 R_MMIX_64 \.text\+0x0+8
diff --git a/gas/testsuite/gas/mmix/weak1-s.d b/gas/testsuite/gas/mmix/weak1-s.d
index 36d9a779ef0..3bd9ae49459 100644
--- a/gas/testsuite/gas/mmix/weak1-s.d
+++ b/gas/testsuite/gas/mmix/weak1-s.d
@@ -12,7 +12,7 @@ SYMBOL TABLE:
0+ w \.text 0+ foo
0+4 g \.text 0+ main
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+8 R_MMIX_64 foo
0+4 R_MMIX_PUSHJ_STUBBABLE foo
Contents of section \.text:
diff --git a/gas/testsuite/gas/mmix/weak1.d b/gas/testsuite/gas/mmix/weak1.d
index 4cbea47e0d7..176ae25f7bb 100644
--- a/gas/testsuite/gas/mmix/weak1.d
+++ b/gas/testsuite/gas/mmix/weak1.d
@@ -13,7 +13,7 @@ SYMBOL TABLE:
0+4 g \.text 0+ main
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+18 R_MMIX_64 foo
0+4 R_MMIX_PUSHJ foo
diff --git a/gas/testsuite/gas/mn10300/relax.d b/gas/testsuite/gas/mn10300/relax.d
index 7d16f3956f6..5e6c2cff355 100644
--- a/gas/testsuite/gas/mn10300/relax.d
+++ b/gas/testsuite/gas/mn10300/relax.d
@@ -4,32 +4,32 @@
.*: +file format.*elf32-[am33lin|mn10300].*
RELOCATION RECORDS FOR \[.rlcb\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+8003 R_MN10300_PCREL8 .L0.*_0\+0x00000001
0+8005 R_MN10300_PCREL32 .L1\+0x00000001
RELOCATION RECORDS FOR \[.rlfcb\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+8004 R_MN10300_PCREL8 .L0.*_1\+0x00000002
0+8006 R_MN10300_PCREL32 .L2\+0x00000001
RELOCATION RECORDS FOR \[.rscb\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+103 R_MN10300_PCREL8 .L0.*_2\+0x00000001
0+105 R_MN10300_PCREL16 .L3\+0x00000001
RELOCATION RECORDS FOR \[.rsfcb\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+104 R_MN10300_PCREL8 .L0.*_3\+0x00000002
0+106 R_MN10300_PCREL16 .L4\+0x00000001
RELOCATION RECORDS FOR \[.rsucb\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+104 R_MN10300_PCREL8 .L0.*_4\+0x00000002
0+106 R_MN10300_PCREL16 .L5\+0x00000001
RELOCATION RECORDS FOR \[.rlucb\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0+8004 R_MN10300_PCREL8 .L0.*_5\+0x00000002
0+8006 R_MN10300_PCREL32 .L6\+0x00000001
diff --git a/gas/testsuite/gas/or1k/reloc-1.d b/gas/testsuite/gas/or1k/reloc-1.d
index 3a001c4ed99..ea76166f65c 100644
--- a/gas/testsuite/gas/or1k/reloc-1.d
+++ b/gas/testsuite/gas/or1k/reloc-1.d
@@ -5,7 +5,7 @@
.*: +file format .*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_OR1K_HI_16_IN_INSN x
00000004 R_OR1K_HI_16_IN_INSN x
00000008 R_OR1K_HI_16_IN_INSN x
diff --git a/gas/testsuite/gas/tic6x/data-reloc.d b/gas/testsuite/gas/tic6x/data-reloc.d
index 8a5dc0b8e60..8f3b51ebfe6 100644
--- a/gas/testsuite/gas/tic6x/data-reloc.d
+++ b/gas/testsuite/gas/tic6x/data-reloc.d
@@ -4,7 +4,7 @@
.*: *file format elf32-tic6x-le
RELOCATION RECORDS FOR \[\.data\]:
-OFFSET *TYPE *VALUE *
+OFFSET +TYPE +VALUE
0+00 R_C6000_ABS32 +ext1
0+04 R_C6000_ABS32 +ext1\+0x0+04
0+08 R_C6000_ABS16 +ext2
diff --git a/gas/testsuite/gas/vax/elf-rel.d b/gas/testsuite/gas/vax/elf-rel.d
index d4b26c65afa..12bbb492315 100644
--- a/gas/testsuite/gas/vax/elf-rel.d
+++ b/gas/testsuite/gas/vax/elf-rel.d
@@ -7,7 +7,7 @@
.*: file format elf32-vax
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
00000015 R_VAX_PLT32 text_vax_plt32
00000028 R_VAX_GOT32 text_vax_got32
0000003b R_VAX_GOT32 text_vax_got32\+0x00000020
@@ -23,7 +23,7 @@ OFFSET [ ]+ TYPE VALUE
RELOCATION RECORDS FOR \[\.data\]:
-OFFSET [ ]+ TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_VAX_8 data_vax_8
00000001 R_VAX_16 data_vax_16
00000003 R_VAX_32 data_vax_32
diff --git a/gas/testsuite/gas/xstormy16/reloc-1.d b/gas/testsuite/gas/xstormy16/reloc-1.d
index ac72eee791f..a2155a2b2af 100644
--- a/gas/testsuite/gas/xstormy16/reloc-1.d
+++ b/gas/testsuite/gas/xstormy16/reloc-1.d
@@ -5,7 +5,7 @@
.*: +file format .*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
0*000 R_XSTORMY16_16 global
0*002 R_XSTORMY16_16 global\+0x00000003
0*004 R_XSTORMY16_PC16 global-0x00000004
diff --git a/gas/testsuite/gas/xtensa/pcrel.d b/gas/testsuite/gas/xtensa/pcrel.d
index 0e5f757abe7..f1af03a8cf6 100644
--- a/gas/testsuite/gas/xtensa/pcrel.d
+++ b/gas/testsuite/gas/xtensa/pcrel.d
@@ -5,12 +5,12 @@
.*: +file format .*xtensa.*
RELOCATION RECORDS FOR \[\.literal\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_XTENSA_32_PCREL foo
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000003 R_XTENSA_SLOT0_OP \.literal
00000006 R_XTENSA_32_PCREL foo
0000000a R_XTENSA_32_PCREL \.text\+0x00000003
diff --git a/gas/testsuite/gas/xtensa/weak-call.d b/gas/testsuite/gas/xtensa/weak-call.d
index 0b8d84b9c22..3bcd437f6e5 100644
--- a/gas/testsuite/gas/xtensa/weak-call.d
+++ b/gas/testsuite/gas/xtensa/weak-call.d
@@ -5,7 +5,7 @@
.*: +file format .*xtensa.*
RELOCATION RECORDS FOR \[\.text\]:
-OFFSET TYPE VALUE
+OFFSET +TYPE +VALUE
00000000 R_XTENSA_SLOT0_OP weakdef
00000003 R_XTENSA_SLOT0_OP \.literal
00000003 R_XTENSA_ASM_EXPAND weakref
diff --git a/ld/testsuite/ld-arm/arm-app-abs32.r b/ld/testsuite/ld-arm/arm-app-abs32.r
index fd68a0cc36a..8dedcb61a8a 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 1b5cef2bab6..4c3b6251984 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 35155397103..f9c793c3bc9 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 48749d449f1..62a2019fca6 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 ff263868b97..34930b72cc5 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 910a361ca45..ce724f2110f 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 910a361ca45..ce724f2110f 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 a44f83b35a2..5b9d195504e 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 ec012ffa4d1..f9f68df1601 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 22b755e51b6..df23239f295 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 20f5ccc3e36..6feb7ade5d6 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 648e92f771b..7e08093abcf 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 01378800975..6af0bc35b5e 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 518c18cd58b..a2daeb43c61 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 23d463716c7..51d34aeaf4f 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 3de3ae8dd50..c0b6a91ef69 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 ba54f61f58f..50bee301f0d 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 3847f7723f7..fbb61c8257a 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 02f9b02e95c..90ebdfb278d 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 6bd4d91bf4b..ffc87253ad4 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 defba8ad6a9..163bb018d34 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 9f618d2e140..32d0f89db35 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 331626f17b4..abc0192c3fc 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 4fbd79cedca..5156a27dc2c 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 b95cc2bd96f..e0123042360 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 1840a586e76..107687cc93d 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 c88144816ea..f5eaa8b20f9 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 432b86470cf..0df1e9d4af5 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 c4ef7909578..3bd727a6b3c 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 8a399efb823..ae9862c875b 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 29c46f0845a..4af78fbac8a 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 0117b93aee4..c1b5b1a1e74 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 a396a58efd7..ea1fc29d827 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 287b5ee104a..5d423aad4f3 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 43bb17e187e..21dbabefa96 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 cd3a2f7e261..e0fb31e8523 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 1c3ca022a67..0c1d48658fb 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 32afffa4641..7916d3111ea 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 57f2262b6f7..86a8d4e9865 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 677824ddfab..0a4e527325e 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 0389fb6ccc7..a773522d491 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 97f23516ed0..e0b9a539760 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 e8288bda00b..badbeb3fab8 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 240812e2aa0..5b2c7ecbfc0 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 693f08d4888..0098e56d76e 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 2d99e93b397..ce642033ada 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 640056b966e..c902a8794cd 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 77af273c496..b5f0f561f7c 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 e6f39928c95..6f7dab0c03e 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 302d6bbac13..ec2f7eea78b 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 d8845319136..f4776d6c193 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 3cc05acfc17..5da7257df0b 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 b03f1afc3e3..5bcc0563dc4 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 326f508d3dd..8de215cce06 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 8930c6382b6..4c3d6a751ff 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 86305d314c5..0de07297323 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 1269cb19283..fcca55a2ade 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 dc960c32843..af1e0273f38 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 9160225056e..b3815decd4e 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 c7bfec9af73..88d9fe9e9f2 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 87b54f5a1ac..54cfe38fc37 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 7c8f93b5275..eb254ad359e 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 2b75ce11e0c..c5b778e00a3 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 e8ed1acfa6e..2a114e505ad 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 b685e0601b2..8381a68c695 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 8f10e53f2c5..97d599eace3 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 9aa2d82290f..8ab64c3d759 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 aba0a535d9c..5fee1054b8c 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 71709eb7195..d0640a6f555 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 fdd0b158d28..ebc4ce4d6b5 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 d484de20bd1..04491ad43bc 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 b4e1396ca21..bc65ea1eca9 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 3e0e54b306e..ef549f6cc84 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 0d9f2bb9b8c..43154593fa3 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 f05ac6a305f..2fcb3dd6a65 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 40e1c7c9723..3058c1daee1 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 48917fd4d92..269e257608b 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 cbdfc1ed6b7..a6cc6d059cb 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 414234f94db..1d9d06978cc 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 43091c12550..67c06eefe9a 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/testsui[...]
[diff truncated at 100000 bytes]
More information about the Binutils-cvs
mailing list