diff --git a/ld/testsuite/ld-arm/arm-no-rel-plt.ld b/ld/testsuite/ld-arm/arm-no-rel-plt.ld
index d8e5c9d..391e663 100644
--- a/ld/testsuite/ld-arm/arm-no-rel-plt.ld
+++ b/ld/testsuite/ld-arm/arm-no-rel-plt.ld
@@ -1,9 +1,6 @@
 /* Script for -z combreloc: combine and sort reloc sections */
-OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
-	      "elf32-littlearm")
 OUTPUT_ARCH(arm)
 ENTRY(_start)
-SEARCH_DIR("/home/meadori/Code/install/arm-none-eabi/lib");
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
diff --git a/ld/testsuite/ld-arm/arm-rel32.d b/ld/testsuite/ld-arm/arm-rel32.d
index 919aaa4..ff26386 100644
--- a/ld/testsuite/ld-arm/arm-rel32.d
+++ b/ld/testsuite/ld-arm/arm-rel32.d
@@ -9,4 +9,4 @@ OFFSET +TYPE +VALUE
 
 
 Contents of section \.data:
- [^ ]+ 00000000 00010000  .*
+ [^ ]+ 00000000 (00010000|00000100)  .*
diff --git a/ld/testsuite/ld-arm/data-only-map.d b/ld/testsuite/ld-arm/data-only-map.d
index 706e709..fee073a 100644
--- a/ld/testsuite/ld-arm/data-only-map.d
+++ b/ld/testsuite/ld-arm/data-only-map.d
@@ -1,5 +1,5 @@
 
-[^:]*:     file format elf32-littlearm.*
+[^:]*:     file format elf32-(big|little)arm.*
 
 
 Disassembly of section \.text:
diff --git a/ld/testsuite/ld-arm/fix-arm1176-off.d b/ld/testsuite/ld-arm/fix-arm1176-off.d
index 89f01e2..2693873 100644
--- a/ld/testsuite/ld-arm/fix-arm1176-off.d
+++ b/ld/testsuite/ld-arm/fix-arm1176-off.d
@@ -1,5 +1,5 @@
 
-.*:     file format elf32-littlearm.*
+.*:     file format elf32-(big|little)arm.*
 
 
 Disassembly of section .foo:
diff --git a/ld/testsuite/ld-arm/fix-arm1176-on.d b/ld/testsuite/ld-arm/fix-arm1176-on.d
index 6417a33..834618e 100644
--- a/ld/testsuite/ld-arm/fix-arm1176-on.d
+++ b/ld/testsuite/ld-arm/fix-arm1176-on.d
@@ -1,5 +1,5 @@
 
-.+:     file format elf32-littlearm.*
+.+:     file format elf32-(big|little)arm.*
 
 
 Disassembly of section .foo:
diff --git a/ld/testsuite/ld-arm/ifunc-1.gd b/ld/testsuite/ld-arm/ifunc-1.gd
index ff51d37..f76f6cd 100644
--- a/ld/testsuite/ld-arm/ifunc-1.gd
+++ b/ld/testsuite/ld-arm/ifunc-1.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
 #------------------------------------------------------------------------------
 #------ 00010000: foo
 #------------------------------------------------------------------------------
- 10000 44332211 00800000 18800000           .*
+ 10000 (44332211 00800000 18800000|11223344 00008000 00008018)           .*
 Contents of section \.got:
 #------------------------------------------------------------------------------
 #------ 00011000: .got.plt
@@ -13,17 +13,17 @@ Contents of section \.got:
 #------ 00011008: reserved .got.plt entry
 #------ 0001100c: f1's .igot.plt entry [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11000 00000000 00000000 00000000 00a00000  .*
+ 11000 00000000 00000000 00000000 (00a00000|0000a000)  .*
 #------------------------------------------------------------------------------
 #------ 00011010: f3's .igot.plt pointer to 0xa008 [R_ARM_IRELATIVE]
 #------ 00011014: f2's .igot.plt pointer to 0xa004 [R_ARM_IRELATIVE]
 #------ 00011018: .got entry for foo
 #------ 0001101c: .got entry for f1's .iplt entry
 #------------------------------------------------------------------------------
- 11010 08a00000 04a00000 00000100 00900000  .*
+ 11010 (08a00000 04a00000 00000100 00900000|0000a008 0000a004 00010000 00009000)  .*
 #------------------------------------------------------------------------------
 #------ 00011020: .got entry for foo
 #------ 00011024: .got entry for f3
 #------ 00011028: .got entry for f2
 #------------------------------------------------------------------------------
- 11020 00000100 0c900000 18900000           .*
+ 11020 (00000100 0c900000 18900000|00010000 0000900c 00009018)           .*
diff --git a/ld/testsuite/ld-arm/ifunc-10.gd b/ld/testsuite/ld-arm/ifunc-10.gd
index be3e09f..b35e10b 100644
--- a/ld/testsuite/ld-arm/ifunc-10.gd
+++ b/ld/testsuite/ld-arm/ifunc-10.gd
@@ -8,88 +8,88 @@ Contents of section \.data:
 #------ 00010008: contains PC-relative offset of aaf1's .iplt entry
 #------ 0001000c: contains atf1's .iplt entry
 #------------------------------------------------------------------------------
- 10000 44332211 c4900000 bc90ffff d4900000  .*
+ 10000 (44332211 c4900000 bc90ffff d4900000|11223344 000090c4 ffff90bc 000090d4)  .*
 #------------------------------------------------------------------------------
 #------ 00010010: contains PC-relative offset of atf1's .iplt entry
 #------ 00010014: contains abf1's .iplt entry
 #------ 00010018: contains PC-relative offset of abf1's .iplt entry
 #------ 0001001c: contains taf1's .iplt entry
 #------------------------------------------------------------------------------
- 10010 c490ffff e4900000 cc90ffff f0900000  .*
+ 10010 (c490ffff e4900000 cc90ffff f0900000|ffff90c4 000090e4 ffff90cc 000090f0)  .*
 #------------------------------------------------------------------------------
 #------ 00010020: contains PC-relative offset of taf1's .iplt entry
 #------ 00010024: contains ttf1's .iplt entry
 #------ 00010028: contains PC-relative offset of ttf1's .iplt entry
 #------ 0001002c: contains tbf1's .iplt entry
 #------------------------------------------------------------------------------
- 10020 d090ffff 00910000 d890ffff 10910000  .*
+ 10020 (d090ffff 00910000 d890ffff 10910000|ffff90d0 00009100 ffff90d8 00009110)  .*
 #------------------------------------------------------------------------------
 #------ 00010030: contains PC-relative offset of tbf1's .iplt entry
 #------ 00010034: contains aaf2's .plt entry
 #------ 00010038: contains PC-relative offset of aaf2's .plt entry
 #------ 0001003c: contains atf2's .plt entry
 #------------------------------------------------------------------------------
- 10030 e090ffff 5c900000 2490ffff 18900000  .*
+ 10030 (e090ffff 5c900000 2490ffff 18900000|ffff90e0 0000905c ffff9024 00009018)  .*
 #------------------------------------------------------------------------------
 #------ 00010040: contains PC-relative offset of atf2's .plt entry
 #------ 00010044: contains abf2's .plt entry
 #------ 00010048: contains PC-relative offset of abf2's .plt entry
 #------ 0001004c: contains taf2's .plt entry
 #------------------------------------------------------------------------------
- 10040 d88fffff b8900000 7090ffff 50900000  .*
+ 10040 (d88fffff b8900000 7090ffff 50900000|ffff8fd8 000090b8 ffff9070 00009050)  .*
 #------------------------------------------------------------------------------
 #------ 00010050: contains PC-relative offset of taf2's .plt entry
 #------ 00010054: contains ttf2's .plt entry
 #------ 00010058: contains PC-relative offset of ttf2's .plt entry
 #------ 0001005c: contains tbf2's .plt entry
 #------------------------------------------------------------------------------
