aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2022-05-31 11:07:37 +0930
committerAlan Modra <amodra@gmail.com>2022-05-31 11:25:09 +0930
commit99f647e200a9a329e80fe813bc708e89927ea5ad (patch)
tree99e69231ebeb09ee48b8d1b780d0dfe0f78ba97f /gas
parent8b294b1fc74e0cd46a0462dfc2f68cffd9728cc3 (diff)
downloadgdb-99f647e200a9a329e80fe813bc708e89927ea5ad.zip
gdb-99f647e200a9a329e80fe813bc708e89927ea5ad.tar.gz
gdb-99f647e200a9a329e80fe813bc708e89927ea5ad.tar.bz2
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.
Diffstat (limited to 'gas')
-rw-r--r--gas/testsuite/gas/all/fwdexp.d2
-rw-r--r--gas/testsuite/gas/all/weakref1.d2
-rw-r--r--gas/testsuite/gas/alpha/elf-reloc-1.d2
-rw-r--r--gas/testsuite/gas/alpha/elf-reloc-4.d2
-rw-r--r--gas/testsuite/gas/alpha/elf-reloc-7.d6
-rw-r--r--gas/testsuite/gas/alpha/elf-reloc-8.d8
-rw-r--r--gas/testsuite/gas/alpha/elf-tls-1.d2
-rw-r--r--gas/testsuite/gas/arm/local_function.d2
-rw-r--r--gas/testsuite/gas/arm/thumbrel.d2
-rw-r--r--gas/testsuite/gas/arm/unwind.d4
-rw-r--r--gas/testsuite/gas/arm/unwind_vxworks.d4
-rw-r--r--gas/testsuite/gas/avr/diffreloc_withrelax.d4
-rw-r--r--gas/testsuite/gas/avr/noreloc_withoutrelax.d2
-rw-r--r--gas/testsuite/gas/avr/pc-relative-reloc.d2
-rw-r--r--gas/testsuite/gas/bfin/reloc.d4
-rw-r--r--gas/testsuite/gas/cfi/cfi-alpha-2.d2
-rw-r--r--gas/testsuite/gas/cfi/reloc-pe-i386.d2
-rw-r--r--gas/testsuite/gas/cris/rd-dtpoffd1.d2
-rw-r--r--gas/testsuite/gas/cris/x-to-dcr1-sreg.d2
-rw-r--r--gas/testsuite/gas/elf/equ-reloc.d2
-rw-r--r--gas/testsuite/gas/elf/missing-build-notes.d2
-rw-r--r--gas/testsuite/gas/i386/ilp32/elf/equ-reloc.d2
-rw-r--r--gas/testsuite/gas/i386/ilp32/quad.d2
-rw-r--r--gas/testsuite/gas/i386/rela.d2
-rw-r--r--gas/testsuite/gas/i386/size-5b.d2
-rw-r--r--gas/testsuite/gas/i386/wrap32-data.d2
-rw-r--r--gas/testsuite/gas/ia64/ltoff22x-1.d2
-rw-r--r--gas/testsuite/gas/ia64/ltoff22x-2.d2
-rw-r--r--gas/testsuite/gas/ia64/ltoff22x-3.d2
-rw-r--r--gas/testsuite/gas/ia64/ltoff22x-4.d2
-rw-r--r--gas/testsuite/gas/ia64/ltoff22x-5.d2
-rw-r--r--gas/testsuite/gas/ia64/order.d4
-rw-r--r--gas/testsuite/gas/m32r/rel32-pic.d2
-rw-r--r--gas/testsuite/gas/m32r/rel32.d2
-rw-r--r--gas/testsuite/gas/mips/compact-eh-eb-1.d2
-rw-r--r--gas/testsuite/gas/mips/compact-eh-eb-2.d6
-rw-r--r--gas/testsuite/gas/mips/compact-eh-eb-3.d2
-rw-r--r--gas/testsuite/gas/mips/compact-eh-eb-4.d2
-rw-r--r--gas/testsuite/gas/mips/compact-eh-eb-5.d6
-rw-r--r--gas/testsuite/gas/mips/compact-eh-eb-6.d2
-rw-r--r--gas/testsuite/gas/mips/compact-eh-eb-7.d4
-rw-r--r--gas/testsuite/gas/mips/compact-eh-el-1.d2
-rw-r--r--gas/testsuite/gas/mips/compact-eh-el-2.d6
-rw-r--r--gas/testsuite/gas/mips/compact-eh-el-3.d2
-rw-r--r--gas/testsuite/gas/mips/compact-eh-el-4.d2
-rw-r--r--gas/testsuite/gas/mips/compact-eh-el-5.d6
-rw-r--r--gas/testsuite/gas/mips/compact-eh-el-6.d2
-rw-r--r--gas/testsuite/gas/mips/compact-eh-el-7.d4
-rw-r--r--gas/testsuite/gas/mips/e32-rel2.d2
-rw-r--r--gas/testsuite/gas/mips/e32el-rel2.d2
-rw-r--r--gas/testsuite/gas/mips/ehword.d2
-rw-r--r--gas/testsuite/gas/mips/elf-rel.d2
-rw-r--r--gas/testsuite/gas/mips/elf-rel2.d2
-rw-r--r--gas/testsuite/gas/mips/elf-rel3.d2
-rw-r--r--gas/testsuite/gas/mips/elfel-rel.d2
-rw-r--r--gas/testsuite/gas/mips/elfel-rel2.d2
-rw-r--r--gas/testsuite/gas/mips/elfel-rel3.d2
-rw-r--r--gas/testsuite/gas/mips/jalr3-n64.d2
-rw-r--r--gas/testsuite/gas/mips/jalr3.d2
-rw-r--r--gas/testsuite/gas/mips/micromips@elf-rel2.d2
-rw-r--r--gas/testsuite/gas/mips/micromips@elfel-rel2.d2
-rw-r--r--gas/testsuite/gas/mips/mips16-e.d2
-rw-r--r--gas/testsuite/gas/mips/mips16-f.d2
-rw-r--r--gas/testsuite/gas/mips/mips16-hilo-match.d4
-rw-r--r--gas/testsuite/gas/mips/mipsel16-e.d2
-rw-r--r--gas/testsuite/gas/mips/mipsel16-f.d2
-rw-r--r--gas/testsuite/gas/mips/pcrel-4-32.d2
-rw-r--r--gas/testsuite/gas/mips/pcrel-4-64.d2
-rw-r--r--gas/testsuite/gas/mips/pcrel-4-n32.d2
-rw-r--r--gas/testsuite/gas/mips/tmips16-e.d2
-rw-r--r--gas/testsuite/gas/mips/tmips16-f.d2
-rw-r--r--gas/testsuite/gas/mips/tmipsel16-e.d2
-rw-r--r--gas/testsuite/gas/mips/tmipsel16-f.d2
-rw-r--r--gas/testsuite/gas/mmix/basep-10.d4
-rw-r--r--gas/testsuite/gas/mmix/basep-11.d2
-rw-r--r--gas/testsuite/gas/mmix/basep-9.d4
-rw-r--r--gas/testsuite/gas/mmix/comment-3.d2
-rw-r--r--gas/testsuite/gas/mmix/fb-1.d2
-rw-r--r--gas/testsuite/gas/mmix/fb-2.d4
-rw-r--r--gas/testsuite/gas/mmix/greg1.d2
-rw-r--r--gas/testsuite/gas/mmix/greg1a.d2
-rw-r--r--gas/testsuite/gas/mmix/greg2.d2
-rw-r--r--gas/testsuite/gas/mmix/greg2a.d2
-rw-r--r--gas/testsuite/gas/mmix/greg3.d4
-rw-r--r--gas/testsuite/gas/mmix/greg4.d4
-rw-r--r--gas/testsuite/gas/mmix/greg5.d2
-rw-r--r--gas/testsuite/gas/mmix/greg6.d4
-rw-r--r--gas/testsuite/gas/mmix/greg7.d2
-rw-r--r--gas/testsuite/gas/mmix/greg8.d4
-rw-r--r--gas/testsuite/gas/mmix/local-1.d2
-rw-r--r--gas/testsuite/gas/mmix/odd-1.d2
-rw-r--r--gas/testsuite/gas/mmix/op-0-1.d2
-rw-r--r--gas/testsuite/gas/mmix/op-0-1s.d2
-rw-r--r--gas/testsuite/gas/mmix/op-0-2.d2
-rw-r--r--gas/testsuite/gas/mmix/pr25331.d2
-rw-r--r--gas/testsuite/gas/mmix/prefix1.d2
-rw-r--r--gas/testsuite/gas/mmix/prefix3.d4
-rw-r--r--gas/testsuite/gas/mmix/weak1-s.d2
-rw-r--r--gas/testsuite/gas/mmix/weak1.d2
-rw-r--r--gas/testsuite/gas/mn10300/relax.d12
-rw-r--r--gas/testsuite/gas/or1k/reloc-1.d2
-rw-r--r--gas/testsuite/gas/tic6x/data-reloc.d2
-rw-r--r--gas/testsuite/gas/vax/elf-rel.d4
-rw-r--r--gas/testsuite/gas/xstormy16/reloc-1.d2
-rw-r--r--gas/testsuite/gas/xtensa/pcrel.d4
-rw-r--r--gas/testsuite/gas/xtensa/weak-call.d2
106 files changed, 142 insertions, 142 deletions
diff --git a/gas/testsuite/gas/all/fwdexp.d b/gas/testsuite/gas/all/fwdexp.d
index 211ab9f..e83d05a 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 4c25164..a264003 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 69a16b7..89ecadf 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 29b32e2..b9f5f88 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 c51b667..c8fd75a 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 8ba78c3..0f51cca 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 7dee62a..ebc783f 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 2c473c0..450154f 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 bc8644b..1875115 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 3588a27..9e7046f 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 36c3b59..e33c996 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 9d59e05..8d1ef54 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 7ec7d32..b386c1b 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 30d0df6..dc8d42b 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 c42060a..4e70ede 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 cd7c9dd..6a04141 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 dc12629..0e79b4a 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 16fc9bc..b5c6573 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 533f172..d7edf2d 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 e4e7d47..871d1d6 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 0cfb110..95071ba 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 91b5ea7..e1edbfc 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 13f5d75..03dcf85 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 198f712..413bc27b 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 8439801..968bb3a 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 a58f349..ba0a340 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 f15565d..94b2a20 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 8a2dbda..a16ddf3 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 724cc59..e30551e 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 feedbae..29f17b8 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 e6081b4..e9016cd 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 45887d8..c28bc66 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 9a27fe9..d5f3d9f 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 abfe136..ed0165b 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 2a233d6..c412162 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 feefafa..e088586 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 6782d2b..2f0e844 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 b9fe3c0..4ca4a24 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 79a65bb..298d283 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 496be17..3766ecb 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 2daae3f..8c89123 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 64abfba..7046dd4 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 f5fe968..3573670 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 aacfac2..b426ec9 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 d3d85e1..67d8592 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 aa84332..623cc06 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 802a946..7d5e2dd 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 c3c585e..7296c60 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 74edeb5..5583e48 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 abfcc57..5418aae 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 4cbef12..3b368be 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 6208fac..bb7077e 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 8ca682f..69356ec 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 bfa9c40..51b1b83 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 bac44ed..7a9a3b9 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 5f90a0d..62a7f44 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 d6cda0a..4f021fb 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 001e7f1..2b5ffff 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 73ce08a..0966650 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 da4dd69..ca49776 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 f771e79..84fdd62 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 f2eb31e..d64b882 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 6ca5bb9..9605b6f 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 4a86bbc..76ad7b3 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 c820658..2e4e841 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 21756bd..57db1a7 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 06bc52b..8e94cb3 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 931ff96..e615924 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 56ec6ef..e7dab8a 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 6d3a618..bcf3de0 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 cb09276..95bb564 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 8c98d05..95d473c 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 503f8be..5639bb0 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 07c990c..d7991bb 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 dc03ca4..b07a624 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 148c899..905054d 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 19922b8..b0df1d0 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 c7f1d12..a25c7b3 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 74eb71f..7a0db52 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 fe3b548..96152eb 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 86ab572..75038bf 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 fe3b548..96152eb 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 ea8cb1e..9f6d156 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 fcaa439..d80746d 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 fb55605..6a23053 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 5d4bbba..c14dc1c 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 e66e38f..53de22b 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 f4cae18..022e39c 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 c244919..cdbf035 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 ecca837..cf94ec6 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 b59e857..4f7c411 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 0344af3..ea58107 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 d64ced8..797e283 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 c0fb4de..943a62f 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 cabb058..cb7e034 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 b774193..39ebee5 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 2ecbcc1..14311b6 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 36d9a77..3bd9ae4 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 4cbea47..176ae25 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 7d16f39..5e6c2cf 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 3a001c4..ea76166 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 8a5dc0b..8f3b51e 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 d4b26c6..12bbb49 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 ac72eee..a2155a2 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 0e5f757..f1af03a 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 0b8d84b..3bcd437 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