[AArch64] Print spaces after commas in addresses

I got an off-list request to make the AArch64 disassembler print
spaces after commas in addresses.  This patch does that.

The same code is used to print operands in "did you mean" errors,
so to keep things consistent, the patch also prints spaces between
operands in those messages.

opcodes/
	* aarch64-opc.c (print_immediate_offset_address): Print spaces
	after commas in addresses.
	(aarch64_print_operand): Likewise.

gas/
	* config/tc-aarch64.c (print_operands): Print spaces between
	operands.
	* testsuite/gas/aarch64/ilp32-basic.d: Expect spaces after ","
	in addresses.
	* testsuite/gas/aarch64/ldst-reg-imm-post-ind.d: Likewise.
	* testsuite/gas/aarch64/ldst-reg-imm-pre-ind.d: Likewise.
	* testsuite/gas/aarch64/ldst-reg-pair.d: Likewise.
	* testsuite/gas/aarch64/ldst-reg-reg-offset.d: Likewise.
	* testsuite/gas/aarch64/ldst-reg-uns-imm.d: Likewise.
	* testsuite/gas/aarch64/ldst-reg-unscaled-imm.d: Likewise.
	* testsuite/gas/aarch64/reloc-insn.d: Likewise.
	* testsuite/gas/aarch64/sve.d: Likewise.
	* testsuite/gas/aarch64/symbol.d: Likewise.
	* testsuite/gas/aarch64/system.d: Likewise.
	* testsuite/gas/aarch64/tls-desc.d: Likewise.
	* testsuite/gas/aarch64/sve-invalid.l: Expect spaces after ","
	in suggested alternatives.
	* testsuite/gas/aarch64/verbose-error.l: Likewise.

ld/
	* testsuite/ld-aarch64/emit-relocs-28.d: Expect spaces after ","
	in addresses.
	* testsuite/ld-aarch64/emit-relocs-301-be.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-301.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-302-be.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-302.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-310-be.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-310.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-313.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-515-be.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-515.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-516-be.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-516.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-531.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-532.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-533.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-534.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-535.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-536.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-537.d: Likewise.
	* testsuite/ld-aarch64/emit-relocs-538.d: Likewise.
	* testsuite/ld-aarch64/erratum835769.d: Likewise.
	* testsuite/ld-aarch64/erratum843419.d: Likewise.
	* testsuite/ld-aarch64/farcall-b-plt.d: Likewise.
	* testsuite/ld-aarch64/farcall-bl-plt.d: Likewise.
	* testsuite/ld-aarch64/gc-plt-relocs.d: Likewise.
	* testsuite/ld-aarch64/ifunc-21.d: Likewise.
	* testsuite/ld-aarch64/ifunc-7c.d: Likewise.
	* testsuite/ld-aarch64/tls-desc-ie.d: Likewise.
	* testsuite/ld-aarch64/tls-large-desc-be.d: Likewise.
	* testsuite/ld-aarch64/tls-large-desc.d: Likewise.
	* testsuite/ld-aarch64/tls-large-ie-be.d: Likewise.
	* testsuite/ld-aarch64/tls-large-ie.d: Likewise.
	* testsuite/ld-aarch64/tls-relax-all.d: Likewise.
	* testsuite/ld-aarch64/tls-relax-gd-ie.d: Likewise.
	* testsuite/ld-aarch64/tls-relax-gdesc-ie-2.d: Likewise.
	* testsuite/ld-aarch64/tls-relax-gdesc-ie.d: Likewise.
	* testsuite/ld-aarch64/tls-relax-large-desc-ie-be.d: Likewise.
	* testsuite/ld-aarch64/tls-relax-large-desc-ie.d: Likewise.
	* testsuite/ld-aarch64/tls-tiny-desc.d: Likewise.
	* testsuite/ld-aarch64/tls-tiny-gd.d: Likewise.

41 files changed, 136 insertions, 92 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 01c8a04..0d900f8 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,49 @@
 2016-09-21  Richard Sandiford  <richard.sandiford@arm.com>
 
+	* testsuite/ld-aarch64/emit-relocs-28.d: Expect spaces after ","
+	in addresses.
+	* testsuite/ld-aarch64/emit-relocs-301-be.d: Likewise.
+	* testsuite/ld-aarch64/emit-relocs-301.d: Likewise.
+	* testsuite/ld-aarch64/emit-relocs-302-be.d: Likewise.
+	* testsuite/ld-aarch64/emit-relocs-302.d: Likewise.
+	* testsuite/ld-aarch64/emit-relocs-310-be.d: Likewise.
+	* testsuite/ld-aarch64/emit-relocs-310.d: Likewise.
+	* testsuite/ld-aarch64/emit-relocs-313.d: Likewise.
+	* testsuite/ld-aarch64/emit-relocs-515-be.d: Likewise.
+	* testsuite/ld-aarch64/emit-relocs-515.d: Likewise.
+	* testsuite/ld-aarch64/emit-relocs-516-be.d: Likewise.
+	* testsuite/ld-aarch64/emit-relocs-516.d: Likewise.
+	* testsuite/ld-aarch64/emit-relocs-531.d: Likewise.
+	* testsuite/ld-aarch64/emit-relocs-532.d: Likewise.
+	* testsuite/ld-aarch64/emit-relocs-533.d: Likewise.
+	* testsuite/ld-aarch64/emit-relocs-534.d: Likewise.
+	* testsuite/ld-aarch64/emit-relocs-535.d: Likewise.
+	* testsuite/ld-aarch64/emit-relocs-536.d: Likewise.
+	* testsuite/ld-aarch64/emit-relocs-537.d: Likewise.
+	* testsuite/ld-aarch64/emit-relocs-538.d: Likewise.
+	* testsuite/ld-aarch64/erratum835769.d: Likewise.
+	* testsuite/ld-aarch64/erratum843419.d: Likewise.
+	* testsuite/ld-aarch64/farcall-b-plt.d: Likewise.
+	* testsuite/ld-aarch64/farcall-bl-plt.d: Likewise.
+	* testsuite/ld-aarch64/gc-plt-relocs.d: Likewise.
+	* testsuite/ld-aarch64/ifunc-21.d: Likewise.
+	* testsuite/ld-aarch64/ifunc-7c.d: Likewise.
+	* testsuite/ld-aarch64/tls-desc-ie.d: Likewise.
+	* testsuite/ld-aarch64/tls-large-desc-be.d: Likewise.
+	* testsuite/ld-aarch64/tls-large-desc.d: Likewise.
+	* testsuite/ld-aarch64/tls-large-ie-be.d: Likewise.
+	* testsuite/ld-aarch64/tls-large-ie.d: Likewise.
+	* testsuite/ld-aarch64/tls-relax-all.d: Likewise.
+	* testsuite/ld-aarch64/tls-relax-gd-ie.d: Likewise.
+	* testsuite/ld-aarch64/tls-relax-gdesc-ie-2.d: Likewise.
+	* testsuite/ld-aarch64/tls-relax-gdesc-ie.d: Likewise.
+	* testsuite/ld-aarch64/tls-relax-large-desc-ie-be.d: Likewise.
+	* testsuite/ld-aarch64/tls-relax-large-desc-ie.d: Likewise.
+	* testsuite/ld-aarch64/tls-tiny-desc.d: Likewise.
+	* testsuite/ld-aarch64/tls-tiny-gd.d: Likewise.
+
+2016-09-21  Richard Sandiford  <richard.sandiford@arm.com>
+
 	* testsuite/ld-aarch64/emit-relocs-280.d: Match branch comments.
 	* testsuite/ld-aarch64/weak-undefined.d: Likewise.
 
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-28.d b/ld/testsuite/ld-aarch64/emit-relocs-28.d
index 24424b9..fd5c71c 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-28.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-28.d
@@ -11,9 +11,9 @@ Disassembly of section .text:
 .* <\.text>:
   .*:	.* 	adrp	x2, .* <.*>
 			.*: R_AARCH64_P32_ADR_PREL_PG_HI21	_GLOBAL_OFFSET_TABLE_