- 10050 0090ffff 34900000 dc8fffff 44900000  .*
+ 10050 (0090ffff 34900000 dc8fffff 44900000|ffff9000 00009034 ffff8fdc 00009044)  .*
 #------------------------------------------------------------------------------
 #------ 00010060: contains PC-relative offset of tbf2's .plt entry
 #------ 00010064: contains aaf3
 #------ 00010068: contains PC-relative offset of aaf3
 #------ 0001006c: contains atf3
 #------------------------------------------------------------------------------
- 10060 e48fffff 68910000 0091ffff 20910000  .*
+ 10060 (e48fffff 68910000 0091ffff 20910000|ffff8fe4 00009168 ffff9100 00009120)  .*
 #------------------------------------------------------------------------------
 #------ 00010070: contains PC-relative offset of atf3
 #------ 00010074: contains abf3
 #------ 00010078: contains PC-relative offset of abf3
 #------ 0001007c: contains taf3
 #------------------------------------------------------------------------------
- 10070 b090ffff 30910000 b890ffff 5c910000  .*
+ 10070 (b090ffff 30910000 b890ffff 5c910000|ffff90b0 00009130 ffff90b8 0000915c)  .*
 #------------------------------------------------------------------------------
 #------ 00010080: contains PC-relative offset of taf3
 #------ 00010084: contains ttf3
 #------ 00010088: contains PC-relative offset of ttf3
 #------ 0001008c: contains tbf3
 #------------------------------------------------------------------------------
- 10080 dc90ffff 40910000 b890ffff 50910000  .*
+ 10080 (dc90ffff 40910000 b890ffff 50910000|ffff90dc 00009140 ffff90b8 00009150)  .*
 #------------------------------------------------------------------------------
 #------ 00010090: contains PC-relative offset of tbf3
 #------ 00010094: contains aaf4's .plt entry
 #------ 00010098: contains PC-relative offset of aaf4's .plt entry
 #------ 0001009c: contains atf4's .plt entry
 #------------------------------------------------------------------------------
- 10090 c090ffff 24900000 8c8fffff 9c900000  .*
+ 10090 (c090ffff 24900000 8c8fffff 9c900000|ffff90c0 00009024 ffff8f8c 0000909c)  .*
 #------------------------------------------------------------------------------
 #------ 000100a0: contains PC-relative offset of atf4's .plt entry
 #------ 000100a4: contains abf4's .plt entry
 #------ 000100a8: contains PC-relative offset of abf4's .plt entry
 #------ 000100ac: contains taf4's .plt entry
 #------------------------------------------------------------------------------
- 100a0 fc8fffff 6c900000 c48fffff a8900000  .*
+ 100a0 (fc8fffff 6c900000 c48fffff a8900000|ffff8ffc 0000906c ffff8fc4 000090a8)  .*
 #------------------------------------------------------------------------------
 #------ 000100b0: contains PC-relative offset of taf4's .plt entry
 #------ 000100b4: contains ttf4's .plt entry
 #------ 000100b8: contains PC-relative offset of ttf4's .plt entry
 #------ 000100bc: contains tbf4's .plt entry
 #------------------------------------------------------------------------------
- 100b0 f88fffff 8c900000 d48fffff 7c900000  .*
+ 100b0 (f88fffff 8c900000 d48fffff 7c900000|ffff8ff8 0000908c ffff8fd4 0000907c)  .*
 #------------------------------------------------------------------------------
 #------ 000100c0: contains PC-relative offset of tbf4's .plt entry
 #------------------------------------------------------------------------------
- 100c0 bc8fffff                             .*
+ 100c0 (bc8fffff|ffff8fbc)                             .*
 Contents of section \.got:
 #------------------------------------------------------------------------------
 #------ 00011000: .got.plt
@@ -97,91 +97,91 @@ Contents of section \.got:
 #------ 00011008: reserved .got.plt entry
 #------ 0001100c: atf2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00900000  .*
+ 11000 (00200100 00000000 00000000 00900000|00012000 00000000 00000000 00009000)  .*
 #------------------------------------------------------------------------------
 #------ 00011010: aaf4's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 00011014: ttf2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 00011018: tbf2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 0001101c: taf2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------------------------------------------------------------------------------
- 11010 00900000 00900000 00900000 00900000  .*
+ 11010 (00900000 00900000 00900000 00900000|00009000 00009000 00009000 00009000)  .*
 #------------------------------------------------------------------------------
 #------ 00011020: aaf2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 00011024: abf4's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 00011028: tbf4's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 0001102c: ttf4's .got.plt entry [R_ARM_JUMP_SLOT]
 #------------------------------------------------------------------------------
- 11020 00900000 00900000 00900000 00900000  .*
+ 11020 (00900000 00900000 00900000 00900000|00009000 00009000 00009000 00009000)  .*
 #------------------------------------------------------------------------------
 #------ 00011030: atf4's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 00011034: taf4's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 00011038: abf2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 0001103c: aaf1's .igot.plt entry [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11030 00900000 00900000 00900000 00a00000  .*
+ 11030 (00900000 00900000 00900000 00a00000|00009000 00009000 00009000 0000a000)  .*
 #------------------------------------------------------------------------------
 #------ 00011040: atf1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011044: abf1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011048: taf1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 0001104c: ttf1's .igot.plt entry [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11040 04a00000 08a00000 0da00000 0fa00000  .*
+ 11040 (04a00000 08a00000 0da00000 0fa00000|0000a004 0000a008 0000a00d 0000a00f)  .*
 #------------------------------------------------------------------------------
 #------ 00011050: tbf1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011054: atf3's .igot.plt pointer to 0xa018 [R_ARM_IRELATIVE]
 #------ 00011058: abf3's .igot.plt pointer to 0xa01c [R_ARM_IRELATIVE]
 #------ 0001105c: ttf3's .igot.plt pointer to 0xa023 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11050 11a00000 18a00000 1ca00000 23a00000  .*
+ 11050 (11a00000 18a00000 1ca00000 23a00000|0000a011 0000a018 0000a01c 0000a023)  .*
 #------------------------------------------------------------------------------
 #------ 00011060: tbf3's .igot.plt pointer to 0xa025 [R_ARM_IRELATIVE]
 #------ 00011064: taf3's .igot.plt pointer to 0xa021 [R_ARM_IRELATIVE]
 #------ 00011068: aaf3's .igot.plt pointer to 0xa014 [R_ARM_IRELATIVE]
 #------ 0001106c: .got entry for foo
 #------------------------------------------------------------------------------
- 11060 25a00000 21a00000 14a00000 00000100  .*
+ 11060 (25a00000 21a00000 14a00000 00000100|0000a025 0000a021 0000a014 00010000)  .*
 #------------------------------------------------------------------------------
 #------ 00011070: .got entry for aaf1's .iplt entry
 #------ 00011074: .got entry for atf1's .iplt entry
 #------ 00011078: .got entry for abf1's .iplt entry
 #------ 0001107c: .got entry for taf1's .iplt entry
 #------------------------------------------------------------------------------
- 11070 c4900000 d4900000 e4900000 f0900000  .*
+ 11070 (c4900000 d4900000 e4900000 f0900000|000090c4 000090d4 000090e4 000090f0)  .*
 #------------------------------------------------------------------------------
 #------ 00011080: .got entry for ttf1's .iplt entry
 #------ 00011084: .got entry for tbf1's .iplt entry
 #------ 00011088: .got entry for foo
 #------ 0001108c: .got entry for atf2 [R_ARM_GLOB_DAT]
 #------------------------------------------------------------------------------