-  .*:	.* 	ldr	x0, \[x2,#.*\]
+  .*:	.* 	ldr	x0, \[x2, #.*\]
 			.*: R_AARCH64_P32_LD32_GOTPAGE_LO14	globala
-  .*:	.* 	ldr	x0, \[x2,#.*\]
+  .*:	.* 	ldr	x0, \[x2, #.*\]
 			.*: R_AARCH64_P32_LD32_GOTPAGE_LO14	globalb
-  .*:	.* 	ldr	x0, \[x2,#.*\]
+  .*:	.* 	ldr	x0, \[x2, #.*\]
 			.*: R_AARCH64_P32_LD32_GOTPAGE_LO14	globalc
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-301-be.d b/ld/testsuite/ld-aarch64/emit-relocs-301-be.d
index dbe2560..63f1045 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-301-be.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-301-be.d
@@ -17,7 +17,7 @@ Disassembly of section .text:
 			10010: R_AARCH64_MOVW_GOTOFF_G0_NC	globalb
    10014:	f2800100 	movk	x0, #0x8
 			10014: R_AARCH64_MOVW_GOTOFF_G0_NC	globalc
-   10018:	f8606820 	ldr	x0, \[x1,x0\]
+   10018:	f8606820 	ldr	x0, \[x1, x0\]
    1001c:	00000000 	\.word	0x00000000
 			1001c: R_AARCH64_PREL64	_GLOBAL_OFFSET_TABLE_
    10020:	0000ffe4 	\.word	0x0000ffe4
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-301.d b/ld/testsuite/ld-aarch64/emit-relocs-301.d
index 9270c9e..9d6e31f 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-301.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-301.d
@@ -17,7 +17,7 @@ Disassembly of section .text:
 			10010: R_AARCH64_MOVW_GOTOFF_G0_NC	globalb
    10014:	f2800100 	movk	x0, #0x8
 			10014: R_AARCH64_MOVW_GOTOFF_G0_NC	globalc
-   10018:	f8606820 	ldr	x0, \[x1,x0\]
+   10018:	f8606820 	ldr	x0, \[x1, x0\]
    1001c:	0000ffe4 	\.word	0x0000ffe4
 			1001c: R_AARCH64_PREL64	_GLOBAL_OFFSET_TABLE_
    10020:	00000000 	\.word	0x00000000
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-302-be.d b/ld/testsuite/ld-aarch64/emit-relocs-302-be.d
index da8beef..3cdf9fe 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-302-be.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-302-be.d
@@ -17,7 +17,7 @@ Disassembly of section .text:
 			10010: R_AARCH64_MOVW_GOTOFF_G1	globalb
    10014:	d2a00000 	movz	x0, #0x0, lsl #16
 			10014: R_AARCH64_MOVW_GOTOFF_G1	globalc
-   10018:	f8606820 	ldr	x0, \[x1,x0\]
+   10018:	f8606820 	ldr	x0, \[x1, x0\]
    1001c:	00000000 	\.word	0x00000000
 			1001c: R_AARCH64_PREL64	_GLOBAL_OFFSET_TABLE_
    10020:	0000ffe4 	\.word	0x0000ffe4
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-302.d b/ld/testsuite/ld-aarch64/emit-relocs-302.d
index 696b836..a36d25e 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-302.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-302.d
@@ -17,7 +17,7 @@ Disassembly of section .text:
 			10010: R_AARCH64_MOVW_GOTOFF_G1	globalb
    10014:	d2a00000 	movz	x0, #0x0, lsl #16
 			10014: R_AARCH64_MOVW_GOTOFF_G1	globalc
-   10018:	f8606820 	ldr	x0, \[x1,x0\]
+   10018:	f8606820 	ldr	x0, \[x1, x0\]
    1001c:	0000ffe4 	\.word	0x0000ffe4
 			1001c: R_AARCH64_PREL64	_GLOBAL_OFFSET_TABLE_
    10020:	00000000 	\.word	0x00000000
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-310-be.d b/ld/testsuite/ld-aarch64/emit-relocs-310-be.d
index 7ef6fb6..7eec2ab 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-310-be.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-310-be.d
@@ -11,11 +11,11 @@ Disassembly of section .text:
    10000:	580000c1 	ldr	x1, 10018 <\.text\+0x18>
    10004:	100000a2 	adr	x2, 10018 <\.text\+0x18>
    10008:	8b010041 	add	x1, x2, x1
-   1000c:	f9400820 	ldr	x0, \[x1,#16\]
+   1000c:	f9400820 	ldr	x0, \[x1, #16\]
 			1000c: R_AARCH64_LD64_GOTOFF_LO15	globala
-   10010:	f9400c20 	ldr	x0, \[x1,#24\]
+   10010:	f9400c20 	ldr	x0, \[x1, #24\]
 			10010: R_AARCH64_LD64_GOTOFF_LO15	globalb
-   10014:	f9400420 	ldr	x0, \[x1,#8\]
+   10014:	f9400420 	ldr	x0, \[x1, #8\]
 			10014: R_AARCH64_LD64_GOTOFF_LO15	globalc
    10018:	00000000 	.word	0x00000000
 			10018: R_AARCH64_PREL64	_GLOBAL_OFFSET_TABLE_
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-310.d b/ld/testsuite/ld-aarch64/emit-relocs-310.d
index 2f78ddd..f7af0a3 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-310.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-310.d
@@ -11,11 +11,11 @@ Disassembly of section .text:
    10000:	580000c1 	ldr	x1, 10018 <\.text\+0x18>
    10004:	100000a2 	adr	x2, 10018 <\.text\+0x18>
    10008:	8b010041 	add	x1, x2, x1
-   1000c:	f9400820 	ldr	x0, \[x1,#16\]
+   1000c:	f9400820 	ldr	x0, \[x1, #16\]
 			1000c: R_AARCH64_LD64_GOTOFF_LO15	globala
-   10010:	f9400c20 	ldr	x0, \[x1,#24\]
+   10010:	f9400c20 	ldr	x0, \[x1, #24\]
 			10010: R_AARCH64_LD64_GOTOFF_LO15	globalb
-   10014:	f9400420 	ldr	x0, \[x1,#8\]
+   10014:	f9400420 	ldr	x0, \[x1, #8\]
 			10014: R_AARCH64_LD64_GOTOFF_LO15	globalc
    10018:	0000ffe8 	.word	0x0000ffe8
 			10018: R_AARCH64_PREL64	_GLOBAL_OFFSET_TABLE_
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-313.d b/ld/testsuite/ld-aarch64/emit-relocs-313.d
index 0a7b5d1..1a28b35 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-313.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-313.d
@@ -10,9 +10,9 @@ Disassembly of section .text:
 0000000000010000 <\.text>:
    10000:	90000082 	adrp	x2, 20000 <_GLOBAL_OFFSET_TABLE_>
 			10000: R_AARCH64_ADR_PREL_PG_HI21	_GLOBAL_OFFSET_TABLE_
-   10004:	f9400840 	ldr	x0, \[x2,#16\]
+   10004:	f9400840 	ldr	x0, \[x2, #16\]
 			10004: R_AARCH64_LD64_GOTPAGE_LO15	globala
-   10008:	f9400c40 	ldr	x0, \[x2,#24\]
+   10008:	f9400c40 	ldr	x0, \[x2, #24\]
 			10008: R_AARCH64_LD64_GOTPAGE_LO15	globalb
-   1000c:	f9400440 	ldr	x0, \[x2,#8\]
+   1000c:	f9400440 	ldr	x0, \[x2, #8\]
 			1000c: R_AARCH64_LD64_GOTPAGE_LO15	globalc
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-515-be.d b/ld/testsuite/ld-aarch64/emit-relocs-515-be.d
index 6e0039d..0bd39e3 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-515-be.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-515-be.d
@@ -20,15 +20,15 @@ Disassembly of section .text:
 Disassembly of section .plt:
 
 0000000000010024 \<.plt\>:
-   10024:	a9bf7bf0 	stp	x16, x30, \[sp,#-16\]!
+   10024:	a9bf7bf0 	stp	x16, x30, \[sp, #-16\]!
    10028:	90000090 	adrp	x16, 20000 \<_GLOBAL_OFFSET_TABLE_\>
-   1002c:	f9401611 	ldr	x17, \[x16,#40\]
+   1002c:	f9401611 	ldr	x17, \[x16, #40\]
    10030:	9100a210 	add	x16, x16, #0x28
    10034:	d61f0220 	br	x17
    10038:	d503201f 	nop
    1003c:	d503201f 	nop
    10040:	d503201f 	nop
    10044:	90000090 	adrp	x16, 20000 \<_GLOBAL_OFFSET_TABLE_\>
-   10048:	f9401a11 	ldr	x17, \[x16,#48\]
+   10048:	f9401a11 	ldr	x17, \[x16, #48\]
    1004c:	9100c210 	add	x16, x16, #0x30
    10050:	d61f0220 	br	x17
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-515.d b/ld/testsuite/ld-aarch64/emit-relocs-515.d
index a4e8a47..67f436b 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-515.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-515.d
@@ -20,15 +20,15 @@ Disassembly of section .text:
 Disassembly of section .plt:
 
 0000000000010024 \<.plt\>:
-   10024:	a9bf7bf0 	stp	x16, x30, \[sp,#-16\]!
+   10024:	a9bf7bf0 	stp	x16, x30, \[sp, #-16\]!
    10028:	90000090 	adrp	x16, 20000 \<_GLOBAL_OFFSET_TABLE_\>
-   1002c:	f9401611 	ldr	x17, \[x16,#40\]
+   1002c:	f9401611 	ldr	x17, \[x16, #40\]
    10030:	9100a210 	add	x16, x16, #0x28
    10034:	d61f0220 	br	x17
    10038:	d503201f 	nop
    1003c:	d503201f 	nop
    10040:	d503201f 	nop
    10044:	90000090 	adrp	x16, 20000 \<_GLOBAL_OFFSET_TABLE_\>
-   10048:	f9401a11 	ldr	x17, \[x16,#48\]
+   10048:	f9401a11 	ldr	x17, \[x16, #48\]
    1004c:	9100c210 	add	x16, x16, #0x30
    10050:	d61f0220 	br	x17
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-516-be.d b/ld/testsuite/ld-aarch64/emit-relocs-516-be.d
index 3a55762..e3b528d 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-516-be.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-516-be.d
@@ -21,15 +21,15 @@ Disassembly of section .text:
 Disassembly of section .plt:
 
 0000000000010028 \<.plt\>:
-   10028:	a9bf7bf0 	stp	x16, x30, \[sp,#-16\]!
+   10028:	a9bf7bf0 	stp	x16, x30, \[sp, #-16\]!
    1002c:	90000090 	adrp	x16, 20000 \<_GLOBAL_OFFSET_TABLE_\>
-   10030:	f9401e11 	ldr	x17, \[x16,#56\]
+   10030:	f9401e11 	ldr	x17, \[x16, #56\]
    10034:	9100e210 	add	x16, x16, #0x38
    10038:	d61f0220 	br	x17
    1003c:	d503201f 	nop
    10040:	d503201f 	nop
    10044:	d503201f 	nop
    10048:	90000090 	adrp	x16, 20000 \<_GLOBAL_OFFSET_TABLE_\>
-   1004c:	f9402211 	ldr	x17, \[x16,#64\]
+   1004c:	f9402211 	ldr	x17, \[x16, #64\]
    10050:	91010210 	add	x16, x16, #0x40
    10054:	d61f0220 	br	x17
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-516.d b/ld/testsuite/ld-aarch64/emit-relocs-516.d
index 09d2c7a..2ace032 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-516.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-516.d
@@ -21,15 +21,15 @@ Disassembly of section .text:
 Disassembly of section .plt:
 
 0000000000010028 \<.plt\>:
-   10028:	a9bf7bf0 	stp	x16, x30, \[sp,#-16\]!
+   10028:	a9bf7bf0 	stp	x16, x30, \[sp, #-16\]!
    1002c:	90000090 	adrp	x16, 20000 \<_GLOBAL_OFFSET_TABLE_\>
-   10030:	f9401e11 	ldr	x17, \[x16,#56\]
+   10030:	f9401e11 	ldr	x17, \[x16, #56\]
    10034:	9100e210 	add	x16, x16, #0x38
    10038:	d61f0220 	br	x17
    1003c:	d503201f 	nop
    10040:	d503201f 	nop
    10044:	d503201f 	nop
    10048:	90000090 	adrp	x16, 20000 \<_GLOBAL_OFFSET_TABLE_\>
-   1004c:	f9402211 	ldr	x17, \[x16,#64\]
+   1004c:	f9402211 	ldr	x17, \[x16, #64\]
    10050:	91010210 	add	x16, x16, #0x40
    10054:	d61f0220 	br	x17
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-531.d b/ld/testsuite/ld-aarch64/emit-relocs-531.d
index 588f127..20b78e9 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-531.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-531.d
@@ -3,5 +3,5 @@
 #objdump: -dr
 #...
 0000000000010000 <.text>:
-   10000:	39801115 	ldrsb	x21, \[x8,#4\]
+   10000:	39801115 	ldrsb	x21, \[x8, #4\]
 			10000: R_AARCH64_TLSLD_LDST8_DTPREL_LO12	v2
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-532.d b/ld/testsuite/ld-aarch64/emit-relocs-532.d
index f5f49b8..318c926 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-532.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-532.d
@@ -3,7 +3,7 @@
 #objdump: -dr
 #...
 0000000000010000 <.text>:
-   10000:	3980109d 	ldrsb	x29, \[x4,#4\]
+   10000:	3980109d 	ldrsb	x29, \[x4, #4\]
 			10000: R_AARCH64_TLSLD_LDST8_DTPREL_LO12_NC	v2
-   10004:	398020f2 	ldrsb	x18, \[x7,#8\]
+   10004:	398020f2 	ldrsb	x18, \[x7, #8\]
 			10004: R_AARCH64_TLSLD_LDST8_DTPREL_LO12_NC	v3
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-533.d b/ld/testsuite/ld-aarch64/emit-relocs-533.d
index 09b3d11..35f8cc1 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-533.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-533.d
@@ -3,5 +3,5 @@
 #objdump: -dr
 #...
 0000000000010000 <.text>:
-   10000:	798008eb 	ldrsh	x11, \[x7,#4\]
+   10000:	798008eb 	ldrsh	x11, \[x7, #4\]
 			10000: R_AARCH64_TLSLD_LDST16_DTPREL_LO12	v2
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-534.d b/ld/testsuite/ld-aarch64/emit-relocs-534.d
index e2fa478..121fdc4 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-534.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-534.d
@@ -3,7 +3,7 @@
 #objdump: -dr
 #...
 0000000000010000 <.text>:
-   10000:	798009d6 	ldrsh	x22, \[x14,#4\]
+   10000:	798009d6 	ldrsh	x22, \[x14, #4\]
 			10000: R_AARCH64_TLSLD_LDST16_DTPREL_LO12_NC	v2
-   10004:	79a71a28 	ldrsh	x8, \[x17,#5004\]
+   10004:	79a71a28 	ldrsh	x8, \[x17, #5004\]
 			10004: R_AARCH64_TLSLD_LDST16_DTPREL_LO12_NC	v3
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-535.d b/ld/testsuite/ld-aarch64/emit-relocs-535.d
index 32766bf..4dfc127 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-535.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-535.d
@@ -3,5 +3,5 @@
 #objdump: -dr
 #...
 0000000000010000 <.text>:
-   10000:	b9800661 	ldrsw	x1, \[x19,#4\]
+   10000:	b9800661 	ldrsw	x1, \[x19, #4\]
 			10000: R_AARCH64_TLSLD_LDST32_DTPREL_LO12	v2
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-536.d b/ld/testsuite/ld-aarch64/emit-relocs-536.d
index 862208a..0a42fa1 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-536.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-536.d
@@ -3,7 +3,7 @@
 #objdump: -dr
 #...
 0000000000010000 <.text>:
-   10000:	b98005d6 	ldrsw	x22, \[x14,#4\]
+   10000:	b98005d6 	ldrsw	x22, \[x14, #4\]
 			10000: R_AARCH64_TLSLD_LDST32_DTPREL_LO12_NC	v2
-   10004:	b9800628 	ldrsw	x8, \[x17,#4\]
+   10004:	b9800628 	ldrsw	x8, \[x17, #4\]
 			10004: R_AARCH64_TLSLD_LDST32_DTPREL_LO12_NC	v3
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-537.d b/ld/testsuite/ld-aarch64/emit-relocs-537.d
index 82cc9bb..9067a90 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-537.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-537.d
@@ -3,5 +3,5 @@
 #objdump: -dr
 #...
 0000000000010000 <.text>:
-   10000:	f9400520 	ldr	x0, \[x9,#8\]
+   10000:	f9400520 	ldr	x0, \[x9, #8\]
 			10000: R_AARCH64_TLSLD_LDST64_DTPREL_LO12	v2
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-538.d b/ld/testsuite/ld-aarch64/emit-relocs-538.d
index dffde23..6824c0b 100644
--- a/ld/testsuite/ld-aarch64/emit-relocs-538.d
+++ b/ld/testsuite/ld-aarch64/emit-relocs-538.d
@@ -3,7 +3,7 @@
 #objdump: -dr
 #...
 0000000000010000 <.text>:
-   10000:	f9400482 	ldr	x2, \[x4,#8\]
+   10000:	f9400482 	ldr	x2, \[x4, #8\]
 			10000: R_AARCH64_TLSLD_LDST64_DTPREL_LO12_NC	v2
-   10004:	f940062e 	ldr	x14, \[x17,#8\]
+   10004:	f940062e 	ldr	x14, \[x17, #8\]
 			10004: R_AARCH64_TLSLD_LDST64_DTPREL_LO12_NC	v3
diff --git a/ld/testsuite/ld-aarch64/erratum835769.d b/ld/testsuite/ld-aarch64/erratum835769.d
index f3b0ed4..c1a71ad 100644
--- a/ld/testsuite/ld-aarch64/erratum835769.d
+++ b/ld/testsuite/ld-aarch64/erratum835769.d
@@ -2,7 +2,7 @@
 Disassembly of section .text:
 #...
 [0-9a-f]+ <a1ldr>:
-[ \t0-9a-f]+:[ \t]+b8408c87[ \t]+ldr[ \t]+w7, \[x4,#8\]\!
+[ \t0-9a-f]+:[ \t]+b8408c87[ \t]+ldr[ \t]+w7, \[x4, #8\]\!
 [ \t0-9a-f]+:[ \t]+1b017c06[ \t]+mul[ \t]+w6, w0, w1
 [ \t0-9a-f]+:[ \t]+f9400084[ \t]+ldr[ \t]+x4, \[x4\]
 [ \t0-9a-f]+:[ \t0-9a-z]+[ \t]+b[ \t]+[0-9a-f]+ <__erratum_835769_veneer_0>
@@ -10,7 +10,7 @@ Disassembly of section .text:
 [ \t0-9a-f]+:[ \t]+d65f03c0[ \t]+ret
 
 [0-9a-f]+ <a5ldr>:
-[ \t0-9a-f]+:[ \t]+b8408c87[ \t]+ldr[ \t]+w7, \[x4,#8\]!
+[ \t0-9a-f]+:[ \t]+b8408c87[ \t]+ldr[ \t]+w7, \[x4, #8\]!
 [ \t0-9a-f]+:[ \t]+1b017c06[ \t]+mul[ \t]+w6, w0, w1
 [ \t0-9a-f]+:[ \t]+f9400084[ \t]+ldr[ \t]+x4, \[x4\]
 [ \t0-9a-f]+:[ \t0-9a-z]+[ \t]+b[ \t]+[0-9a-f]+ <__erratum_835769_veneer_1>
@@ -18,7 +18,7 @@ Disassembly of section .text:
 [ \t0-9a-f]+:[ \t]+d65f03c0[ \t]+ret
 
 [0-9a-f]+ <a6ldr>:
-[ \t0-9a-f]+:[ \t]+b8408c87[ \t]+ldr[ \t]+w7, \[x4,#8\]!
+[ \t0-9a-f]+:[ \t]+b8408c87[ \t]+ldr[ \t]+w7, \[x4, #8\]!
 [ \t0-9a-f]+:[ \t]+1b017c06[ \t]+mul[ \t]+w6, w0, w1
 [ \t0-9a-f]+:[ \t]+f9400084[ \t]+ldr[ \t]+x4, \[x4\]
 [ \t0-9a-f]+:[ \t]+9b031885[ \t]+madd[ \t]+x5, x4, x3, x6
@@ -26,7 +26,7 @@ Disassembly of section .text:
 [ \t0-9a-f]+:[ \t]+d65f03c0[ \t]+ret
 
 [0-9a-f]+ <a7str>:
-[ \t0-9a-f]+:[ \t]+b8408c87[ \t]+ldr[ \t]+w7, \[x4,#8\]!
+[ \t0-9a-f]+:[ \t]+b8408c87[ \t]+ldr[ \t]+w7, \[x4, #8\]!
 [ \t0-9a-f]+:[ \t]+1b017c06[ \t]+mul[ \t]+w6, w0, w1
 [ \t0-9a-f]+:[ \t]+f9000084[ \t]+str[ \t]+x4, \[x4\]
 [ \t0-9a-f]+:[ \t0-9a-z]+[ \t]+b[ \t]+[0-9a-f]+ <__erratum_835769_veneer_2>
diff --git a/ld/testsuite/ld-aarch64/erratum843419.d b/ld/testsuite/ld-aarch64/erratum843419.d
index 4be8f9e..55a8a8c 100644
--- a/ld/testsuite/ld-aarch64/erratum843419.d
+++ b/ld/testsuite/ld-aarch64/erratum843419.d
@@ -9,17 +9,17 @@ Disassembly of section .e843419:
 0000000020000000 <e843419>:
     20000000:	d10043ff 	sub	sp, sp, #0x10
     20000004:	d28001a7 	mov	x7, #0xd                   	// #13
-    20000008:	b9000fe7 	str	w7, \[sp,#12\]
+    20000008:	b9000fe7 	str	w7, \[sp, #12\]
     2000000c:	140003fb 	b	20000ff8 <e843419_1>
 	...
 
 0000000020000ff8 <e843419_1>:
     20000ff8:	90100000 	adrp	x0, 40000000 <[_a-zA-z0-9]+>
-    20000ffc:	f800c007 	stur	x7, \[x0,#12\]
+    20000ffc:	f800c007 	stur	x7, \[x0, #12\]
     20001000:	d2800128 	mov	x8, #0x9                   	// #9
     20001004:	14000008 	b	20001024 <e843419@0002_00000013_1004>
     20001008:	8b050020 	add	x0, x1, x5
-    2000100c:	b9400fe7 	ldr	w7, \[sp,#12\]
+    2000100c:	b9400fe7 	ldr	w7, \[sp, #12\]
     20001010:	0b0700e0 	add	w0, w7, w7
     20001014:	910043ff 	add	sp, sp, #0x10
     20001018:	14000005 	b	2000102c <__e835769_veneer>
@@ -39,7 +39,7 @@ Disassembly of section .e843419:
 Disassembly of section .e835769:
 
 0000000003000000 <e835769>:
- 3000000:	b8408c87 	ldr	w7, \[x4,#8\]!
+ 3000000:	b8408c87 	ldr	w7, \[x4, #8\]!
  3000004:	1b017c06 	mul	w6, w0, w1
  3000008:	f9400084 	ldr	x4, \[x4\]
  300000c:	14000004 	b	300001c <__erratum_835769_veneer_0>
@@ -57,7 +57,7 @@ Disassembly of section .text:
 0000000000400000 <main>:
   400000:	d10043ff 	sub	sp, sp, #0x10
   400004:	d28001a7 	mov	x7, #0xd                   	// #13
-  400008:	b9000fe7 	str	w7, \[sp,#12\]
+  400008:	b9000fe7 	str	w7, \[sp, #12\]
   40000c:	14000003 	b	400018 <__e843419_veneer>
   400010:	d65f03c0 	ret
   400014:	14000400 	b	401014 <__e843419_veneer\+0xffc>
diff --git a/ld/testsuite/ld-aarch64/farcall-b-plt.d b/ld/testsuite/ld-aarch64/farcall-b-plt.d
index 49c82eb..00469af 100644
--- a/ld/testsuite/ld-aarch64/farcall-b-plt.d
+++ b/ld/testsuite/ld-aarch64/farcall-b-plt.d
@@ -8,9 +8,9 @@
 Disassembly of section .plt:
 
 .* <foo@plt.*>:
-.*:	a9bf7bf0 	stp	x16, x30, \[sp,#-16\]!
+.*:	a9bf7bf0 	stp	x16, x30, \[sp, #-16\]!
 .*:	.* 	adrp	x16, .* <__foo_veneer\+.*>
-.*:	.* 	ldr	x17, \[x16,#.*\]
+.*:	.* 	ldr	x17, \[x16, #.*\]
 .*:	.* 	add	x16, x16, #.*
 .*:	d61f0220 	br	x17
 .*:	d503201f 	nop
@@ -19,7 +19,7 @@ Disassembly of section .plt:
 
 .* <foo@plt>:
 .*:	.* 	adrp	x16, .* <__foo_veneer\+.*>
-.*:	.* 	ldr	x17, \[x16,#.*\]
+.*:	.* 	ldr	x17, \[x16, #.*\]
 .*:	.* 	add	x16, x16, #.*
 .*:	d61f0220 	br	x17
 
diff --git a/ld/testsuite/ld-aarch64/farcall-bl-plt.d b/ld/testsuite/ld-aarch64/farcall-bl-plt.d
index 457a4fa..28fcb8c 100644
--- a/ld/testsuite/ld-aarch64/farcall-bl-plt.d
+++ b/ld/testsuite/ld-aarch64/farcall-bl-plt.d
@@ -8,9 +8,9 @@
 Disassembly of section .plt:
 
 .* <foo@plt.*>:
-.*:	a9bf7bf0 	stp	x16, x30, \[sp,#-16\]!
+.*:	a9bf7bf0 	stp	x16, x30, \[sp, #-16\]!
 .*:	.* 	adrp	x16, .* <__foo_veneer\+.*>
-.*:	.* 	ldr	x17, \[x16,#.*\]
+.*:	.* 	ldr	x17, \[x16, #.*\]
 .*:	.* 	add	x16, x16, #.*
 .*:	d61f0220 	br	x17
 .*:	d503201f 	nop
@@ -19,7 +19,7 @@ Disassembly of section .plt:
 
 .* <foo@plt>:
 .*:	.* 	adrp	x16, .* <__foo_veneer\+.*>
-.*:	.* 	ldr	x17, \[x16,#.*\]
+.*:	.* 	ldr	x17, \[x16, #.*\]
 .*:	.* 	add	x16, x16, #.*
 .*:	d61f0220 	br	x17
 
diff --git a/ld/testsuite/ld-aarch64/gc-plt-relocs.d b/ld/testsuite/ld-aarch64/gc-plt-relocs.d
index cb38c8d..086968c 100644
--- a/ld/testsuite/ld-aarch64/gc-plt-relocs.d
+++ b/ld/testsuite/ld-aarch64/gc-plt-relocs.d
@@ -34,15 +34,15 @@ Disassembly of section .text:
 Disassembly of section .plt:
 
 0+8010 \<\.plt\>:
-    8010:	a9bf7bf0 	stp	x16, x30, \[sp,#-16\]!
+    8010:	a9bf7bf0 	stp	x16, x30, \[sp, #-16\]!
     8014:	b0000010 	adrp	x16, 9000 .*
-    8018:	f9400e11 	ldr	x17, \[x16,#24\]
+    8018:	f9400e11 	ldr	x17, \[x16, #24\]
     801c:	91006210 	add	x16, x16, #0x18
     8020:	d61f0220 	br	x17
     8024:	d503201f 	nop
     8028:	d503201f 	nop
     802c:	d503201f 	nop
     8030:	b0000010 	adrp	x16, 9000 .*
-    8034:	f9401211 	ldr	x17, \[x16,#32\]
+    8034:	f9401211 	ldr	x17, \[x16, #32\]
     8038:	91008210 	add	x16, x16, #0x20
     803c:	d61f0220 	br	x17
diff --git a/ld/testsuite/ld-aarch64/ifunc-21.d b/ld/testsuite/ld-aarch64/ifunc-21.d
index 9ea01e6..eef2e62 100644
--- a/ld/testsuite/ld-aarch64/ifunc-21.d
+++ b/ld/testsuite/ld-aarch64/ifunc-21.d
@@ -20,7 +20,7 @@ Disassembly of section .text:
 
 .* <bar>:
  .*:	90000080 	adrp	x0, 10000 <.*>
- .*:	.* 	ldr	x0, \[x0,#(960|1040)\]
+ .*:	.* 	ldr	x0, \[x0, #(960|1040)\]
  .*:	d65f03c0 	ret
 
 #pass
\ No newline at end of file
diff --git a/ld/testsuite/ld-aarch64/ifunc-7c.d b/ld/testsuite/ld-aarch64/ifunc-7c.d
index 1967742..e56322a 100644
--- a/ld/testsuite/ld-aarch64/ifunc-7c.d
+++ b/ld/testsuite/ld-aarch64/ifunc-7c.d
@@ -16,4 +16,4 @@ Disassembly of section \.text:
 [0-9a-f]+ <__start>:
  [0-9a-f]+:	[0-9a-f]+ 	bl	[0-9a-f]+ <\*ABS\*\+0x[0-9a-f]+@plt>
  [0-9a-f]+:	[0-9a-f]+ 	adrp	x0, [0-9]+ <__start\+0x[0-9a-f]+>
- [0-9a-f]+:	[0-9a-f]+ 	ldr	x0, \[x0,.+\]
+ [0-9a-f]+:	[0-9a-f]+ 	ldr	x0, \[x0, .+\]
diff --git a/ld/testsuite/ld-aarch64/tls-desc-ie.d b/ld/testsuite/ld-aarch64/tls-desc-ie.d
index 037da07..5b77872 100644
--- a/ld/testsuite/ld-aarch64/tls-desc-ie.d
+++ b/ld/testsuite/ld-aarch64/tls-desc-ie.d
@@ -7,14 +7,14 @@
  +10008:	94000016 	bl	10060 <v1\+0x10060>
  +1000c:	d503201f 	nop
  +10010:	90000080 	adrp	x0, 20000 <_GLOBAL_OFFSET_TABLE_>
- +10014:	f9400400 	ldr	x0, \[x0,#8\]
+ +10014:	f9400400 	ldr	x0, \[x0, #8\]
  +10018:	d503201f 	nop
  +1001c:	d503201f 	nop
  +10020:	d53bd041 	mrs	x1, tpidr_el0
  +10024:	8b000020 	add	x0, x1, x0
  +10028:	d53bd042 	mrs	x2, tpidr_el0
  +1002c:	90000080 	adrp	x0, 20000 <_GLOBAL_OFFSET_TABLE_>
- +10030:	f9400400 	ldr	x0, \[x0,#8\]
+ +10030:	f9400400 	ldr	x0, \[x0, #8\]
  +10034:	8b000040 	add	x0, x2, x0
  +10038:	b9400000 	ldr	w0, \[x0\]
  +1003c:	0b000020 	add	w0, w1, w0
@@ -22,15 +22,15 @@
 Disassembly of section .plt:
 
 0000000000010040 <.plt>:
- +10040:	a9bf7bf0 	stp	x16, x30, \[sp,#-16\]!
+ +10040:	a9bf7bf0 	stp	x16, x30, \[sp, #-16\]!
  +10044:	90000090 	adrp	x16, 20000 <_GLOBAL_OFFSET_TABLE_>
- +10048:	f9401a11 	ldr	x17, \[x16,#48\]
+ +10048:	f9401a11 	ldr	x17, \[x16, #48\]
  +1004c:	9100c210 	add	x16, x16, #0x30
  +10050:	d61f0220 	br	x17
  +10054:	d503201f 	nop
  +10058:	d503201f 	nop
  +1005c:	d503201f 	nop
  +10060:	90000090 	adrp	x16, 20000 <_GLOBAL_OFFSET_TABLE_>
- +10064:	f9401e11 	ldr	x17, \[x16,#56\]
+ +10064:	f9401e11 	ldr	x17, \[x16, #56\]
  +10068:	9100e210 	add	x16, x16, #0x38
  +1006c:	d61f0220 	br	x17
diff --git a/ld/testsuite/ld-aarch64/tls-large-desc-be.d b/ld/testsuite/ld-aarch64/tls-large-desc-be.d
index 2d72da6..217794c 100644
--- a/ld/testsuite/ld-aarch64/tls-large-desc-be.d
+++ b/ld/testsuite/ld-aarch64/tls-large-desc-be.d
@@ -12,7 +12,7 @@ Disassembly of section .text:
   +10008:	8b020032 	add	x18, x1, x2
   +1000c:	d2a00000 	movz	x0, #0x0, lsl #16
   +10010:	f2800500 	movk	x0, #0x28
-  +10014:	f8606a41 	ldr	x1, \[x18,x0\]
+  +10014:	f8606a41 	ldr	x1, \[x18, x0\]
   +10018:	8b000240 	add	x0, x18, x0
   +1001c:	d63f0020 	blr	x1
   +10020:	00000000 	.word	0x00000000
@@ -21,18 +21,18 @@ Disassembly of section .text:
 Disassembly of section .plt:
 
 0000000000010028 <.plt>:
-  +10028:	a9bf7bf0 	stp	x16, x30, \[sp,#-16\]!
+  +10028:	a9bf7bf0 	stp	x16, x30, \[sp, #-16\]!
   +1002c:	90000090 	adrp	x16, 20000 \<_GLOBAL_OFFSET_TABLE_\>
-  +10030:	f9401211 	ldr	x17, \[x16,#32\]
+  +10030:	f9401211 	ldr	x17, \[x16, #32\]
   +10034:	91008210 	add	x16, x16, #0x20
   +10038:	d61f0220 	br	x17
   +1003c:	d503201f 	nop
   +10040:	d503201f 	nop
   +10044:	d503201f 	nop
-  +10048:	a9bf0fe2 	stp	x2, x3, \[sp,#-16\]!
+  +10048:	a9bf0fe2 	stp	x2, x3, \[sp, #-16\]!
   +1004c:	90000082 	adrp	x2, 20000 \<_GLOBAL_OFFSET_TABLE_\>
   +10050:	90000083 	adrp	x3, 20000 \<_GLOBAL_OFFSET_TABLE_\>
-  +10054:	f9400442 	ldr	x2, \[x2,#8\]
+  +10054:	f9400442 	ldr	x2, \[x2, #8\]
   +10058:	91004063 	add	x3, x3, #0x10
   +1005c:	d61f0040 	br	x2
   +10060:	d503201f 	nop
diff --git a/ld/testsuite/ld-aarch64/tls-large-desc.d b/ld/testsuite/ld-aarch64/tls-large-desc.d
index b8dcc02..9fa6dcc 100644
--- a/ld/testsuite/ld-aarch64/tls-large-desc.d
+++ b/ld/testsuite/ld-aarch64/tls-large-desc.d
@@ -12,7 +12,7 @@ Disassembly of section .text:
   +10008:	8b020032 	add	x18, x1, x2
   +1000c:	d2a00000 	movz	x0, #0x0, lsl #16
   +10010:	f2800500 	movk	x0, #0x28
-  +10014:	f8606a41 	ldr	x1, \[x18,x0\]
+  +10014:	f8606a41 	ldr	x1, \[x18, x0\]
   +10018:	8b000240 	add	x0, x18, x0
   +1001c:	d63f0020 	blr	x1
   +10020:	0000ffe0 	.word	0x0000ffe0
@@ -21,18 +21,18 @@ Disassembly of section .text:
 Disassembly of section .plt:
 
 0000000000010028 <.plt>:
-  +10028:	a9bf7bf0 	stp	x16, x30, \[sp,#-16\]!
+  +10028:	a9bf7bf0 	stp	x16, x30, \[sp, #-16\]!
   +1002c:	90000090 	adrp	x16, 20000 \<_GLOBAL_OFFSET_TABLE_\>
-  +10030:	f9401211 	ldr	x17, \[x16,#32\]
+  +10030:	f9401211 	ldr	x17, \[x16, #32\]
   +10034:	91008210 	add	x16, x16, #0x20
   +10038:	d61f0220 	br	x17
   +1003c:	d503201f 	nop
   +10040:	d503201f 	nop
   +10044:	d503201f 	nop
-  +10048:	a9bf0fe2 	stp	x2, x3, \[sp,#-16\]!
+  +10048:	a9bf0fe2 	stp	x2, x3, \[sp, #-16\]!
   +1004c:	90000082 	adrp	x2, 20000 \<_GLOBAL_OFFSET_TABLE_\>
   +10050:	90000083 	adrp	x3, 20000 \<_GLOBAL_OFFSET_TABLE_\>
-  +10054:	f9400442 	ldr	x2, \[x2,#8\]
+  +10054:	f9400442 	ldr	x2, \[x2, #8\]
   +10058:	91004063 	add	x3, x3, #0x10
   +1005c:	d61f0040 	br	x2
   +10060:	d503201f 	nop
diff --git a/ld/testsuite/ld-aarch64/tls-large-ie-be.d b/ld/testsuite/ld-aarch64/tls-large-ie-be.d
index 380718b..64a4384 100644
--- a/ld/testsuite/ld-aarch64/tls-large-ie-be.d
+++ b/ld/testsuite/ld-aarch64/tls-large-ie-be.d
@@ -13,7 +13,7 @@ Disassembly of section .text:
    1000c:	d53bd042 	mrs	x2, tpidr_el0
    10010:	d2a00000 	movz	x0, #0x0, lsl #16
    10014:	f2800100 	movk	x0, #0x8
-   10018:	f8606820 	ldr	x0, \[x1,x0\]
+   10018:	f8606820 	ldr	x0, \[x1, x0\]
    1001c:	8b020000 	add	x0, x0, x2
    10020:	d503201f 	nop
    10024:	0000(ffdc|0000) 	.word	0x0000(ffdc|0000)
diff --git a/ld/testsuite/ld-aarch64/tls-large-ie.d b/ld/testsuite/ld-aarch64/tls-large-ie.d
index 13b77f3..98606d6 100644
--- a/ld/testsuite/ld-aarch64/tls-large-ie.d
+++ b/ld/testsuite/ld-aarch64/tls-large-ie.d
@@ -13,7 +13,7 @@ Disassembly of section .text:
    1000c:	d53bd042 	mrs	x2, tpidr_el0
    10010:	d2a00000 	movz	x0, #0x0, lsl #16
    10014:	f2800100 	movk	x0, #0x8
-   10018:	f8606820 	ldr	x0, \[x1,x0\]
+   10018:	f8606820 	ldr	x0, \[x1, x0\]
    1001c:	8b020000 	add	x0, x0, x2
    10020:	d503201f 	nop
    10024:	0000ffdc 	.word	0x0000ffdc
diff --git a/ld/testsuite/ld-aarch64/tls-relax-all.d b/ld/testsuite/ld-aarch64/tls-relax-all.d
index b36b634..5942186 100644
--- a/ld/testsuite/ld-aarch64/tls-relax-all.d
+++ b/ld/testsuite/ld-aarch64/tls-relax-all.d
@@ -2,10 +2,10 @@
 #ld: -T relocs.ld -e0
 #objdump: -dr
 #...
- +10000:	a9bf7bfd 	stp	x29, x30, \[sp,#-16\]!
+ +10000:	a9bf7bfd 	stp	x29, x30, \[sp, #-16\]!
  +10004:	910003fd 	mov	x29, sp
  +10008:	90000080 	adrp	x0, 20000 <_GLOBAL_OFFSET_TABLE_>
- +1000c:	f9400400 	ldr	x0, \[x0,#8\]
+ +1000c:	f9400400 	ldr	x0, \[x0, #8\]
  +10010:	d503201f 	nop
  +10014:	d503201f 	nop
  +10018:	d53bd041 	mrs	x1, tpidr_el0
@@ -20,7 +20,7 @@
  +1003c:	b9400000 	ldr	w0, \[x0\]
  +10040:	0b000021 	add	w1, w1, w0
  +10044:	90000080 	adrp	x0, 20000 <_GLOBAL_OFFSET_TABLE_>
- +10048:	f9400800 	ldr	x0, \[x0,#16\]
+ +10048:	f9400800 	ldr	x0, \[x0, #16\]
  +1004c:	d53bd041 	mrs	x1, tpidr_el0
  +10050:	8b000020 	add	x0, x1, x0
  +10054:	b9400000 	ldr	w0, \[x0\]
diff --git a/ld/testsuite/ld-aarch64/tls-relax-gd-ie.d b/ld/testsuite/ld-aarch64/tls-relax-gd-ie.d
index d3783ac..f80bb90 100644
--- a/ld/testsuite/ld-aarch64/tls-relax-gd-ie.d
+++ b/ld/testsuite/ld-aarch64/tls-relax-gd-ie.d
@@ -3,7 +3,7 @@
 #objdump: -dr
 #...
  +10000:	90000080 	adrp	x0, 20000 <_GLOBAL_OFFSET_TABLE_>
- +10004:	f9400400 	ldr	x0, \[x0,#8\]
+ +10004:	f9400400 	ldr	x0, \[x0, #8\]
  +10008:	d53bd041 	mrs	x1, tpidr_el0
  +1000c:	8b000020 	add	x0, x1, x0
  +10010:	b9400000 	ldr	w0, \[x0\]
diff --git a/ld/testsuite/ld-aarch64/tls-relax-gdesc-ie-2.d b/ld/testsuite/ld-aarch64/tls-relax-gdesc-ie-2.d
index 92002de..2b8e346 100644
--- a/ld/testsuite/ld-aarch64/tls-relax-gdesc-ie-2.d
+++ b/ld/testsuite/ld-aarch64/tls-relax-gdesc-ie-2.d
@@ -4,7 +4,7 @@
 #...
  +10000:	90000080 	adrp	x0, 20000 <_GLOBAL_OFFSET_TABLE_>
  +10004:	d503201f 	nop
- +10008:	f9400400 	ldr	x0, \[x0,#8\]
+ +10008:	f9400400 	ldr	x0, \[x0, #8\]
  +1000c:	d503201f 	nop
  +10010:	d503201f 	nop
  +10014:	d503201f 	nop
diff --git a/ld/testsuite/ld-aarch64/tls-relax-gdesc-ie.d b/ld/testsuite/ld-aarch64/tls-relax-gdesc-ie.d
index 634a55a..86277f8 100644
--- a/ld/testsuite/ld-aarch64/tls-relax-gdesc-ie.d
+++ b/ld/testsuite/ld-aarch64/tls-relax-gdesc-ie.d
@@ -3,7 +3,7 @@
 #objdump: -dr
 #...
  +10000:	90000080 	adrp	x0, 20000 <_GLOBAL_OFFSET_TABLE_>
- +10004:	f9400400 	ldr	x0, \[x0,#8\]
+ +10004:	f9400400 	ldr	x0, \[x0, #8\]
  +10008:	d503201f 	nop
  +1000c:	d503201f 	nop
  +10010:	d53bd041 	mrs	x1, tpidr_el0
diff --git a/ld/testsuite/ld-aarch64/tls-relax-large-desc-ie-be.d b/ld/testsuite/ld-aarch64/tls-relax-large-desc-ie-be.d
index ea2e59b..8994b94 100644
--- a/ld/testsuite/ld-aarch64/tls-relax-large-desc-ie-be.d
+++ b/ld/testsuite/ld-aarch64/tls-relax-large-desc-ie-be.d
@@ -12,7 +12,7 @@ Disassembly of section .text:
   +10008:	8b020032 	add	x18, x1, x2
   +1000c:	d2a00000 	movz	x0, #0x0, lsl #16
   +10010:	f2800100 	movk	x0, #0x8
-  +10014:	f8606a40 	ldr	x0, \[x18,x0\]
+  +10014:	f8606a40 	ldr	x0, \[x18, x0\]
   +10018:	d503201f 	nop
   +1001c:	d503201f 	nop
   +10020:	00000000 	.word	0x00000000
diff --git a/ld/testsuite/ld-aarch64/tls-relax-large-desc-ie.d b/ld/testsuite/ld-aarch64/tls-relax-large-desc-ie.d
index 680fc57..21ad5e5 100644
--- a/ld/testsuite/ld-aarch64/tls-relax-large-desc-ie.d
+++ b/ld/testsuite/ld-aarch64/tls-relax-large-desc-ie.d
@@ -12,7 +12,7 @@ Disassembly of section .text:
   +10008:	8b020032 	add	x18, x1, x2
   +1000c:	d2a00000 	movz	x0, #0x0, lsl #16
   +10010:	f2800100 	movk	x0, #0x8
-  +10014:	f8606a40 	ldr	x0, \[x18,x0\]
+  +10014:	f8606a40 	ldr	x0, \[x18, x0\]
   +10018:	d503201f 	nop
   +1001c:	d503201f 	nop
   +10020:	0000ffe0 	.word	0x0000ffe0
diff --git a/ld/testsuite/ld-aarch64/tls-tiny-desc.d b/ld/testsuite/ld-aarch64/tls-tiny-desc.d
index fc75eee..7b88786 100644
--- a/ld/testsuite/ld-aarch64/tls-tiny-desc.d
+++ b/ld/testsuite/ld-aarch64/tls-tiny-desc.d
@@ -13,18 +13,18 @@ Disassembly of section .text:
 Disassembly of section .plt:
 
 000000000001000c \<.plt\>:
- +1000c:	a9bf7bf0 	stp	x16, x30, \[sp,#-16\]!
+ +1000c:	a9bf7bf0 	stp	x16, x30, \[sp, #-16\]!
  +10010:	90000090 	adrp	x16, 20000 \<_GLOBAL_OFFSET_TABLE_\>
- +10014:	f9401211 	ldr	x17, \[x16,#32\]
+ +10014:	f9401211 	ldr	x17, \[x16, #32\]
  +10018:	91008210 	add	x16, x16, #0x20
  +1001c:	d61f0220 	br	x17
  +10020:	d503201f 	nop
  +10024:	d503201f 	nop
  +10028:	d503201f 	nop
- +1002c:	a9bf0fe2 	stp	x2, x3, \[sp,#-16\]!
+ +1002c:	a9bf0fe2 	stp	x2, x3, \[sp, #-16\]!
  +10030:	90000082 	adrp	x2, 20000 \<_GLOBAL_OFFSET_TABLE_\>
  +10034:	90000083 	adrp	x3, 20000 \<_GLOBAL_OFFSET_TABLE_\>
- +10038:	f9400442 	ldr	x2, \[x2,#8\]
+ +10038:	f9400442 	ldr	x2, \[x2, #8\]
  +1003c:	91004063 	add	x3, x3, #0x10
  +10040:	d61f0040 	br	x2
  +10044:	d503201f 	nop
diff --git a/ld/testsuite/ld-aarch64/tls-tiny-gd.d b/ld/testsuite/ld-aarch64/tls-tiny-gd.d
index 5e77706..2f55f7b 100644
--- a/ld/testsuite/ld-aarch64/tls-tiny-gd.d
+++ b/ld/testsuite/ld-aarch64/tls-tiny-gd.d
@@ -13,15 +13,15 @@ Disassembly of section .text:
 Disassembly of section .plt:
 
 000000000001000c \<.plt\>:
- +1000c:	a9bf7bf0 	stp	x16, x30, \[sp,#-16\]!
+ +1000c:	a9bf7bf0 	stp	x16, x30, \[sp, #-16\]!
  +10010:	90000090 	adrp	x16, 20000 \<_GLOBAL_OFFSET_TABLE_\>
- +10014:	f9401611 	ldr	x17, \[x16,#40\]
+ +10014:	f9401611 	ldr	x17, \[x16, #40\]
  +10018:	9100a210 	add	x16, x16, #0x28
  +1001c:	d61f0220 	br	x17
  +10020:	d503201f 	nop
  +10024:	d503201f 	nop
  +10028:	d503201f 	nop
  +1002c:	90000090 	adrp	x16, 20000 \<_GLOBAL_OFFSET_TABLE_\>
- +10030:	f9401a11 	ldr	x17, \[x16,#48\]
+ +10030:	f9401a11 	ldr	x17, \[x16, #48\]
  +10034:	9100c210 	add	x16, x16, #0x30
  +10038:	d61f0220 	br	x17