- 11080 00910000 10910000 00000100 00000000  .*
+ 11080 (00910000 10910000 00000100|00009100 00009110 00010000) 00000000  .*
 #------------------------------------------------------------------------------
 #------ 00011090: .got entry for aaf4 [R_ARM_GLOB_DAT]
 #------ 00011094: .got entry for ttf2 [R_ARM_GLOB_DAT]
 #------ 00011098: .got entry for tbf2 [R_ARM_GLOB_DAT]
 #------ 0001109c: .got entry for atf3
 #------------------------------------------------------------------------------
- 11090 00000000 00000000 00000000 20910000  .*
+ 11090 00000000 00000000 00000000 (20910000|00009120)  .*
 #------------------------------------------------------------------------------
 #------ 000110a0: .got entry for abf3
 #------ 000110a4: .got entry for taf2 [R_ARM_GLOB_DAT]
 #------ 000110a8: .got entry for aaf2 [R_ARM_GLOB_DAT]
 #------ 000110ac: .got entry for ttf3
 #------------------------------------------------------------------------------
- 110a0 30910000 00000000 00000000 40910000  .*
+ 110a0 (30910000 00000000 00000000 40910000|00009130 00000000 00000000 00009140)  .*
 #------------------------------------------------------------------------------
 #------ 000110b0: .got entry for tbf3
 #------ 000110b4: .got entry for taf3
 #------ 000110b8: .got entry for abf4 [R_ARM_GLOB_DAT]
 #------ 000110bc: .got entry for tbf4 [R_ARM_GLOB_DAT]
 #------------------------------------------------------------------------------
- 110b0 50910000 5c910000 00000000 00000000  .*
+ 110b0 (50910000 5c910000|00009150 0000915c) 00000000 00000000  .*
 #------------------------------------------------------------------------------
 #------ 000110c0: .got entry for ttf4 [R_ARM_GLOB_DAT]
 #------ 000110c4: .got entry for aaf3
 #------ 000110c8: .got entry for atf4 [R_ARM_GLOB_DAT]
 #------ 000110cc: .got entry for taf4 [R_ARM_GLOB_DAT]
 #------------------------------------------------------------------------------
- 110c0 00000000 68910000 00000000 00000000  .*
+ 110c0 00000000 (68910000|00009168) 00000000 00000000  .*
 #------------------------------------------------------------------------------
 #------ 000110d0: .got entry for abf2 [R_ARM_GLOB_DAT]
 #------------------------------------------------------------------------------
diff --git a/ld/testsuite/ld-arm/ifunc-11.gd b/ld/testsuite/ld-arm/ifunc-11.gd
index aea1583..b62524c 100644
--- a/ld/testsuite/ld-arm/ifunc-11.gd
+++ b/ld/testsuite/ld-arm/ifunc-11.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
 #------------------------------------------------------------------------------
 #------ 00010000: foo
 #------------------------------------------------------------------------------
- 10000 44332211 00800000 30800000           .*
+ 10000 (44332211 00800000 30800000|11223344 00008000 00008030)           .*
 Contents of section \.got:
 #------------------------------------------------------------------------------
 #------ 00011000: .got.plt
@@ -13,17 +13,17 @@ Contents of section \.got:
 #------ 00011008: reserved .got.plt entry
 #------ 0001100c: .got entry for foo
 #------------------------------------------------------------------------------
- 11000 00000000 00000000 00000000 00000100  .*
+ 11000 00000000 00000000 00000000 (00000100|00010000)  .*
 #------------------------------------------------------------------------------
 #------ 00011010: .got entry for f1 [R_ARM_IRELATIVE]
 #------ 00011014: .got entry for f1t [R_ARM_IRELATIVE]
 #------ 00011018: .got entry for foo
 #------ 0001101c: .got entry for f2t [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11010 00a00000 0da00000 00000100 0fa00000  .*
+ 11010 (00a00000 0da00000 00000100 0fa00000|0000a000 0000a00d 00010000 0000a00f)  .*
 #------------------------------------------------------------------------------
 #------ 00011020: .got entry for f3 [R_ARM_IRELATIVE]
 #------ 00011024: .got entry for f2 [R_ARM_IRELATIVE]
 #------ 00011028: .got entry for f3t [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11020 08a00000 04a00000 11a00000           .*
+ 11020 (08a00000 04a00000 11a00000|0000a008 0000a004 0000a011)           .*
diff --git a/ld/testsuite/ld-arm/ifunc-12.gd b/ld/testsuite/ld-arm/ifunc-12.gd
index 721c315..7f1c0ef 100644
--- a/ld/testsuite/ld-arm/ifunc-12.gd
+++ b/ld/testsuite/ld-arm/ifunc-12.gd
@@ -8,14 +8,14 @@ Contents of section \.data:
 #------ 00010008: f2 [R_ARM_ABS32]
 #------ 0001000c: contains f3 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 10000 44332211 00a00000 00000000 08a00000  .*
+ 10000 (44332211 00a00000 00000000 08a00000|11223344 0000a000 00000000 0000a008)  .*
 #------------------------------------------------------------------------------
 #------ 00010010: contains f1t [R_ARM_IRELATIVE]
 #------ 00010014: f2t [R_ARM_ABS32]
 #------ 00010018: contains f3t [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 10010 0da00000 00000000 11a00000 80800000  .*
- 10020 80800000                             .*
+ 10010 (0da00000 00000000 11a00000 80800000|0000a00d 00000000 0000a011 00008080)  .*
+ 10020 (80800000|00008080)                             .*
 Contents of section \.got:
 #------------------------------------------------------------------------------
 #------ 00011000: .got.plt
@@ -23,17 +23,17 @@ Contents of section \.got:
 #------ 00011008: reserved .got.plt entry
 #------ 0001100c: .got entry for foo [R_ARM_RELATIVE]
 #------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00000100  .*
+ 11000 (00200100 00000000 00000000 00000100|00012000 00000000 00000000 00010000)  .*
 #------------------------------------------------------------------------------
 #------ 00011010: .got entry for f1 [R_ARM_IRELATIVE]
 #------ 00011014: .got entry for f1t [R_ARM_IRELATIVE]
 #------ 00011018: .got entry for foo [R_ARM_RELATIVE]
 #------ 0001101c: .got entry for f2t [R_ARM_GLOB_DAT]
 #------------------------------------------------------------------------------
- 11010 00a00000 0da00000 00000100 00000000  .*
+ 11010 (00a00000 0da00000 00000100|0000a000 0000a00d 00010000) 00000000  .*
 #------------------------------------------------------------------------------
 #------ 00011020: .got entry for f3 [R_ARM_IRELATIVE]
 #------ 00011024: .got entry for f2 [R_ARM_GLOB_DAT]
 #------ 00011028: .got entry for f3t [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11020 08a00000 00000000 11a00000           .*
+ 11020 (08a00000 00000000 11a00000|0000a008 00000000 0000a011)           .*
diff --git a/ld/testsuite/ld-arm/ifunc-13.gd b/ld/testsuite/ld-arm/ifunc-13.gd
index 9b5dbcb..43f8aad 100644
--- a/ld/testsuite/ld-arm/ifunc-13.gd
+++ b/ld/testsuite/ld-arm/ifunc-13.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
 #------------------------------------------------------------------------------
 #------ 00010000: foo
 #------------------------------------------------------------------------------
- 10000 44332211 30800000 30800000           .*
+ 10000 (44332211 30800000 30800000|11223344 00008030 00008030)           .*
 Contents of section \.got:
 #------------------------------------------------------------------------------
 #------ 00011000: .got.plt
@@ -13,17 +13,17 @@ Contents of section \.got:
 #------ 00011008: reserved .got.plt entry
 #------ 0001100c: .got entry for foo
 #------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00000100  .*
+ 11000 (00200100 00000000 00000000 00000100|00012000 00000000 00000000 00010000)  .*
 #------------------------------------------------------------------------------
 #------ 00011010: .got entry for f1 [R_ARM_IRELATIVE]
 #------ 00011014: .got entry for f1t [R_ARM_IRELATIVE]
 #------ 00011018: .got entry for foo
 #------ 0001101c: .got entry for f2t [R_ARM_GLOB_DAT]
 #------------------------------------------------------------------------------
- 11010 00a00000 09a00000 00000100 00000000  .*
+ 11010 (00a00000 09a00000 00000100 00000000|0000a000 0000a009 00010000 00000000)  .*
 #------------------------------------------------------------------------------
 #------ 00011020: .got entry for f3 [R_ARM_IRELATIVE]
 #------ 00011024: .got entry for f2 [R_ARM_GLOB_DAT]
 #------ 00011028: .got entry for f3t [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11020 04a00000 00000000 0ba00000           .*
+ 11020 (04a00000 00000000 0ba00000|0000a004 00000000 0000a00b)           .*
diff --git a/ld/testsuite/ld-arm/ifunc-14.gd b/ld/testsuite/ld-arm/ifunc-14.gd
index c054e6b..40479cc 100644
--- a/ld/testsuite/ld-arm/ifunc-14.gd
+++ b/ld/testsuite/ld-arm/ifunc-14.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
 #------------------------------------------------------------------------------
 #------ 00010000: foo
 #------------------------------------------------------------------------------
- 10000 44332211 00800000 20800000           .*
+ 10000 (44332211 00800000 20800000|11223344 00008000 00008020)           .*
 Contents of section \.got:
 #------------------------------------------------------------------------------
 #------ 00011000: .got.plt
@@ -13,15 +13,15 @@ Contents of section \.got:
 #------ 00011008: reserved .got.plt entry
 #------ 0001100c: f2t's .got.plt entry [R_ARM_JUMP_SLOT]
 #------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00900000  .*
+ 11000 (00200100 00000000 00000000 00900000|00012000 00000000 00000000 00009000)  .*
 #------------------------------------------------------------------------------
 #------ 00011010: f2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 00011014: f1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011018: f1t's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 0001101c: f3's .igot.plt pointer to 0xa004 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11010 00900000 00a00000 09a00000 04a00000  .*
+ 11010 (00900000 00a00000 09a00000 04a00000|00009000 0000a000 0000a009 0000a004)  .*
 #------------------------------------------------------------------------------
 #------ 00011020: f3t's .igot.plt pointer to 0xa00b [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11020 0ba00000                             .*
+ 11020 (0ba00000|0000a00b)                             .*
diff --git a/ld/testsuite/ld-arm/ifunc-15.gd b/ld/testsuite/ld-arm/ifunc-15.gd
index c054e6b..40479cc 100644
--- a/ld/testsuite/ld-arm/ifunc-15.gd
+++ b/ld/testsuite/ld-arm/ifunc-15.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
 #------------------------------------------------------------------------------
 #------ 00010000: foo
 #------------------------------------------------------------------------------
- 10000 44332211 00800000 20800000           .*
+ 10000 (44332211 00800000 20800000|11223344 00008000 00008020)           .*
 Contents of section \.got:
 #------------------------------------------------------------------------------
 #------ 00011000: .got.plt
@@ -13,15 +13,15 @@ Contents of section \.got:
 #------ 00011008: reserved .got.plt entry
 #------ 0001100c: f2t's .got.plt entry [R_ARM_JUMP_SLOT]
 #------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00900000  .*
+ 11000 (00200100 00000000 00000000 00900000|00012000 00000000 00000000 00009000)  .*
 #------------------------------------------------------------------------------
 #------ 00011010: f2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 00011014: f1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011018: f1t's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 0001101c: f3's .igot.plt pointer to 0xa004 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11010 00900000 00a00000 09a00000 04a00000  .*
+ 11010 (00900000 00a00000 09a00000 04a00000|00009000 0000a000 0000a009 0000a004)  .*
 #------------------------------------------------------------------------------
 #------ 00011020: f3t's .igot.plt pointer to 0xa00b [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11020 0ba00000                             .*
+ 11020 (0ba00000|0000a00b)                             .*
diff --git a/ld/testsuite/ld-arm/ifunc-16.gd b/ld/testsuite/ld-arm/ifunc-16.gd
index 7c4e820..b3a1902 100644
--- a/ld/testsuite/ld-arm/ifunc-16.gd
+++ b/ld/testsuite/ld-arm/ifunc-16.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
 #------------------------------------------------------------------------------
 #------ 00010000: foo
 #------------------------------------------------------------------------------
- 10000 44332211 00800000 30800000           .*
+ 10000 (44332211 00800000 30800000|11223344 00008000 00008030)           .*
 Contents of section \.got:
 #------------------------------------------------------------------------------
 #------ 00011000: .got.plt
@@ -13,15 +13,15 @@ Contents of section \.got:
 #------ 00011008: reserved .got.plt entry
 #------ 0001100c: f1's .igot.plt entry [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00a00000  .*
+ 11000 (00200100 00000000 00000000 00a00000|00012000 00000000 00000000 0000a000)  .*
 #------------------------------------------------------------------------------
 #------ 00011010: f1t's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011014: f2t's .igot.plt pointer to 0xa00f [R_ARM_IRELATIVE]
 #------ 00011018: f3's .igot.plt pointer to 0xa008 [R_ARM_IRELATIVE]
 #------ 0001101c: f2's .igot.plt pointer to 0xa004 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11010 0da00000 0fa00000 08a00000 04a00000  .*
+ 11010 (0da00000 0fa00000 08a00000 04a00000|0000a00d 0000a00f 0000a008 0000a004)  .*
 #------------------------------------------------------------------------------
 #------ 00011020: f3t's .igot.plt pointer to 0xa011 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11020 11a00000                             .*
+ 11020 (11a00000|0000a011)                             .*
diff --git a/ld/testsuite/ld-arm/ifunc-17.gd b/ld/testsuite/ld-arm/ifunc-17.gd
index dadfc9e..41e3adf 100644
--- a/ld/testsuite/ld-arm/ifunc-17.gd
+++ b/ld/testsuite/ld-arm/ifunc-17.gd
@@ -6,5 +6,5 @@ Contents of section \.got:
 #------ 0001100c: 0xa001 (appfunc1)
 #------ 00011010: 0xa003 (appfunc2)
 #------------------------------------------------------------------------------
- 11000 00000000 00000000 00000000 01a00000  .*
- 11010 03a00000                             .*
+ 11000 00000000 00000000 00000000 (01a00000|0000a001)  .*
+ 11010 (03a00000|0000a003)                             .*
diff --git a/ld/testsuite/ld-arm/ifunc-2.gd b/ld/testsuite/ld-arm/ifunc-2.gd
index 0917a75..864d902 100644
--- a/ld/testsuite/ld-arm/ifunc-2.gd
+++ b/ld/testsuite/ld-arm/ifunc-2.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
 #------------------------------------------------------------------------------
 #------ 00010000: foo
 #------------------------------------------------------------------------------
- 10000 44332211                             .*
+ 10000 (44332211|11223344)                             .*
 Contents of section \.got:
 #------------------------------------------------------------------------------
 #------ 00011000: .got.plt
@@ -13,36 +13,36 @@ Contents of section \.got:
 #------ 00011008: reserved .got.plt entry
 #------ 0001100c: f1's .igot.plt entry [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11000 00000000 00000000 00000000 00a00000  .*
+ 11000 00000000 00000000 00000000 (00a00000|0000a000)  .*
 #------------------------------------------------------------------------------
 #------ 00011010: f2's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011014: f3's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011018: f4's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 0001101c: f7's .igot.plt pointer to 0xa018 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11010 05a00000 08a00000 0da00000 18a00000  .*
+ 11010 (05a00000 08a00000 0da00000 18a00000|0000a005 0000a008 0000a00d 0000a018)  .*
 #------------------------------------------------------------------------------
 #------ 00011020: f5's .igot.plt pointer to 0xa010 [R_ARM_IRELATIVE]
 #------ 00011024: f8's .igot.plt pointer to 0xa01d [R_ARM_IRELATIVE]
 #------ 00011028: f6's .igot.plt pointer to 0xa015 [R_ARM_IRELATIVE]
 #------ 0001102c: .got entry for foo
 #------------------------------------------------------------------------------
- 11020 10a00000 1da00000 15a00000 00000100  .*
+ 11020 (10a00000 1da00000 15a00000 00000100|0000a010 0000a01d 0000a015 00010000)  .*
 #------------------------------------------------------------------------------
 #------ 00011030: .got entry for f1's .iplt entry
 #------ 00011034: .got entry for f2's .iplt entry
 #------ 00011038: .got entry for f3's .iplt entry
 #------ 0001103c: .got entry for f4's .iplt entry
 #------------------------------------------------------------------------------
- 11030 00900000 0c900000 1c900000 2c900000  .*
+ 11030 (00900000 0c900000 1c900000 2c900000|00009000 0000900c 0000901c 0000902c)  .*
 #------------------------------------------------------------------------------
 #------ 00011040: .got entry for foo
 #------ 00011044: .got entry for f7
 #------ 00011048: .got entry for f5
 #------ 0001104c: .got entry for f8
 #------------------------------------------------------------------------------
- 11040 00000100 3c900000 48900000 58900000  .*
+ 11040 (00000100 3c900000 48900000 58900000|00010000 0000903c 00009048 00009058)  .*
 #------------------------------------------------------------------------------
 #------ 00011050: .got entry for f6
 #------------------------------------------------------------------------------
- 11050 64900000                             .*
+ 11050 (64900000|00009064)                             .*
diff --git a/ld/testsuite/ld-arm/ifunc-3.gd b/ld/testsuite/ld-arm/ifunc-3.gd
index db7fd42..ef6f2df 100644
--- a/ld/testsuite/ld-arm/ifunc-3.gd
+++ b/ld/testsuite/ld-arm/ifunc-3.gd
@@ -8,20 +8,20 @@ Contents of section \.data:
 #------ 00010008: contains PC-relative offset of foo
 #------ 0001000c: contains f1 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 10000 44332211 00000100 f8ffffff 00a00000  .*
+ 10000 (44332211 00000100 f8ffffff 00a00000|11223344 00010000 fffffff8 0000a000)  .*
 #------------------------------------------------------------------------------
 #------ 00010010: contains PC-relative offset of f1's .iplt entry
 #------ 00010014: f2 [R_ARM_ABS32]
 #------ 00010018: f2 [R_ARM_REL32]
 #------ 0001001c: contains f3 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 10010 1090ffff 00000000 00000000 08a00000  .*
+ 10010 (1090ffff 00000000 00000000 08a00000|ffff9010 00000000 00000000 0000a008)  .*
 #------------------------------------------------------------------------------
 #------ 00010020: contains PC-relative offset of f3's .iplt entry
 #------ 00010024: f4 [R_ARM_ABS32]
 #------ 00010028: contains PC-relative offset of f4's .iplt entry
 #------------------------------------------------------------------------------
- 10020 0c90ffff 00000000 1090ffff           .*
+ 10020 (0c90ffff 00000000 1090ffff|ffff900c 00000000 ffff9010)           .*
 Contents of section \.got:
 #------------------------------------------------------------------------------
 #------ 00011000: .got.plt
@@ -29,17 +29,17 @@ Contents of section \.got:
 #------ 00011008: reserved .got.plt entry
 #------ 0001100c: f2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00900000  .*
+ 11000 (00200100 00000000 00000000 00900000|00012000 00000000 00000000 00009000)  .*
 #------------------------------------------------------------------------------
 #------ 00011010: f1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011014: f3's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011018: f4's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 0001101c: .got entry for foo [R_ARM_RELATIVE]
 #------------------------------------------------------------------------------
- 11010 00a00000 08a00000 0ca00000 00000100  .*
+ 11010 (00a00000 08a00000 0ca00000 00000100|0000a000 0000a008 0000a00c 00010000)  .*
 #------------------------------------------------------------------------------
 #------ 00011020: .got entry for foo [R_ARM_RELATIVE]
 #------ 00011024: .got entry for f2 [R_ARM_GLOB_DAT]
 #------ 00011028: .got entry for f4 [R_ARM_GLOB_DAT]
 #------------------------------------------------------------------------------
- 11020 00000100 00000000 00000000           .*
+ 11020 (00000100|00010000) 00000000 00000000           .*
diff --git a/ld/testsuite/ld-arm/ifunc-4.gd b/ld/testsuite/ld-arm/ifunc-4.gd
index f768c68..bb7a8d6 100644
--- a/ld/testsuite/ld-arm/ifunc-4.gd
+++ b/ld/testsuite/ld-arm/ifunc-4.gd
@@ -8,28 +8,28 @@ Contents of section \.data:
 #------ 00010008: contains PC-relative offset of aaf1's .iplt entry
 #------ 0001000c: contains atf1 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 10000 44332211 00a00000 6490ffff 04a00000  .*
+ 10000 (44332211 00a00000 6490ffff 04a00000|11223344 0000a000 ffff9064 0000a004)  .*
 #------------------------------------------------------------------------------
 #------ 00010010: contains PC-relative offset of atf1's .iplt entry
 #------ 00010014: contains abf1 [R_ARM_IRELATIVE]
 #------ 00010018: contains PC-relative offset of abf1's .iplt entry
 #------ 0001001c: contains taf1 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 10010 6c90ffff 08a00000 7490ffff 0da00000  .*
+ 10010 (6c90ffff 08a00000 7490ffff 0da00000|ffff906c 0000a008 ffff9074 0000a00d)  .*
 #------------------------------------------------------------------------------
 #------ 00010020: contains PC-relative offset of taf1's .iplt entry
 #------ 00010024: contains ttf1 [R_ARM_IRELATIVE]
 #------ 00010028: contains PC-relative offset of ttf1's .iplt entry
 #------ 0001002c: contains tbf1 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 10020 7890ffff 0fa00000 8090ffff 11a00000  .*
+ 10020 (7890ffff 0fa00000 8090ffff 11a00000|ffff9078 0000a00f ffff9080 0000a011)  .*
 #------------------------------------------------------------------------------
 #------ 00010030: contains PC-relative offset of tbf1's .iplt entry
 #------ 00010034: aaf2 [R_ARM_ABS32]
 #------ 00010038: aaf2 [R_ARM_REL32]
 #------ 0001003c: atf2 [R_ARM_ABS32]
 #------------------------------------------------------------------------------
- 10030 8890ffff 00000000 00000000 00000000  .*
+ 10030 (8890ffff|ffff9088) 00000000 00000000 00000000  .*
 #------------------------------------------------------------------------------
 #------ 00010040: atf2 [R_ARM_REL32]
 #------ 00010044: abf2 [R_ARM_ABS32]
@@ -50,46 +50,46 @@ Contents of section \.data:
 #------ 00010068: contains PC-relative offset of aaf3's .iplt entry
 #------ 0001006c: contains atf3 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 10060 00000000 28a00000 e490ffff 2ca00000  .*
+ 10060 00000000 (28a00000 e490ffff 2ca00000|0000a028 ffff90e4 0000a02c)  .*
 #------------------------------------------------------------------------------
 #------ 00010070: contains PC-relative offset of atf3's .iplt entry
 #------ 00010074: contains abf3 [R_ARM_IRELATIVE]
 #------ 00010078: contains PC-relative offset of abf3's .iplt entry
 #------ 0001007c: contains taf3 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 10070 6490ffff 30a00000 6c90ffff 35a00000  .*
+ 10070 (6490ffff 30a00000 6c90ffff 35a00000|ffff9064 0000a030 ffff906c 0000a035)  .*
 #------------------------------------------------------------------------------
 #------ 00010080: contains PC-relative offset of taf3's .iplt entry
 #------ 00010084: contains ttf3 [R_ARM_IRELATIVE]
 #------ 00010088: contains PC-relative offset of ttf3's .iplt entry
 #------ 0001008c: contains tbf3 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 10080 9090ffff 37a00000 6c90ffff 39a00000  .*
+ 10080 (9090ffff 37a00000 6c90ffff 39a00000|ffff9090 0000a037 ffff906c 0000a039)  .*
 #------------------------------------------------------------------------------
 #------ 00010090: contains PC-relative offset of tbf3's .iplt entry
 #------ 00010094: aaf4 [R_ARM_ABS32]
 #------ 00010098: contains PC-relative offset of aaf4's .iplt entry
 #------ 0001009c: atf4 [R_ARM_ABS32]
 #------------------------------------------------------------------------------
- 10090 7490ffff 00000000 2c90ffff 00000000  .*
+ 10090 (7490ffff 00000000 2c90ffff|ffff9074 00000000 ffff902c) 00000000  .*
 #------------------------------------------------------------------------------
 #------ 000100a0: contains PC-relative offset of atf4's .iplt entry
 #------ 000100a4: abf4 [R_ARM_ABS32]
 #------ 000100a8: contains PC-relative offset of abf4's .iplt entry
 #------ 000100ac: taf4 [R_ARM_ABS32]
 #------------------------------------------------------------------------------
- 100a0 bc90ffff 00000000 7890ffff 00000000  .*
+ 100a0 (bc90ffff 00000000 7890ffff|ffff90bc 00000000 ffff9078) 00000000  .*
 #------------------------------------------------------------------------------
 #------ 000100b0: contains PC-relative offset of taf4's .iplt entry
 #------ 000100b4: ttf4 [R_ARM_ABS32]
 #------ 000100b8: contains PC-relative offset of ttf4's .iplt entry
 #------ 000100bc: tbf4 [R_ARM_ABS32]
 #------------------------------------------------------------------------------
- 100b0 b890ffff 00000000 8890ffff 00000000  .*
+ 100b0 (b890ffff 00000000 8890ffff|ffff90b8 00000000 ffff9088) 00000000  .*
 #------------------------------------------------------------------------------
 #------ 000100c0: contains PC-relative offset of tbf4's .iplt entry
 #------------------------------------------------------------------------------
- 100c0 7090ffff                             .*
+ 100c0 (7090ffff|ffff9070)                             .*
 Contents of section \.got:
 #------------------------------------------------------------------------------
 #------ 00011000: .got.plt
@@ -97,56 +97,56 @@ Contents of section \.got:
 #------ 00011008: reserved .got.plt entry
 #------ 0001100c: atf2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00900000  .*
+ 11000 (00200100 00000000 00000000 00900000|00012000 00000000 00000000 00009000)  .*
 #------------------------------------------------------------------------------
 #------ 00011010: ttf2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 00011014: tbf2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 00011018: taf2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 0001101c: aaf2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------------------------------------------------------------------------------
- 11010 00900000 00900000 00900000 00900000  .*
+ 11010 (00900000 00900000 00900000 00900000|00009000 00009000 00009000 00009000)  .*
 #------------------------------------------------------------------------------
 #------ 00011020: abf2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 00011024: aaf1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011028: atf1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 0001102c: abf1's .igot.plt entry [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11020 00900000 00a00000 04a00000 08a00000  .*
+ 11020 (00900000 00a00000 04a00000 08a00000|00009000 0000a000 0000a004 0000a008)  .*
 #------------------------------------------------------------------------------
 #------ 00011030: taf1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011034: ttf1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011038: tbf1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 0001103c: aaf4's .igot.plt entry [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11030 0da00000 0fa00000 11a00000 3ca00000  .*
+ 11030 (0da00000 0fa00000 11a00000 3ca00000|0000a00d 0000a00f 0000a011 0000a03c)  .*
 #------------------------------------------------------------------------------
 #------ 00011040: atf3's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011044: abf3's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011048: ttf3's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 0001104c: tbf3's .igot.plt entry [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11040 2ca00000 30a00000 37a00000 39a00000  .*
+ 11040 (2ca00000 30a00000 37a00000 39a00000|0000a02c 0000a030 0000a037 0000a039)  .*
 #------------------------------------------------------------------------------
 #------ 00011050: taf3's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011054: abf4's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011058: tbf4's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 0001105c: ttf4's .igot.plt entry [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11050 35a00000 44a00000 4da00000 4ba00000  .*
+ 11050 (35a00000 44a00000 4da00000 4ba00000|0000a035 0000a044 0000a04d 0000a04b)  .*
 #------------------------------------------------------------------------------
 #------ 00011060: aaf3's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011064: atf4's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011068: taf4's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 0001106c: .got entry for foo [R_ARM_RELATIVE]
 #------------------------------------------------------------------------------
- 11060 28a00000 40a00000 49a00000 00000100  .*
+ 11060 (28a00000 40a00000 49a00000 00000100|0000a028 0000a040 0000a049 00010000)  .*
 #------------------------------------------------------------------------------
 #------ 00011070: .got entry for foo [R_ARM_RELATIVE]
 #------ 00011074: .got entry for atf2 [R_ARM_GLOB_DAT]
 #------ 00011078: .got entry for aaf4 [R_ARM_GLOB_DAT]
 #------ 0001107c: .got entry for ttf2 [R_ARM_GLOB_DAT]
 #------------------------------------------------------------------------------
- 11070 00000100 00000000 00000000 00000000  .*
+ 11070 (00000100|00010000) 00000000 00000000 00000000  .*
 #------------------------------------------------------------------------------
 #------ 00011080: .got entry for tbf2 [R_ARM_GLOB_DAT]
 #------ 00011084: .got entry for taf2 [R_ARM_GLOB_DAT]
diff --git a/ld/testsuite/ld-arm/ifunc-5.gd b/ld/testsuite/ld-arm/ifunc-5.gd
index 8cd69df..fba1512 100644
--- a/ld/testsuite/ld-arm/ifunc-5.gd
+++ b/ld/testsuite/ld-arm/ifunc-5.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
 #------------------------------------------------------------------------------
 #------ 00010000: foo
 #------------------------------------------------------------------------------
- 10000 44332211 00800000 18800000           .*
+ 10000 (44332211 00800000 18800000|11223344 00008000 00008018)           .*
 Contents of section \.got:
 #------------------------------------------------------------------------------
 #------ 00011000: .got.plt
@@ -13,11 +13,11 @@ Contents of section \.got:
 #------ 00011008: reserved .got.plt entry
 #------ 0001100c: f1's .igot.plt entry [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11000 00000000 00000000 00000000 00a00000  .*
+ 11000 00000000 00000000 00000000 (00a00000|0000a000)  .*
 #------------------------------------------------------------------------------
 #------ 00011010: f3's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011014: f2's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011018: .got entry for foo
 #------ 0001101c: .got entry for foo
 #------------------------------------------------------------------------------
- 11010 08a00000 04a00000 00000100 00000100  .*
+ 11010 (08a00000 04a00000 00000100 00000100|0000a008 0000a004 00010000 00010000)  .*
diff --git a/ld/testsuite/ld-arm/ifunc-6.gd b/ld/testsuite/ld-arm/ifunc-6.gd
index 45fd914..649a57b 100644
--- a/ld/testsuite/ld-arm/ifunc-6.gd
+++ b/ld/testsuite/ld-arm/ifunc-6.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
 #------------------------------------------------------------------------------
 #------ 00010000: foo
 #------------------------------------------------------------------------------
- 10000 44332211 00800000 20800000           .*
+ 10000 (44332211 00800000 20800000|11223344 00008000 00008020)           .*
 Contents of section \.got:
 #------------------------------------------------------------------------------
 #------ 00011000: .got.plt
@@ -13,15 +13,15 @@ Contents of section \.got:
 #------ 00011008: reserved .got.plt entry
 #------ 0001100c: f3's .igot.plt entry [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11000 00000000 00000000 00000000 08a00000  .*
+ 11000 00000000 00000000 00000000 (08a00000|0000a008)  .*
 #------------------------------------------------------------------------------
 #------ 00011010: f2's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011014: f4's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011018: f1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 0001101c: .got entry for foo
 #------------------------------------------------------------------------------
- 11010 05a00000 0da00000 00a00000 00000100  .*
+ 11010 (05a00000 0da00000 00a00000 00000100|0000a005 0000a00d 0000a000 00010000)  .*
 #------------------------------------------------------------------------------
 #------ 00011020: .got entry for foo
 #------------------------------------------------------------------------------
- 11020 00000100                             .*
+ 11020 (00000100|00010000)                             .*
diff --git a/ld/testsuite/ld-arm/ifunc-7.gd b/ld/testsuite/ld-arm/ifunc-7.gd
index a116aaf..3251c45 100644
--- a/ld/testsuite/ld-arm/ifunc-7.gd
+++ b/ld/testsuite/ld-arm/ifunc-7.gd
@@ -8,20 +8,20 @@ Contents of section \.data:
 #------ 00010008: contains PC-relative offset of foo
 #------ 0001000c: contains f1 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 10000 44332211 00000100 f8ffffff 00a00000  .*
+ 10000 (44332211 00000100 f8ffffff 00a00000|11223344 00010000 fffffff8 0000a000)  .*
 #------------------------------------------------------------------------------
 #------ 00010010: contains PC-relative offset of f1's .iplt entry
 #------ 00010014: f2 [R_ARM_ABS32]
 #------ 00010018: f2 [R_ARM_REL32]
 #------ 0001001c: contains f3 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 10010 1c90ffff 00000000 00000000 04a00000  .*
+ 10010 (1c90ffff 00000000 00000000 04a00000|ffff901c 00000000 00000000 0000a004)  .*
 #------------------------------------------------------------------------------
 #------ 00010020: contains PC-relative offset of f3's .iplt entry
 #------ 00010024: f4 [R_ARM_ABS32]
 #------ 00010028: f4 [R_ARM_REL32]
 #------------------------------------------------------------------------------
- 10020 1890ffff 00000000 00000000           .*
+ 10020 (1890ffff|ffff9018) 00000000 00000000           .*
 Contents of section \.got:
 #------------------------------------------------------------------------------
 #------ 00011000: .got.plt
@@ -29,17 +29,17 @@ Contents of section \.got:
 #------ 00011008: reserved .got.plt entry
 #------ 0001100c: f2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00900000  .*
+ 11000 (00200100 00000000 00000000 00900000|00012000 00000000 00000000 00009000)  .*
 #------------------------------------------------------------------------------
 #------ 00011010: f4's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 00011014: f1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011018: f3's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 0001101c: .got entry for foo [R_ARM_RELATIVE]
 #------------------------------------------------------------------------------
- 11010 00900000 00a00000 04a00000 00000100  .*
+ 11010 (00900000 00a00000 04a00000 00000100|00009000 0000a000 0000a004 00010000)  .*
 #------------------------------------------------------------------------------
 #------ 00011020: .got entry for foo [R_ARM_RELATIVE]
 #------ 00011024: .got entry for f2 [R_ARM_GLOB_DAT]
 #------ 00011028: .got entry for f4 [R_ARM_GLOB_DAT]
 #------------------------------------------------------------------------------
- 11020 00000100 00000000 00000000           .*
+ 11020 (00000100|00010000) 00000000 00000000           .*
diff --git a/ld/testsuite/ld-arm/ifunc-8.gd b/ld/testsuite/ld-arm/ifunc-8.gd
index 7efefa0..356f042 100644
--- a/ld/testsuite/ld-arm/ifunc-8.gd
+++ b/ld/testsuite/ld-arm/ifunc-8.gd
@@ -8,28 +8,28 @@ Contents of section \.data:
 #------ 00010008: contains PC-relative offset of aaf1's .iplt entry
 #------ 0001000c: contains atf1 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 10000 44332211 00a00000 bc90ffff 04a00000  .*
+ 10000 (44332211 00a00000 bc90ffff 04a00000|11223344 0000a000 ffff90bc 0000a004)  .*
 #------------------------------------------------------------------------------
 #------ 00010010: contains PC-relative offset of atf1's .iplt entry
 #------ 00010014: contains abf1 [R_ARM_IRELATIVE]
 #------ 00010018: contains PC-relative offset of abf1's .iplt entry
 #------ 0001001c: contains taf1 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 10010 c490ffff 08a00000 cc90ffff 0da00000  .*
+ 10010 (c490ffff 08a00000 cc90ffff 0da00000|ffff90c4 0000a008 ffff90cc 0000a00d)  .*
 #------------------------------------------------------------------------------
 #------ 00010020: contains PC-relative offset of taf1's .iplt entry
 #------ 00010024: contains ttf1 [R_ARM_IRELATIVE]
 #------ 00010028: contains PC-relative offset of ttf1's .iplt entry
 #------ 0001002c: contains tbf1 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 10020 d090ffff 0fa00000 d890ffff 11a00000  .*
+ 10020 (d090ffff 0fa00000 d890ffff 11a00000|ffff90d0 0000a00f ffff90d8 0000a011)  .*
 #------------------------------------------------------------------------------
 #------ 00010030: contains PC-relative offset of tbf1's .iplt entry
 #------ 00010034: aaf2 [R_ARM_ABS32]
 #------ 00010038: aaf2 [R_ARM_REL32]
 #------ 0001003c: atf2 [R_ARM_ABS32]
 #------------------------------------------------------------------------------
- 10030 e090ffff 00000000 00000000 00000000  .*
+ 10030 (e090ffff|ffff90e0) 00000000 00000000 00000000  .*
 #------------------------------------------------------------------------------
 #------ 00010040: atf2 [R_ARM_REL32]
 #------ 00010044: abf2 [R_ARM_ABS32]
@@ -50,28 +50,28 @@ Contents of section \.data:
 #------ 00010068: contains PC-relative offset of aaf3's .iplt entry
 #------ 0001006c: contains atf3 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 10060 00000000 14a00000 0091ffff 18a00000  .*
+ 10060 00000000 (14a00000 0091ffff 18a00000|0000a014 ffff9100 0000a018)  .*
 #------------------------------------------------------------------------------
 #------ 00010070: contains PC-relative offset of atf3's .iplt entry
 #------ 00010074: contains abf3 [R_ARM_IRELATIVE]
 #------ 00010078: contains PC-relative offset of abf3's .iplt entry
 #------ 0001007c: contains taf3 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 10070 b090ffff 1ca00000 b890ffff 21a00000  .*
+ 10070 (b090ffff 1ca00000 b890ffff 21a00000|ffff90b0 0000a01c ffff90b8 0000a021)  .*
 #------------------------------------------------------------------------------
 #------ 00010080: contains PC-relative offset of taf3's .iplt entry
 #------ 00010084: contains ttf3 [R_ARM_IRELATIVE]
 #------ 00010088: contains PC-relative offset of ttf3's .iplt entry
 #------ 0001008c: contains tbf3 [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 10080 dc90ffff 23a00000 b890ffff 25a00000  .*
+ 10080 (dc90ffff 23a00000 b890ffff 25a00000|ffff90dc 0000a023 ffff90b8 0000a025)  .*
 #------------------------------------------------------------------------------
 #------ 00010090: contains PC-relative offset of tbf3's .iplt entry
 #------ 00010094: aaf4 [R_ARM_ABS32]
 #------ 00010098: aaf4 [R_ARM_REL32]
 #------ 0001009c: atf4 [R_ARM_ABS32]
 #------------------------------------------------------------------------------
- 10090 c090ffff 00000000 00000000 00000000  .*
+ 10090 (c090ffff|ffff90c0) 00000000 00000000 00000000  .*
 #------------------------------------------------------------------------------
 #------ 000100a0: atf4 [R_ARM_REL32]
 #------ 000100a4: abf4 [R_ARM_ABS32]
@@ -97,56 +97,56 @@ Contents of section \.got:
 #------ 00011008: reserved .got.plt entry
 #------ 0001100c: atf2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00900000  .*
+ 11000 (00200100 00000000 00000000 00900000|00012000 00000000 00000000 00009000)  .*
 #------------------------------------------------------------------------------
 #------ 00011010: aaf4's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 00011014: ttf2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 00011018: tbf2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 0001101c: taf2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------------------------------------------------------------------------------
- 11010 00900000 00900000 00900000 00900000  .*
+ 11010 (00900000 00900000 00900000 00900000|00009000 00009000 00009000 00009000)  .*
 #------------------------------------------------------------------------------
 #------ 00011020: aaf2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 00011024: abf4's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 00011028: tbf4's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 0001102c: ttf4's .got.plt entry [R_ARM_JUMP_SLOT]
 #------------------------------------------------------------------------------
- 11020 00900000 00900000 00900000 00900000  .*
+ 11020 (00900000 00900000 00900000 00900000|00009000 00009000 00009000 00009000)  .*
 #------------------------------------------------------------------------------
 #------ 00011030: atf4's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 00011034: taf4's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 00011038: abf2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------ 0001103c: aaf1's .igot.plt entry [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11030 00900000 00900000 00900000 00a00000  .*
+ 11030 (00900000 00900000 00900000 00a00000|00009000 00009000 00009000 0000a000)  .*
 #------------------------------------------------------------------------------
 #------ 00011040: atf1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011044: abf1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011048: taf1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 0001104c: ttf1's .igot.plt entry [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11040 04a00000 08a00000 0da00000 0fa00000  .*
+ 11040 (04a00000 08a00000 0da00000 0fa00000|0000a004 0000a008 0000a00d 0000a00f)  .*
 #------------------------------------------------------------------------------
 #------ 00011050: tbf1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011054: atf3's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011058: abf3's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 0001105c: ttf3's .igot.plt entry [R_ARM_IRELATIVE]
 #------------------------------------------------------------------------------
- 11050 11a00000 18a00000 1ca00000 23a00000  .*
+ 11050 (11a00000 18a00000 1ca00000 23a00000|0000a011 0000a018 0000a01c 0000a023)  .*
 #------------------------------------------------------------------------------
 #------ 00011060: tbf3's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011064: taf3's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011068: aaf3's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 0001106c: .got entry for foo [R_ARM_RELATIVE]
 #------------------------------------------------------------------------------
- 11060 25a00000 21a00000 14a00000 00000100  .*
+ 11060 (25a00000 21a00000 14a00000 00000100|0000a025 0000a021 0000a014 00010000)  .*
 #------------------------------------------------------------------------------
 #------ 00011070: .got entry for foo [R_ARM_RELATIVE]
 #------ 00011074: .got entry for atf2 [R_ARM_GLOB_DAT]
 #------ 00011078: .got entry for aaf4 [R_ARM_GLOB_DAT]
 #------ 0001107c: .got entry for ttf2 [R_ARM_GLOB_DAT]
 #------------------------------------------------------------------------------
- 11070 00000100 00000000 00000000 00000000  .*
+ 11070 (00000100|00010000) 00000000 00000000 00000000  .*
 #------------------------------------------------------------------------------
 #------ 00011080: .got entry for tbf2 [R_ARM_GLOB_DAT]
 #------ 00011084: .got entry for taf2 [R_ARM_GLOB_DAT]
diff --git a/ld/testsuite/ld-arm/ifunc-9.gd b/ld/testsuite/ld-arm/ifunc-9.gd
index 6f220d1..54cd830 100644
--- a/ld/testsuite/ld-arm/ifunc-9.gd
+++ b/ld/testsuite/ld-arm/ifunc-9.gd
@@ -5,7 +5,7 @@ Contents of section \.data:
 #------------------------------------------------------------------------------
 #------ 00010000: foo
 #------------------------------------------------------------------------------
- 10000 44332211                             .*
+ 10000 (44332211|11223344)                             .*
 Contents of section \.got:
 #------------------------------------------------------------------------------
 #------ 00011000: .got.plt
@@ -13,17 +13,17 @@ Contents of section \.got:
 #------ 00011008: reserved .got.plt entry
 #------ 0001100c: f2's .got.plt entry [R_ARM_JUMP_SLOT]
 #------------------------------------------------------------------------------
- 11000 00200100 00000000 00000000 00900000  .*
+ 11000 (00200100 00000000 00000000 00900000|00012000 00000000 00000000 00009000)  .*
 #------------------------------------------------------------------------------
 #------ 00011010: f1's .igot.plt entry [R_ARM_IRELATIVE]
 #------ 00011014: f3's .igot.plt pointer to 0xa004 [R_ARM_IRELATIVE]
 #------ 00011018: .got entry for foo
 #------ 0001101c: .got entry for f1's .iplt entry
 #------------------------------------------------------------------------------
- 11010 00a00000 04a00000 00000100 20900000  .*
+ 11010 (00a00000 04a00000 00000100 20900000|0000a000 0000a004 00010000 00009020)  .*
 #------------------------------------------------------------------------------
 #------ 00011020: .got entry for foo
 #------ 00011024: .got entry for f3
 #------ 00011028: .got entry for f2 [R_ARM_GLOB_DAT]
 #------------------------------------------------------------------------------
- 11020 00000100 2c900000 00000000           .*
+ 11020 (00000100 2c900000|00010000 0000902c) 00000000           .*
diff --git a/ld/testsuite/ld-arm/jump-reloc-veneers-long.d b/ld/testsuite/ld-arm/jump-reloc-veneers-long.d
index c69e688..6bd5652 100644
--- a/ld/testsuite/ld-arm/jump-reloc-veneers-long.d
+++ b/ld/testsuite/ld-arm/jump-reloc-veneers-long.d
@@ -10,7 +10,7 @@ Disassembly of section destsect:
 Disassembly of section .text:
 
 000080.. <[^>]*>:
-    80..:	b802f000 	.word	0xb802f000
+    80..:	(b802f000|f000b802) 	.word	0x(b802f000|f000b802)
     80..:	00000000 	andeq	r0, r0, r0
 
 000080.. <[^>]*>:
diff --git a/ld/testsuite/ld-arm/reloc-boundaries.d b/ld/testsuite/ld-arm/reloc-boundaries.d
index 4bfaf0a..e71c5ae 100644
--- a/ld/testsuite/ld-arm/reloc-boundaries.d
+++ b/ld/testsuite/ld-arm/reloc-boundaries.d
@@ -2,5 +2,5 @@
 [^:]*:     file format elf32-(little|big)arm.*
 
 Contents of section .text:
- [0-9a-f]+ 80ff0080 ffff                        ......          
+ [0-9a-f]+ (80ff0080|80ff8000) ffff                        ......          
 #...
