* [PATCH] Pretty-printing plt entries on ARM (second try)
@ 2014-03-12 9:10 Yury Gribov
2014-03-14 11:32 ` Nicholas Clifton
0 siblings, 1 reply; 7+ messages in thread
From: Yury Gribov @ 2014-03-12 9:10 UTC (permalink / raw)
To: binutils; +Cc: Viacheslav Garbuzov, Pavel Fedin
[-- Attachment #1: Type: text/plain, Size: 1582 bytes --]
This is simplified version of patch originally proposed in
https://sourceware.org/ml/binutils/2014-03/msg00046.html
This code will add pretty-printing of PLT entries on ARM, so e.g. instead of
Disassembly of section .plt:
00001000 <.plt>:
1000: e52de004 push {lr} ; (str lr, [sp, #-4]!)
1004: e59fe004 ldr lr, [pc, #4] ; 1010 <_start-0x14>
1008: e08fe00e add lr, pc, lr
100c: e5bef008 ldr pc, [lr, #8]!
1010: f00000f0 .word 0xf00000f0
1014: e28fc20f add ip, pc, #-268435456 ; 0xf0000000
1018: e28cc600 add ip, ip, #0, 12
101c: e28cca00 add ip, ip, #0, 20
1020: e5bcf0f0 ldr pc, [ip, #240]! ; 0xf0
objdump will now output a much more convenient message:
Disassembly of section .plt:
00001000 <foo@plt-0x14>:
1000: e52de004 push {lr} ; (str lr, [sp, #-4]!)
1004: e59fe004 ldr lr, [pc, #4] ; 1010 <foo@plt-0x4>
1008: e08fe00e add lr, pc, lr
100c: e5bef008 ldr pc, [lr, #8]!
1010: f00000f0 .word 0xf00000f0
00001014 <foo@plt>:
1014: e28fc20f add ip, pc, #-268435456 ; 0xf0000000
1018: e28cc600 add ip, ip, #0, 12
101c: e28cca00 add ip, ip, #0, 20
1020: e5bcf0f0 ldr pc, [ip, #240]! ; 0xf0
Instead of abusing elf_backend_plt_sym_val I overloaded
bfd_elf32_get_synthetic_symtab (per Pavel's advice). This has
significantly shortened the patch.
I got no regressions for host-only tests on
arm-{gnueabi,eabi,nacl,symbian}. I haven't tried runtime gdb tests (they
require complete toolchains for all platforms and I don't have them atm).
Ok to commit?
-Y
[-- Attachment #2: arm_pretty_plt_dumps.diff --]
[-- Type: text/x-diff, Size: 155095 bytes --]
2014-03-11 Yury Gribov <y.gribov@samsung.com>
Pavel Fedin <p.fedin@samsung.com>
Support limited pretty-printing of PLT entries on eabi and nacl ARM targets.
bfd/
* elf32-arm.c (elf32_arm_get_synthetic_symtab): Add new callback.
(elf32_arm_nacl_plt_sym_val): Likewise.
(elf32_arm_eabi_plt_size): Add helper function.
ld/testsuite/
* ld-arm/arm-app-abs32.d: Updated test.
* ld-arm/arm-app.d: Likewise.
* ld-arm/arm-lib-plt32.d: Likewise.
* ld-arm/arm-lib.d: Likewise.
* ld-arm/armthumb-lib.d: Likewise.
* ld-arm/cortex-a8-fix-b-plt.d: Likewise.
* ld-arm/cortex-a8-fix-bcc-plt.d: Likewise.
* ld-arm/cortex-a8-fix-bl-plt.d: Likewise.
* ld-arm/cortex-a8-fix-bl-rel-plt.d: Likewise.
* ld-arm/cortex-a8-fix-blx-plt.d: Likewise.
* ld-arm/farcall-mixed-app-v5.d: Likewise.
* ld-arm/farcall-mixed-app.d: Likewise.
* ld-arm/farcall-mixed-lib-v4t.d: Likewise.
* ld-arm/farcall-mixed-lib.d: Likewise.
* ld-arm/ifunc-10.dd: Likewise.
* ld-arm/ifunc-14.dd: Likewise.
* ld-arm/ifunc-15.dd: Likewise.
* ld-arm/ifunc-3.dd: Likewise.
* ld-arm/ifunc-4.dd: Likewise.
* ld-arm/ifunc-7.dd: Likewise.
* ld-arm/ifunc-8.dd: Likewise.
* ld-arm/ifunc-9.dd: Likewise.
* ld-arm/long-plt-format.d: Likewise.
* ld-arm/mixed-app-v5.d: Likewise.
* ld-arm/mixed-app.d: Likewise.
* ld-arm/mixed-lib.d: Likewise.
* ld-arm/thumb2-bl-undefweak.d: Likewise.
* ld-arm/thumb2-bl-undefweak1.d: Likewise.
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index db9566b..1c541d5 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -15900,6 +15900,156 @@ const struct elf_size_info elf32_arm_size_info =
bfd_elf32_swap_reloca_out
};
+/* Return size of plt entry starting at ADDR
+ or (bfd_vma) -1 if size can not be determined. */
+
+static bfd_vma
+elf32_arm_eabi_plt_size (const bfd *abfd, const bfd_byte *addr)
+{
+ bfd_vma first_insn;
+ bfd_vma plt_size = 0;
+
+ /* Respect Thumb stub if necessary. */
+ if (H_GET_16(abfd, addr) == elf32_arm_plt_thumb_stub[0])
+ {
+ plt_size += 2 * ARRAY_SIZE(elf32_arm_plt_thumb_stub);
+ }
+
+ /* Strip immediate from first add. */
+ first_insn = H_GET_32(abfd, addr + plt_size) & 0xffffff00;
+
+#ifdef FOUR_WORD_PLT
+ if (first_insn == elf32_arm_plt_entry[0])
+ plt_size += 4 * ARRAY_SIZE(elf32_arm_plt_entry);
+#else
+ if (first_insn == elf32_arm_plt_entry_long[0])
+ plt_size += 4 * ARRAY_SIZE(elf32_arm_plt_entry_long);
+ else if (first_insn == elf32_arm_plt_entry_short[0])
+ plt_size += 4 * ARRAY_SIZE(elf32_arm_plt_entry_short);
+#endif
+ else
+ /* We don't yet support other PLT formats (pure Thumb2, etc.). */
+ return (bfd_vma) -1;
+
+ return plt_size;
+}
+
+static long
+elf32_arm_get_synthetic_symtab (bfd *abfd,
+ long symcount ATTRIBUTE_UNUSED,
+ asymbol **syms ATTRIBUTE_UNUSED,
+ long dynsymcount,
+ asymbol **dynsyms,
+ asymbol **ret)
+{
+ /* Implementation is shamelessly borrowed from _bfd_elf_get_synthetic_symtab. */
+
+ asection *relplt;
+ asymbol *s;
+ arelent *p;
+ long count, i, n;
+ size_t size;
+ Elf_Internal_Shdr *hdr;
+ char *names;
+ asection *plt;
+ bfd_vma offset;
+ bfd_byte *data;
+
+ *ret = NULL;
+
+ if ((abfd->flags & (DYNAMIC | EXEC_P)) == 0)
+ return 0;
+
+ if (dynsymcount <= 0)
+ return 0;
+
+ relplt = bfd_get_section_by_name (abfd, ".rel.plt");
+ if (relplt == NULL)
+ return 0;
+
+ hdr = &elf_section_data (relplt)->this_hdr;
+ if (hdr->sh_link != elf_dynsymtab (abfd)
+ || (hdr->sh_type != SHT_REL && hdr->sh_type != SHT_RELA))
+ return 0;
+
+ plt = bfd_get_section_by_name (abfd, ".plt");
+ if (plt == NULL)
+ return 0;
+
+ if (!elf32_arm_size_info.slurp_reloc_table (abfd, relplt, dynsyms, TRUE))
+ return -1;
+
+ data = plt->contents;
+ if (data == NULL)
+ {
+ if (!bfd_get_full_section_contents(abfd, (asection *)plt, &data) || data == NULL)
+ return -1;
+ bfd_cache_section_contents((asection *)plt, data);
+ }
+
+ count = relplt->size / hdr->sh_entsize;
+ size = count * sizeof (asymbol);
+ p = relplt->relocation;
+ for (i = 0; i < count; i++, p += elf32_arm_size_info.int_rels_per_ext_rel)
+ {
+ size += strlen ((*p->sym_ptr_ptr)->name) + sizeof ("@plt");
+ if (p->addend != 0)
+ {
+ size += sizeof ("+0x") - 1 + 8;
+ }
+ }
+
+ s = *ret = (asymbol *) bfd_malloc (size);
+ if (s == NULL)
+ return -1;
+
+ names = (char *) (s + count);
+ p = relplt->relocation;
+ n = 0;
+ offset = 4 * ARRAY_SIZE(elf32_arm_plt0_entry);
+ for (i = 0; i < count; i++, p += elf32_arm_size_info.int_rels_per_ext_rel)
+ {
+ size_t len;
+
+ bfd_vma plt_size = elf32_arm_eabi_plt_size (abfd, data + offset);
+ if (plt_size == (bfd_vma) -1)
+ break;
+
+ *s = **p->sym_ptr_ptr;
+ /* Undefined syms won't have BSF_LOCAL or BSF_GLOBAL set. Since
+ we are defining a symbol, ensure one of them is set. */
+ if ((s->flags & BSF_LOCAL) == 0)
+ s->flags |= BSF_GLOBAL;
+ s->flags |= BSF_SYNTHETIC;
+ s->section = plt;
+ s->value = offset;
+ s->name = names;
+ s->udata.p = NULL;
+ len = strlen ((*p->sym_ptr_ptr)->name);
+ memcpy (names, (*p->sym_ptr_ptr)->name, len);
+ names += len;
+ if (p->addend != 0)
+ {
+ char buf[30], *a;
+
+ memcpy (names, "+0x", sizeof ("+0x") - 1);
+ names += sizeof ("+0x") - 1;
+ bfd_sprintf_vma (abfd, buf, p->addend);
+ for (a = buf; *a == '0'; ++a)
+ ;
+ len = strlen (a);
+ memcpy (names, a, len);
+ names += len;
+ }
+ memcpy (names, "@plt", sizeof ("@plt"));
+ names += sizeof ("@plt");
+ ++s, ++n;
+ offset += plt_size;
+ }
+
+ return n;
+}
+
#define ELF_ARCH bfd_arch_arm
#define ELF_TARGET_ID ARM_ELF_DATA
#define ELF_MACHINE_CODE EM_ARM
@@ -15926,6 +16076,7 @@ const struct elf_size_info elf32_arm_size_info =
#define bfd_elf32_new_section_hook elf32_arm_new_section_hook
#define bfd_elf32_bfd_is_target_special_symbol elf32_arm_is_target_special_symbol
#define bfd_elf32_bfd_final_link elf32_arm_final_link
+#define bfd_elf32_get_synthetic_symtab elf32_arm_get_synthetic_symtab
#define elf_backend_get_symbol_type elf32_arm_get_symbol_type
#define elf_backend_gc_mark_hook elf32_arm_gc_mark_hook
@@ -16030,6 +16181,15 @@ elf32_arm_nacl_final_write_processing (bfd *abfd, bfd_boolean linker)
nacl_final_write_processing (abfd, linker);
}
+static bfd_vma
+elf32_arm_nacl_plt_sym_val (bfd_vma i, const asection *plt,
+ const arelent *rel ATTRIBUTE_UNUSED)
+{
+ return plt->vma + 4 * (
+ ARRAY_SIZE(elf32_arm_nacl_plt0_entry) +
+ i * ARRAY_SIZE(elf32_arm_nacl_plt_entry));
+}
+
#undef elf32_bed
#define elf32_bed elf32_arm_nacl_bed
@@ -16044,6 +16204,9 @@ elf32_arm_nacl_final_write_processing (bfd *abfd, bfd_boolean linker)
#define elf_backend_modify_program_headers nacl_modify_program_headers
#undef elf_backend_final_write_processing
#define elf_backend_final_write_processing elf32_arm_nacl_final_write_processing
+#undef bfd_elf32_get_synthetic_symtab
+#undef elf_backend_plt_sym_val
+#define elf_backend_plt_sym_val elf32_arm_nacl_plt_sym_val
#undef ELF_MAXPAGESIZE
#define ELF_MAXPAGESIZE 0x10000
diff --git a/ld/testsuite/ld-arm/arm-app-abs32.d b/ld/testsuite/ld-arm/arm-app-abs32.d
index e6c4632..2f56c08 100644
--- a/ld/testsuite/ld-arm/arm-app-abs32.d
+++ b/ld/testsuite/ld-arm/arm-app-abs32.d
@@ -6,12 +6,13 @@ start address .*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func1@plt-0x14>:
+.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- +.*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x10>
+ +.*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1@plt-0x4>
+.*: e08fe00e add lr, pc, lr
+.*: e5bef008 ldr pc, \[lr, #8\]!
+.*: .* .*
+.* <lib_func1@plt>:
+.*: e28fc6.* add ip, pc, #.*
+.*: e28cca.* add ip, ip, #.* ; .*
+.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
diff --git a/ld/testsuite/ld-arm/arm-app.d b/ld/testsuite/ld-arm/arm-app.d
index 88169af..9788db0 100644
--- a/ld/testsuite/ld-arm/arm-app.d
+++ b/ld/testsuite/ld-arm/arm-app.d
@@ -6,12 +6,13 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func1@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x10>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -27,7 +28,7 @@ Disassembly of section .text:
.* <app_func>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff4 bl .* <_start-0xc>
+ .*: ebfffff4 bl .* <lib_func1@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
diff --git a/ld/testsuite/ld-arm/arm-lib-plt32.d b/ld/testsuite/ld-arm/arm-lib-plt32.d
index 279ea5a..e04adb8 100644
--- a/ld/testsuite/ld-arm/arm-lib-plt32.d
+++ b/ld/testsuite/ld-arm/arm-lib-plt32.d
@@ -6,12 +6,13 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x10>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -20,7 +21,7 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff9 bl .* <lib_func1-0xc>
+ .*: ebfffff9 bl .* <app_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
diff --git a/ld/testsuite/ld-arm/arm-lib.d b/ld/testsuite/ld-arm/arm-lib.d
index 22e21d5..887880f 100644
--- a/ld/testsuite/ld-arm/arm-lib.d
+++ b/ld/testsuite/ld-arm/arm-lib.d
@@ -6,12 +6,13 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x10>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -20,7 +21,7 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff9 bl .* <lib_func1-0xc>
+ .*: ebfffff9 bl .* <app_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
diff --git a/ld/testsuite/ld-arm/armthumb-lib.d b/ld/testsuite/ld-arm/armthumb-lib.d
index dae72ed..b63e3e6 100644
--- a/ld/testsuite/ld-arm/armthumb-lib.d
+++ b/ld/testsuite/ld-arm/armthumb-lib.d
@@ -6,12 +6,13 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x1.>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -20,7 +21,7 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff. bl .* <lib_func1-0x..?>
+ .*: ebfffff. bl .* <app_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
.*: e1a00000 nop ; \(mov r0, r0\)
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
index 4f1078d..0f40861 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008000 <\.plt>:
+00008000 <bar@plt-0x14>:
8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <foo-0xfe0>
+ 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <bar@plt-0x4>
8008: e08fe00e add lr, pc, lr
800c: e5bef008 ldr pc, \[lr, #8\]!
8010: 00000ffc \.word 0x00000ffc
+00008014 <bar@plt>:
8014: 4778 bx pc
8016: 46c0 nop ; \(mov r8, r8\)
8018: e28fc600 add ip, pc, #0, 12
@@ -27,4 +28,4 @@ Disassembly of section \.text:
9002: 0000 movs r0, r0
9004: 0000 movs r0, r0
9006: 0000 movs r0, r0
- 9008: f7ff b804 b\.w 8014 <foo-0xfdc>
+ 9008: f7ff b804 b\.w 8014 <bar@plt>
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
index 1e0cab2..b6e6fff 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008000 <\.plt>:
+00008000 <bar@plt-0x14>:
8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <foo-0xfe0>
+ 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <bar@plt-0x4>
8008: e08fe00e add lr, pc, lr
800c: e5bef008 ldr pc, \[lr, #8\]!
8010: 00001004 \.word 0x00001004
+00008014 <bar@plt>:
8014: 4778 bx pc
8016: 46c0 nop ; \(mov r8, r8\)
8018: e28fc600 add ip, pc, #0, 12
@@ -29,4 +30,4 @@ Disassembly of section \.text:
9006: 0000 movs r0, r0
9008: d001 beq\.n 900e <foo\+0x1e>
900a: f7ff bffa b\.w 9002 <foo\+0x12>
- 900e: f7ff b801 b\.w 8014 <foo-0xfdc>
+ 900e: f7ff b801 b\.w 8014 <bar@plt>
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
index ebb480f..baad3d0 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008000 <\.plt>:
+00008000 <bar@plt-0x14>:
8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <foo-0xfe0>
+ 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <bar@plt-0x4>
8008: e08fe00e add lr, pc, lr
800c: e5bef008 ldr pc, \[lr, #8\]!
8010: 00000ffc \.word 0x00000ffc
+00008014 <bar@plt>:
8014: e28fc600 add ip, pc, #0, 12
8018: e28cca00 add ip, ip, #0, 20
801c: e5bcfffc ldr pc, \[ip, #4092\]! ; 0xffc
@@ -25,4 +26,4 @@ Disassembly of section \.text:
9002: 0000 movs r0, r0
9004: 0000 movs r0, r0
9006: 0000 movs r0, r0
- 9008: eafffc01 b 8014 <foo-0xfdc>
+ 9008: eafffc01 b 8014 <bar@plt>
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
index f8a9c24..e2fd8ac 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008e00 <\.plt>:
+00008e00 <targetfn@plt-0x14>:
8e00: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8e04: e59fe004 ldr lr, \[pc, #4\] ; 8e10 <targetfn-0xf0>
+ 8e04: e59fe004 ldr lr, \[pc, #4\] ; 8e10 <targetfn@plt-0x4>
8e08: e08fe00e add lr, pc, lr
8e0c: e5bef008 ldr pc, \[lr, #8\]!
8e10: 0000827c \.word 0x0000827c
+00008e14 <targetfn@plt>:
8e14: e28fc600 add ip, pc, #0, 12
8e18: e28cca08 add ip, ip, #8, 20 ; 0x8000
8e1c: e5bcf27c ldr pc, \[ip, #636\]! ; 0x27c
@@ -24,69 +25,69 @@ Disassembly of section \.text:
00008f08 <_start>:
8f08: bf00 nop
8f0a: eb01 0002 add\.w r0, r1, r2
- 8f0e: f7ff ef82 blx 8e14 <targetfn-0xec>
+ 8f0e: f7ff ef82 blx 8e14 <targetfn@plt>
8f12: eb01 0002 add\.w r0, r1, r2
- 8f16: f7ff ef7e blx 8e14 <targetfn-0xec>
+ 8f16: f7ff ef7e blx 8e14 <targetfn@plt>
8f1a: eb01 0002 add\.w r0, r1, r2
- 8f1e: f7ff ef7a blx 8e14 <targetfn-0xec>
+ 8f1e: f7ff ef7a blx 8e14 <targetfn@plt>
8f22: eb01 0002 add\.w r0, r1, r2
- 8f26: f7ff ef76 blx 8e14 <targetfn-0xec>
+ 8f26: f7ff ef76 blx 8e14 <targetfn@plt>
8f2a: eb01 0002 add\.w r0, r1, r2
- 8f2e: f7ff ef72 blx 8e14 <targetfn-0xec>
+ 8f2e: f7ff ef72 blx 8e14 <targetfn@plt>
8f32: eb01 0002 add\.w r0, r1, r2
- 8f36: f7ff ef6e blx 8e14 <targetfn-0xec>
+ 8f36: f7ff ef6e blx 8e14 <targetfn@plt>
8f3a: eb01 0002 add\.w r0, r1, r2
- 8f3e: f7ff ef6a blx 8e14 <targetfn-0xec>
+ 8f3e: f7ff ef6a blx 8e14 <targetfn@plt>
8f42: eb01 0002 add\.w r0, r1, r2
- 8f46: f7ff ef66 blx 8e14 <targetfn-0xec>
+ 8f46: f7ff ef66 blx 8e14 <targetfn@plt>
8f4a: eb01 0002 add\.w r0, r1, r2
- 8f4e: f7ff ef62 blx 8e14 <targetfn-0xec>
+ 8f4e: f7ff ef62 blx 8e14 <targetfn@plt>
8f52: eb01 0002 add\.w r0, r1, r2
- 8f56: f7ff ef5e blx 8e14 <targetfn-0xec>
+ 8f56: f7ff ef5e blx 8e14 <targetfn@plt>
8f5a: eb01 0002 add\.w r0, r1, r2
- 8f5e: f7ff ef5a blx 8e14 <targetfn-0xec>
+ 8f5e: f7ff ef5a blx 8e14 <targetfn@plt>
8f62: eb01 0002 add\.w r0, r1, r2
- 8f66: f7ff ef56 blx 8e14 <targetfn-0xec>
+ 8f66: f7ff ef56 blx 8e14 <targetfn@plt>
8f6a: eb01 0002 add\.w r0, r1, r2
- 8f6e: f7ff ef52 blx 8e14 <targetfn-0xec>
+ 8f6e: f7ff ef52 blx 8e14 <targetfn@plt>
8f72: eb01 0002 add\.w r0, r1, r2
- 8f76: f7ff ef4e blx 8e14 <targetfn-0xec>
+ 8f76: f7ff ef4e blx 8e14 <targetfn@plt>
8f7a: eb01 0002 add\.w r0, r1, r2
- 8f7e: f7ff ef4a blx 8e14 <targetfn-0xec>
+ 8f7e: f7ff ef4a blx 8e14 <targetfn@plt>
8f82: eb01 0002 add\.w r0, r1, r2
- 8f86: f7ff ef46 blx 8e14 <targetfn-0xec>
+ 8f86: f7ff ef46 blx 8e14 <targetfn@plt>
8f8a: eb01 0002 add\.w r0, r1, r2
- 8f8e: f7ff ef42 blx 8e14 <targetfn-0xec>
+ 8f8e: f7ff ef42 blx 8e14 <targetfn@plt>
8f92: eb01 0002 add\.w r0, r1, r2
- 8f96: f7ff ef3e blx 8e14 <targetfn-0xec>
+ 8f96: f7ff ef3e blx 8e14 <targetfn@plt>
8f9a: eb01 0002 add\.w r0, r1, r2
- 8f9e: f7ff ef3a blx 8e14 <targetfn-0xec>
+ 8f9e: f7ff ef3a blx 8e14 <targetfn@plt>
8fa2: eb01 0002 add\.w r0, r1, r2
- 8fa6: f7ff ef36 blx 8e14 <targetfn-0xec>
+ 8fa6: f7ff ef36 blx 8e14 <targetfn@plt>
8faa: eb01 0002 add\.w r0, r1, r2
- 8fae: f7ff ef32 blx 8e14 <targetfn-0xec>
+ 8fae: f7ff ef32 blx 8e14 <targetfn@plt>
8fb2: eb01 0002 add\.w r0, r1, r2
- 8fb6: f7ff ef2e blx 8e14 <targetfn-0xec>
+ 8fb6: f7ff ef2e blx 8e14 <targetfn@plt>
8fba: eb01 0002 add\.w r0, r1, r2
- 8fbe: f7ff ef2a blx 8e14 <targetfn-0xec>
+ 8fbe: f7ff ef2a blx 8e14 <targetfn@plt>
8fc2: eb01 0002 add\.w r0, r1, r2
- 8fc6: f7ff ef26 blx 8e14 <targetfn-0xec>
+ 8fc6: f7ff ef26 blx 8e14 <targetfn@plt>
8fca: eb01 0002 add\.w r0, r1, r2
- 8fce: f7ff ef22 blx 8e14 <targetfn-0xec>
+ 8fce: f7ff ef22 blx 8e14 <targetfn@plt>
8fd2: eb01 0002 add\.w r0, r1, r2
- 8fd6: f7ff ef1e blx 8e14 <targetfn-0xec>
+ 8fd6: f7ff ef1e blx 8e14 <targetfn@plt>
8fda: eb01 0002 add\.w r0, r1, r2
- 8fde: f7ff ef1a blx 8e14 <targetfn-0xec>
+ 8fde: f7ff ef1a blx 8e14 <targetfn@plt>
8fe2: eb01 0002 add\.w r0, r1, r2
- 8fe6: f7ff ef16 blx 8e14 <targetfn-0xec>
+ 8fe6: f7ff ef16 blx 8e14 <targetfn@plt>
8fea: eb01 0002 add\.w r0, r1, r2
- 8fee: f7ff ef12 blx 8e14 <targetfn-0xec>
+ 8fee: f7ff ef12 blx 8e14 <targetfn@plt>
8ff2: eb01 0002 add\.w r0, r1, r2
- 8ff6: f7ff ef0e blx 8e14 <targetfn-0xec>
+ 8ff6: f7ff ef0e blx 8e14 <targetfn@plt>
8ffa: eb01 0002 add\.w r0, r1, r2
8ffe: f000 e808 blx 9010 <_start\+0x108>
9002: eb01 0002 add\.w r0, r1, r2
- 9006: f7ff ef06 blx 8e14 <targetfn-0xec>
+ 9006: f7ff ef06 blx 8e14 <targetfn@plt>
900a: 4770 bx lr
900c: f3af 8000 nop\.w
- 9010: eaffff7f b 8e14 <targetfn-0xec>
+ 9010: eaffff7f b 8e14 <targetfn@plt>
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
index ebb480f..baad3d0 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008000 <\.plt>:
+00008000 <bar@plt-0x14>:
8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <foo-0xfe0>
+ 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <bar@plt-0x4>
8008: e08fe00e add lr, pc, lr
800c: e5bef008 ldr pc, \[lr, #8\]!
8010: 00000ffc \.word 0x00000ffc
+00008014 <bar@plt>:
8014: e28fc600 add ip, pc, #0, 12
8018: e28cca00 add ip, ip, #0, 20
801c: e5bcfffc ldr pc, \[ip, #4092\]! ; 0xffc
@@ -25,4 +26,4 @@ Disassembly of section \.text:
9002: 0000 movs r0, r0
9004: 0000 movs r0, r0
9006: 0000 movs r0, r0
- 9008: eafffc01 b 8014 <foo-0xfdc>
+ 9008: eafffc01 b 8014 <bar@plt>
diff --git a/ld/testsuite/ld-arm/farcall-mixed-app-v5.d b/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
index 781b972..7466883 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
@@ -6,15 +6,17 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -25,15 +27,15 @@ Disassembly of section .text:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
.*: eb000008 bl .* <__app_func_veneer>
- .*: ebfffff5 bl .* <_start-0x18>
- .*: ebfffff1 bl .* <_start-0x24>
+ .*: ebfffff5 bl .* <lib_func1@plt>
+ .*: ebfffff1 bl .* <lib_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
.*: e1a00000 nop ; \(mov r0, r0\)
.* <app_tfunc_close>:
.*: b500 push {lr}
- .*: f7ff efdc blx .* <_start-0x24>
+ .*: f7ff efdc blx .* <lib_func2@plt>
.*: bd00 pop {pc}
.*: 4770 bx lr
.*: 46c0 nop ; \(mov r8, r8\)
diff --git a/ld/testsuite/ld-arm/farcall-mixed-app.d b/ld/testsuite/ld-arm/farcall-mixed-app.d
index b6cc2d0..cfe31a4 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-app.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-app.d
@@ -6,17 +6,19 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func2@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -27,15 +29,15 @@ Disassembly of section .text:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
.*: eb000008 bl .* <__app_func_veneer>
- .*: ebfffff6 bl .* <_start-0x14>
- .*: ebfffff2 bl .* <_start-0x20>
+ .*: ebfffff6 bl .* <lib_func1@plt>
+ .*: ebfffff2 bl .* <lib_func2@plt\+0x4>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
.*: e1a00000 nop ; \(mov r0, r0\)
.* <app_tfunc_close>:
.*: b500 push {lr}
- .*: f7ff ffdb bl 81dc <_start-0x24>
+ .*: f7ff ffdb bl 81dc <lib_func2@plt>
.*: bd00 pop {pc}
.*: 4770 bx lr
.*: 46c0 nop ; \(mov r8, r8\)
diff --git a/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d b/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
index 3be297b..eec8de6 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
@@ -5,27 +5,31 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x.*>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .* .word .*
+.* <app_func@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]! ; .*
+.* <app_func_weak@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]! ; 0x.*
+.* <lib_func3@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]! ; 0x.*
+.* <lib_func4@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
@@ -37,10 +41,10 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebffff.. bl .* <lib_func1-0x.*>
- .*: ebffff.. bl .* <lib_func1-0x.*>
- .*: ebffff.. bl .* <lib_func1-0x.*>
- .*: ebffff.. bl .* <lib_func1-0x.*>
+ .*: ebffff.. bl .* <app_func@plt\+0x.*>
+ .*: ebffff.. bl .* <app_func_weak@plt\+0x.*>
+ .*: ebffff.. bl .* <lib_func3@plt\+0x.*>
+ .*: ebffff.. bl .* <lib_func4@plt\+0x.*>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
...
diff --git a/ld/testsuite/ld-arm/farcall-mixed-lib.d b/ld/testsuite/ld-arm/farcall-mixed-lib.d
index 05578f4..9577af9 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-lib.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-lib.d
@@ -5,21 +5,25 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x.*>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <app_func_weak@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func3@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func4@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -29,10 +33,10 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebffff.. bl .* <lib_func1-0x..?>
- .*: ebffff.. bl .* <lib_func1-0x..?>
- .*: ebfffff. bl .* <lib_func1-0x..?>
- .*: ebfffff. bl .* <lib_func1-0x..?>
+ .*: ebffff.. bl .* <app_func@plt>
+ .*: ebffff.. bl .* <app_func_weak@plt>
+ .*: ebfffff. bl .* <lib_func3@plt>
+ .*: ebfffff. bl .* <lib_func4@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
...
diff --git a/ld/testsuite/ld-arm/ifunc-10.dd b/ld/testsuite/ld-arm/ifunc-10.dd
index 105b09b..88bae50 100644
--- a/ld/testsuite/ld-arm/ifunc-10.dd
+++ b/ld/testsuite/ld-arm/ifunc-10.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <atf2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <atf3-0x110>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <atf2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
+00009014 <atf2@plt>:
9014: 4778 bx pc
9016: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -27,12 +28,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
+00009024 <aaf4@plt>:
9024: e28fc600 add ip, pc, #0, 12
9028: e28cca07 add ip, ip, #28672 ; 0x7000
902c: e5bcffe4 ldr pc, \[ip, #4068\]! ; 0xfe4
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
+00009030 <ttf2@plt>:
9030: 4778 bx pc
9032: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -44,6 +47,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
+00009040 <tbf2@plt>:
9040: 4778 bx pc
9042: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -55,18 +59,21 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
+00009050 <taf2@plt>:
9050: e28fc600 add ip, pc, #0, 12
9054: e28cca07 add ip, ip, #28672 ; 0x7000
9058: e5bcffc4 ldr pc, \[ip, #4036\]! ; 0xfc4
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
+0000905c <aaf2@plt>:
905c: e28fc600 add ip, pc, #0, 12
9060: e28cca07 add ip, ip, #28672 ; 0x7000
9064: e5bcffbc ldr pc, \[ip, #4028\]! ; 0xfbc
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
+00009068 <abf4@plt>:
9068: 4778 bx pc
906a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -78,6 +85,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
+00009078 <tbf4@plt>:
9078: 4778 bx pc
907a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -89,6 +97,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
+00009088 <ttf4@plt>:
9088: 4778 bx pc
908a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -100,6 +109,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
+00009098 <atf4@plt>:
9098: 4778 bx pc
909a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -111,12 +121,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
+000090a8 <taf4@plt>:
90a8: e28fc600 add ip, pc, #0, 12
90ac: e28cca07 add ip, ip, #28672 ; 0x7000
90b0: e5bcff84 ldr pc, \[ip, #3972\]! ; 0xf84
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
+000090b4 <abf2@plt>:
90b4: 4778 bx pc
90b6: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -281,15 +293,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a044: ebfffc1e bl 90c4 <atf3-0x5c>
+ a044: ebfffc1e bl 90c4 <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a048: eafffc1d b 90c4 <atf3-0x5c>
+ a048: eafffc1d b 90c4 <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a04c: 0afffc1c beq 90c4 <atf3-0x5c>
+ a04c: 0afffc1c beq 90c4 <abf2@plt\+0x10>
a050: e59f4000 ldr r4, \[pc\] ; a058 <_start\+0x30>
a054: e59f4000 ldr r4, \[pc\] ; a05c <_start\+0x34>
#------------------------------------------------------------------------------
@@ -303,15 +315,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a060: ebfffc22 bl 90f0 <atf3-0x30>
+ a060: ebfffc22 bl 90f0 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a064: eafffc21 b 90f0 <atf3-0x30>
+ a064: eafffc21 b 90f0 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a068: 0afffc20 beq 90f0 <atf3-0x30>
+ a068: 0afffc20 beq 90f0 <abf2@plt\+0x3c>
a06c: e59f4000 ldr r4, \[pc\] ; a074 <_start\+0x4c>
a070: e59f4000 ldr r4, \[pc\] ; a078 <_start\+0x50>
#------------------------------------------------------------------------------
@@ -325,15 +337,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a07c: ebfffc18 bl 90e4 <atf3-0x3c>
+ a07c: ebfffc18 bl 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a080: eafffc17 b 90e4 <atf3-0x3c>
+ a080: eafffc17 b 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a084: 0afffc16 beq 90e4 <atf3-0x3c>
+ a084: 0afffc16 beq 90e4 <abf2@plt\+0x30>
a088: e59f4000 ldr r4, \[pc\] ; a090 <_start\+0x68>
a08c: e59f4000 ldr r4, \[pc\] ; a094 <_start\+0x6c>
#------------------------------------------------------------------------------
@@ -347,15 +359,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a098: ebfffc1c bl 9110 <atf3-0x10>
+ a098: ebfffc1c bl 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a09c: eafffc1b b 9110 <atf3-0x10>
+ a09c: eafffc1b b 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0a0: 0afffc1a beq 9110 <atf3-0x10>
+ a0a0: 0afffc1a beq 9110 <abf2@plt\+0x5c>
a0a4: e59f4000 ldr r4, \[pc\] ; a0ac <_start\+0x84>
a0a8: e59f4000 ldr r4, \[pc\] ; a0b0 <_start\+0x88>
#------------------------------------------------------------------------------
@@ -369,15 +381,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0b4: ebfffbe8 bl 905c <atf3-0xc4>
+ a0b4: ebfffbe8 bl 905c <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0b8: eafffbe7 b 905c <atf3-0xc4>
+ a0b8: eafffbe7 b 905c <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0bc: 0afffbe6 beq 905c <atf3-0xc4>
+ a0bc: 0afffbe6 beq 905c <aaf2@plt>
a0c0: e59f4000 ldr r4, \[pc\] ; a0c8 <_start\+0xa0>
a0c4: e59f4000 ldr r4, \[pc\] ; a0cc <_start\+0xa4>
#------------------------------------------------------------------------------
@@ -391,15 +403,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d0: ebfffbde bl 9050 <atf3-0xd0>
+ a0d0: ebfffbde bl 9050 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d4: eafffbdd b 9050 <atf3-0xd0>
+ a0d4: eafffbdd b 9050 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d8: 0afffbdc beq 9050 <atf3-0xd0>
+ a0d8: 0afffbdc beq 9050 <taf2@plt>
a0dc: e59f4000 ldr r4, \[pc\] ; a0e4 <_start\+0xbc>
a0e0: e59f4000 ldr r4, \[pc\] ; a0e8 <_start\+0xc0>
#------------------------------------------------------------------------------
@@ -413,15 +425,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0ec: ebfffbf1 bl 90b8 <atf3-0x68>
+ a0ec: ebfffbf1 bl 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0f0: eafffbf0 b 90b8 <atf3-0x68>
+ a0f0: eafffbf0 b 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0f4: 0afffbef beq 90b8 <atf3-0x68>
+ a0f4: 0afffbef beq 90b8 <abf2@plt\+0x4>
a0f8: e59f4000 ldr r4, \[pc\] ; a100 <_start\+0xd8>
a0fc: e59f4000 ldr r4, \[pc\] ; a104 <_start\+0xdc>
#------------------------------------------------------------------------------
@@ -435,15 +447,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a108: ebfffbcd bl 9044 <atf3-0xdc>
+ a108: ebfffbcd bl 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a10c: eafffbcc b 9044 <atf3-0xdc>
+ a10c: eafffbcc b 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a110: 0afffbcb beq 9044 <atf3-0xdc>
+ a110: 0afffbcb beq 9044 <tbf2@plt\+0x4>
a114: e59f4000 ldr r4, \[pc\] ; a11c <_start\+0xf4>
a118: e59f4000 ldr r4, \[pc\] ; a120 <_start\+0xf8>
#------------------------------------------------------------------------------
@@ -509,15 +521,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a194: ebfffba2 bl 9024 <atf3-0xfc>
+ a194: ebfffba2 bl 9024 <aaf4@plt>
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a198: eafffba1 b 9024 <atf3-0xfc>
+ a198: eafffba1 b 9024 <aaf4@plt>
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a19c: 0afffba0 beq 9024 <atf3-0xfc>
+ a19c: 0afffba0 beq 9024 <aaf4@plt>
a1a0: e59f4000 ldr r4, \[pc\] ; a1a8 <_start\+0x180>
a1a4: e59f4000 ldr r4, \[pc\] ; a1ac <_start\+0x184>
#------------------------------------------------------------------------------
@@ -531,15 +543,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b0: ebfffbbc bl 90a8 <atf3-0x78>
+ a1b0: ebfffbbc bl 90a8 <taf4@plt>
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b4: eafffbbb b 90a8 <atf3-0x78>
+ a1b4: eafffbbb b 90a8 <taf4@plt>
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b8: 0afffbba beq 90a8 <atf3-0x78>
+ a1b8: 0afffbba beq 90a8 <taf4@plt>
a1bc: e59f4000 ldr r4, \[pc\] ; a1c4 <_start\+0x19c>
a1c0: e59f4000 ldr r4, \[pc\] ; a1c8 <_start\+0x1a0>
#------------------------------------------------------------------------------
@@ -553,15 +565,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1cc: ebfffba6 bl 906c <atf3-0xb4>
+ a1cc: ebfffba6 bl 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1d0: eafffba5 b 906c <atf3-0xb4>
+ a1d0: eafffba5 b 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1d4: 0afffba4 beq 906c <atf3-0xb4>
+ a1d4: 0afffba4 beq 906c <abf4@plt\+0x4>
a1d8: e59f4000 ldr r4, \[pc\] ; a1e0 <_start\+0x1b8>
a1dc: e59f4000 ldr r4, \[pc\] ; a1e4 <_start\+0x1bc>
#------------------------------------------------------------------------------
@@ -575,15 +587,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1e8: ebfffba3 bl 907c <atf3-0xa4>
+ a1e8: ebfffba3 bl 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1ec: eafffba2 b 907c <atf3-0xa4>
+ a1ec: eafffba2 b 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1f0: 0afffba1 beq 907c <atf3-0xa4>
+ a1f0: 0afffba1 beq 907c <tbf4@plt\+0x4>
a1f4: e59f4000 ldr r4, \[pc\] ; a1fc <_start\+0x1d4>
a1f8: e59f4000 ldr r4, \[pc\] ; a200 <_start\+0x1d8>
#------------------------------------------------------------------------------
@@ -612,15 +624,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf1's .iplt entry
#------------------------------------------------------------------------------
- a21c: f7fe ef5a blx 90d4 <atf3-0x4c>
+ a21c: f7fe ef5a blx 90d4 <abf2@plt\+0x20>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a220: f7fe bf56 b\.w 90d0 <atf3-0x50>
+ a220: f7fe bf56 b\.w 90d0 <abf2@plt\+0x1c>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a224: f43e af54 beq\.w 90d0 <atf3-0x50>
+ a224: f43e af54 beq\.w 90d0 <abf2@plt\+0x1c>
a228: 4c00 ldr r4, \[pc, #0\] ; \(a22c <_thumb\+0x28>\)
a22a: 4c01 ldr r4, \[pc, #4\] ; \(a230 <_thumb\+0x2c>\)
#------------------------------------------------------------------------------
@@ -634,15 +646,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf1's .iplt entry
#------------------------------------------------------------------------------
- a234: f7fe ef64 blx 9100 <atf3-0x20>
+ a234: f7fe ef64 blx 9100 <abf2@plt\+0x4c>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a238: f7fe bf60 b\.w 90fc <atf3-0x24>
+ a238: f7fe bf60 b\.w 90fc <abf2@plt\+0x48>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a23c: f43e af5e beq\.w 90fc <atf3-0x24>
+ a23c: f43e af5e beq\.w 90fc <abf2@plt\+0x48>
a240: 4c00 ldr r4, \[pc, #0\] ; \(a244 <_thumb\+0x40>\)
a242: 4c01 ldr r4, \[pc, #4\] ; \(a248 <_thumb\+0x44>\)
#------------------------------------------------------------------------------
@@ -656,15 +668,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a24c: f7fe ef4a blx 90e4 <atf3-0x3c>
+ a24c: f7fe ef4a blx 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a250: f7fe bf46 b\.w 90e0 <atf3-0x40>
+ a250: f7fe bf46 b\.w 90e0 <abf2@plt\+0x2c>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a254: f43e af44 beq\.w 90e0 <atf3-0x40>
+ a254: f43e af44 beq\.w 90e0 <abf2@plt\+0x2c>
a258: 4c00 ldr r4, \[pc, #0\] ; \(a25c <_thumb\+0x58>\)
a25a: 4c01 ldr r4, \[pc, #4\] ; \(a260 <_thumb\+0x5c>\)
#------------------------------------------------------------------------------
@@ -678,15 +690,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a264: f7fe ef54 blx 9110 <atf3-0x10>
+ a264: f7fe ef54 blx 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a268: f7fe bf50 b\.w 910c <atf3-0x14>
+ a268: f7fe bf50 b\.w 910c <abf2@plt\+0x58>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a26c: f43e af4e beq\.w 910c <atf3-0x14>
+ a26c: f43e af4e beq\.w 910c <abf2@plt\+0x58>
a270: 4c00 ldr r4, \[pc, #0\] ; \(a274 <_thumb\+0x70>\)
a272: 4c01 ldr r4, \[pc, #4\] ; \(a278 <_thumb\+0x74>\)
#------------------------------------------------------------------------------
@@ -700,15 +712,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf2's .plt entry
#------------------------------------------------------------------------------
- a27c: f7fe eecc blx 9018 <atf3-0x108>
+ a27c: f7fe eecc blx 9018 <atf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a280: f7fe bec8 b\.w 9014 <atf3-0x10c>
+ a280: f7fe bec8 b\.w 9014 <atf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a284: f43e aec6 beq\.w 9014 <atf3-0x10c>
+ a284: f43e aec6 beq\.w 9014 <atf2@plt>
a288: 4c00 ldr r4, \[pc, #0\] ; \(a28c <_thumb\+0x88>\)
a28a: 4c01 ldr r4, \[pc, #4\] ; \(a290 <_thumb\+0x8c>\)
#------------------------------------------------------------------------------
@@ -722,15 +734,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf2's .plt entry
#------------------------------------------------------------------------------
- a294: f7fe eece blx 9034 <atf3-0xec>
+ a294: f7fe eece blx 9034 <ttf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a298: f7fe beca b\.w 9030 <atf3-0xf0>
+ a298: f7fe beca b\.w 9030 <ttf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a29c: f43e aec8 beq\.w 9030 <atf3-0xf0>
+ a29c: f43e aec8 beq\.w 9030 <ttf2@plt>
a2a0: 4c00 ldr r4, \[pc, #0\] ; \(a2a4 <_thumb\+0xa0>\)
a2a2: 4c01 ldr r4, \[pc, #4\] ; \(a2a8 <_thumb\+0xa4>\)
#------------------------------------------------------------------------------
@@ -744,15 +756,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a2ac: f7fe ef04 blx 90b8 <atf3-0x68>
+ a2ac: f7fe ef04 blx 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2b0: f7fe bf00 b\.w 90b4 <atf3-0x6c>
+ a2b0: f7fe bf00 b\.w 90b4 <abf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2b4: f43e aefe beq\.w 90b4 <atf3-0x6c>
+ a2b4: f43e aefe beq\.w 90b4 <abf2@plt>
a2b8: 4c00 ldr r4, \[pc, #0\] ; \(a2bc <_thumb\+0xb8>\)
a2ba: 4c01 ldr r4, \[pc, #4\] ; \(a2c0 <_thumb\+0xbc>\)
#------------------------------------------------------------------------------
@@ -766,15 +778,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a2c4: f7fe eebe blx 9044 <atf3-0xdc>
+ a2c4: f7fe eebe blx 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2c8: f7fe beba b\.w 9040 <atf3-0xe0>
+ a2c8: f7fe beba b\.w 9040 <tbf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2cc: f43e aeb8 beq\.w 9040 <atf3-0xe0>
+ a2cc: f43e aeb8 beq\.w 9040 <tbf2@plt>
a2d0: 4c00 ldr r4, \[pc, #0\] ; \(a2d4 <_thumb\+0xd0>\)
a2d2: 4c01 ldr r4, \[pc, #4\] ; \(a2d8 <_thumb\+0xd4>\)
#------------------------------------------------------------------------------
@@ -789,11 +801,11 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ thumb entry to atf3
#------------------------------------------------------------------------------
- a2e0: f7fe bf1c b\.w 911c <atf3-0x4>
+ a2e0: f7fe bf1c b\.w 911c <abf2@plt\+0x68>
#------------------------------------------------------------------------------
#------ thumb entry to atf3
#------------------------------------------------------------------------------
- a2e4: f43e af1a beq\.w 911c <atf3-0x4>
+ a2e4: f43e af1a beq\.w 911c <abf2@plt\+0x68>
a2e8: 4c00 ldr r4, \[pc, #0\] ; \(a2ec <_thumb\+0xe8>\)
a2ea: 4c01 ldr r4, \[pc, #4\] ; \(a2f0 <_thumb\+0xec>\)
#------------------------------------------------------------------------------
@@ -864,15 +876,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf4's .plt entry
#------------------------------------------------------------------------------
- a33c: f7fe eeae blx 909c <atf3-0x84>
+ a33c: f7fe eeae blx 909c <atf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
- a340: f7fe beaa b\.w 9098 <atf3-0x88>
+ a340: f7fe beaa b\.w 9098 <atf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
- a344: f43e aea8 beq\.w 9098 <atf3-0x88>
+ a344: f43e aea8 beq\.w 9098 <atf4@plt>
a348: 4c00 ldr r4, \[pc, #0\] ; \(a34c <_thumb\+0x148>\)
a34a: 4c01 ldr r4, \[pc, #4\] ; \(a350 <_thumb\+0x14c>\)
#------------------------------------------------------------------------------
@@ -886,15 +898,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf4's .plt entry
#------------------------------------------------------------------------------
- a354: f7fe ee9a blx 908c <atf3-0x94>
+ a354: f7fe ee9a blx 908c <ttf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
- a358: f7fe be96 b\.w 9088 <atf3-0x98>
+ a358: f7fe be96 b\.w 9088 <ttf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
- a35c: f43e ae94 beq\.w 9088 <atf3-0x98>
+ a35c: f43e ae94 beq\.w 9088 <ttf4@plt>
a360: 4c00 ldr r4, \[pc, #0\] ; \(a364 <_thumb\+0x160>\)
a362: 4c01 ldr r4, \[pc, #4\] ; \(a368 <_thumb\+0x164>\)
#------------------------------------------------------------------------------
@@ -908,15 +920,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a36c: f7fe ee7e blx 906c <atf3-0xb4>
+ a36c: f7fe ee7e blx 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
- a370: f7fe be7a b\.w 9068 <atf3-0xb8>
+ a370: f7fe be7a b\.w 9068 <abf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
- a374: f43e ae78 beq\.w 9068 <atf3-0xb8>
+ a374: f43e ae78 beq\.w 9068 <abf4@plt>
a378: 4c00 ldr r4, \[pc, #0\] ; \(a37c <_thumb\+0x178>\)
a37a: 4c01 ldr r4, \[pc, #4\] ; \(a380 <_thumb\+0x17c>\)
#------------------------------------------------------------------------------
@@ -930,15 +942,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a384: f7fe ee7a blx 907c <atf3-0xa4>
+ a384: f7fe ee7a blx 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
- a388: f7fe be76 b\.w 9078 <atf3-0xa8>
+ a388: f7fe be76 b\.w 9078 <tbf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
- a38c: f43e ae74 beq\.w 9078 <atf3-0xa8>
+ a38c: f43e ae74 beq\.w 9078 <tbf4@plt>
a390: 4c00 ldr r4, \[pc, #0\] ; \(a394 <_thumb\+0x190>\)
a392: 4c01 ldr r4, \[pc, #4\] ; \(a398 <_thumb\+0x194>\)
#------------------------------------------------------------------------------
diff --git a/ld/testsuite/ld-arm/ifunc-14.dd b/ld/testsuite/ld-arm/ifunc-14.dd
index 861f687..cbad1c8 100644
--- a/ld/testsuite/ld-arm/ifunc-14.dd
+++ b/ld/testsuite/ld-arm/ifunc-14.dd
@@ -4,7 +4,7 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2t@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <__irel_end\+0xff0>
9008: e08fe00e add lr, pc, lr
@@ -16,12 +16,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2t's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2t@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009020 <f2@plt>:
9020: e28fc600 add ip, pc, #0, 12
9024: e28cca07 add ip, ip, #28672 ; 0x7000
9028: e5bcffe8 ldr pc, \[ip, #4072\]! ; 0xfe8
diff --git a/ld/testsuite/ld-arm/ifunc-15.dd b/ld/testsuite/ld-arm/ifunc-15.dd
index d764841..f23e8e8 100644
--- a/ld/testsuite/ld-arm/ifunc-15.dd
+++ b/ld/testsuite/ld-arm/ifunc-15.dd
@@ -4,7 +4,7 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2t@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <__irel_end\+0xff0>
9008: e08fe00e add lr, pc, lr
@@ -16,12 +16,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2t's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2t@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009020 <f2@plt>:
9020: e28fc600 add ip, pc, #0, 12
9024: e28cca07 add ip, ip, #28672 ; 0x7000
9028: e5bcffe8 ldr pc, \[ip, #4072\]! ; 0xfe8
diff --git a/ld/testsuite/ld-arm/ifunc-3.dd b/ld/testsuite/ld-arm/ifunc-3.dd
index a1fb37a..b267bf1 100644
--- a/ld/testsuite/ld-arm/ifunc-3.dd
+++ b/ld/testsuite/ld-arm/ifunc-3.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f1-0xff0>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
@@ -71,7 +72,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f1's .iplt entry
#------------------------------------------------------------------------------
- a024: ebfffbfd bl 9020 <f1-0xfe0>
+ a024: ebfffbfd bl 9020 <f2@plt\+0xc>
a028: e59f4000 ldr r4, \[pc\] ; a030 <arm\+0x20>
a02c: e59f4000 ldr r4, \[pc\] ; a034 <arm\+0x24>
#------------------------------------------------------------------------------
@@ -85,7 +86,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
- a038: ebfffbf5 bl 9014 <f1-0xfec>
+ a038: ebfffbf5 bl 9014 <f2@plt>
a03c: e59f4000 ldr r4, \[pc\] ; a044 <arm\+0x34>
a040: e59f4000 ldr r4, \[pc\] ; a048 <arm\+0x38>
#------------------------------------------------------------------------------
@@ -99,7 +100,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f3's .iplt entry
#------------------------------------------------------------------------------
- a04c: ebfffbf6 bl 902c <f1-0xfd4>
+ a04c: ebfffbf6 bl 902c <f2@plt\+0x18>
a050: e59f4000 ldr r4, \[pc\] ; a058 <arm\+0x48>
a054: e59f4000 ldr r4, \[pc\] ; a05c <arm\+0x4c>
#------------------------------------------------------------------------------
@@ -113,7 +114,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f4's .iplt entry
#------------------------------------------------------------------------------
- a060: ebfffbf4 bl 9038 <f1-0xfc8>
+ a060: ebfffbf4 bl 9038 <f2@plt\+0x24>
a064: e59f4000 ldr r4, \[pc\] ; a06c <arm\+0x5c>
a068: e59f4000 ldr r4, \[pc\] ; a070 <arm\+0x60>
#------------------------------------------------------------------------------
diff --git a/ld/testsuite/ld-arm/ifunc-4.dd b/ld/testsuite/ld-arm/ifunc-4.dd
index f5a4d91..6ce996b 100644
--- a/ld/testsuite/ld-arm/ifunc-4.dd
+++ b/ld/testsuite/ld-arm/ifunc-4.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <atf2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <aaf1-0xff0>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <atf2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
+00009014 <atf2@plt>:
9014: 4778 bx pc
9016: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -27,6 +28,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
+00009024 <ttf2@plt>:
9024: 4778 bx pc
9026: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -38,6 +40,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
+00009034 <tbf2@plt>:
9034: 4778 bx pc
9036: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -49,18 +52,21 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
+00009044 <taf2@plt>:
9044: e28fc600 add ip, pc, #0, 12
9048: e28cca07 add ip, ip, #28672 ; 0x7000
904c: e5bcffcc ldr pc, \[ip, #4044\]! ; 0xfcc
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
+00009050 <aaf2@plt>:
9050: e28fc600 add ip, pc, #0, 12
9054: e28cca07 add ip, ip, #28672 ; 0x7000
9058: e5bcffc4 ldr pc, \[ip, #4036\]! ; 0xfc4
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
+0000905c <abf2@plt>:
905c: 4778 bx pc
905e: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -337,15 +343,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a06c: ebfffbfe bl 906c <aaf1-0xf94>
+ a06c: ebfffbfe bl 906c <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a070: eafffbfd b 906c <aaf1-0xf94>
+ a070: eafffbfd b 906c <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a074: 0afffbfc beq 906c <aaf1-0xf94>
+ a074: 0afffbfc beq 906c <abf2@plt\+0x10>
a078: e59f4000 ldr r4, \[pc\] ; a080 <arm\+0x30>
a07c: e59f4000 ldr r4, \[pc\] ; a084 <arm\+0x34>
#------------------------------------------------------------------------------
@@ -359,15 +365,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a088: ebfffc02 bl 9098 <aaf1-0xf68>
+ a088: ebfffc02 bl 9098 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a08c: eafffc01 b 9098 <aaf1-0xf68>
+ a08c: eafffc01 b 9098 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a090: 0afffc00 beq 9098 <aaf1-0xf68>
+ a090: 0afffc00 beq 9098 <abf2@plt\+0x3c>
a094: e59f4000 ldr r4, \[pc\] ; a09c <arm\+0x4c>
a098: e59f4000 ldr r4, \[pc\] ; a0a0 <arm\+0x50>
#------------------------------------------------------------------------------
@@ -381,15 +387,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a0a4: ebfffbf8 bl 908c <aaf1-0xf74>
+ a0a4: ebfffbf8 bl 908c <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a0a8: eafffbf7 b 908c <aaf1-0xf74>
+ a0a8: eafffbf7 b 908c <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a0ac: 0afffbf6 beq 908c <aaf1-0xf74>
+ a0ac: 0afffbf6 beq 908c <abf2@plt\+0x30>
a0b0: e59f4000 ldr r4, \[pc\] ; a0b8 <arm\+0x68>
a0b4: e59f4000 ldr r4, \[pc\] ; a0bc <arm\+0x6c>
#------------------------------------------------------------------------------
@@ -403,15 +409,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0c0: ebfffbfc bl 90b8 <aaf1-0xf48>
+ a0c0: ebfffbfc bl 90b8 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0c4: eafffbfb b 90b8 <aaf1-0xf48>
+ a0c4: eafffbfb b 90b8 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0c8: 0afffbfa beq 90b8 <aaf1-0xf48>
+ a0c8: 0afffbfa beq 90b8 <abf2@plt\+0x5c>
a0cc: e59f4000 ldr r4, \[pc\] ; a0d4 <arm\+0x84>
a0d0: e59f4000 ldr r4, \[pc\] ; a0d8 <arm\+0x88>
#------------------------------------------------------------------------------
@@ -425,15 +431,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0dc: ebfffbdb bl 9050 <aaf1-0xfb0>
+ a0dc: ebfffbdb bl 9050 <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0e0: eafffbda b 9050 <aaf1-0xfb0>
+ a0e0: eafffbda b 9050 <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0e4: 0afffbd9 beq 9050 <aaf1-0xfb0>
+ a0e4: 0afffbd9 beq 9050 <aaf2@plt>
a0e8: e59f4000 ldr r4, \[pc\] ; a0f0 <arm\+0xa0>
a0ec: e59f4000 ldr r4, \[pc\] ; a0f4 <arm\+0xa4>
#------------------------------------------------------------------------------
@@ -447,15 +453,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0f8: ebfffbd1 bl 9044 <aaf1-0xfbc>
+ a0f8: ebfffbd1 bl 9044 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0fc: eafffbd0 b 9044 <aaf1-0xfbc>
+ a0fc: eafffbd0 b 9044 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a100: 0afffbcf beq 9044 <aaf1-0xfbc>
+ a100: 0afffbcf beq 9044 <taf2@plt>
a104: e59f4000 ldr r4, \[pc\] ; a10c <arm\+0xbc>
a108: e59f4000 ldr r4, \[pc\] ; a110 <arm\+0xc0>
#------------------------------------------------------------------------------
@@ -469,15 +475,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a114: ebfffbd1 bl 9060 <aaf1-0xfa0>
+ a114: ebfffbd1 bl 9060 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a118: eafffbd0 b 9060 <aaf1-0xfa0>
+ a118: eafffbd0 b 9060 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a11c: 0afffbcf beq 9060 <aaf1-0xfa0>
+ a11c: 0afffbcf beq 9060 <abf2@plt\+0x4>
a120: e59f4000 ldr r4, \[pc\] ; a128 <arm\+0xd8>
a124: e59f4000 ldr r4, \[pc\] ; a12c <arm\+0xdc>
#------------------------------------------------------------------------------
@@ -491,15 +497,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a130: ebfffbc0 bl 9038 <aaf1-0xfc8>
+ a130: ebfffbc0 bl 9038 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a134: eafffbbf b 9038 <aaf1-0xfc8>
+ a134: eafffbbf b 9038 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a138: 0afffbbe beq 9038 <aaf1-0xfc8>
+ a138: 0afffbbe beq 9038 <tbf2@plt\+0x4>
a13c: e59f4000 ldr r4, \[pc\] ; a144 <arm\+0xf4>
a140: e59f4000 ldr r4, \[pc\] ; a148 <arm\+0xf8>
#------------------------------------------------------------------------------
@@ -513,15 +519,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a14c: ebfffbfe bl 914c <aaf1-0xeb4>
+ a14c: ebfffbfe bl 914c <abf2@plt\+0xf0>
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a150: eafffbfd b 914c <aaf1-0xeb4>
+ a150: eafffbfd b 914c <abf2@plt\+0xf0>
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a154: 0afffbfc beq 914c <aaf1-0xeb4>
+ a154: 0afffbfc beq 914c <abf2@plt\+0xf0>
a158: e59f4000 ldr r4, \[pc\] ; a160 <arm\+0x110>
a15c: e59f4000 ldr r4, \[pc\] ; a164 <arm\+0x114>
#------------------------------------------------------------------------------
@@ -535,15 +541,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a168: ebfffbe8 bl 9110 <aaf1-0xef0>
+ a168: ebfffbe8 bl 9110 <abf2@plt\+0xb4>
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a16c: eafffbe7 b 9110 <aaf1-0xef0>
+ a16c: eafffbe7 b 9110 <abf2@plt\+0xb4>
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a170: 0afffbe6 beq 9110 <aaf1-0xef0>
+ a170: 0afffbe6 beq 9110 <abf2@plt\+0xb4>
a174: e59f4000 ldr r4, \[pc\] ; a17c <arm\+0x12c>
a178: e59f4000 ldr r4, \[pc\] ; a180 <arm\+0x130>
#------------------------------------------------------------------------------
@@ -557,15 +563,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a184: ebfffbd6 bl 90e4 <aaf1-0xf1c>
+ a184: ebfffbd6 bl 90e4 <abf2@plt\+0x88>
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a188: eafffbd5 b 90e4 <aaf1-0xf1c>
+ a188: eafffbd5 b 90e4 <abf2@plt\+0x88>
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a18c: 0afffbd4 beq 90e4 <aaf1-0xf1c>
+ a18c: 0afffbd4 beq 90e4 <abf2@plt\+0x88>
a190: e59f4000 ldr r4, \[pc\] ; a198 <arm\+0x148>
a194: e59f4000 ldr r4, \[pc\] ; a19c <arm\+0x14c>
#------------------------------------------------------------------------------
@@ -579,15 +585,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a1a0: ebfffbd7 bl 9104 <aaf1-0xefc>
+ a1a0: ebfffbd7 bl 9104 <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a1a4: eafffbd6 b 9104 <aaf1-0xefc>
+ a1a4: eafffbd6 b 9104 <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a1a8: 0afffbd5 beq 9104 <aaf1-0xefc>
+ a1a8: 0afffbd5 beq 9104 <abf2@plt\+0xa8>
a1ac: e59f4000 ldr r4, \[pc\] ; a1b4 <arm\+0x164>
a1b0: e59f4000 ldr r4, \[pc\] ; a1b8 <arm\+0x168>
#------------------------------------------------------------------------------
@@ -601,15 +607,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf4's .iplt entry
#------------------------------------------------------------------------------
- a1bc: ebfffbc0 bl 90c4 <aaf1-0xf3c>
+ a1bc: ebfffbc0 bl 90c4 <abf2@plt\+0x68>
#------------------------------------------------------------------------------
#------ aaf4's .iplt entry
#------------------------------------------------------------------------------
- a1c0: eafffbbf b 90c4 <aaf1-0xf3c>
+ a1c0: eafffbbf b 90c4 <abf2@plt\+0x68>
#------------------------------------------------------------------------------
#------ aaf4's .iplt entry
#------------------------------------------------------------------------------
- a1c4: 0afffbbe beq 90c4 <aaf1-0xf3c>
+ a1c4: 0afffbbe beq 90c4 <abf2@plt\+0x68>
a1c8: e59f4000 ldr r4, \[pc\] ; a1d0 <arm\+0x180>
a1cc: e59f4000 ldr r4, \[pc\] ; a1d4 <arm\+0x184>
#------------------------------------------------------------------------------
@@ -623,15 +629,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf4's .iplt entry
#------------------------------------------------------------------------------
- a1d8: ebfffbe2 bl 9168 <aaf1-0xe98>
+ a1d8: ebfffbe2 bl 9168 <abf2@plt\+0x10c>
#------------------------------------------------------------------------------
#------ taf4's .iplt entry
#------------------------------------------------------------------------------
- a1dc: eafffbe1 b 9168 <aaf1-0xe98>
+ a1dc: eafffbe1 b 9168 <abf2@plt\+0x10c>
#------------------------------------------------------------------------------
#------ taf4's .iplt entry
#------------------------------------------------------------------------------
- a1e0: 0afffbe0 beq 9168 <aaf1-0xe98>
+ a1e0: 0afffbe0 beq 9168 <abf2@plt\+0x10c>
a1e4: e59f4000 ldr r4, \[pc\] ; a1ec <arm\+0x19c>
a1e8: e59f4000 ldr r4, \[pc\] ; a1f0 <arm\+0x1a0>
#------------------------------------------------------------------------------
@@ -645,15 +651,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .iplt entry
#------------------------------------------------------------------------------
- a1f4: ebfffbc9 bl 9120 <aaf1-0xee0>
+ a1f4: ebfffbc9 bl 9120 <abf2@plt\+0xc4>
#------------------------------------------------------------------------------
#------ abf4's .iplt entry
#------------------------------------------------------------------------------
- a1f8: eafffbc8 b 9120 <aaf1-0xee0>
+ a1f8: eafffbc8 b 9120 <abf2@plt\+0xc4>
#------------------------------------------------------------------------------
#------ abf4's .iplt entry
#------------------------------------------------------------------------------
- a1fc: 0afffbc7 beq 9120 <aaf1-0xee0>
+ a1fc: 0afffbc7 beq 9120 <abf2@plt\+0xc4>
a200: e59f4000 ldr r4, \[pc\] ; a208 <arm\+0x1b8>
a204: e59f4000 ldr r4, \[pc\] ; a20c <arm\+0x1bc>
#------------------------------------------------------------------------------
@@ -667,15 +673,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .iplt entry
#------------------------------------------------------------------------------
- a210: ebfffbc6 bl 9130 <aaf1-0xed0>
+ a210: ebfffbc6 bl 9130 <abf2@plt\+0xd4>
#------------------------------------------------------------------------------
#------ tbf4's .iplt entry
#------------------------------------------------------------------------------
- a214: eafffbc5 b 9130 <aaf1-0xed0>
+ a214: eafffbc5 b 9130 <abf2@plt\+0xd4>
#------------------------------------------------------------------------------
#------ tbf4's .iplt entry
#------------------------------------------------------------------------------
- a218: 0afffbc4 beq 9130 <aaf1-0xed0>
+ a218: 0afffbc4 beq 9130 <abf2@plt\+0xd4>
a21c: e59f4000 ldr r4, \[pc\] ; a224 <arm\+0x1d4>
a220: e59f4000 ldr r4, \[pc\] ; a228 <arm\+0x1d8>
#------------------------------------------------------------------------------
@@ -704,15 +710,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf1's .iplt entry
#------------------------------------------------------------------------------
- a244: f7fe ef1a blx 907c <aaf1-0xf84>
+ a244: f7fe ef1a blx 907c <abf2@plt\+0x20>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a248: f7fe bf16 b\.w 9078 <aaf1-0xf88>
+ a248: f7fe bf16 b\.w 9078 <abf2@plt\+0x1c>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a24c: f43e af14 beq\.w 9078 <aaf1-0xf88>
+ a24c: f43e af14 beq\.w 9078 <abf2@plt\+0x1c>
a250: 4c00 ldr r4, \[pc, #0\] ; \(a254 <_thumb\+0x28>\)
a252: 4c01 ldr r4, \[pc, #4\] ; \(a258 <_thumb\+0x2c>\)
#------------------------------------------------------------------------------
@@ -726,15 +732,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf1's .iplt entry
#------------------------------------------------------------------------------
- a25c: f7fe ef24 blx 90a8 <aaf1-0xf58>
+ a25c: f7fe ef24 blx 90a8 <abf2@plt\+0x4c>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a260: f7fe bf20 b\.w 90a4 <aaf1-0xf5c>
+ a260: f7fe bf20 b\.w 90a4 <abf2@plt\+0x48>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a264: f43e af1e beq\.w 90a4 <aaf1-0xf5c>
+ a264: f43e af1e beq\.w 90a4 <abf2@plt\+0x48>
a268: 4c00 ldr r4, \[pc, #0\] ; \(a26c <_thumb\+0x40>\)
a26a: 4c01 ldr r4, \[pc, #4\] ; \(a270 <_thumb\+0x44>\)
#------------------------------------------------------------------------------
@@ -748,15 +754,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a274: f7fe ef0a blx 908c <aaf1-0xf74>
+ a274: f7fe ef0a blx 908c <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a278: f7fe bf06 b\.w 9088 <aaf1-0xf78>
+ a278: f7fe bf06 b\.w 9088 <abf2@plt\+0x2c>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a27c: f43e af04 beq\.w 9088 <aaf1-0xf78>
+ a27c: f43e af04 beq\.w 9088 <abf2@plt\+0x2c>
a280: 4c00 ldr r4, \[pc, #0\] ; \(a284 <_thumb\+0x58>\)
a282: 4c01 ldr r4, \[pc, #4\] ; \(a288 <_thumb\+0x5c>\)
#------------------------------------------------------------------------------
@@ -770,15 +776,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a28c: f7fe ef14 blx 90b8 <aaf1-0xf48>
+ a28c: f7fe ef14 blx 90b8 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a290: f7fe bf10 b\.w 90b4 <aaf1-0xf4c>
+ a290: f7fe bf10 b\.w 90b4 <abf2@plt\+0x58>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a294: f43e af0e beq\.w 90b4 <aaf1-0xf4c>
+ a294: f43e af0e beq\.w 90b4 <abf2@plt\+0x58>
a298: 4c00 ldr r4, \[pc, #0\] ; \(a29c <_thumb\+0x70>\)
a29a: 4c01 ldr r4, \[pc, #4\] ; \(a2a0 <_thumb\+0x74>\)
#------------------------------------------------------------------------------
@@ -792,15 +798,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf2's .plt entry
#------------------------------------------------------------------------------
- a2a4: f7fe eeb8 blx 9018 <aaf1-0xfe8>
+ a2a4: f7fe eeb8 blx 9018 <atf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a2a8: f7fe beb4 b\.w 9014 <aaf1-0xfec>
+ a2a8: f7fe beb4 b\.w 9014 <atf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a2ac: f43e aeb2 beq\.w 9014 <aaf1-0xfec>
+ a2ac: f43e aeb2 beq\.w 9014 <atf2@plt>
a2b0: 4c00 ldr r4, \[pc, #0\] ; \(a2b4 <_thumb\+0x88>\)
a2b2: 4c01 ldr r4, \[pc, #4\] ; \(a2b8 <_thumb\+0x8c>\)
#------------------------------------------------------------------------------
@@ -814,15 +820,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf2's .plt entry
#------------------------------------------------------------------------------
- a2bc: f7fe eeb4 blx 9028 <aaf1-0xfd8>
+ a2bc: f7fe eeb4 blx 9028 <ttf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a2c0: f7fe beb0 b\.w 9024 <aaf1-0xfdc>
+ a2c0: f7fe beb0 b\.w 9024 <ttf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a2c4: f43e aeae beq\.w 9024 <aaf1-0xfdc>
+ a2c4: f43e aeae beq\.w 9024 <ttf2@plt>
a2c8: 4c00 ldr r4, \[pc, #0\] ; \(a2cc <_thumb\+0xa0>\)
a2ca: 4c01 ldr r4, \[pc, #4\] ; \(a2d0 <_thumb\+0xa4>\)
#------------------------------------------------------------------------------
@@ -836,15 +842,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a2d4: f7fe eec4 blx 9060 <aaf1-0xfa0>
+ a2d4: f7fe eec4 blx 9060 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2d8: f7fe bec0 b\.w 905c <aaf1-0xfa4>
+ a2d8: f7fe bec0 b\.w 905c <abf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2dc: f43e aebe beq\.w 905c <aaf1-0xfa4>
+ a2dc: f43e aebe beq\.w 905c <abf2@plt>
a2e0: 4c00 ldr r4, \[pc, #0\] ; \(a2e4 <_thumb\+0xb8>\)
a2e2: 4c01 ldr r4, \[pc, #4\] ; \(a2e8 <_thumb\+0xbc>\)
#------------------------------------------------------------------------------
@@ -858,15 +864,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a2ec: f7fe eea4 blx 9038 <aaf1-0xfc8>
+ a2ec: f7fe eea4 blx 9038 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2f0: f7fe bea0 b\.w 9034 <aaf1-0xfcc>
+ a2f0: f7fe bea0 b\.w 9034 <tbf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2f4: f43e ae9e beq\.w 9034 <aaf1-0xfcc>
+ a2f4: f43e ae9e beq\.w 9034 <tbf2@plt>
a2f8: 4c00 ldr r4, \[pc, #0\] ; \(a2fc <_thumb\+0xd0>\)
a2fa: 4c01 ldr r4, \[pc, #4\] ; \(a300 <_thumb\+0xd4>\)
#------------------------------------------------------------------------------
@@ -880,15 +886,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf3's .iplt entry
#------------------------------------------------------------------------------
- a304: f7fe eee6 blx 90d4 <aaf1-0xf2c>
+ a304: f7fe eee6 blx 90d4 <abf2@plt\+0x78>
#------------------------------------------------------------------------------
#------ thumb entry to atf3's .iplt entry
#------------------------------------------------------------------------------
- a308: f7fe bee2 b\.w 90d0 <aaf1-0xf30>
+ a308: f7fe bee2 b\.w 90d0 <abf2@plt\+0x74>
#------------------------------------------------------------------------------
#------ thumb entry to atf3's .iplt entry
#------------------------------------------------------------------------------
- a30c: f43e aee0 beq\.w 90d0 <aaf1-0xf30>
+ a30c: f43e aee0 beq\.w 90d0 <abf2@plt\+0x74>
a310: 4c00 ldr r4, \[pc, #0\] ; \(a314 <_thumb\+0xe8>\)
a312: 4c01 ldr r4, \[pc, #4\] ; \(a318 <_thumb\+0xec>\)
#------------------------------------------------------------------------------
@@ -902,15 +908,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf3's .iplt entry
#------------------------------------------------------------------------------
- a31c: f7fe eeea blx 90f4 <aaf1-0xf0c>
+ a31c: f7fe eeea blx 90f4 <abf2@plt\+0x98>
#------------------------------------------------------------------------------
#------ thumb entry to ttf3's .iplt entry
#------------------------------------------------------------------------------
- a320: f7fe bee6 b\.w 90f0 <aaf1-0xf10>
+ a320: f7fe bee6 b\.w 90f0 <abf2@plt\+0x94>
#------------------------------------------------------------------------------
#------ thumb entry to ttf3's .iplt entry
#------------------------------------------------------------------------------
- a324: f43e aee4 beq\.w 90f0 <aaf1-0xf10>
+ a324: f43e aee4 beq\.w 90f0 <abf2@plt\+0x94>
a328: 4c00 ldr r4, \[pc, #0\] ; \(a32c <_thumb\+0x100>\)
a32a: 4c01 ldr r4, \[pc, #4\] ; \(a330 <_thumb\+0x104>\)
#------------------------------------------------------------------------------
@@ -924,15 +930,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a334: f7fe eed6 blx 90e4 <aaf1-0xf1c>
+ a334: f7fe eed6 blx 90e4 <abf2@plt\+0x88>
#------------------------------------------------------------------------------
#------ thumb entry to abf3's .iplt entry
#------------------------------------------------------------------------------
- a338: f7fe bed2 b\.w 90e0 <aaf1-0xf20>
+ a338: f7fe bed2 b\.w 90e0 <abf2@plt\+0x84>
#------------------------------------------------------------------------------
#------ thumb entry to abf3's .iplt entry
#------------------------------------------------------------------------------
- a33c: f43e aed0 beq\.w 90e0 <aaf1-0xf20>
+ a33c: f43e aed0 beq\.w 90e0 <abf2@plt\+0x84>
a340: 4c00 ldr r4, \[pc, #0\] ; \(a344 <_thumb\+0x118>\)
a342: 4c01 ldr r4, \[pc, #4\] ; \(a348 <_thumb\+0x11c>\)
#------------------------------------------------------------------------------
@@ -946,15 +952,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a34c: f7fe eeda blx 9104 <aaf1-0xefc>
+ a34c: f7fe eeda blx 9104 <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ thumb entry to tbf3's .iplt entry
#------------------------------------------------------------------------------
- a350: f7fe bed6 b\.w 9100 <aaf1-0xf00>
+ a350: f7fe bed6 b\.w 9100 <abf2@plt\+0xa4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf3's .iplt entry
#------------------------------------------------------------------------------
- a354: f43e aed4 beq\.w 9100 <aaf1-0xf00>
+ a354: f43e aed4 beq\.w 9100 <abf2@plt\+0xa4>
a358: 4c00 ldr r4, \[pc, #0\] ; \(a35c <_thumb\+0x130>\)
a35a: 4c01 ldr r4, \[pc, #4\] ; \(a360 <_thumb\+0x134>\)
#------------------------------------------------------------------------------
@@ -968,15 +974,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf4's .iplt entry
#------------------------------------------------------------------------------
- a364: f7fe eefa blx 915c <aaf1-0xea4>
+ a364: f7fe eefa blx 915c <abf2@plt\+0x100>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .iplt entry
#------------------------------------------------------------------------------
- a368: f7fe bef6 b\.w 9158 <aaf1-0xea8>
+ a368: f7fe bef6 b\.w 9158 <abf2@plt\+0xfc>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .iplt entry
#------------------------------------------------------------------------------
- a36c: f43e aef4 beq\.w 9158 <aaf1-0xea8>
+ a36c: f43e aef4 beq\.w 9158 <abf2@plt\+0xfc>
a370: 4c00 ldr r4, \[pc, #0\] ; \(a374 <_thumb\+0x148>\)
a372: 4c01 ldr r4, \[pc, #4\] ; \(a378 <_thumb\+0x14c>\)
#------------------------------------------------------------------------------
@@ -990,15 +996,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf4's .iplt entry
#------------------------------------------------------------------------------
- a37c: f7fe eee0 blx 9140 <aaf1-0xec0>
+ a37c: f7fe eee0 blx 9140 <abf2@plt\+0xe4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .iplt entry
#------------------------------------------------------------------------------
- a380: f7fe bedc b\.w 913c <aaf1-0xec4>
+ a380: f7fe bedc b\.w 913c <abf2@plt\+0xe0>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .iplt entry
#------------------------------------------------------------------------------
- a384: f43e aeda beq\.w 913c <aaf1-0xec4>
+ a384: f43e aeda beq\.w 913c <abf2@plt\+0xe0>
a388: 4c00 ldr r4, \[pc, #0\] ; \(a38c <_thumb\+0x160>\)
a38a: 4c01 ldr r4, \[pc, #4\] ; \(a390 <_thumb\+0x164>\)
#------------------------------------------------------------------------------
@@ -1012,15 +1018,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .iplt entry
#------------------------------------------------------------------------------
- a394: f7fe eec4 blx 9120 <aaf1-0xee0>
+ a394: f7fe eec4 blx 9120 <abf2@plt\+0xc4>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .iplt entry
#------------------------------------------------------------------------------
- a398: f7fe bec0 b\.w 911c <aaf1-0xee4>
+ a398: f7fe bec0 b\.w 911c <abf2@plt\+0xc0>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .iplt entry
#------------------------------------------------------------------------------
- a39c: f43e aebe beq\.w 911c <aaf1-0xee4>
+ a39c: f43e aebe beq\.w 911c <abf2@plt\+0xc0>
a3a0: 4c00 ldr r4, \[pc, #0\] ; \(a3a4 <_thumb\+0x178>\)
a3a2: 4c01 ldr r4, \[pc, #4\] ; \(a3a8 <_thumb\+0x17c>\)
#------------------------------------------------------------------------------
@@ -1034,15 +1040,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .iplt entry
#------------------------------------------------------------------------------
- a3ac: f7fe eec0 blx 9130 <aaf1-0xed0>
+ a3ac: f7fe eec0 blx 9130 <abf2@plt\+0xd4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .iplt entry
#------------------------------------------------------------------------------
- a3b0: f7fe bebc b\.w 912c <aaf1-0xed4>
+ a3b0: f7fe bebc b\.w 912c <abf2@plt\+0xd0>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .iplt entry
#------------------------------------------------------------------------------
- a3b4: f43e aeba beq\.w 912c <aaf1-0xed4>
+ a3b4: f43e aeba beq\.w 912c <abf2@plt\+0xd0>
a3b8: 4c00 ldr r4, \[pc, #0\] ; \(a3bc <_thumb\+0x190>\)
a3ba: 4c01 ldr r4, \[pc, #4\] ; \(a3c0 <_thumb\+0x194>\)
#------------------------------------------------------------------------------
diff --git a/ld/testsuite/ld-arm/ifunc-7.dd b/ld/testsuite/ld-arm/ifunc-7.dd
index e9a9681..f82fd37 100644
--- a/ld/testsuite/ld-arm/ifunc-7.dd
+++ b/ld/testsuite/ld-arm/ifunc-7.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f1-0xff0>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,12 +16,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
#------------------------------------------------------------------------------
#------ f4's .plt entry
#------------------------------------------------------------------------------
+00009020 <f4@plt>:
9020: e28fc600 add ip, pc, #0, 12
9024: e28cca07 add ip, ip, #28672 ; 0x7000
9028: e5bcffe8 ldr pc, \[ip, #4072\]! ; 0xfe8
@@ -65,7 +67,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f1's .iplt entry
#------------------------------------------------------------------------------
- a01c: ebfffc02 bl 902c <f1-0xfd4>
+ a01c: ebfffc02 bl 902c <f4@plt\+0xc>
a020: e59f4000 ldr r4, \[pc\] ; a028 <arm\+0x20>
a024: e59f4000 ldr r4, \[pc\] ; a02c <arm\+0x24>
#------------------------------------------------------------------------------
@@ -79,7 +81,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
- a030: ebfffbf7 bl 9014 <f1-0xfec>
+ a030: ebfffbf7 bl 9014 <f2@plt>
a034: e59f4000 ldr r4, \[pc\] ; a03c <arm\+0x34>
a038: e59f4000 ldr r4, \[pc\] ; a040 <arm\+0x38>
#------------------------------------------------------------------------------
@@ -93,7 +95,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f3's .iplt entry
#------------------------------------------------------------------------------
- a044: ebfffbfb bl 9038 <f1-0xfc8>
+ a044: ebfffbfb bl 9038 <f4@plt\+0x18>
a048: e59f4000 ldr r4, \[pc\] ; a050 <arm\+0x48>
a04c: e59f4000 ldr r4, \[pc\] ; a054 <arm\+0x4c>
#------------------------------------------------------------------------------
@@ -107,7 +109,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f4's .plt entry
#------------------------------------------------------------------------------
- a058: ebfffbf0 bl 9020 <f1-0xfe0>
+ a058: ebfffbf0 bl 9020 <f4@plt>
a05c: e59f4000 ldr r4, \[pc\] ; a064 <arm\+0x5c>
a060: e59f4000 ldr r4, \[pc\] ; a068 <arm\+0x60>
#------------------------------------------------------------------------------
diff --git a/ld/testsuite/ld-arm/ifunc-8.dd b/ld/testsuite/ld-arm/ifunc-8.dd
index 5b255e2..3cca17c 100644
--- a/ld/testsuite/ld-arm/ifunc-8.dd
+++ b/ld/testsuite/ld-arm/ifunc-8.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <atf2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <aaf1-0xff0>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <atf2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
+00009014 <atf2@plt>:
9014: 4778 bx pc
9016: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -27,12 +28,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
+00009024 <aaf4@plt>:
9024: e28fc600 add ip, pc, #0, 12
9028: e28cca07 add ip, ip, #28672 ; 0x7000
902c: e5bcffe4 ldr pc, \[ip, #4068\]! ; 0xfe4
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
+00009030 <ttf2@plt>:
9030: 4778 bx pc
9032: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -44,6 +47,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
+00009040 <tbf2@plt>:
9040: 4778 bx pc
9042: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -55,18 +59,21 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
+00009050 <taf2@plt>:
9050: e28fc600 add ip, pc, #0, 12
9054: e28cca07 add ip, ip, #28672 ; 0x7000
9058: e5bcffc4 ldr pc, \[ip, #4036\]! ; 0xfc4
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
+0000905c <aaf2@plt>:
905c: e28fc600 add ip, pc, #0, 12
9060: e28cca07 add ip, ip, #28672 ; 0x7000
9064: e5bcffbc ldr pc, \[ip, #4028\]! ; 0xfbc
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
+00009068 <abf4@plt>:
9068: 4778 bx pc
906a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -78,6 +85,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
+00009078 <tbf4@plt>:
9078: 4778 bx pc
907a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -89,6 +97,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
+00009088 <ttf4@plt>:
9088: 4778 bx pc
908a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -100,6 +109,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
+00009098 <atf4@plt>:
9098: 4778 bx pc
909a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -111,12 +121,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
+000090a8 <taf4@plt>:
90a8: e28fc600 add ip, pc, #0, 12
90ac: e28cca07 add ip, ip, #28672 ; 0x7000
90b0: e5bcff84 ldr pc, \[ip, #3972\]! ; 0xf84
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
+000090b4 <abf2@plt>:
90b4: 4778 bx pc
90b6: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -299,15 +311,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a044: ebfffc1e bl 90c4 <aaf1-0xf3c>
+ a044: ebfffc1e bl 90c4 <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a048: eafffc1d b 90c4 <aaf1-0xf3c>
+ a048: eafffc1d b 90c4 <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a04c: 0afffc1c beq 90c4 <aaf1-0xf3c>
+ a04c: 0afffc1c beq 90c4 <abf2@plt\+0x10>
a050: e59f4000 ldr r4, \[pc\] ; a058 <arm\+0x30>
a054: e59f4000 ldr r4, \[pc\] ; a05c <arm\+0x34>
#------------------------------------------------------------------------------
@@ -321,15 +333,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a060: ebfffc22 bl 90f0 <aaf1-0xf10>
+ a060: ebfffc22 bl 90f0 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a064: eafffc21 b 90f0 <aaf1-0xf10>
+ a064: eafffc21 b 90f0 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a068: 0afffc20 beq 90f0 <aaf1-0xf10>
+ a068: 0afffc20 beq 90f0 <abf2@plt\+0x3c>
a06c: e59f4000 ldr r4, \[pc\] ; a074 <arm\+0x4c>
a070: e59f4000 ldr r4, \[pc\] ; a078 <arm\+0x50>
#------------------------------------------------------------------------------
@@ -343,15 +355,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a07c: ebfffc18 bl 90e4 <aaf1-0xf1c>
+ a07c: ebfffc18 bl 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a080: eafffc17 b 90e4 <aaf1-0xf1c>
+ a080: eafffc17 b 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a084: 0afffc16 beq 90e4 <aaf1-0xf1c>
+ a084: 0afffc16 beq 90e4 <abf2@plt\+0x30>
a088: e59f4000 ldr r4, \[pc\] ; a090 <arm\+0x68>
a08c: e59f4000 ldr r4, \[pc\] ; a094 <arm\+0x6c>
#------------------------------------------------------------------------------
@@ -365,15 +377,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a098: ebfffc1c bl 9110 <aaf1-0xef0>
+ a098: ebfffc1c bl 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a09c: eafffc1b b 9110 <aaf1-0xef0>
+ a09c: eafffc1b b 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0a0: 0afffc1a beq 9110 <aaf1-0xef0>
+ a0a0: 0afffc1a beq 9110 <abf2@plt\+0x5c>
a0a4: e59f4000 ldr r4, \[pc\] ; a0ac <arm\+0x84>
a0a8: e59f4000 ldr r4, \[pc\] ; a0b0 <arm\+0x88>
#------------------------------------------------------------------------------
@@ -387,15 +399,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0b4: ebfffbe8 bl 905c <aaf1-0xfa4>
+ a0b4: ebfffbe8 bl 905c <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0b8: eafffbe7 b 905c <aaf1-0xfa4>
+ a0b8: eafffbe7 b 905c <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0bc: 0afffbe6 beq 905c <aaf1-0xfa4>
+ a0bc: 0afffbe6 beq 905c <aaf2@plt>
a0c0: e59f4000 ldr r4, \[pc\] ; a0c8 <arm\+0xa0>
a0c4: e59f4000 ldr r4, \[pc\] ; a0cc <arm\+0xa4>
#------------------------------------------------------------------------------
@@ -409,15 +421,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d0: ebfffbde bl 9050 <aaf1-0xfb0>
+ a0d0: ebfffbde bl 9050 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d4: eafffbdd b 9050 <aaf1-0xfb0>
+ a0d4: eafffbdd b 9050 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d8: 0afffbdc beq 9050 <aaf1-0xfb0>
+ a0d8: 0afffbdc beq 9050 <taf2@plt>
a0dc: e59f4000 ldr r4, \[pc\] ; a0e4 <arm\+0xbc>
a0e0: e59f4000 ldr r4, \[pc\] ; a0e8 <arm\+0xc0>
#------------------------------------------------------------------------------
@@ -431,15 +443,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0ec: ebfffbf1 bl 90b8 <aaf1-0xf48>
+ a0ec: ebfffbf1 bl 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0f0: eafffbf0 b 90b8 <aaf1-0xf48>
+ a0f0: eafffbf0 b 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0f4: 0afffbef beq 90b8 <aaf1-0xf48>
+ a0f4: 0afffbef beq 90b8 <abf2@plt\+0x4>
a0f8: e59f4000 ldr r4, \[pc\] ; a100 <arm\+0xd8>
a0fc: e59f4000 ldr r4, \[pc\] ; a104 <arm\+0xdc>
#------------------------------------------------------------------------------
@@ -453,15 +465,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a108: ebfffbcd bl 9044 <aaf1-0xfbc>
+ a108: ebfffbcd bl 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a10c: eafffbcc b 9044 <aaf1-0xfbc>
+ a10c: eafffbcc b 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a110: 0afffbcb beq 9044 <aaf1-0xfbc>
+ a110: 0afffbcb beq 9044 <tbf2@plt\+0x4>
a114: e59f4000 ldr r4, \[pc\] ; a11c <arm\+0xf4>
a118: e59f4000 ldr r4, \[pc\] ; a120 <arm\+0xf8>
#------------------------------------------------------------------------------
@@ -475,15 +487,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a124: ebfffc0f bl 9168 <aaf1-0xe98>
+ a124: ebfffc0f bl 9168 <abf2@plt\+0xb4>
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a128: eafffc0e b 9168 <aaf1-0xe98>
+ a128: eafffc0e b 9168 <abf2@plt\+0xb4>
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a12c: 0afffc0d beq 9168 <aaf1-0xe98>
+ a12c: 0afffc0d beq 9168 <abf2@plt\+0xb4>
a130: e59f4000 ldr r4, \[pc\] ; a138 <arm\+0x110>
a134: e59f4000 ldr r4, \[pc\] ; a13c <arm\+0x114>
#------------------------------------------------------------------------------
@@ -497,15 +509,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a140: ebfffc05 bl 915c <aaf1-0xea4>
+ a140: ebfffc05 bl 915c <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a144: eafffc04 b 915c <aaf1-0xea4>
+ a144: eafffc04 b 915c <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a148: 0afffc03 beq 915c <aaf1-0xea4>
+ a148: 0afffc03 beq 915c <abf2@plt\+0xa8>
a14c: e59f4000 ldr r4, \[pc\] ; a154 <arm\+0x12c>
a150: e59f4000 ldr r4, \[pc\] ; a158 <arm\+0x130>
#------------------------------------------------------------------------------
@@ -519,15 +531,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a15c: ebfffbf3 bl 9130 <aaf1-0xed0>
+ a15c: ebfffbf3 bl 9130 <abf2@plt\+0x7c>
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a160: eafffbf2 b 9130 <aaf1-0xed0>
+ a160: eafffbf2 b 9130 <abf2@plt\+0x7c>
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a164: 0afffbf1 beq 9130 <aaf1-0xed0>
+ a164: 0afffbf1 beq 9130 <abf2@plt\+0x7c>
a168: e59f4000 ldr r4, \[pc\] ; a170 <arm\+0x148>
a16c: e59f4000 ldr r4, \[pc\] ; a174 <arm\+0x14c>
#------------------------------------------------------------------------------
@@ -541,15 +553,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a178: ebfffbf4 bl 9150 <aaf1-0xeb0>
+ a178: ebfffbf4 bl 9150 <abf2@plt\+0x9c>
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a17c: eafffbf3 b 9150 <aaf1-0xeb0>
+ a17c: eafffbf3 b 9150 <abf2@plt\+0x9c>
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a180: 0afffbf2 beq 9150 <aaf1-0xeb0>
+ a180: 0afffbf2 beq 9150 <abf2@plt\+0x9c>
a184: e59f4000 ldr r4, \[pc\] ; a18c <arm\+0x164>
a188: e59f4000 ldr r4, \[pc\] ; a190 <arm\+0x168>
#------------------------------------------------------------------------------
@@ -563,15 +575,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a194: ebfffba2 bl 9024 <aaf1-0xfdc>
+ a194: ebfffba2 bl 9024 <aaf4@plt>
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a198: eafffba1 b 9024 <aaf1-0xfdc>
+ a198: eafffba1 b 9024 <aaf4@plt>
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a19c: 0afffba0 beq 9024 <aaf1-0xfdc>
+ a19c: 0afffba0 beq 9024 <aaf4@plt>
a1a0: e59f4000 ldr r4, \[pc\] ; a1a8 <arm\+0x180>
a1a4: e59f4000 ldr r4, \[pc\] ; a1ac <arm\+0x184>
#------------------------------------------------------------------------------
@@ -585,15 +597,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b0: ebfffbbc bl 90a8 <aaf1-0xf58>
+ a1b0: ebfffbbc bl 90a8 <taf4@plt>
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b4: eafffbbb b 90a8 <aaf1-0xf58>
+ a1b4: eafffbbb b 90a8 <taf4@plt>
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b8: 0afffbba beq 90a8 <aaf1-0xf58>
+ a1b8: 0afffbba beq 90a8 <taf4@plt>
a1bc: e59f4000 ldr r4, \[pc\] ; a1c4 <arm\+0x19c>
a1c0: e59f4000 ldr r4, \[pc\] ; a1c8 <arm\+0x1a0>
#------------------------------------------------------------------------------
@@ -607,15 +619,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1cc: ebfffba6 bl 906c <aaf1-0xf94>
+ a1cc: ebfffba6 bl 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1d0: eafffba5 b 906c <aaf1-0xf94>
+ a1d0: eafffba5 b 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1d4: 0afffba4 beq 906c <aaf1-0xf94>
+ a1d4: 0afffba4 beq 906c <abf4@plt\+0x4>
a1d8: e59f4000 ldr r4, \[pc\] ; a1e0 <arm\+0x1b8>
a1dc: e59f4000 ldr r4, \[pc\] ; a1e4 <arm\+0x1bc>
#------------------------------------------------------------------------------
@@ -629,15 +641,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1e8: ebfffba3 bl 907c <aaf1-0xf84>
+ a1e8: ebfffba3 bl 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1ec: eafffba2 b 907c <aaf1-0xf84>
+ a1ec: eafffba2 b 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1f0: 0afffba1 beq 907c <aaf1-0xf84>
+ a1f0: 0afffba1 beq 907c <tbf4@plt\+0x4>
a1f4: e59f4000 ldr r4, \[pc\] ; a1fc <arm\+0x1d4>
a1f8: e59f4000 ldr r4, \[pc\] ; a200 <arm\+0x1d8>
#------------------------------------------------------------------------------
@@ -666,15 +678,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf1's .iplt entry
#------------------------------------------------------------------------------
- a21c: f7fe ef5a blx 90d4 <aaf1-0xf2c>
+ a21c: f7fe ef5a blx 90d4 <abf2@plt\+0x20>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a220: f7fe bf56 b\.w 90d0 <aaf1-0xf30>
+ a220: f7fe bf56 b\.w 90d0 <abf2@plt\+0x1c>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a224: f43e af54 beq\.w 90d0 <aaf1-0xf30>
+ a224: f43e af54 beq\.w 90d0 <abf2@plt\+0x1c>
a228: 4c00 ldr r4, \[pc, #0\] ; \(a22c <_thumb\+0x28>\)
a22a: 4c01 ldr r4, \[pc, #4\] ; \(a230 <_thumb\+0x2c>\)
#------------------------------------------------------------------------------
@@ -688,15 +700,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf1's .iplt entry
#------------------------------------------------------------------------------
- a234: f7fe ef64 blx 9100 <aaf1-0xf00>
+ a234: f7fe ef64 blx 9100 <abf2@plt\+0x4c>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a238: f7fe bf60 b\.w 90fc <aaf1-0xf04>
+ a238: f7fe bf60 b\.w 90fc <abf2@plt\+0x48>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a23c: f43e af5e beq\.w 90fc <aaf1-0xf04>
+ a23c: f43e af5e beq\.w 90fc <abf2@plt\+0x48>
a240: 4c00 ldr r4, \[pc, #0\] ; \(a244 <_thumb\+0x40>\)
a242: 4c01 ldr r4, \[pc, #4\] ; \(a248 <_thumb\+0x44>\)
#------------------------------------------------------------------------------
@@ -710,15 +722,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a24c: f7fe ef4a blx 90e4 <aaf1-0xf1c>
+ a24c: f7fe ef4a blx 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a250: f7fe bf46 b\.w 90e0 <aaf1-0xf20>
+ a250: f7fe bf46 b\.w 90e0 <abf2@plt\+0x2c>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a254: f43e af44 beq\.w 90e0 <aaf1-0xf20>
+ a254: f43e af44 beq\.w 90e0 <abf2@plt\+0x2c>
a258: 4c00 ldr r4, \[pc, #0\] ; \(a25c <_thumb\+0x58>\)
a25a: 4c01 ldr r4, \[pc, #4\] ; \(a260 <_thumb\+0x5c>\)
#------------------------------------------------------------------------------
@@ -732,15 +744,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a264: f7fe ef54 blx 9110 <aaf1-0xef0>
+ a264: f7fe ef54 blx 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a268: f7fe bf50 b\.w 910c <aaf1-0xef4>
+ a268: f7fe bf50 b\.w 910c <abf2@plt\+0x58>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a26c: f43e af4e beq\.w 910c <aaf1-0xef4>
+ a26c: f43e af4e beq\.w 910c <abf2@plt\+0x58>
a270: 4c00 ldr r4, \[pc, #0\] ; \(a274 <_thumb\+0x70>\)
a272: 4c01 ldr r4, \[pc, #4\] ; \(a278 <_thumb\+0x74>\)
#------------------------------------------------------------------------------
@@ -754,15 +766,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf2's .plt entry
#------------------------------------------------------------------------------
- a27c: f7fe eecc blx 9018 <aaf1-0xfe8>
+ a27c: f7fe eecc blx 9018 <atf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a280: f7fe bec8 b\.w 9014 <aaf1-0xfec>
+ a280: f7fe bec8 b\.w 9014 <atf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a284: f43e aec6 beq\.w 9014 <aaf1-0xfec>
+ a284: f43e aec6 beq\.w 9014 <atf2@plt>
a288: 4c00 ldr r4, \[pc, #0\] ; \(a28c <_thumb\+0x88>\)
a28a: 4c01 ldr r4, \[pc, #4\] ; \(a290 <_thumb\+0x8c>\)
#------------------------------------------------------------------------------
@@ -776,15 +788,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf2's .plt entry
#------------------------------------------------------------------------------
- a294: f7fe eece blx 9034 <aaf1-0xfcc>
+ a294: f7fe eece blx 9034 <ttf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a298: f7fe beca b\.w 9030 <aaf1-0xfd0>
+ a298: f7fe beca b\.w 9030 <ttf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a29c: f43e aec8 beq\.w 9030 <aaf1-0xfd0>
+ a29c: f43e aec8 beq\.w 9030 <ttf2@plt>
a2a0: 4c00 ldr r4, \[pc, #0\] ; \(a2a4 <_thumb\+0xa0>\)
a2a2: 4c01 ldr r4, \[pc, #4\] ; \(a2a8 <_thumb\+0xa4>\)
#------------------------------------------------------------------------------
@@ -798,15 +810,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a2ac: f7fe ef04 blx 90b8 <aaf1-0xf48>
+ a2ac: f7fe ef04 blx 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2b0: f7fe bf00 b\.w 90b4 <aaf1-0xf4c>
+ a2b0: f7fe bf00 b\.w 90b4 <abf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2b4: f43e aefe beq\.w 90b4 <aaf1-0xf4c>
+ a2b4: f43e aefe beq\.w 90b4 <abf2@plt>
a2b8: 4c00 ldr r4, \[pc, #0\] ; \(a2bc <_thumb\+0xb8>\)
a2ba: 4c01 ldr r4, \[pc, #4\] ; \(a2c0 <_thumb\+0xbc>\)
#------------------------------------------------------------------------------
@@ -820,15 +832,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a2c4: f7fe eebe blx 9044 <aaf1-0xfbc>
+ a2c4: f7fe eebe blx 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2c8: f7fe beba b\.w 9040 <aaf1-0xfc0>
+ a2c8: f7fe beba b\.w 9040 <tbf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2cc: f43e aeb8 beq\.w 9040 <aaf1-0xfc0>
+ a2cc: f43e aeb8 beq\.w 9040 <tbf2@plt>
a2d0: 4c00 ldr r4, \[pc, #0\] ; \(a2d4 <_thumb\+0xd0>\)
a2d2: 4c01 ldr r4, \[pc, #4\] ; \(a2d8 <_thumb\+0xd4>\)
#------------------------------------------------------------------------------
@@ -842,15 +854,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf3's .iplt entry
#------------------------------------------------------------------------------
- a2dc: f7fe ef20 blx 9120 <aaf1-0xee0>
+ a2dc: f7fe ef20 blx 9120 <abf2@plt\+0x6c>
#------------------------------------------------------------------------------
#------ thumb entry to atf3's .iplt entry
#------------------------------------------------------------------------------
- a2e0: f7fe bf1c b\.w 911c <aaf1-0xee4>
+ a2e0: f7fe bf1c b\.w 911c <abf2@plt\+0x68>
#------------------------------------------------------------------------------
#------ thumb entry to atf3's .iplt entry
#------------------------------------------------------------------------------
- a2e4: f43e af1a beq\.w 911c <aaf1-0xee4>
+ a2e4: f43e af1a beq\.w 911c <abf2@plt\+0x68>
a2e8: 4c00 ldr r4, \[pc, #0\] ; \(a2ec <_thumb\+0xe8>\)
a2ea: 4c01 ldr r4, \[pc, #4\] ; \(a2f0 <_thumb\+0xec>\)
#------------------------------------------------------------------------------
@@ -864,15 +876,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf3's .iplt entry
#------------------------------------------------------------------------------
- a2f4: f7fe ef24 blx 9140 <aaf1-0xec0>
+ a2f4: f7fe ef24 blx 9140 <abf2@plt\+0x8c>
#------------------------------------------------------------------------------
#------ thumb entry to ttf3's .iplt entry
#------------------------------------------------------------------------------
- a2f8: f7fe bf20 b\.w 913c <aaf1-0xec4>
+ a2f8: f7fe bf20 b\.w 913c <abf2@plt\+0x88>
#------------------------------------------------------------------------------
#------ thumb entry to ttf3's .iplt entry
#------------------------------------------------------------------------------
- a2fc: f43e af1e beq\.w 913c <aaf1-0xec4>
+ a2fc: f43e af1e beq\.w 913c <abf2@plt\+0x88>
a300: 4c00 ldr r4, \[pc, #0\] ; \(a304 <_thumb\+0x100>\)
a302: 4c01 ldr r4, \[pc, #4\] ; \(a308 <_thumb\+0x104>\)
#------------------------------------------------------------------------------
@@ -886,15 +898,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a30c: f7fe ef10 blx 9130 <aaf1-0xed0>
+ a30c: f7fe ef10 blx 9130 <abf2@plt\+0x7c>
#------------------------------------------------------------------------------
#------ thumb entry to abf3's .iplt entry
#------------------------------------------------------------------------------
- a310: f7fe bf0c b\.w 912c <aaf1-0xed4>
+ a310: f7fe bf0c b\.w 912c <abf2@plt\+0x78>
#------------------------------------------------------------------------------
#------ thumb entry to abf3's .iplt entry
#------------------------------------------------------------------------------
- a314: f43e af0a beq\.w 912c <aaf1-0xed4>
+ a314: f43e af0a beq\.w 912c <abf2@plt\+0x78>
a318: 4c00 ldr r4, \[pc, #0\] ; \(a31c <_thumb\+0x118>\)
a31a: 4c01 ldr r4, \[pc, #4\] ; \(a320 <_thumb\+0x11c>\)
#------------------------------------------------------------------------------
@@ -908,15 +920,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a324: f7fe ef14 blx 9150 <aaf1-0xeb0>
+ a324: f7fe ef14 blx 9150 <abf2@plt\+0x9c>
#------------------------------------------------------------------------------
#------ thumb entry to tbf3's .iplt entry
#------------------------------------------------------------------------------
- a328: f7fe bf10 b\.w 914c <aaf1-0xeb4>
+ a328: f7fe bf10 b\.w 914c <abf2@plt\+0x98>
#------------------------------------------------------------------------------
#------ thumb entry to tbf3's .iplt entry
#------------------------------------------------------------------------------
- a32c: f43e af0e beq\.w 914c <aaf1-0xeb4>
+ a32c: f43e af0e beq\.w 914c <abf2@plt\+0x98>
a330: 4c00 ldr r4, \[pc, #0\] ; \(a334 <_thumb\+0x130>\)
a332: 4c01 ldr r4, \[pc, #4\] ; \(a338 <_thumb\+0x134>\)
#------------------------------------------------------------------------------
@@ -930,15 +942,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf4's .plt entry
#------------------------------------------------------------------------------
- a33c: f7fe eeae blx 909c <aaf1-0xf64>
+ a33c: f7fe eeae blx 909c <atf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
- a340: f7fe beaa b\.w 9098 <aaf1-0xf68>
+ a340: f7fe beaa b\.w 9098 <atf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
- a344: f43e aea8 beq\.w 9098 <aaf1-0xf68>
+ a344: f43e aea8 beq\.w 9098 <atf4@plt>
a348: 4c00 ldr r4, \[pc, #0\] ; \(a34c <_thumb\+0x148>\)
a34a: 4c01 ldr r4, \[pc, #4\] ; \(a350 <_thumb\+0x14c>\)
#------------------------------------------------------------------------------
@@ -952,15 +964,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf4's .plt entry
#------------------------------------------------------------------------------
- a354: f7fe ee9a blx 908c <aaf1-0xf74>
+ a354: f7fe ee9a blx 908c <ttf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
- a358: f7fe be96 b\.w 9088 <aaf1-0xf78>
+ a358: f7fe be96 b\.w 9088 <ttf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
- a35c: f43e ae94 beq\.w 9088 <aaf1-0xf78>
+ a35c: f43e ae94 beq\.w 9088 <ttf4@plt>
a360: 4c00 ldr r4, \[pc, #0\] ; \(a364 <_thumb\+0x160>\)
a362: 4c01 ldr r4, \[pc, #4\] ; \(a368 <_thumb\+0x164>\)
#------------------------------------------------------------------------------
@@ -974,15 +986,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a36c: f7fe ee7e blx 906c <aaf1-0xf94>
+ a36c: f7fe ee7e blx 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
- a370: f7fe be7a b\.w 9068 <aaf1-0xf98>
+ a370: f7fe be7a b\.w 9068 <abf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
- a374: f43e ae78 beq\.w 9068 <aaf1-0xf98>
+ a374: f43e ae78 beq\.w 9068 <abf4@plt>
a378: 4c00 ldr r4, \[pc, #0\] ; \(a37c <_thumb\+0x178>\)
a37a: 4c01 ldr r4, \[pc, #4\] ; \(a380 <_thumb\+0x17c>\)
#------------------------------------------------------------------------------
@@ -996,15 +1008,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a384: f7fe ee7a blx 907c <aaf1-0xf84>
+ a384: f7fe ee7a blx 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
- a388: f7fe be76 b\.w 9078 <aaf1-0xf88>
+ a388: f7fe be76 b\.w 9078 <tbf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
- a38c: f43e ae74 beq\.w 9078 <aaf1-0xf88>
+ a38c: f43e ae74 beq\.w 9078 <tbf4@plt>
a390: 4c00 ldr r4, \[pc, #0\] ; \(a394 <_thumb\+0x190>\)
a392: 4c01 ldr r4, \[pc, #4\] ; \(a398 <_thumb\+0x194>\)
#------------------------------------------------------------------------------
diff --git a/ld/testsuite/ld-arm/ifunc-9.dd b/ld/testsuite/ld-arm/ifunc-9.dd
index 36139d9..af7ec4b 100644
--- a/ld/testsuite/ld-arm/ifunc-9.dd
+++ b/ld/testsuite/ld-arm/ifunc-9.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f3-0x1c>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
@@ -71,7 +72,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f1's .iplt entry
#------------------------------------------------------------------------------
- a034: ebfffbf9 bl 9020 <f3-0xc>
+ a034: ebfffbf9 bl 9020 <f2@plt\+0xc>
a038: e59f400c ldr r4, \[pc, #12\] ; a04c <_start\+0x44>
a03c: e59f400c ldr r4, \[pc, #12\] ; a050 <_start\+0x48>
a040: e59f400c ldr r4, \[pc, #12\] ; a054 <_start\+0x4c>
@@ -100,7 +101,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
- a060: ebfffbeb bl 9014 <f3-0x18>
+ a060: ebfffbeb bl 9014 <f2@plt>
a064: e59f400c ldr r4, \[pc, #12\] ; a078 <_start\+0x70>
a068: e59f400c ldr r4, \[pc, #12\] ; a07c <_start\+0x74>
a06c: e59f400c ldr r4, \[pc, #12\] ; a080 <_start\+0x78>
diff --git a/ld/testsuite/ld-arm/long-plt-format.d b/ld/testsuite/ld-arm/long-plt-format.d
index c64b42f..b0a1abc 100644
--- a/ld/testsuite/ld-arm/long-plt-format.d
+++ b/ld/testsuite/ld-arm/long-plt-format.d
@@ -3,12 +3,13 @@
Disassembly of section .plt:
-.* <.plt>:
+.* <foo@plt-0x14>:
.*: .*
.*: .*
.*: .*
.*: .*
.*: .* .word .*
+.* <foo@plt>:
.*: .* add ip, pc, #-268435456 ; 0xf0000000
.*: .* add ip, ip, #0, 12
.*: .* add ip, ip, #0, 20
diff --git a/ld/testsuite/ld-arm/mixed-app-v5.d b/ld/testsuite/ld-arm/mixed-app-v5.d
index 82013f3..92b5ebb 100644
--- a/ld/testsuite/ld-arm/mixed-app-v5.d
+++ b/ld/testsuite/ld-arm/mixed-app-v5.d
@@ -6,15 +6,17 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -48,7 +50,7 @@ Disassembly of section .text:
.* <app_tfunc>:
.*: b500 push {lr}
- .*: f7ff efc. blx .* <_start-0x..>
+ .*: f7ff efc. blx .* <lib_func2@plt>
.*: bd00 pop {pc}
.*: 4770 bx lr
.*: 46c0 nop ; \(mov r8, r8\)
diff --git a/ld/testsuite/ld-arm/mixed-app.d b/ld/testsuite/ld-arm/mixed-app.d
index 4de8e57..06166f0 100644
--- a/ld/testsuite/ld-arm/mixed-app.d
+++ b/ld/testsuite/ld-arm/mixed-app.d
@@ -6,17 +6,19 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func2@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -50,7 +52,7 @@ Disassembly of section .text:
.* <app_tfunc>:
.*: b500 push {lr}
- .*: f7ff ffc. bl .* <_start-0x..>
+ .*: f7ff ffc. bl .* <lib_func2@plt>
.*: bd00 pop {pc}
.*: 4770 bx lr
.*: 46c0 nop ; \(mov r8, r8\)
diff --git a/ld/testsuite/ld-arm/mixed-lib.d b/ld/testsuite/ld-arm/mixed-lib.d
index d3a9ff9..6b344a5 100644
--- a/ld/testsuite/ld-arm/mixed-lib.d
+++ b/ld/testsuite/ld-arm/mixed-lib.d
@@ -6,12 +6,13 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x.*>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -20,7 +21,7 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff. bl .* <lib_func1-0x..?>
+ .*: ebfffff. bl .* <app_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
.*: e1a00000 nop ; \(mov r0, r0\)
diff --git a/ld/testsuite/ld-arm/thumb2-bl-undefweak.d b/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
index 5c286bee9..c501aa2 100644
--- a/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
+++ b/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
@@ -6,4 +6,4 @@
Disassembly of section .text:
.* <foo>:
- +[0-9a-f]+: .... .... bl. [0-9a-f]+ <foo-0x[0-9a-f]+>
+ +[0-9a-f]+: .... .... bl. [0-9a-f]+ <bar@plt>
diff --git a/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d b/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d
index a6907f5..806f66c 100644
--- a/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d
+++ b/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d
@@ -6,4 +6,4 @@
Disassembly of section .text:
.* <foo>:
- +[0-9a-f]+: ........ bl [0-9a-f]+ <foo-0x[0-9a-f]+>
+ +[0-9a-f]+: ........ bl [0-9a-f]+ <bar@plt>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Pretty-printing plt entries on ARM (second try)
2014-03-12 9:10 [PATCH] Pretty-printing plt entries on ARM (second try) Yury Gribov
@ 2014-03-14 11:32 ` Nicholas Clifton
2014-03-14 12:35 ` Yury Gribov
0 siblings, 1 reply; 7+ messages in thread
From: Nicholas Clifton @ 2014-03-14 11:32 UTC (permalink / raw)
To: Yury Gribov, binutils; +Cc: Viacheslav Garbuzov, Pavel Fedin
Hi Yury,
> This is simplified version of patch originally proposed in
> https://sourceware.org/ml/binutils/2014-03/msg00046.html
Why does your patch not support Thumb2 PLT entries ? Support for them
was recently added and I see no reason why they should not be supported
as well.
Cheers
Nick
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Pretty-printing plt entries on ARM (second try)
2014-03-14 11:32 ` Nicholas Clifton
@ 2014-03-14 12:35 ` Yury Gribov
2014-03-17 12:06 ` Yury Gribov
0 siblings, 1 reply; 7+ messages in thread
From: Yury Gribov @ 2014-03-14 12:35 UTC (permalink / raw)
To: Nicholas Clifton, binutils; +Cc: Viacheslav Garbuzov, Pavel Fedin
> Why does your patch not support Thumb2 PLT entries ?
> Support for them was recently added and
> I see no reason why they should not be supported as well.
The one and only reason is that code to analyze them would probably be
rather ugly (I need to mask out imm which is spread all across instruction).
I can add it if you find it necessary.
-Y
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Pretty-printing plt entries on ARM (second try)
2014-03-14 12:35 ` Yury Gribov
@ 2014-03-17 12:06 ` Yury Gribov
2014-03-24 4:48 ` [PATCH][PING] " Yury Gribov
0 siblings, 1 reply; 7+ messages in thread
From: Yury Gribov @ 2014-03-17 12:06 UTC (permalink / raw)
To: Nicholas Clifton, binutils; +Cc: Viacheslav Garbuzov, Pavel Fedin
[-- Attachment #1: Type: text/plain, Size: 643 bytes --]
Nicholas Clifton wrote:
> Why does your patch not support Thumb2 PLT entries ?
>
> The one and only reason is that code to analyze them would probably be
> rather ugly (I need to mask out imm which is spread all across
> instruction).
> I can add it if you find it necessary.
Attaching the Thumb2-friendly implementation which turned out to not be
as ugly as I feared.
I've rebased the code on top of current Binutils trunk and checked
eabi/gnueabi/symbianelf/nacl.
I'm not sure how to autotest Thumb-only platforms. Are those already
checked when I configure for standard gnueabi/eabi targets?
Or should I use some special triplet?
-Y
[-- Attachment #2: arm_pretty_plt_dumps_2.diff --]
[-- Type: text/x-diff, Size: 156304 bytes --]
commit da04fea4d722c6d24efe7888ae2da248b9f5c0f9
Author: Yury Gribov <y.gribov@samsung.com>
Date: Wed Mar 12 15:59:30 2014 +0400
2014-03-11 Yury Gribov <y.gribov@samsung.com>
Pavel Fedin <p.fedin@samsung.com>
Support limited pretty-printing of PLT entries on eabi and nacl ARM targets.
bfd/
* elf32-arm.c (elf32_arm_get_synthetic_symtab): Add new callback.
(elf32_arm_nacl_plt_sym_val): Likewise.
(elf32_arm_plt0_size): Add helper function.
(elf32_arm_plt_size): Likewise.
ld/testsuite/
* ld-arm/arm-app-abs32.d: Updated test.
* ld-arm/arm-app.d: Likewise.
* ld-arm/arm-lib-plt32.d: Likewise.
* ld-arm/arm-lib.d: Likewise.
* ld-arm/armthumb-lib.d: Likewise.
* ld-arm/cortex-a8-fix-b-plt.d: Likewise.
* ld-arm/cortex-a8-fix-bcc-plt.d: Likewise.
* ld-arm/cortex-a8-fix-bl-plt.d: Likewise.
* ld-arm/cortex-a8-fix-bl-rel-plt.d: Likewise.
* ld-arm/cortex-a8-fix-blx-plt.d: Likewise.
* ld-arm/farcall-mixed-app-v5.d: Likewise.
* ld-arm/farcall-mixed-app.d: Likewise.
* ld-arm/farcall-mixed-lib-v4t.d: Likewise.
* ld-arm/farcall-mixed-lib.d: Likewise.
* ld-arm/ifunc-10.dd: Likewise.
* ld-arm/ifunc-14.dd: Likewise.
* ld-arm/ifunc-15.dd: Likewise.
* ld-arm/ifunc-3.dd: Likewise.
* ld-arm/ifunc-4.dd: Likewise.
* ld-arm/ifunc-7.dd: Likewise.
* ld-arm/ifunc-8.dd: Likewise.
* ld-arm/ifunc-9.dd: Likewise.
* ld-arm/long-plt-format.d: Likewise.
* ld-arm/mixed-app-v5.d: Likewise.
* ld-arm/mixed-app.d: Likewise.
* ld-arm/mixed-lib.d: Likewise.
* ld-arm/thumb2-bl-undefweak.d: Likewise.
* ld-arm/thumb2-bl-undefweak1.d: Likewise.
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index db9566b..8301aea 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -15900,6 +15900,187 @@ const struct elf_size_info elf32_arm_size_info =
bfd_elf32_swap_reloca_out
};
+/* Return size of plt0 entry starting at ADDR
+ or (bfd_vma) -1 if size can not be determined. */
+
+static bfd_vma
+elf32_arm_plt0_size (const bfd *abfd, const bfd_byte *addr)
+{
+ bfd_vma first_word;
+ bfd_vma plt0_size;
+
+ first_word = H_GET_32(abfd, addr);
+
+ if (first_word == elf32_arm_plt0_entry[0])
+ plt0_size = 4 * ARRAY_SIZE(elf32_arm_plt0_entry);
+ else if (first_word == elf32_thumb2_plt0_entry[0])
+ plt0_size = 4 * ARRAY_SIZE (elf32_thumb2_plt0_entry);
+ else
+ /* We don't yet handle this PLT format */
+ return (bfd_vma) -1;
+
+ return plt0_size;
+}
+
+/* Return size of plt entry starting at offset OFFSET
+ of plt section located at address START
+ or (bfd_vma) -1 if size can not be determined. */
+
+static bfd_vma
+elf32_arm_plt_size (const bfd *abfd, const bfd_byte *start, bfd_vma offset)
+{
+ bfd_vma first_insn;
+ bfd_vma plt_size = 0;
+ const bfd_byte *addr = start + offset;
+
+ /* PLT entry size if fixed on Thumb-only platforms */
+ if (H_GET_32(abfd, start) == elf32_thumb2_plt0_entry[0])
+ return 4 * ARRAY_SIZE(elf32_thumb2_plt_entry);
+
+ /* Respect Thumb stub if necessary. */
+ if (H_GET_16(abfd, addr) == elf32_arm_plt_thumb_stub[0])
+ {
+ plt_size += 2 * ARRAY_SIZE(elf32_arm_plt_thumb_stub);
+ }
+
+ /* Strip immediate from first add. */
+ first_insn = H_GET_32(abfd, addr + plt_size) & 0xffffff00;
+
+#ifdef FOUR_WORD_PLT
+ if (first_insn == elf32_arm_plt_entry[0])
+ plt_size += 4 * ARRAY_SIZE(elf32_arm_plt_entry);
+#else
+ if (first_insn == elf32_arm_plt_entry_long[0])
+ plt_size += 4 * ARRAY_SIZE(elf32_arm_plt_entry_long);
+ else if (first_insn == elf32_arm_plt_entry_short[0])
+ plt_size += 4 * ARRAY_SIZE(elf32_arm_plt_entry_short);
+#endif
+ else
+ /* We don't yet handle this PLT format */
+ return (bfd_vma) -1;
+
+ return plt_size;
+}
+
+static long
+elf32_arm_get_synthetic_symtab (bfd *abfd,
+ long symcount ATTRIBUTE_UNUSED,
+ asymbol **syms ATTRIBUTE_UNUSED,
+ long dynsymcount,
+ asymbol **dynsyms,
+ asymbol **ret)
+{
+ /* Implementation is shamelessly borrowed from _bfd_elf_get_synthetic_symtab. */
+
+ asection *relplt;
+ asymbol *s;
+ arelent *p;
+ long count, i, n;
+ size_t size;
+ Elf_Internal_Shdr *hdr;
+ char *names;
+ asection *plt;
+ bfd_vma offset;
+ bfd_byte *data;
+
+ *ret = NULL;
+
+ if ((abfd->flags & (DYNAMIC | EXEC_P)) == 0)
+ return 0;
+
+ if (dynsymcount <= 0)
+ return 0;
+
+ relplt = bfd_get_section_by_name (abfd, ".rel.plt");
+ if (relplt == NULL)
+ return 0;
+
+ hdr = &elf_section_data (relplt)->this_hdr;
+ if (hdr->sh_link != elf_dynsymtab (abfd)
+ || (hdr->sh_type != SHT_REL && hdr->sh_type != SHT_RELA))
+ return 0;
+
+ plt = bfd_get_section_by_name (abfd, ".plt");
+ if (plt == NULL)
+ return 0;
+
+ if (!elf32_arm_size_info.slurp_reloc_table (abfd, relplt, dynsyms, TRUE))
+ return -1;
+
+ data = plt->contents;
+ if (data == NULL)
+ {
+ if (!bfd_get_full_section_contents(abfd, (asection *)plt, &data) || data == NULL)
+ return -1;
+ bfd_cache_section_contents((asection *)plt, data);
+ }
+
+ count = relplt->size / hdr->sh_entsize;
+ size = count * sizeof (asymbol);
+ p = relplt->relocation;
+ for (i = 0; i < count; i++, p += elf32_arm_size_info.int_rels_per_ext_rel)
+ {
+ size += strlen ((*p->sym_ptr_ptr)->name) + sizeof ("@plt");
+ if (p->addend != 0)
+ {
+ size += sizeof ("+0x") - 1 + 8;
+ }
+ }
+
+ s = *ret = (asymbol *) bfd_malloc (size);
+ if (s == NULL)
+ return -1;
+
+ offset = elf32_arm_plt0_size (abfd, data);
+ if (offset == (bfd_vma) -1)
+ return -1;
+
+ names = (char *) (s + count);
+ p = relplt->relocation;
+ n = 0;
+ for (i = 0; i < count; i++, p += elf32_arm_size_info.int_rels_per_ext_rel)
+ {
+ size_t len;
+
+ bfd_vma plt_size = elf32_arm_plt_size (abfd, data, offset);
+ if (plt_size == (bfd_vma) -1)
+ break;
+
+ *s = **p->sym_ptr_ptr;
+ /* Undefined syms won't have BSF_LOCAL or BSF_GLOBAL set. Since
+ we are defining a symbol, ensure one of them is set. */
+ if ((s->flags & BSF_LOCAL) == 0)
+ s->flags |= BSF_GLOBAL;
+ s->flags |= BSF_SYNTHETIC;
+ s->section = plt;
+ s->value = offset;
+ s->name = names;
+ s->udata.p = NULL;
+ len = strlen ((*p->sym_ptr_ptr)->name);
+ memcpy (names, (*p->sym_ptr_ptr)->name, len);
+ names += len;
+ if (p->addend != 0)
+ {
+ char buf[30], *a;
+
+ memcpy (names, "+0x", sizeof ("+0x") - 1);
+ names += sizeof ("+0x") - 1;
+ bfd_sprintf_vma (abfd, buf, p->addend);
+ for (a = buf; *a == '0'; ++a)
+ ;
+ len = strlen (a);
+ memcpy (names, a, len);
+ names += len;
+ }
+ memcpy (names, "@plt", sizeof ("@plt"));
+ names += sizeof ("@plt");
+ ++s, ++n;
+ offset += plt_size;
+ }
+
+ return n;
+}
+
#define ELF_ARCH bfd_arch_arm
#define ELF_TARGET_ID ARM_ELF_DATA
#define ELF_MACHINE_CODE EM_ARM
@@ -15926,6 +16107,7 @@ const struct elf_size_info elf32_arm_size_info =
#define bfd_elf32_new_section_hook elf32_arm_new_section_hook
#define bfd_elf32_bfd_is_target_special_symbol elf32_arm_is_target_special_symbol
#define bfd_elf32_bfd_final_link elf32_arm_final_link
+#define bfd_elf32_get_synthetic_symtab elf32_arm_get_synthetic_symtab
#define elf_backend_get_symbol_type elf32_arm_get_symbol_type
#define elf_backend_gc_mark_hook elf32_arm_gc_mark_hook
@@ -16030,6 +16212,15 @@ elf32_arm_nacl_final_write_processing (bfd *abfd, bfd_boolean linker)
nacl_final_write_processing (abfd, linker);
}
+static bfd_vma
+elf32_arm_nacl_plt_sym_val (bfd_vma i, const asection *plt,
+ const arelent *rel ATTRIBUTE_UNUSED)
+{
+ return plt->vma + 4 * (
+ ARRAY_SIZE(elf32_arm_nacl_plt0_entry) +
+ i * ARRAY_SIZE(elf32_arm_nacl_plt_entry));
+}
+
#undef elf32_bed
#define elf32_bed elf32_arm_nacl_bed
@@ -16044,6 +16235,9 @@ elf32_arm_nacl_final_write_processing (bfd *abfd, bfd_boolean linker)
#define elf_backend_modify_program_headers nacl_modify_program_headers
#undef elf_backend_final_write_processing
#define elf_backend_final_write_processing elf32_arm_nacl_final_write_processing
+#undef bfd_elf32_get_synthetic_symtab
+#undef elf_backend_plt_sym_val
+#define elf_backend_plt_sym_val elf32_arm_nacl_plt_sym_val
#undef ELF_MAXPAGESIZE
#define ELF_MAXPAGESIZE 0x10000
diff --git a/ld/testsuite/ld-arm/arm-app-abs32.d b/ld/testsuite/ld-arm/arm-app-abs32.d
index e6c4632..2f56c08 100644
--- a/ld/testsuite/ld-arm/arm-app-abs32.d
+++ b/ld/testsuite/ld-arm/arm-app-abs32.d
@@ -6,12 +6,13 @@ start address .*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func1@plt-0x14>:
+.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- +.*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x10>
+ +.*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1@plt-0x4>
+.*: e08fe00e add lr, pc, lr
+.*: e5bef008 ldr pc, \[lr, #8\]!
+.*: .* .*
+.* <lib_func1@plt>:
+.*: e28fc6.* add ip, pc, #.*
+.*: e28cca.* add ip, ip, #.* ; .*
+.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
diff --git a/ld/testsuite/ld-arm/arm-app.d b/ld/testsuite/ld-arm/arm-app.d
index 88169af..9788db0 100644
--- a/ld/testsuite/ld-arm/arm-app.d
+++ b/ld/testsuite/ld-arm/arm-app.d
@@ -6,12 +6,13 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func1@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x10>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -27,7 +28,7 @@ Disassembly of section .text:
.* <app_func>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff4 bl .* <_start-0xc>
+ .*: ebfffff4 bl .* <lib_func1@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
diff --git a/ld/testsuite/ld-arm/arm-lib-plt32.d b/ld/testsuite/ld-arm/arm-lib-plt32.d
index 279ea5a..e04adb8 100644
--- a/ld/testsuite/ld-arm/arm-lib-plt32.d
+++ b/ld/testsuite/ld-arm/arm-lib-plt32.d
@@ -6,12 +6,13 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x10>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -20,7 +21,7 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff9 bl .* <lib_func1-0xc>
+ .*: ebfffff9 bl .* <app_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
diff --git a/ld/testsuite/ld-arm/arm-lib.d b/ld/testsuite/ld-arm/arm-lib.d
index 22e21d5..887880f 100644
--- a/ld/testsuite/ld-arm/arm-lib.d
+++ b/ld/testsuite/ld-arm/arm-lib.d
@@ -6,12 +6,13 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x10>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -20,7 +21,7 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff9 bl .* <lib_func1-0xc>
+ .*: ebfffff9 bl .* <app_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
diff --git a/ld/testsuite/ld-arm/armthumb-lib.d b/ld/testsuite/ld-arm/armthumb-lib.d
index dae72ed..b63e3e6 100644
--- a/ld/testsuite/ld-arm/armthumb-lib.d
+++ b/ld/testsuite/ld-arm/armthumb-lib.d
@@ -6,12 +6,13 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x1.>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -20,7 +21,7 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff. bl .* <lib_func1-0x..?>
+ .*: ebfffff. bl .* <app_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
.*: e1a00000 nop ; \(mov r0, r0\)
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
index 4f1078d..0f40861 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008000 <\.plt>:
+00008000 <bar@plt-0x14>:
8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <foo-0xfe0>
+ 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <bar@plt-0x4>
8008: e08fe00e add lr, pc, lr
800c: e5bef008 ldr pc, \[lr, #8\]!
8010: 00000ffc \.word 0x00000ffc
+00008014 <bar@plt>:
8014: 4778 bx pc
8016: 46c0 nop ; \(mov r8, r8\)
8018: e28fc600 add ip, pc, #0, 12
@@ -27,4 +28,4 @@ Disassembly of section \.text:
9002: 0000 movs r0, r0
9004: 0000 movs r0, r0
9006: 0000 movs r0, r0
- 9008: f7ff b804 b\.w 8014 <foo-0xfdc>
+ 9008: f7ff b804 b\.w 8014 <bar@plt>
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
index 1e0cab2..b6e6fff 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008000 <\.plt>:
+00008000 <bar@plt-0x14>:
8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <foo-0xfe0>
+ 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <bar@plt-0x4>
8008: e08fe00e add lr, pc, lr
800c: e5bef008 ldr pc, \[lr, #8\]!
8010: 00001004 \.word 0x00001004
+00008014 <bar@plt>:
8014: 4778 bx pc
8016: 46c0 nop ; \(mov r8, r8\)
8018: e28fc600 add ip, pc, #0, 12
@@ -29,4 +30,4 @@ Disassembly of section \.text:
9006: 0000 movs r0, r0
9008: d001 beq\.n 900e <foo\+0x1e>
900a: f7ff bffa b\.w 9002 <foo\+0x12>
- 900e: f7ff b801 b\.w 8014 <foo-0xfdc>
+ 900e: f7ff b801 b\.w 8014 <bar@plt>
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
index ebb480f..baad3d0 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008000 <\.plt>:
+00008000 <bar@plt-0x14>:
8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <foo-0xfe0>
+ 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <bar@plt-0x4>
8008: e08fe00e add lr, pc, lr
800c: e5bef008 ldr pc, \[lr, #8\]!
8010: 00000ffc \.word 0x00000ffc
+00008014 <bar@plt>:
8014: e28fc600 add ip, pc, #0, 12
8018: e28cca00 add ip, ip, #0, 20
801c: e5bcfffc ldr pc, \[ip, #4092\]! ; 0xffc
@@ -25,4 +26,4 @@ Disassembly of section \.text:
9002: 0000 movs r0, r0
9004: 0000 movs r0, r0
9006: 0000 movs r0, r0
- 9008: eafffc01 b 8014 <foo-0xfdc>
+ 9008: eafffc01 b 8014 <bar@plt>
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
index f8a9c24..e2fd8ac 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008e00 <\.plt>:
+00008e00 <targetfn@plt-0x14>:
8e00: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8e04: e59fe004 ldr lr, \[pc, #4\] ; 8e10 <targetfn-0xf0>
+ 8e04: e59fe004 ldr lr, \[pc, #4\] ; 8e10 <targetfn@plt-0x4>
8e08: e08fe00e add lr, pc, lr
8e0c: e5bef008 ldr pc, \[lr, #8\]!
8e10: 0000827c \.word 0x0000827c
+00008e14 <targetfn@plt>:
8e14: e28fc600 add ip, pc, #0, 12
8e18: e28cca08 add ip, ip, #8, 20 ; 0x8000
8e1c: e5bcf27c ldr pc, \[ip, #636\]! ; 0x27c
@@ -24,69 +25,69 @@ Disassembly of section \.text:
00008f08 <_start>:
8f08: bf00 nop
8f0a: eb01 0002 add\.w r0, r1, r2
- 8f0e: f7ff ef82 blx 8e14 <targetfn-0xec>
+ 8f0e: f7ff ef82 blx 8e14 <targetfn@plt>
8f12: eb01 0002 add\.w r0, r1, r2
- 8f16: f7ff ef7e blx 8e14 <targetfn-0xec>
+ 8f16: f7ff ef7e blx 8e14 <targetfn@plt>
8f1a: eb01 0002 add\.w r0, r1, r2
- 8f1e: f7ff ef7a blx 8e14 <targetfn-0xec>
+ 8f1e: f7ff ef7a blx 8e14 <targetfn@plt>
8f22: eb01 0002 add\.w r0, r1, r2
- 8f26: f7ff ef76 blx 8e14 <targetfn-0xec>
+ 8f26: f7ff ef76 blx 8e14 <targetfn@plt>
8f2a: eb01 0002 add\.w r0, r1, r2
- 8f2e: f7ff ef72 blx 8e14 <targetfn-0xec>
+ 8f2e: f7ff ef72 blx 8e14 <targetfn@plt>
8f32: eb01 0002 add\.w r0, r1, r2
- 8f36: f7ff ef6e blx 8e14 <targetfn-0xec>
+ 8f36: f7ff ef6e blx 8e14 <targetfn@plt>
8f3a: eb01 0002 add\.w r0, r1, r2
- 8f3e: f7ff ef6a blx 8e14 <targetfn-0xec>
+ 8f3e: f7ff ef6a blx 8e14 <targetfn@plt>
8f42: eb01 0002 add\.w r0, r1, r2
- 8f46: f7ff ef66 blx 8e14 <targetfn-0xec>
+ 8f46: f7ff ef66 blx 8e14 <targetfn@plt>
8f4a: eb01 0002 add\.w r0, r1, r2
- 8f4e: f7ff ef62 blx 8e14 <targetfn-0xec>
+ 8f4e: f7ff ef62 blx 8e14 <targetfn@plt>
8f52: eb01 0002 add\.w r0, r1, r2
- 8f56: f7ff ef5e blx 8e14 <targetfn-0xec>
+ 8f56: f7ff ef5e blx 8e14 <targetfn@plt>
8f5a: eb01 0002 add\.w r0, r1, r2
- 8f5e: f7ff ef5a blx 8e14 <targetfn-0xec>
+ 8f5e: f7ff ef5a blx 8e14 <targetfn@plt>
8f62: eb01 0002 add\.w r0, r1, r2
- 8f66: f7ff ef56 blx 8e14 <targetfn-0xec>
+ 8f66: f7ff ef56 blx 8e14 <targetfn@plt>
8f6a: eb01 0002 add\.w r0, r1, r2
- 8f6e: f7ff ef52 blx 8e14 <targetfn-0xec>
+ 8f6e: f7ff ef52 blx 8e14 <targetfn@plt>
8f72: eb01 0002 add\.w r0, r1, r2
- 8f76: f7ff ef4e blx 8e14 <targetfn-0xec>
+ 8f76: f7ff ef4e blx 8e14 <targetfn@plt>
8f7a: eb01 0002 add\.w r0, r1, r2
- 8f7e: f7ff ef4a blx 8e14 <targetfn-0xec>
+ 8f7e: f7ff ef4a blx 8e14 <targetfn@plt>
8f82: eb01 0002 add\.w r0, r1, r2
- 8f86: f7ff ef46 blx 8e14 <targetfn-0xec>
+ 8f86: f7ff ef46 blx 8e14 <targetfn@plt>
8f8a: eb01 0002 add\.w r0, r1, r2
- 8f8e: f7ff ef42 blx 8e14 <targetfn-0xec>
+ 8f8e: f7ff ef42 blx 8e14 <targetfn@plt>
8f92: eb01 0002 add\.w r0, r1, r2
- 8f96: f7ff ef3e blx 8e14 <targetfn-0xec>
+ 8f96: f7ff ef3e blx 8e14 <targetfn@plt>
8f9a: eb01 0002 add\.w r0, r1, r2
- 8f9e: f7ff ef3a blx 8e14 <targetfn-0xec>
+ 8f9e: f7ff ef3a blx 8e14 <targetfn@plt>
8fa2: eb01 0002 add\.w r0, r1, r2
- 8fa6: f7ff ef36 blx 8e14 <targetfn-0xec>
+ 8fa6: f7ff ef36 blx 8e14 <targetfn@plt>
8faa: eb01 0002 add\.w r0, r1, r2
- 8fae: f7ff ef32 blx 8e14 <targetfn-0xec>
+ 8fae: f7ff ef32 blx 8e14 <targetfn@plt>
8fb2: eb01 0002 add\.w r0, r1, r2
- 8fb6: f7ff ef2e blx 8e14 <targetfn-0xec>
+ 8fb6: f7ff ef2e blx 8e14 <targetfn@plt>
8fba: eb01 0002 add\.w r0, r1, r2
- 8fbe: f7ff ef2a blx 8e14 <targetfn-0xec>
+ 8fbe: f7ff ef2a blx 8e14 <targetfn@plt>
8fc2: eb01 0002 add\.w r0, r1, r2
- 8fc6: f7ff ef26 blx 8e14 <targetfn-0xec>
+ 8fc6: f7ff ef26 blx 8e14 <targetfn@plt>
8fca: eb01 0002 add\.w r0, r1, r2
- 8fce: f7ff ef22 blx 8e14 <targetfn-0xec>
+ 8fce: f7ff ef22 blx 8e14 <targetfn@plt>
8fd2: eb01 0002 add\.w r0, r1, r2
- 8fd6: f7ff ef1e blx 8e14 <targetfn-0xec>
+ 8fd6: f7ff ef1e blx 8e14 <targetfn@plt>
8fda: eb01 0002 add\.w r0, r1, r2
- 8fde: f7ff ef1a blx 8e14 <targetfn-0xec>
+ 8fde: f7ff ef1a blx 8e14 <targetfn@plt>
8fe2: eb01 0002 add\.w r0, r1, r2
- 8fe6: f7ff ef16 blx 8e14 <targetfn-0xec>
+ 8fe6: f7ff ef16 blx 8e14 <targetfn@plt>
8fea: eb01 0002 add\.w r0, r1, r2
- 8fee: f7ff ef12 blx 8e14 <targetfn-0xec>
+ 8fee: f7ff ef12 blx 8e14 <targetfn@plt>
8ff2: eb01 0002 add\.w r0, r1, r2
- 8ff6: f7ff ef0e blx 8e14 <targetfn-0xec>
+ 8ff6: f7ff ef0e blx 8e14 <targetfn@plt>
8ffa: eb01 0002 add\.w r0, r1, r2
8ffe: f000 e808 blx 9010 <_start\+0x108>
9002: eb01 0002 add\.w r0, r1, r2
- 9006: f7ff ef06 blx 8e14 <targetfn-0xec>
+ 9006: f7ff ef06 blx 8e14 <targetfn@plt>
900a: 4770 bx lr
900c: f3af 8000 nop\.w
- 9010: eaffff7f b 8e14 <targetfn-0xec>
+ 9010: eaffff7f b 8e14 <targetfn@plt>
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
index ebb480f..baad3d0 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008000 <\.plt>:
+00008000 <bar@plt-0x14>:
8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <foo-0xfe0>
+ 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <bar@plt-0x4>
8008: e08fe00e add lr, pc, lr
800c: e5bef008 ldr pc, \[lr, #8\]!
8010: 00000ffc \.word 0x00000ffc
+00008014 <bar@plt>:
8014: e28fc600 add ip, pc, #0, 12
8018: e28cca00 add ip, ip, #0, 20
801c: e5bcfffc ldr pc, \[ip, #4092\]! ; 0xffc
@@ -25,4 +26,4 @@ Disassembly of section \.text:
9002: 0000 movs r0, r0
9004: 0000 movs r0, r0
9006: 0000 movs r0, r0
- 9008: eafffc01 b 8014 <foo-0xfdc>
+ 9008: eafffc01 b 8014 <bar@plt>
diff --git a/ld/testsuite/ld-arm/farcall-mixed-app-v5.d b/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
index 781b972..7466883 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
@@ -6,15 +6,17 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -25,15 +27,15 @@ Disassembly of section .text:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
.*: eb000008 bl .* <__app_func_veneer>
- .*: ebfffff5 bl .* <_start-0x18>
- .*: ebfffff1 bl .* <_start-0x24>
+ .*: ebfffff5 bl .* <lib_func1@plt>
+ .*: ebfffff1 bl .* <lib_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
.*: e1a00000 nop ; \(mov r0, r0\)
.* <app_tfunc_close>:
.*: b500 push {lr}
- .*: f7ff efdc blx .* <_start-0x24>
+ .*: f7ff efdc blx .* <lib_func2@plt>
.*: bd00 pop {pc}
.*: 4770 bx lr
.*: 46c0 nop ; \(mov r8, r8\)
diff --git a/ld/testsuite/ld-arm/farcall-mixed-app.d b/ld/testsuite/ld-arm/farcall-mixed-app.d
index b6cc2d0..cfe31a4 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-app.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-app.d
@@ -6,17 +6,19 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func2@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -27,15 +29,15 @@ Disassembly of section .text:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
.*: eb000008 bl .* <__app_func_veneer>
- .*: ebfffff6 bl .* <_start-0x14>
- .*: ebfffff2 bl .* <_start-0x20>
+ .*: ebfffff6 bl .* <lib_func1@plt>
+ .*: ebfffff2 bl .* <lib_func2@plt\+0x4>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
.*: e1a00000 nop ; \(mov r0, r0\)
.* <app_tfunc_close>:
.*: b500 push {lr}
- .*: f7ff ffdb bl 81dc <_start-0x24>
+ .*: f7ff ffdb bl 81dc <lib_func2@plt>
.*: bd00 pop {pc}
.*: 4770 bx lr
.*: 46c0 nop ; \(mov r8, r8\)
diff --git a/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d b/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
index 3be297b..eec8de6 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
@@ -5,27 +5,31 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x.*>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .* .word .*
+.* <app_func@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]! ; .*
+.* <app_func_weak@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]! ; 0x.*
+.* <lib_func3@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]! ; 0x.*
+.* <lib_func4@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
@@ -37,10 +41,10 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebffff.. bl .* <lib_func1-0x.*>
- .*: ebffff.. bl .* <lib_func1-0x.*>
- .*: ebffff.. bl .* <lib_func1-0x.*>
- .*: ebffff.. bl .* <lib_func1-0x.*>
+ .*: ebffff.. bl .* <app_func@plt\+0x.*>
+ .*: ebffff.. bl .* <app_func_weak@plt\+0x.*>
+ .*: ebffff.. bl .* <lib_func3@plt\+0x.*>
+ .*: ebffff.. bl .* <lib_func4@plt\+0x.*>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
...
diff --git a/ld/testsuite/ld-arm/farcall-mixed-lib.d b/ld/testsuite/ld-arm/farcall-mixed-lib.d
index 05578f4..9577af9 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-lib.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-lib.d
@@ -5,21 +5,25 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x.*>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <app_func_weak@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func3@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func4@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -29,10 +33,10 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebffff.. bl .* <lib_func1-0x..?>
- .*: ebffff.. bl .* <lib_func1-0x..?>
- .*: ebfffff. bl .* <lib_func1-0x..?>
- .*: ebfffff. bl .* <lib_func1-0x..?>
+ .*: ebffff.. bl .* <app_func@plt>
+ .*: ebffff.. bl .* <app_func_weak@plt>
+ .*: ebfffff. bl .* <lib_func3@plt>
+ .*: ebfffff. bl .* <lib_func4@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
...
diff --git a/ld/testsuite/ld-arm/ifunc-10.dd b/ld/testsuite/ld-arm/ifunc-10.dd
index 105b09b..88bae50 100644
--- a/ld/testsuite/ld-arm/ifunc-10.dd
+++ b/ld/testsuite/ld-arm/ifunc-10.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <atf2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <atf3-0x110>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <atf2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
+00009014 <atf2@plt>:
9014: 4778 bx pc
9016: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -27,12 +28,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
+00009024 <aaf4@plt>:
9024: e28fc600 add ip, pc, #0, 12
9028: e28cca07 add ip, ip, #28672 ; 0x7000
902c: e5bcffe4 ldr pc, \[ip, #4068\]! ; 0xfe4
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
+00009030 <ttf2@plt>:
9030: 4778 bx pc
9032: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -44,6 +47,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
+00009040 <tbf2@plt>:
9040: 4778 bx pc
9042: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -55,18 +59,21 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
+00009050 <taf2@plt>:
9050: e28fc600 add ip, pc, #0, 12
9054: e28cca07 add ip, ip, #28672 ; 0x7000
9058: e5bcffc4 ldr pc, \[ip, #4036\]! ; 0xfc4
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
+0000905c <aaf2@plt>:
905c: e28fc600 add ip, pc, #0, 12
9060: e28cca07 add ip, ip, #28672 ; 0x7000
9064: e5bcffbc ldr pc, \[ip, #4028\]! ; 0xfbc
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
+00009068 <abf4@plt>:
9068: 4778 bx pc
906a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -78,6 +85,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
+00009078 <tbf4@plt>:
9078: 4778 bx pc
907a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -89,6 +97,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
+00009088 <ttf4@plt>:
9088: 4778 bx pc
908a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -100,6 +109,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
+00009098 <atf4@plt>:
9098: 4778 bx pc
909a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -111,12 +121,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
+000090a8 <taf4@plt>:
90a8: e28fc600 add ip, pc, #0, 12
90ac: e28cca07 add ip, ip, #28672 ; 0x7000
90b0: e5bcff84 ldr pc, \[ip, #3972\]! ; 0xf84
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
+000090b4 <abf2@plt>:
90b4: 4778 bx pc
90b6: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -281,15 +293,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a044: ebfffc1e bl 90c4 <atf3-0x5c>
+ a044: ebfffc1e bl 90c4 <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a048: eafffc1d b 90c4 <atf3-0x5c>
+ a048: eafffc1d b 90c4 <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a04c: 0afffc1c beq 90c4 <atf3-0x5c>
+ a04c: 0afffc1c beq 90c4 <abf2@plt\+0x10>
a050: e59f4000 ldr r4, \[pc\] ; a058 <_start\+0x30>
a054: e59f4000 ldr r4, \[pc\] ; a05c <_start\+0x34>
#------------------------------------------------------------------------------
@@ -303,15 +315,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a060: ebfffc22 bl 90f0 <atf3-0x30>
+ a060: ebfffc22 bl 90f0 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a064: eafffc21 b 90f0 <atf3-0x30>
+ a064: eafffc21 b 90f0 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a068: 0afffc20 beq 90f0 <atf3-0x30>
+ a068: 0afffc20 beq 90f0 <abf2@plt\+0x3c>
a06c: e59f4000 ldr r4, \[pc\] ; a074 <_start\+0x4c>
a070: e59f4000 ldr r4, \[pc\] ; a078 <_start\+0x50>
#------------------------------------------------------------------------------
@@ -325,15 +337,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a07c: ebfffc18 bl 90e4 <atf3-0x3c>
+ a07c: ebfffc18 bl 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a080: eafffc17 b 90e4 <atf3-0x3c>
+ a080: eafffc17 b 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a084: 0afffc16 beq 90e4 <atf3-0x3c>
+ a084: 0afffc16 beq 90e4 <abf2@plt\+0x30>
a088: e59f4000 ldr r4, \[pc\] ; a090 <_start\+0x68>
a08c: e59f4000 ldr r4, \[pc\] ; a094 <_start\+0x6c>
#------------------------------------------------------------------------------
@@ -347,15 +359,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a098: ebfffc1c bl 9110 <atf3-0x10>
+ a098: ebfffc1c bl 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a09c: eafffc1b b 9110 <atf3-0x10>
+ a09c: eafffc1b b 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0a0: 0afffc1a beq 9110 <atf3-0x10>
+ a0a0: 0afffc1a beq 9110 <abf2@plt\+0x5c>
a0a4: e59f4000 ldr r4, \[pc\] ; a0ac <_start\+0x84>
a0a8: e59f4000 ldr r4, \[pc\] ; a0b0 <_start\+0x88>
#------------------------------------------------------------------------------
@@ -369,15 +381,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0b4: ebfffbe8 bl 905c <atf3-0xc4>
+ a0b4: ebfffbe8 bl 905c <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0b8: eafffbe7 b 905c <atf3-0xc4>
+ a0b8: eafffbe7 b 905c <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0bc: 0afffbe6 beq 905c <atf3-0xc4>
+ a0bc: 0afffbe6 beq 905c <aaf2@plt>
a0c0: e59f4000 ldr r4, \[pc\] ; a0c8 <_start\+0xa0>
a0c4: e59f4000 ldr r4, \[pc\] ; a0cc <_start\+0xa4>
#------------------------------------------------------------------------------
@@ -391,15 +403,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d0: ebfffbde bl 9050 <atf3-0xd0>
+ a0d0: ebfffbde bl 9050 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d4: eafffbdd b 9050 <atf3-0xd0>
+ a0d4: eafffbdd b 9050 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d8: 0afffbdc beq 9050 <atf3-0xd0>
+ a0d8: 0afffbdc beq 9050 <taf2@plt>
a0dc: e59f4000 ldr r4, \[pc\] ; a0e4 <_start\+0xbc>
a0e0: e59f4000 ldr r4, \[pc\] ; a0e8 <_start\+0xc0>
#------------------------------------------------------------------------------
@@ -413,15 +425,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0ec: ebfffbf1 bl 90b8 <atf3-0x68>
+ a0ec: ebfffbf1 bl 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0f0: eafffbf0 b 90b8 <atf3-0x68>
+ a0f0: eafffbf0 b 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0f4: 0afffbef beq 90b8 <atf3-0x68>
+ a0f4: 0afffbef beq 90b8 <abf2@plt\+0x4>
a0f8: e59f4000 ldr r4, \[pc\] ; a100 <_start\+0xd8>
a0fc: e59f4000 ldr r4, \[pc\] ; a104 <_start\+0xdc>
#------------------------------------------------------------------------------
@@ -435,15 +447,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a108: ebfffbcd bl 9044 <atf3-0xdc>
+ a108: ebfffbcd bl 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a10c: eafffbcc b 9044 <atf3-0xdc>
+ a10c: eafffbcc b 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a110: 0afffbcb beq 9044 <atf3-0xdc>
+ a110: 0afffbcb beq 9044 <tbf2@plt\+0x4>
a114: e59f4000 ldr r4, \[pc\] ; a11c <_start\+0xf4>
a118: e59f4000 ldr r4, \[pc\] ; a120 <_start\+0xf8>
#------------------------------------------------------------------------------
@@ -509,15 +521,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a194: ebfffba2 bl 9024 <atf3-0xfc>
+ a194: ebfffba2 bl 9024 <aaf4@plt>
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a198: eafffba1 b 9024 <atf3-0xfc>
+ a198: eafffba1 b 9024 <aaf4@plt>
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a19c: 0afffba0 beq 9024 <atf3-0xfc>
+ a19c: 0afffba0 beq 9024 <aaf4@plt>
a1a0: e59f4000 ldr r4, \[pc\] ; a1a8 <_start\+0x180>
a1a4: e59f4000 ldr r4, \[pc\] ; a1ac <_start\+0x184>
#------------------------------------------------------------------------------
@@ -531,15 +543,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b0: ebfffbbc bl 90a8 <atf3-0x78>
+ a1b0: ebfffbbc bl 90a8 <taf4@plt>
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b4: eafffbbb b 90a8 <atf3-0x78>
+ a1b4: eafffbbb b 90a8 <taf4@plt>
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b8: 0afffbba beq 90a8 <atf3-0x78>
+ a1b8: 0afffbba beq 90a8 <taf4@plt>
a1bc: e59f4000 ldr r4, \[pc\] ; a1c4 <_start\+0x19c>
a1c0: e59f4000 ldr r4, \[pc\] ; a1c8 <_start\+0x1a0>
#------------------------------------------------------------------------------
@@ -553,15 +565,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1cc: ebfffba6 bl 906c <atf3-0xb4>
+ a1cc: ebfffba6 bl 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1d0: eafffba5 b 906c <atf3-0xb4>
+ a1d0: eafffba5 b 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1d4: 0afffba4 beq 906c <atf3-0xb4>
+ a1d4: 0afffba4 beq 906c <abf4@plt\+0x4>
a1d8: e59f4000 ldr r4, \[pc\] ; a1e0 <_start\+0x1b8>
a1dc: e59f4000 ldr r4, \[pc\] ; a1e4 <_start\+0x1bc>
#------------------------------------------------------------------------------
@@ -575,15 +587,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1e8: ebfffba3 bl 907c <atf3-0xa4>
+ a1e8: ebfffba3 bl 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1ec: eafffba2 b 907c <atf3-0xa4>
+ a1ec: eafffba2 b 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1f0: 0afffba1 beq 907c <atf3-0xa4>
+ a1f0: 0afffba1 beq 907c <tbf4@plt\+0x4>
a1f4: e59f4000 ldr r4, \[pc\] ; a1fc <_start\+0x1d4>
a1f8: e59f4000 ldr r4, \[pc\] ; a200 <_start\+0x1d8>
#------------------------------------------------------------------------------
@@ -612,15 +624,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf1's .iplt entry
#------------------------------------------------------------------------------
- a21c: f7fe ef5a blx 90d4 <atf3-0x4c>
+ a21c: f7fe ef5a blx 90d4 <abf2@plt\+0x20>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a220: f7fe bf56 b\.w 90d0 <atf3-0x50>
+ a220: f7fe bf56 b\.w 90d0 <abf2@plt\+0x1c>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a224: f43e af54 beq\.w 90d0 <atf3-0x50>
+ a224: f43e af54 beq\.w 90d0 <abf2@plt\+0x1c>
a228: 4c00 ldr r4, \[pc, #0\] ; \(a22c <_thumb\+0x28>\)
a22a: 4c01 ldr r4, \[pc, #4\] ; \(a230 <_thumb\+0x2c>\)
#------------------------------------------------------------------------------
@@ -634,15 +646,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf1's .iplt entry
#------------------------------------------------------------------------------
- a234: f7fe ef64 blx 9100 <atf3-0x20>
+ a234: f7fe ef64 blx 9100 <abf2@plt\+0x4c>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a238: f7fe bf60 b\.w 90fc <atf3-0x24>
+ a238: f7fe bf60 b\.w 90fc <abf2@plt\+0x48>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a23c: f43e af5e beq\.w 90fc <atf3-0x24>
+ a23c: f43e af5e beq\.w 90fc <abf2@plt\+0x48>
a240: 4c00 ldr r4, \[pc, #0\] ; \(a244 <_thumb\+0x40>\)
a242: 4c01 ldr r4, \[pc, #4\] ; \(a248 <_thumb\+0x44>\)
#------------------------------------------------------------------------------
@@ -656,15 +668,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a24c: f7fe ef4a blx 90e4 <atf3-0x3c>
+ a24c: f7fe ef4a blx 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a250: f7fe bf46 b\.w 90e0 <atf3-0x40>
+ a250: f7fe bf46 b\.w 90e0 <abf2@plt\+0x2c>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a254: f43e af44 beq\.w 90e0 <atf3-0x40>
+ a254: f43e af44 beq\.w 90e0 <abf2@plt\+0x2c>
a258: 4c00 ldr r4, \[pc, #0\] ; \(a25c <_thumb\+0x58>\)
a25a: 4c01 ldr r4, \[pc, #4\] ; \(a260 <_thumb\+0x5c>\)
#------------------------------------------------------------------------------
@@ -678,15 +690,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a264: f7fe ef54 blx 9110 <atf3-0x10>
+ a264: f7fe ef54 blx 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a268: f7fe bf50 b\.w 910c <atf3-0x14>
+ a268: f7fe bf50 b\.w 910c <abf2@plt\+0x58>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a26c: f43e af4e beq\.w 910c <atf3-0x14>
+ a26c: f43e af4e beq\.w 910c <abf2@plt\+0x58>
a270: 4c00 ldr r4, \[pc, #0\] ; \(a274 <_thumb\+0x70>\)
a272: 4c01 ldr r4, \[pc, #4\] ; \(a278 <_thumb\+0x74>\)
#------------------------------------------------------------------------------
@@ -700,15 +712,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf2's .plt entry
#------------------------------------------------------------------------------
- a27c: f7fe eecc blx 9018 <atf3-0x108>
+ a27c: f7fe eecc blx 9018 <atf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a280: f7fe bec8 b\.w 9014 <atf3-0x10c>
+ a280: f7fe bec8 b\.w 9014 <atf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a284: f43e aec6 beq\.w 9014 <atf3-0x10c>
+ a284: f43e aec6 beq\.w 9014 <atf2@plt>
a288: 4c00 ldr r4, \[pc, #0\] ; \(a28c <_thumb\+0x88>\)
a28a: 4c01 ldr r4, \[pc, #4\] ; \(a290 <_thumb\+0x8c>\)
#------------------------------------------------------------------------------
@@ -722,15 +734,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf2's .plt entry
#------------------------------------------------------------------------------
- a294: f7fe eece blx 9034 <atf3-0xec>
+ a294: f7fe eece blx 9034 <ttf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a298: f7fe beca b\.w 9030 <atf3-0xf0>
+ a298: f7fe beca b\.w 9030 <ttf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a29c: f43e aec8 beq\.w 9030 <atf3-0xf0>
+ a29c: f43e aec8 beq\.w 9030 <ttf2@plt>
a2a0: 4c00 ldr r4, \[pc, #0\] ; \(a2a4 <_thumb\+0xa0>\)
a2a2: 4c01 ldr r4, \[pc, #4\] ; \(a2a8 <_thumb\+0xa4>\)
#------------------------------------------------------------------------------
@@ -744,15 +756,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a2ac: f7fe ef04 blx 90b8 <atf3-0x68>
+ a2ac: f7fe ef04 blx 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2b0: f7fe bf00 b\.w 90b4 <atf3-0x6c>
+ a2b0: f7fe bf00 b\.w 90b4 <abf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2b4: f43e aefe beq\.w 90b4 <atf3-0x6c>
+ a2b4: f43e aefe beq\.w 90b4 <abf2@plt>
a2b8: 4c00 ldr r4, \[pc, #0\] ; \(a2bc <_thumb\+0xb8>\)
a2ba: 4c01 ldr r4, \[pc, #4\] ; \(a2c0 <_thumb\+0xbc>\)
#------------------------------------------------------------------------------
@@ -766,15 +778,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a2c4: f7fe eebe blx 9044 <atf3-0xdc>
+ a2c4: f7fe eebe blx 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2c8: f7fe beba b\.w 9040 <atf3-0xe0>
+ a2c8: f7fe beba b\.w 9040 <tbf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2cc: f43e aeb8 beq\.w 9040 <atf3-0xe0>
+ a2cc: f43e aeb8 beq\.w 9040 <tbf2@plt>
a2d0: 4c00 ldr r4, \[pc, #0\] ; \(a2d4 <_thumb\+0xd0>\)
a2d2: 4c01 ldr r4, \[pc, #4\] ; \(a2d8 <_thumb\+0xd4>\)
#------------------------------------------------------------------------------
@@ -789,11 +801,11 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ thumb entry to atf3
#------------------------------------------------------------------------------
- a2e0: f7fe bf1c b\.w 911c <atf3-0x4>
+ a2e0: f7fe bf1c b\.w 911c <abf2@plt\+0x68>
#------------------------------------------------------------------------------
#------ thumb entry to atf3
#------------------------------------------------------------------------------
- a2e4: f43e af1a beq\.w 911c <atf3-0x4>
+ a2e4: f43e af1a beq\.w 911c <abf2@plt\+0x68>
a2e8: 4c00 ldr r4, \[pc, #0\] ; \(a2ec <_thumb\+0xe8>\)
a2ea: 4c01 ldr r4, \[pc, #4\] ; \(a2f0 <_thumb\+0xec>\)
#------------------------------------------------------------------------------
@@ -864,15 +876,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf4's .plt entry
#------------------------------------------------------------------------------
- a33c: f7fe eeae blx 909c <atf3-0x84>
+ a33c: f7fe eeae blx 909c <atf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
- a340: f7fe beaa b\.w 9098 <atf3-0x88>
+ a340: f7fe beaa b\.w 9098 <atf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
- a344: f43e aea8 beq\.w 9098 <atf3-0x88>
+ a344: f43e aea8 beq\.w 9098 <atf4@plt>
a348: 4c00 ldr r4, \[pc, #0\] ; \(a34c <_thumb\+0x148>\)
a34a: 4c01 ldr r4, \[pc, #4\] ; \(a350 <_thumb\+0x14c>\)
#------------------------------------------------------------------------------
@@ -886,15 +898,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf4's .plt entry
#------------------------------------------------------------------------------
- a354: f7fe ee9a blx 908c <atf3-0x94>
+ a354: f7fe ee9a blx 908c <ttf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
- a358: f7fe be96 b\.w 9088 <atf3-0x98>
+ a358: f7fe be96 b\.w 9088 <ttf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
- a35c: f43e ae94 beq\.w 9088 <atf3-0x98>
+ a35c: f43e ae94 beq\.w 9088 <ttf4@plt>
a360: 4c00 ldr r4, \[pc, #0\] ; \(a364 <_thumb\+0x160>\)
a362: 4c01 ldr r4, \[pc, #4\] ; \(a368 <_thumb\+0x164>\)
#------------------------------------------------------------------------------
@@ -908,15 +920,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a36c: f7fe ee7e blx 906c <atf3-0xb4>
+ a36c: f7fe ee7e blx 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
- a370: f7fe be7a b\.w 9068 <atf3-0xb8>
+ a370: f7fe be7a b\.w 9068 <abf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
- a374: f43e ae78 beq\.w 9068 <atf3-0xb8>
+ a374: f43e ae78 beq\.w 9068 <abf4@plt>
a378: 4c00 ldr r4, \[pc, #0\] ; \(a37c <_thumb\+0x178>\)
a37a: 4c01 ldr r4, \[pc, #4\] ; \(a380 <_thumb\+0x17c>\)
#------------------------------------------------------------------------------
@@ -930,15 +942,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a384: f7fe ee7a blx 907c <atf3-0xa4>
+ a384: f7fe ee7a blx 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
- a388: f7fe be76 b\.w 9078 <atf3-0xa8>
+ a388: f7fe be76 b\.w 9078 <tbf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
- a38c: f43e ae74 beq\.w 9078 <atf3-0xa8>
+ a38c: f43e ae74 beq\.w 9078 <tbf4@plt>
a390: 4c00 ldr r4, \[pc, #0\] ; \(a394 <_thumb\+0x190>\)
a392: 4c01 ldr r4, \[pc, #4\] ; \(a398 <_thumb\+0x194>\)
#------------------------------------------------------------------------------
diff --git a/ld/testsuite/ld-arm/ifunc-14.dd b/ld/testsuite/ld-arm/ifunc-14.dd
index 861f687..cbad1c8 100644
--- a/ld/testsuite/ld-arm/ifunc-14.dd
+++ b/ld/testsuite/ld-arm/ifunc-14.dd
@@ -4,7 +4,7 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2t@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <__irel_end\+0xff0>
9008: e08fe00e add lr, pc, lr
@@ -16,12 +16,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2t's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2t@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009020 <f2@plt>:
9020: e28fc600 add ip, pc, #0, 12
9024: e28cca07 add ip, ip, #28672 ; 0x7000
9028: e5bcffe8 ldr pc, \[ip, #4072\]! ; 0xfe8
diff --git a/ld/testsuite/ld-arm/ifunc-15.dd b/ld/testsuite/ld-arm/ifunc-15.dd
index d764841..f23e8e8 100644
--- a/ld/testsuite/ld-arm/ifunc-15.dd
+++ b/ld/testsuite/ld-arm/ifunc-15.dd
@@ -4,7 +4,7 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2t@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <__irel_end\+0xff0>
9008: e08fe00e add lr, pc, lr
@@ -16,12 +16,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2t's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2t@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009020 <f2@plt>:
9020: e28fc600 add ip, pc, #0, 12
9024: e28cca07 add ip, ip, #28672 ; 0x7000
9028: e5bcffe8 ldr pc, \[ip, #4072\]! ; 0xfe8
diff --git a/ld/testsuite/ld-arm/ifunc-3.dd b/ld/testsuite/ld-arm/ifunc-3.dd
index a1fb37a..b267bf1 100644
--- a/ld/testsuite/ld-arm/ifunc-3.dd
+++ b/ld/testsuite/ld-arm/ifunc-3.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f1-0xff0>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
@@ -71,7 +72,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f1's .iplt entry
#------------------------------------------------------------------------------
- a024: ebfffbfd bl 9020 <f1-0xfe0>
+ a024: ebfffbfd bl 9020 <f2@plt\+0xc>
a028: e59f4000 ldr r4, \[pc\] ; a030 <arm\+0x20>
a02c: e59f4000 ldr r4, \[pc\] ; a034 <arm\+0x24>
#------------------------------------------------------------------------------
@@ -85,7 +86,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
- a038: ebfffbf5 bl 9014 <f1-0xfec>
+ a038: ebfffbf5 bl 9014 <f2@plt>
a03c: e59f4000 ldr r4, \[pc\] ; a044 <arm\+0x34>
a040: e59f4000 ldr r4, \[pc\] ; a048 <arm\+0x38>
#------------------------------------------------------------------------------
@@ -99,7 +100,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f3's .iplt entry
#------------------------------------------------------------------------------
- a04c: ebfffbf6 bl 902c <f1-0xfd4>
+ a04c: ebfffbf6 bl 902c <f2@plt\+0x18>
a050: e59f4000 ldr r4, \[pc\] ; a058 <arm\+0x48>
a054: e59f4000 ldr r4, \[pc\] ; a05c <arm\+0x4c>
#------------------------------------------------------------------------------
@@ -113,7 +114,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f4's .iplt entry
#------------------------------------------------------------------------------
- a060: ebfffbf4 bl 9038 <f1-0xfc8>
+ a060: ebfffbf4 bl 9038 <f2@plt\+0x24>
a064: e59f4000 ldr r4, \[pc\] ; a06c <arm\+0x5c>
a068: e59f4000 ldr r4, \[pc\] ; a070 <arm\+0x60>
#------------------------------------------------------------------------------
diff --git a/ld/testsuite/ld-arm/ifunc-4.dd b/ld/testsuite/ld-arm/ifunc-4.dd
index f5a4d91..6ce996b 100644
--- a/ld/testsuite/ld-arm/ifunc-4.dd
+++ b/ld/testsuite/ld-arm/ifunc-4.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <atf2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <aaf1-0xff0>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <atf2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
+00009014 <atf2@plt>:
9014: 4778 bx pc
9016: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -27,6 +28,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
+00009024 <ttf2@plt>:
9024: 4778 bx pc
9026: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -38,6 +40,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
+00009034 <tbf2@plt>:
9034: 4778 bx pc
9036: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -49,18 +52,21 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
+00009044 <taf2@plt>:
9044: e28fc600 add ip, pc, #0, 12
9048: e28cca07 add ip, ip, #28672 ; 0x7000
904c: e5bcffcc ldr pc, \[ip, #4044\]! ; 0xfcc
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
+00009050 <aaf2@plt>:
9050: e28fc600 add ip, pc, #0, 12
9054: e28cca07 add ip, ip, #28672 ; 0x7000
9058: e5bcffc4 ldr pc, \[ip, #4036\]! ; 0xfc4
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
+0000905c <abf2@plt>:
905c: 4778 bx pc
905e: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -337,15 +343,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a06c: ebfffbfe bl 906c <aaf1-0xf94>
+ a06c: ebfffbfe bl 906c <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a070: eafffbfd b 906c <aaf1-0xf94>
+ a070: eafffbfd b 906c <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a074: 0afffbfc beq 906c <aaf1-0xf94>
+ a074: 0afffbfc beq 906c <abf2@plt\+0x10>
a078: e59f4000 ldr r4, \[pc\] ; a080 <arm\+0x30>
a07c: e59f4000 ldr r4, \[pc\] ; a084 <arm\+0x34>
#------------------------------------------------------------------------------
@@ -359,15 +365,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a088: ebfffc02 bl 9098 <aaf1-0xf68>
+ a088: ebfffc02 bl 9098 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a08c: eafffc01 b 9098 <aaf1-0xf68>
+ a08c: eafffc01 b 9098 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a090: 0afffc00 beq 9098 <aaf1-0xf68>
+ a090: 0afffc00 beq 9098 <abf2@plt\+0x3c>
a094: e59f4000 ldr r4, \[pc\] ; a09c <arm\+0x4c>
a098: e59f4000 ldr r4, \[pc\] ; a0a0 <arm\+0x50>
#------------------------------------------------------------------------------
@@ -381,15 +387,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a0a4: ebfffbf8 bl 908c <aaf1-0xf74>
+ a0a4: ebfffbf8 bl 908c <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a0a8: eafffbf7 b 908c <aaf1-0xf74>
+ a0a8: eafffbf7 b 908c <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a0ac: 0afffbf6 beq 908c <aaf1-0xf74>
+ a0ac: 0afffbf6 beq 908c <abf2@plt\+0x30>
a0b0: e59f4000 ldr r4, \[pc\] ; a0b8 <arm\+0x68>
a0b4: e59f4000 ldr r4, \[pc\] ; a0bc <arm\+0x6c>
#------------------------------------------------------------------------------
@@ -403,15 +409,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0c0: ebfffbfc bl 90b8 <aaf1-0xf48>
+ a0c0: ebfffbfc bl 90b8 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0c4: eafffbfb b 90b8 <aaf1-0xf48>
+ a0c4: eafffbfb b 90b8 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0c8: 0afffbfa beq 90b8 <aaf1-0xf48>
+ a0c8: 0afffbfa beq 90b8 <abf2@plt\+0x5c>
a0cc: e59f4000 ldr r4, \[pc\] ; a0d4 <arm\+0x84>
a0d0: e59f4000 ldr r4, \[pc\] ; a0d8 <arm\+0x88>
#------------------------------------------------------------------------------
@@ -425,15 +431,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0dc: ebfffbdb bl 9050 <aaf1-0xfb0>
+ a0dc: ebfffbdb bl 9050 <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0e0: eafffbda b 9050 <aaf1-0xfb0>
+ a0e0: eafffbda b 9050 <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0e4: 0afffbd9 beq 9050 <aaf1-0xfb0>
+ a0e4: 0afffbd9 beq 9050 <aaf2@plt>
a0e8: e59f4000 ldr r4, \[pc\] ; a0f0 <arm\+0xa0>
a0ec: e59f4000 ldr r4, \[pc\] ; a0f4 <arm\+0xa4>
#------------------------------------------------------------------------------
@@ -447,15 +453,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0f8: ebfffbd1 bl 9044 <aaf1-0xfbc>
+ a0f8: ebfffbd1 bl 9044 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0fc: eafffbd0 b 9044 <aaf1-0xfbc>
+ a0fc: eafffbd0 b 9044 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a100: 0afffbcf beq 9044 <aaf1-0xfbc>
+ a100: 0afffbcf beq 9044 <taf2@plt>
a104: e59f4000 ldr r4, \[pc\] ; a10c <arm\+0xbc>
a108: e59f4000 ldr r4, \[pc\] ; a110 <arm\+0xc0>
#------------------------------------------------------------------------------
@@ -469,15 +475,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a114: ebfffbd1 bl 9060 <aaf1-0xfa0>
+ a114: ebfffbd1 bl 9060 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a118: eafffbd0 b 9060 <aaf1-0xfa0>
+ a118: eafffbd0 b 9060 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a11c: 0afffbcf beq 9060 <aaf1-0xfa0>
+ a11c: 0afffbcf beq 9060 <abf2@plt\+0x4>
a120: e59f4000 ldr r4, \[pc\] ; a128 <arm\+0xd8>
a124: e59f4000 ldr r4, \[pc\] ; a12c <arm\+0xdc>
#------------------------------------------------------------------------------
@@ -491,15 +497,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a130: ebfffbc0 bl 9038 <aaf1-0xfc8>
+ a130: ebfffbc0 bl 9038 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a134: eafffbbf b 9038 <aaf1-0xfc8>
+ a134: eafffbbf b 9038 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a138: 0afffbbe beq 9038 <aaf1-0xfc8>
+ a138: 0afffbbe beq 9038 <tbf2@plt\+0x4>
a13c: e59f4000 ldr r4, \[pc\] ; a144 <arm\+0xf4>
a140: e59f4000 ldr r4, \[pc\] ; a148 <arm\+0xf8>
#------------------------------------------------------------------------------
@@ -513,15 +519,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a14c: ebfffbfe bl 914c <aaf1-0xeb4>
+ a14c: ebfffbfe bl 914c <abf2@plt\+0xf0>
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a150: eafffbfd b 914c <aaf1-0xeb4>
+ a150: eafffbfd b 914c <abf2@plt\+0xf0>
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a154: 0afffbfc beq 914c <aaf1-0xeb4>
+ a154: 0afffbfc beq 914c <abf2@plt\+0xf0>
a158: e59f4000 ldr r4, \[pc\] ; a160 <arm\+0x110>
a15c: e59f4000 ldr r4, \[pc\] ; a164 <arm\+0x114>
#------------------------------------------------------------------------------
@@ -535,15 +541,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a168: ebfffbe8 bl 9110 <aaf1-0xef0>
+ a168: ebfffbe8 bl 9110 <abf2@plt\+0xb4>
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a16c: eafffbe7 b 9110 <aaf1-0xef0>
+ a16c: eafffbe7 b 9110 <abf2@plt\+0xb4>
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a170: 0afffbe6 beq 9110 <aaf1-0xef0>
+ a170: 0afffbe6 beq 9110 <abf2@plt\+0xb4>
a174: e59f4000 ldr r4, \[pc\] ; a17c <arm\+0x12c>
a178: e59f4000 ldr r4, \[pc\] ; a180 <arm\+0x130>
#------------------------------------------------------------------------------
@@ -557,15 +563,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a184: ebfffbd6 bl 90e4 <aaf1-0xf1c>
+ a184: ebfffbd6 bl 90e4 <abf2@plt\+0x88>
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a188: eafffbd5 b 90e4 <aaf1-0xf1c>
+ a188: eafffbd5 b 90e4 <abf2@plt\+0x88>
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a18c: 0afffbd4 beq 90e4 <aaf1-0xf1c>
+ a18c: 0afffbd4 beq 90e4 <abf2@plt\+0x88>
a190: e59f4000 ldr r4, \[pc\] ; a198 <arm\+0x148>
a194: e59f4000 ldr r4, \[pc\] ; a19c <arm\+0x14c>
#------------------------------------------------------------------------------
@@ -579,15 +585,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a1a0: ebfffbd7 bl 9104 <aaf1-0xefc>
+ a1a0: ebfffbd7 bl 9104 <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a1a4: eafffbd6 b 9104 <aaf1-0xefc>
+ a1a4: eafffbd6 b 9104 <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a1a8: 0afffbd5 beq 9104 <aaf1-0xefc>
+ a1a8: 0afffbd5 beq 9104 <abf2@plt\+0xa8>
a1ac: e59f4000 ldr r4, \[pc\] ; a1b4 <arm\+0x164>
a1b0: e59f4000 ldr r4, \[pc\] ; a1b8 <arm\+0x168>
#------------------------------------------------------------------------------
@@ -601,15 +607,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf4's .iplt entry
#------------------------------------------------------------------------------
- a1bc: ebfffbc0 bl 90c4 <aaf1-0xf3c>
+ a1bc: ebfffbc0 bl 90c4 <abf2@plt\+0x68>
#------------------------------------------------------------------------------
#------ aaf4's .iplt entry
#------------------------------------------------------------------------------
- a1c0: eafffbbf b 90c4 <aaf1-0xf3c>
+ a1c0: eafffbbf b 90c4 <abf2@plt\+0x68>
#------------------------------------------------------------------------------
#------ aaf4's .iplt entry
#------------------------------------------------------------------------------
- a1c4: 0afffbbe beq 90c4 <aaf1-0xf3c>
+ a1c4: 0afffbbe beq 90c4 <abf2@plt\+0x68>
a1c8: e59f4000 ldr r4, \[pc\] ; a1d0 <arm\+0x180>
a1cc: e59f4000 ldr r4, \[pc\] ; a1d4 <arm\+0x184>
#------------------------------------------------------------------------------
@@ -623,15 +629,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf4's .iplt entry
#------------------------------------------------------------------------------
- a1d8: ebfffbe2 bl 9168 <aaf1-0xe98>
+ a1d8: ebfffbe2 bl 9168 <abf2@plt\+0x10c>
#------------------------------------------------------------------------------
#------ taf4's .iplt entry
#------------------------------------------------------------------------------
- a1dc: eafffbe1 b 9168 <aaf1-0xe98>
+ a1dc: eafffbe1 b 9168 <abf2@plt\+0x10c>
#------------------------------------------------------------------------------
#------ taf4's .iplt entry
#------------------------------------------------------------------------------
- a1e0: 0afffbe0 beq 9168 <aaf1-0xe98>
+ a1e0: 0afffbe0 beq 9168 <abf2@plt\+0x10c>
a1e4: e59f4000 ldr r4, \[pc\] ; a1ec <arm\+0x19c>
a1e8: e59f4000 ldr r4, \[pc\] ; a1f0 <arm\+0x1a0>
#------------------------------------------------------------------------------
@@ -645,15 +651,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .iplt entry
#------------------------------------------------------------------------------
- a1f4: ebfffbc9 bl 9120 <aaf1-0xee0>
+ a1f4: ebfffbc9 bl 9120 <abf2@plt\+0xc4>
#------------------------------------------------------------------------------
#------ abf4's .iplt entry
#------------------------------------------------------------------------------
- a1f8: eafffbc8 b 9120 <aaf1-0xee0>
+ a1f8: eafffbc8 b 9120 <abf2@plt\+0xc4>
#------------------------------------------------------------------------------
#------ abf4's .iplt entry
#------------------------------------------------------------------------------
- a1fc: 0afffbc7 beq 9120 <aaf1-0xee0>
+ a1fc: 0afffbc7 beq 9120 <abf2@plt\+0xc4>
a200: e59f4000 ldr r4, \[pc\] ; a208 <arm\+0x1b8>
a204: e59f4000 ldr r4, \[pc\] ; a20c <arm\+0x1bc>
#------------------------------------------------------------------------------
@@ -667,15 +673,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .iplt entry
#------------------------------------------------------------------------------
- a210: ebfffbc6 bl 9130 <aaf1-0xed0>
+ a210: ebfffbc6 bl 9130 <abf2@plt\+0xd4>
#------------------------------------------------------------------------------
#------ tbf4's .iplt entry
#------------------------------------------------------------------------------
- a214: eafffbc5 b 9130 <aaf1-0xed0>
+ a214: eafffbc5 b 9130 <abf2@plt\+0xd4>
#------------------------------------------------------------------------------
#------ tbf4's .iplt entry
#------------------------------------------------------------------------------
- a218: 0afffbc4 beq 9130 <aaf1-0xed0>
+ a218: 0afffbc4 beq 9130 <abf2@plt\+0xd4>
a21c: e59f4000 ldr r4, \[pc\] ; a224 <arm\+0x1d4>
a220: e59f4000 ldr r4, \[pc\] ; a228 <arm\+0x1d8>
#------------------------------------------------------------------------------
@@ -704,15 +710,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf1's .iplt entry
#------------------------------------------------------------------------------
- a244: f7fe ef1a blx 907c <aaf1-0xf84>
+ a244: f7fe ef1a blx 907c <abf2@plt\+0x20>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a248: f7fe bf16 b\.w 9078 <aaf1-0xf88>
+ a248: f7fe bf16 b\.w 9078 <abf2@plt\+0x1c>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a24c: f43e af14 beq\.w 9078 <aaf1-0xf88>
+ a24c: f43e af14 beq\.w 9078 <abf2@plt\+0x1c>
a250: 4c00 ldr r4, \[pc, #0\] ; \(a254 <_thumb\+0x28>\)
a252: 4c01 ldr r4, \[pc, #4\] ; \(a258 <_thumb\+0x2c>\)
#------------------------------------------------------------------------------
@@ -726,15 +732,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf1's .iplt entry
#------------------------------------------------------------------------------
- a25c: f7fe ef24 blx 90a8 <aaf1-0xf58>
+ a25c: f7fe ef24 blx 90a8 <abf2@plt\+0x4c>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a260: f7fe bf20 b\.w 90a4 <aaf1-0xf5c>
+ a260: f7fe bf20 b\.w 90a4 <abf2@plt\+0x48>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a264: f43e af1e beq\.w 90a4 <aaf1-0xf5c>
+ a264: f43e af1e beq\.w 90a4 <abf2@plt\+0x48>
a268: 4c00 ldr r4, \[pc, #0\] ; \(a26c <_thumb\+0x40>\)
a26a: 4c01 ldr r4, \[pc, #4\] ; \(a270 <_thumb\+0x44>\)
#------------------------------------------------------------------------------
@@ -748,15 +754,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a274: f7fe ef0a blx 908c <aaf1-0xf74>
+ a274: f7fe ef0a blx 908c <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a278: f7fe bf06 b\.w 9088 <aaf1-0xf78>
+ a278: f7fe bf06 b\.w 9088 <abf2@plt\+0x2c>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a27c: f43e af04 beq\.w 9088 <aaf1-0xf78>
+ a27c: f43e af04 beq\.w 9088 <abf2@plt\+0x2c>
a280: 4c00 ldr r4, \[pc, #0\] ; \(a284 <_thumb\+0x58>\)
a282: 4c01 ldr r4, \[pc, #4\] ; \(a288 <_thumb\+0x5c>\)
#------------------------------------------------------------------------------
@@ -770,15 +776,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a28c: f7fe ef14 blx 90b8 <aaf1-0xf48>
+ a28c: f7fe ef14 blx 90b8 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a290: f7fe bf10 b\.w 90b4 <aaf1-0xf4c>
+ a290: f7fe bf10 b\.w 90b4 <abf2@plt\+0x58>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a294: f43e af0e beq\.w 90b4 <aaf1-0xf4c>
+ a294: f43e af0e beq\.w 90b4 <abf2@plt\+0x58>
a298: 4c00 ldr r4, \[pc, #0\] ; \(a29c <_thumb\+0x70>\)
a29a: 4c01 ldr r4, \[pc, #4\] ; \(a2a0 <_thumb\+0x74>\)
#------------------------------------------------------------------------------
@@ -792,15 +798,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf2's .plt entry
#------------------------------------------------------------------------------
- a2a4: f7fe eeb8 blx 9018 <aaf1-0xfe8>
+ a2a4: f7fe eeb8 blx 9018 <atf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a2a8: f7fe beb4 b\.w 9014 <aaf1-0xfec>
+ a2a8: f7fe beb4 b\.w 9014 <atf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a2ac: f43e aeb2 beq\.w 9014 <aaf1-0xfec>
+ a2ac: f43e aeb2 beq\.w 9014 <atf2@plt>
a2b0: 4c00 ldr r4, \[pc, #0\] ; \(a2b4 <_thumb\+0x88>\)
a2b2: 4c01 ldr r4, \[pc, #4\] ; \(a2b8 <_thumb\+0x8c>\)
#------------------------------------------------------------------------------
@@ -814,15 +820,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf2's .plt entry
#------------------------------------------------------------------------------
- a2bc: f7fe eeb4 blx 9028 <aaf1-0xfd8>
+ a2bc: f7fe eeb4 blx 9028 <ttf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a2c0: f7fe beb0 b\.w 9024 <aaf1-0xfdc>
+ a2c0: f7fe beb0 b\.w 9024 <ttf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a2c4: f43e aeae beq\.w 9024 <aaf1-0xfdc>
+ a2c4: f43e aeae beq\.w 9024 <ttf2@plt>
a2c8: 4c00 ldr r4, \[pc, #0\] ; \(a2cc <_thumb\+0xa0>\)
a2ca: 4c01 ldr r4, \[pc, #4\] ; \(a2d0 <_thumb\+0xa4>\)
#------------------------------------------------------------------------------
@@ -836,15 +842,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a2d4: f7fe eec4 blx 9060 <aaf1-0xfa0>
+ a2d4: f7fe eec4 blx 9060 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2d8: f7fe bec0 b\.w 905c <aaf1-0xfa4>
+ a2d8: f7fe bec0 b\.w 905c <abf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2dc: f43e aebe beq\.w 905c <aaf1-0xfa4>
+ a2dc: f43e aebe beq\.w 905c <abf2@plt>
a2e0: 4c00 ldr r4, \[pc, #0\] ; \(a2e4 <_thumb\+0xb8>\)
a2e2: 4c01 ldr r4, \[pc, #4\] ; \(a2e8 <_thumb\+0xbc>\)
#------------------------------------------------------------------------------
@@ -858,15 +864,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a2ec: f7fe eea4 blx 9038 <aaf1-0xfc8>
+ a2ec: f7fe eea4 blx 9038 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2f0: f7fe bea0 b\.w 9034 <aaf1-0xfcc>
+ a2f0: f7fe bea0 b\.w 9034 <tbf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2f4: f43e ae9e beq\.w 9034 <aaf1-0xfcc>
+ a2f4: f43e ae9e beq\.w 9034 <tbf2@plt>
a2f8: 4c00 ldr r4, \[pc, #0\] ; \(a2fc <_thumb\+0xd0>\)
a2fa: 4c01 ldr r4, \[pc, #4\] ; \(a300 <_thumb\+0xd4>\)
#------------------------------------------------------------------------------
@@ -880,15 +886,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf3's .iplt entry
#------------------------------------------------------------------------------
- a304: f7fe eee6 blx 90d4 <aaf1-0xf2c>
+ a304: f7fe eee6 blx 90d4 <abf2@plt\+0x78>
#------------------------------------------------------------------------------
#------ thumb entry to atf3's .iplt entry
#------------------------------------------------------------------------------
- a308: f7fe bee2 b\.w 90d0 <aaf1-0xf30>
+ a308: f7fe bee2 b\.w 90d0 <abf2@plt\+0x74>
#------------------------------------------------------------------------------
#------ thumb entry to atf3's .iplt entry
#------------------------------------------------------------------------------
- a30c: f43e aee0 beq\.w 90d0 <aaf1-0xf30>
+ a30c: f43e aee0 beq\.w 90d0 <abf2@plt\+0x74>
a310: 4c00 ldr r4, \[pc, #0\] ; \(a314 <_thumb\+0xe8>\)
a312: 4c01 ldr r4, \[pc, #4\] ; \(a318 <_thumb\+0xec>\)
#------------------------------------------------------------------------------
@@ -902,15 +908,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf3's .iplt entry
#------------------------------------------------------------------------------
- a31c: f7fe eeea blx 90f4 <aaf1-0xf0c>
+ a31c: f7fe eeea blx 90f4 <abf2@plt\+0x98>
#------------------------------------------------------------------------------
#------ thumb entry to ttf3's .iplt entry
#------------------------------------------------------------------------------
- a320: f7fe bee6 b\.w 90f0 <aaf1-0xf10>
+ a320: f7fe bee6 b\.w 90f0 <abf2@plt\+0x94>
#------------------------------------------------------------------------------
#------ thumb entry to ttf3's .iplt entry
#------------------------------------------------------------------------------
- a324: f43e aee4 beq\.w 90f0 <aaf1-0xf10>
+ a324: f43e aee4 beq\.w 90f0 <abf2@plt\+0x94>
a328: 4c00 ldr r4, \[pc, #0\] ; \(a32c <_thumb\+0x100>\)
a32a: 4c01 ldr r4, \[pc, #4\] ; \(a330 <_thumb\+0x104>\)
#------------------------------------------------------------------------------
@@ -924,15 +930,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a334: f7fe eed6 blx 90e4 <aaf1-0xf1c>
+ a334: f7fe eed6 blx 90e4 <abf2@plt\+0x88>
#------------------------------------------------------------------------------
#------ thumb entry to abf3's .iplt entry
#------------------------------------------------------------------------------
- a338: f7fe bed2 b\.w 90e0 <aaf1-0xf20>
+ a338: f7fe bed2 b\.w 90e0 <abf2@plt\+0x84>
#------------------------------------------------------------------------------
#------ thumb entry to abf3's .iplt entry
#------------------------------------------------------------------------------
- a33c: f43e aed0 beq\.w 90e0 <aaf1-0xf20>
+ a33c: f43e aed0 beq\.w 90e0 <abf2@plt\+0x84>
a340: 4c00 ldr r4, \[pc, #0\] ; \(a344 <_thumb\+0x118>\)
a342: 4c01 ldr r4, \[pc, #4\] ; \(a348 <_thumb\+0x11c>\)
#------------------------------------------------------------------------------
@@ -946,15 +952,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a34c: f7fe eeda blx 9104 <aaf1-0xefc>
+ a34c: f7fe eeda blx 9104 <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ thumb entry to tbf3's .iplt entry
#------------------------------------------------------------------------------
- a350: f7fe bed6 b\.w 9100 <aaf1-0xf00>
+ a350: f7fe bed6 b\.w 9100 <abf2@plt\+0xa4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf3's .iplt entry
#------------------------------------------------------------------------------
- a354: f43e aed4 beq\.w 9100 <aaf1-0xf00>
+ a354: f43e aed4 beq\.w 9100 <abf2@plt\+0xa4>
a358: 4c00 ldr r4, \[pc, #0\] ; \(a35c <_thumb\+0x130>\)
a35a: 4c01 ldr r4, \[pc, #4\] ; \(a360 <_thumb\+0x134>\)
#------------------------------------------------------------------------------
@@ -968,15 +974,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf4's .iplt entry
#------------------------------------------------------------------------------
- a364: f7fe eefa blx 915c <aaf1-0xea4>
+ a364: f7fe eefa blx 915c <abf2@plt\+0x100>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .iplt entry
#------------------------------------------------------------------------------
- a368: f7fe bef6 b\.w 9158 <aaf1-0xea8>
+ a368: f7fe bef6 b\.w 9158 <abf2@plt\+0xfc>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .iplt entry
#------------------------------------------------------------------------------
- a36c: f43e aef4 beq\.w 9158 <aaf1-0xea8>
+ a36c: f43e aef4 beq\.w 9158 <abf2@plt\+0xfc>
a370: 4c00 ldr r4, \[pc, #0\] ; \(a374 <_thumb\+0x148>\)
a372: 4c01 ldr r4, \[pc, #4\] ; \(a378 <_thumb\+0x14c>\)
#------------------------------------------------------------------------------
@@ -990,15 +996,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf4's .iplt entry
#------------------------------------------------------------------------------
- a37c: f7fe eee0 blx 9140 <aaf1-0xec0>
+ a37c: f7fe eee0 blx 9140 <abf2@plt\+0xe4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .iplt entry
#------------------------------------------------------------------------------
- a380: f7fe bedc b\.w 913c <aaf1-0xec4>
+ a380: f7fe bedc b\.w 913c <abf2@plt\+0xe0>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .iplt entry
#------------------------------------------------------------------------------
- a384: f43e aeda beq\.w 913c <aaf1-0xec4>
+ a384: f43e aeda beq\.w 913c <abf2@plt\+0xe0>
a388: 4c00 ldr r4, \[pc, #0\] ; \(a38c <_thumb\+0x160>\)
a38a: 4c01 ldr r4, \[pc, #4\] ; \(a390 <_thumb\+0x164>\)
#------------------------------------------------------------------------------
@@ -1012,15 +1018,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .iplt entry
#------------------------------------------------------------------------------
- a394: f7fe eec4 blx 9120 <aaf1-0xee0>
+ a394: f7fe eec4 blx 9120 <abf2@plt\+0xc4>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .iplt entry
#------------------------------------------------------------------------------
- a398: f7fe bec0 b\.w 911c <aaf1-0xee4>
+ a398: f7fe bec0 b\.w 911c <abf2@plt\+0xc0>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .iplt entry
#------------------------------------------------------------------------------
- a39c: f43e aebe beq\.w 911c <aaf1-0xee4>
+ a39c: f43e aebe beq\.w 911c <abf2@plt\+0xc0>
a3a0: 4c00 ldr r4, \[pc, #0\] ; \(a3a4 <_thumb\+0x178>\)
a3a2: 4c01 ldr r4, \[pc, #4\] ; \(a3a8 <_thumb\+0x17c>\)
#------------------------------------------------------------------------------
@@ -1034,15 +1040,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .iplt entry
#------------------------------------------------------------------------------
- a3ac: f7fe eec0 blx 9130 <aaf1-0xed0>
+ a3ac: f7fe eec0 blx 9130 <abf2@plt\+0xd4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .iplt entry
#------------------------------------------------------------------------------
- a3b0: f7fe bebc b\.w 912c <aaf1-0xed4>
+ a3b0: f7fe bebc b\.w 912c <abf2@plt\+0xd0>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .iplt entry
#------------------------------------------------------------------------------
- a3b4: f43e aeba beq\.w 912c <aaf1-0xed4>
+ a3b4: f43e aeba beq\.w 912c <abf2@plt\+0xd0>
a3b8: 4c00 ldr r4, \[pc, #0\] ; \(a3bc <_thumb\+0x190>\)
a3ba: 4c01 ldr r4, \[pc, #4\] ; \(a3c0 <_thumb\+0x194>\)
#------------------------------------------------------------------------------
diff --git a/ld/testsuite/ld-arm/ifunc-7.dd b/ld/testsuite/ld-arm/ifunc-7.dd
index e9a9681..f82fd37 100644
--- a/ld/testsuite/ld-arm/ifunc-7.dd
+++ b/ld/testsuite/ld-arm/ifunc-7.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f1-0xff0>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,12 +16,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
#------------------------------------------------------------------------------
#------ f4's .plt entry
#------------------------------------------------------------------------------
+00009020 <f4@plt>:
9020: e28fc600 add ip, pc, #0, 12
9024: e28cca07 add ip, ip, #28672 ; 0x7000
9028: e5bcffe8 ldr pc, \[ip, #4072\]! ; 0xfe8
@@ -65,7 +67,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f1's .iplt entry
#------------------------------------------------------------------------------
- a01c: ebfffc02 bl 902c <f1-0xfd4>
+ a01c: ebfffc02 bl 902c <f4@plt\+0xc>
a020: e59f4000 ldr r4, \[pc\] ; a028 <arm\+0x20>
a024: e59f4000 ldr r4, \[pc\] ; a02c <arm\+0x24>
#------------------------------------------------------------------------------
@@ -79,7 +81,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
- a030: ebfffbf7 bl 9014 <f1-0xfec>
+ a030: ebfffbf7 bl 9014 <f2@plt>
a034: e59f4000 ldr r4, \[pc\] ; a03c <arm\+0x34>
a038: e59f4000 ldr r4, \[pc\] ; a040 <arm\+0x38>
#------------------------------------------------------------------------------
@@ -93,7 +95,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f3's .iplt entry
#------------------------------------------------------------------------------
- a044: ebfffbfb bl 9038 <f1-0xfc8>
+ a044: ebfffbfb bl 9038 <f4@plt\+0x18>
a048: e59f4000 ldr r4, \[pc\] ; a050 <arm\+0x48>
a04c: e59f4000 ldr r4, \[pc\] ; a054 <arm\+0x4c>
#------------------------------------------------------------------------------
@@ -107,7 +109,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f4's .plt entry
#------------------------------------------------------------------------------
- a058: ebfffbf0 bl 9020 <f1-0xfe0>
+ a058: ebfffbf0 bl 9020 <f4@plt>
a05c: e59f4000 ldr r4, \[pc\] ; a064 <arm\+0x5c>
a060: e59f4000 ldr r4, \[pc\] ; a068 <arm\+0x60>
#------------------------------------------------------------------------------
diff --git a/ld/testsuite/ld-arm/ifunc-8.dd b/ld/testsuite/ld-arm/ifunc-8.dd
index 5b255e2..3cca17c 100644
--- a/ld/testsuite/ld-arm/ifunc-8.dd
+++ b/ld/testsuite/ld-arm/ifunc-8.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <atf2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <aaf1-0xff0>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <atf2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
+00009014 <atf2@plt>:
9014: 4778 bx pc
9016: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -27,12 +28,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
+00009024 <aaf4@plt>:
9024: e28fc600 add ip, pc, #0, 12
9028: e28cca07 add ip, ip, #28672 ; 0x7000
902c: e5bcffe4 ldr pc, \[ip, #4068\]! ; 0xfe4
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
+00009030 <ttf2@plt>:
9030: 4778 bx pc
9032: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -44,6 +47,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
+00009040 <tbf2@plt>:
9040: 4778 bx pc
9042: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -55,18 +59,21 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
+00009050 <taf2@plt>:
9050: e28fc600 add ip, pc, #0, 12
9054: e28cca07 add ip, ip, #28672 ; 0x7000
9058: e5bcffc4 ldr pc, \[ip, #4036\]! ; 0xfc4
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
+0000905c <aaf2@plt>:
905c: e28fc600 add ip, pc, #0, 12
9060: e28cca07 add ip, ip, #28672 ; 0x7000
9064: e5bcffbc ldr pc, \[ip, #4028\]! ; 0xfbc
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
+00009068 <abf4@plt>:
9068: 4778 bx pc
906a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -78,6 +85,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
+00009078 <tbf4@plt>:
9078: 4778 bx pc
907a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -89,6 +97,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
+00009088 <ttf4@plt>:
9088: 4778 bx pc
908a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -100,6 +109,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
+00009098 <atf4@plt>:
9098: 4778 bx pc
909a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -111,12 +121,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
+000090a8 <taf4@plt>:
90a8: e28fc600 add ip, pc, #0, 12
90ac: e28cca07 add ip, ip, #28672 ; 0x7000
90b0: e5bcff84 ldr pc, \[ip, #3972\]! ; 0xf84
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
+000090b4 <abf2@plt>:
90b4: 4778 bx pc
90b6: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -299,15 +311,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a044: ebfffc1e bl 90c4 <aaf1-0xf3c>
+ a044: ebfffc1e bl 90c4 <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a048: eafffc1d b 90c4 <aaf1-0xf3c>
+ a048: eafffc1d b 90c4 <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a04c: 0afffc1c beq 90c4 <aaf1-0xf3c>
+ a04c: 0afffc1c beq 90c4 <abf2@plt\+0x10>
a050: e59f4000 ldr r4, \[pc\] ; a058 <arm\+0x30>
a054: e59f4000 ldr r4, \[pc\] ; a05c <arm\+0x34>
#------------------------------------------------------------------------------
@@ -321,15 +333,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a060: ebfffc22 bl 90f0 <aaf1-0xf10>
+ a060: ebfffc22 bl 90f0 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a064: eafffc21 b 90f0 <aaf1-0xf10>
+ a064: eafffc21 b 90f0 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a068: 0afffc20 beq 90f0 <aaf1-0xf10>
+ a068: 0afffc20 beq 90f0 <abf2@plt\+0x3c>
a06c: e59f4000 ldr r4, \[pc\] ; a074 <arm\+0x4c>
a070: e59f4000 ldr r4, \[pc\] ; a078 <arm\+0x50>
#------------------------------------------------------------------------------
@@ -343,15 +355,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a07c: ebfffc18 bl 90e4 <aaf1-0xf1c>
+ a07c: ebfffc18 bl 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a080: eafffc17 b 90e4 <aaf1-0xf1c>
+ a080: eafffc17 b 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a084: 0afffc16 beq 90e4 <aaf1-0xf1c>
+ a084: 0afffc16 beq 90e4 <abf2@plt\+0x30>
a088: e59f4000 ldr r4, \[pc\] ; a090 <arm\+0x68>
a08c: e59f4000 ldr r4, \[pc\] ; a094 <arm\+0x6c>
#------------------------------------------------------------------------------
@@ -365,15 +377,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a098: ebfffc1c bl 9110 <aaf1-0xef0>
+ a098: ebfffc1c bl 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a09c: eafffc1b b 9110 <aaf1-0xef0>
+ a09c: eafffc1b b 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0a0: 0afffc1a beq 9110 <aaf1-0xef0>
+ a0a0: 0afffc1a beq 9110 <abf2@plt\+0x5c>
a0a4: e59f4000 ldr r4, \[pc\] ; a0ac <arm\+0x84>
a0a8: e59f4000 ldr r4, \[pc\] ; a0b0 <arm\+0x88>
#------------------------------------------------------------------------------
@@ -387,15 +399,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0b4: ebfffbe8 bl 905c <aaf1-0xfa4>
+ a0b4: ebfffbe8 bl 905c <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0b8: eafffbe7 b 905c <aaf1-0xfa4>
+ a0b8: eafffbe7 b 905c <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0bc: 0afffbe6 beq 905c <aaf1-0xfa4>
+ a0bc: 0afffbe6 beq 905c <aaf2@plt>
a0c0: e59f4000 ldr r4, \[pc\] ; a0c8 <arm\+0xa0>
a0c4: e59f4000 ldr r4, \[pc\] ; a0cc <arm\+0xa4>
#------------------------------------------------------------------------------
@@ -409,15 +421,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d0: ebfffbde bl 9050 <aaf1-0xfb0>
+ a0d0: ebfffbde bl 9050 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d4: eafffbdd b 9050 <aaf1-0xfb0>
+ a0d4: eafffbdd b 9050 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d8: 0afffbdc beq 9050 <aaf1-0xfb0>
+ a0d8: 0afffbdc beq 9050 <taf2@plt>
a0dc: e59f4000 ldr r4, \[pc\] ; a0e4 <arm\+0xbc>
a0e0: e59f4000 ldr r4, \[pc\] ; a0e8 <arm\+0xc0>
#------------------------------------------------------------------------------
@@ -431,15 +443,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0ec: ebfffbf1 bl 90b8 <aaf1-0xf48>
+ a0ec: ebfffbf1 bl 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0f0: eafffbf0 b 90b8 <aaf1-0xf48>
+ a0f0: eafffbf0 b 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0f4: 0afffbef beq 90b8 <aaf1-0xf48>
+ a0f4: 0afffbef beq 90b8 <abf2@plt\+0x4>
a0f8: e59f4000 ldr r4, \[pc\] ; a100 <arm\+0xd8>
a0fc: e59f4000 ldr r4, \[pc\] ; a104 <arm\+0xdc>
#------------------------------------------------------------------------------
@@ -453,15 +465,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a108: ebfffbcd bl 9044 <aaf1-0xfbc>
+ a108: ebfffbcd bl 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a10c: eafffbcc b 9044 <aaf1-0xfbc>
+ a10c: eafffbcc b 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a110: 0afffbcb beq 9044 <aaf1-0xfbc>
+ a110: 0afffbcb beq 9044 <tbf2@plt\+0x4>
a114: e59f4000 ldr r4, \[pc\] ; a11c <arm\+0xf4>
a118: e59f4000 ldr r4, \[pc\] ; a120 <arm\+0xf8>
#------------------------------------------------------------------------------
@@ -475,15 +487,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a124: ebfffc0f bl 9168 <aaf1-0xe98>
+ a124: ebfffc0f bl 9168 <abf2@plt\+0xb4>
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a128: eafffc0e b 9168 <aaf1-0xe98>
+ a128: eafffc0e b 9168 <abf2@plt\+0xb4>
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a12c: 0afffc0d beq 9168 <aaf1-0xe98>
+ a12c: 0afffc0d beq 9168 <abf2@plt\+0xb4>
a130: e59f4000 ldr r4, \[pc\] ; a138 <arm\+0x110>
a134: e59f4000 ldr r4, \[pc\] ; a13c <arm\+0x114>
#------------------------------------------------------------------------------
@@ -497,15 +509,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a140: ebfffc05 bl 915c <aaf1-0xea4>
+ a140: ebfffc05 bl 915c <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a144: eafffc04 b 915c <aaf1-0xea4>
+ a144: eafffc04 b 915c <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a148: 0afffc03 beq 915c <aaf1-0xea4>
+ a148: 0afffc03 beq 915c <abf2@plt\+0xa8>
a14c: e59f4000 ldr r4, \[pc\] ; a154 <arm\+0x12c>
a150: e59f4000 ldr r4, \[pc\] ; a158 <arm\+0x130>
#------------------------------------------------------------------------------
@@ -519,15 +531,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a15c: ebfffbf3 bl 9130 <aaf1-0xed0>
+ a15c: ebfffbf3 bl 9130 <abf2@plt\+0x7c>
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a160: eafffbf2 b 9130 <aaf1-0xed0>
+ a160: eafffbf2 b 9130 <abf2@plt\+0x7c>
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a164: 0afffbf1 beq 9130 <aaf1-0xed0>
+ a164: 0afffbf1 beq 9130 <abf2@plt\+0x7c>
a168: e59f4000 ldr r4, \[pc\] ; a170 <arm\+0x148>
a16c: e59f4000 ldr r4, \[pc\] ; a174 <arm\+0x14c>
#------------------------------------------------------------------------------
@@ -541,15 +553,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a178: ebfffbf4 bl 9150 <aaf1-0xeb0>
+ a178: ebfffbf4 bl 9150 <abf2@plt\+0x9c>
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a17c: eafffbf3 b 9150 <aaf1-0xeb0>
+ a17c: eafffbf3 b 9150 <abf2@plt\+0x9c>
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a180: 0afffbf2 beq 9150 <aaf1-0xeb0>
+ a180: 0afffbf2 beq 9150 <abf2@plt\+0x9c>
a184: e59f4000 ldr r4, \[pc\] ; a18c <arm\+0x164>
a188: e59f4000 ldr r4, \[pc\] ; a190 <arm\+0x168>
#------------------------------------------------------------------------------
@@ -563,15 +575,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a194: ebfffba2 bl 9024 <aaf1-0xfdc>
+ a194: ebfffba2 bl 9024 <aaf4@plt>
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a198: eafffba1 b 9024 <aaf1-0xfdc>
+ a198: eafffba1 b 9024 <aaf4@plt>
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a19c: 0afffba0 beq 9024 <aaf1-0xfdc>
+ a19c: 0afffba0 beq 9024 <aaf4@plt>
a1a0: e59f4000 ldr r4, \[pc\] ; a1a8 <arm\+0x180>
a1a4: e59f4000 ldr r4, \[pc\] ; a1ac <arm\+0x184>
#------------------------------------------------------------------------------
@@ -585,15 +597,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b0: ebfffbbc bl 90a8 <aaf1-0xf58>
+ a1b0: ebfffbbc bl 90a8 <taf4@plt>
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b4: eafffbbb b 90a8 <aaf1-0xf58>
+ a1b4: eafffbbb b 90a8 <taf4@plt>
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b8: 0afffbba beq 90a8 <aaf1-0xf58>
+ a1b8: 0afffbba beq 90a8 <taf4@plt>
a1bc: e59f4000 ldr r4, \[pc\] ; a1c4 <arm\+0x19c>
a1c0: e59f4000 ldr r4, \[pc\] ; a1c8 <arm\+0x1a0>
#------------------------------------------------------------------------------
@@ -607,15 +619,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1cc: ebfffba6 bl 906c <aaf1-0xf94>
+ a1cc: ebfffba6 bl 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1d0: eafffba5 b 906c <aaf1-0xf94>
+ a1d0: eafffba5 b 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1d4: 0afffba4 beq 906c <aaf1-0xf94>
+ a1d4: 0afffba4 beq 906c <abf4@plt\+0x4>
a1d8: e59f4000 ldr r4, \[pc\] ; a1e0 <arm\+0x1b8>
a1dc: e59f4000 ldr r4, \[pc\] ; a1e4 <arm\+0x1bc>
#------------------------------------------------------------------------------
@@ -629,15 +641,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1e8: ebfffba3 bl 907c <aaf1-0xf84>
+ a1e8: ebfffba3 bl 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1ec: eafffba2 b 907c <aaf1-0xf84>
+ a1ec: eafffba2 b 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1f0: 0afffba1 beq 907c <aaf1-0xf84>
+ a1f0: 0afffba1 beq 907c <tbf4@plt\+0x4>
a1f4: e59f4000 ldr r4, \[pc\] ; a1fc <arm\+0x1d4>
a1f8: e59f4000 ldr r4, \[pc\] ; a200 <arm\+0x1d8>
#------------------------------------------------------------------------------
@@ -666,15 +678,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf1's .iplt entry
#------------------------------------------------------------------------------
- a21c: f7fe ef5a blx 90d4 <aaf1-0xf2c>
+ a21c: f7fe ef5a blx 90d4 <abf2@plt\+0x20>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a220: f7fe bf56 b\.w 90d0 <aaf1-0xf30>
+ a220: f7fe bf56 b\.w 90d0 <abf2@plt\+0x1c>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a224: f43e af54 beq\.w 90d0 <aaf1-0xf30>
+ a224: f43e af54 beq\.w 90d0 <abf2@plt\+0x1c>
a228: 4c00 ldr r4, \[pc, #0\] ; \(a22c <_thumb\+0x28>\)
a22a: 4c01 ldr r4, \[pc, #4\] ; \(a230 <_thumb\+0x2c>\)
#------------------------------------------------------------------------------
@@ -688,15 +700,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf1's .iplt entry
#------------------------------------------------------------------------------
- a234: f7fe ef64 blx 9100 <aaf1-0xf00>
+ a234: f7fe ef64 blx 9100 <abf2@plt\+0x4c>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a238: f7fe bf60 b\.w 90fc <aaf1-0xf04>
+ a238: f7fe bf60 b\.w 90fc <abf2@plt\+0x48>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a23c: f43e af5e beq\.w 90fc <aaf1-0xf04>
+ a23c: f43e af5e beq\.w 90fc <abf2@plt\+0x48>
a240: 4c00 ldr r4, \[pc, #0\] ; \(a244 <_thumb\+0x40>\)
a242: 4c01 ldr r4, \[pc, #4\] ; \(a248 <_thumb\+0x44>\)
#------------------------------------------------------------------------------
@@ -710,15 +722,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a24c: f7fe ef4a blx 90e4 <aaf1-0xf1c>
+ a24c: f7fe ef4a blx 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a250: f7fe bf46 b\.w 90e0 <aaf1-0xf20>
+ a250: f7fe bf46 b\.w 90e0 <abf2@plt\+0x2c>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a254: f43e af44 beq\.w 90e0 <aaf1-0xf20>
+ a254: f43e af44 beq\.w 90e0 <abf2@plt\+0x2c>
a258: 4c00 ldr r4, \[pc, #0\] ; \(a25c <_thumb\+0x58>\)
a25a: 4c01 ldr r4, \[pc, #4\] ; \(a260 <_thumb\+0x5c>\)
#------------------------------------------------------------------------------
@@ -732,15 +744,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a264: f7fe ef54 blx 9110 <aaf1-0xef0>
+ a264: f7fe ef54 blx 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a268: f7fe bf50 b\.w 910c <aaf1-0xef4>
+ a268: f7fe bf50 b\.w 910c <abf2@plt\+0x58>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a26c: f43e af4e beq\.w 910c <aaf1-0xef4>
+ a26c: f43e af4e beq\.w 910c <abf2@plt\+0x58>
a270: 4c00 ldr r4, \[pc, #0\] ; \(a274 <_thumb\+0x70>\)
a272: 4c01 ldr r4, \[pc, #4\] ; \(a278 <_thumb\+0x74>\)
#------------------------------------------------------------------------------
@@ -754,15 +766,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf2's .plt entry
#------------------------------------------------------------------------------
- a27c: f7fe eecc blx 9018 <aaf1-0xfe8>
+ a27c: f7fe eecc blx 9018 <atf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a280: f7fe bec8 b\.w 9014 <aaf1-0xfec>
+ a280: f7fe bec8 b\.w 9014 <atf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a284: f43e aec6 beq\.w 9014 <aaf1-0xfec>
+ a284: f43e aec6 beq\.w 9014 <atf2@plt>
a288: 4c00 ldr r4, \[pc, #0\] ; \(a28c <_thumb\+0x88>\)
a28a: 4c01 ldr r4, \[pc, #4\] ; \(a290 <_thumb\+0x8c>\)
#------------------------------------------------------------------------------
@@ -776,15 +788,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf2's .plt entry
#------------------------------------------------------------------------------
- a294: f7fe eece blx 9034 <aaf1-0xfcc>
+ a294: f7fe eece blx 9034 <ttf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a298: f7fe beca b\.w 9030 <aaf1-0xfd0>
+ a298: f7fe beca b\.w 9030 <ttf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a29c: f43e aec8 beq\.w 9030 <aaf1-0xfd0>
+ a29c: f43e aec8 beq\.w 9030 <ttf2@plt>
a2a0: 4c00 ldr r4, \[pc, #0\] ; \(a2a4 <_thumb\+0xa0>\)
a2a2: 4c01 ldr r4, \[pc, #4\] ; \(a2a8 <_thumb\+0xa4>\)
#------------------------------------------------------------------------------
@@ -798,15 +810,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a2ac: f7fe ef04 blx 90b8 <aaf1-0xf48>
+ a2ac: f7fe ef04 blx 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2b0: f7fe bf00 b\.w 90b4 <aaf1-0xf4c>
+ a2b0: f7fe bf00 b\.w 90b4 <abf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2b4: f43e aefe beq\.w 90b4 <aaf1-0xf4c>
+ a2b4: f43e aefe beq\.w 90b4 <abf2@plt>
a2b8: 4c00 ldr r4, \[pc, #0\] ; \(a2bc <_thumb\+0xb8>\)
a2ba: 4c01 ldr r4, \[pc, #4\] ; \(a2c0 <_thumb\+0xbc>\)
#------------------------------------------------------------------------------
@@ -820,15 +832,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a2c4: f7fe eebe blx 9044 <aaf1-0xfbc>
+ a2c4: f7fe eebe blx 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2c8: f7fe beba b\.w 9040 <aaf1-0xfc0>
+ a2c8: f7fe beba b\.w 9040 <tbf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2cc: f43e aeb8 beq\.w 9040 <aaf1-0xfc0>
+ a2cc: f43e aeb8 beq\.w 9040 <tbf2@plt>
a2d0: 4c00 ldr r4, \[pc, #0\] ; \(a2d4 <_thumb\+0xd0>\)
a2d2: 4c01 ldr r4, \[pc, #4\] ; \(a2d8 <_thumb\+0xd4>\)
#------------------------------------------------------------------------------
@@ -842,15 +854,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf3's .iplt entry
#------------------------------------------------------------------------------
- a2dc: f7fe ef20 blx 9120 <aaf1-0xee0>
+ a2dc: f7fe ef20 blx 9120 <abf2@plt\+0x6c>
#------------------------------------------------------------------------------
#------ thumb entry to atf3's .iplt entry
#------------------------------------------------------------------------------
- a2e0: f7fe bf1c b\.w 911c <aaf1-0xee4>
+ a2e0: f7fe bf1c b\.w 911c <abf2@plt\+0x68>
#------------------------------------------------------------------------------
#------ thumb entry to atf3's .iplt entry
#------------------------------------------------------------------------------
- a2e4: f43e af1a beq\.w 911c <aaf1-0xee4>
+ a2e4: f43e af1a beq\.w 911c <abf2@plt\+0x68>
a2e8: 4c00 ldr r4, \[pc, #0\] ; \(a2ec <_thumb\+0xe8>\)
a2ea: 4c01 ldr r4, \[pc, #4\] ; \(a2f0 <_thumb\+0xec>\)
#------------------------------------------------------------------------------
@@ -864,15 +876,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf3's .iplt entry
#------------------------------------------------------------------------------
- a2f4: f7fe ef24 blx 9140 <aaf1-0xec0>
+ a2f4: f7fe ef24 blx 9140 <abf2@plt\+0x8c>
#------------------------------------------------------------------------------
#------ thumb entry to ttf3's .iplt entry
#------------------------------------------------------------------------------
- a2f8: f7fe bf20 b\.w 913c <aaf1-0xec4>
+ a2f8: f7fe bf20 b\.w 913c <abf2@plt\+0x88>
#------------------------------------------------------------------------------
#------ thumb entry to ttf3's .iplt entry
#------------------------------------------------------------------------------
- a2fc: f43e af1e beq\.w 913c <aaf1-0xec4>
+ a2fc: f43e af1e beq\.w 913c <abf2@plt\+0x88>
a300: 4c00 ldr r4, \[pc, #0\] ; \(a304 <_thumb\+0x100>\)
a302: 4c01 ldr r4, \[pc, #4\] ; \(a308 <_thumb\+0x104>\)
#------------------------------------------------------------------------------
@@ -886,15 +898,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a30c: f7fe ef10 blx 9130 <aaf1-0xed0>
+ a30c: f7fe ef10 blx 9130 <abf2@plt\+0x7c>
#------------------------------------------------------------------------------
#------ thumb entry to abf3's .iplt entry
#------------------------------------------------------------------------------
- a310: f7fe bf0c b\.w 912c <aaf1-0xed4>
+ a310: f7fe bf0c b\.w 912c <abf2@plt\+0x78>
#------------------------------------------------------------------------------
#------ thumb entry to abf3's .iplt entry
#------------------------------------------------------------------------------
- a314: f43e af0a beq\.w 912c <aaf1-0xed4>
+ a314: f43e af0a beq\.w 912c <abf2@plt\+0x78>
a318: 4c00 ldr r4, \[pc, #0\] ; \(a31c <_thumb\+0x118>\)
a31a: 4c01 ldr r4, \[pc, #4\] ; \(a320 <_thumb\+0x11c>\)
#------------------------------------------------------------------------------
@@ -908,15 +920,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a324: f7fe ef14 blx 9150 <aaf1-0xeb0>
+ a324: f7fe ef14 blx 9150 <abf2@plt\+0x9c>
#------------------------------------------------------------------------------
#------ thumb entry to tbf3's .iplt entry
#------------------------------------------------------------------------------
- a328: f7fe bf10 b\.w 914c <aaf1-0xeb4>
+ a328: f7fe bf10 b\.w 914c <abf2@plt\+0x98>
#------------------------------------------------------------------------------
#------ thumb entry to tbf3's .iplt entry
#------------------------------------------------------------------------------
- a32c: f43e af0e beq\.w 914c <aaf1-0xeb4>
+ a32c: f43e af0e beq\.w 914c <abf2@plt\+0x98>
a330: 4c00 ldr r4, \[pc, #0\] ; \(a334 <_thumb\+0x130>\)
a332: 4c01 ldr r4, \[pc, #4\] ; \(a338 <_thumb\+0x134>\)
#------------------------------------------------------------------------------
@@ -930,15 +942,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf4's .plt entry
#------------------------------------------------------------------------------
- a33c: f7fe eeae blx 909c <aaf1-0xf64>
+ a33c: f7fe eeae blx 909c <atf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
- a340: f7fe beaa b\.w 9098 <aaf1-0xf68>
+ a340: f7fe beaa b\.w 9098 <atf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
- a344: f43e aea8 beq\.w 9098 <aaf1-0xf68>
+ a344: f43e aea8 beq\.w 9098 <atf4@plt>
a348: 4c00 ldr r4, \[pc, #0\] ; \(a34c <_thumb\+0x148>\)
a34a: 4c01 ldr r4, \[pc, #4\] ; \(a350 <_thumb\+0x14c>\)
#------------------------------------------------------------------------------
@@ -952,15 +964,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf4's .plt entry
#------------------------------------------------------------------------------
- a354: f7fe ee9a blx 908c <aaf1-0xf74>
+ a354: f7fe ee9a blx 908c <ttf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
- a358: f7fe be96 b\.w 9088 <aaf1-0xf78>
+ a358: f7fe be96 b\.w 9088 <ttf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
- a35c: f43e ae94 beq\.w 9088 <aaf1-0xf78>
+ a35c: f43e ae94 beq\.w 9088 <ttf4@plt>
a360: 4c00 ldr r4, \[pc, #0\] ; \(a364 <_thumb\+0x160>\)
a362: 4c01 ldr r4, \[pc, #4\] ; \(a368 <_thumb\+0x164>\)
#------------------------------------------------------------------------------
@@ -974,15 +986,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a36c: f7fe ee7e blx 906c <aaf1-0xf94>
+ a36c: f7fe ee7e blx 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
- a370: f7fe be7a b\.w 9068 <aaf1-0xf98>
+ a370: f7fe be7a b\.w 9068 <abf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
- a374: f43e ae78 beq\.w 9068 <aaf1-0xf98>
+ a374: f43e ae78 beq\.w 9068 <abf4@plt>
a378: 4c00 ldr r4, \[pc, #0\] ; \(a37c <_thumb\+0x178>\)
a37a: 4c01 ldr r4, \[pc, #4\] ; \(a380 <_thumb\+0x17c>\)
#------------------------------------------------------------------------------
@@ -996,15 +1008,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a384: f7fe ee7a blx 907c <aaf1-0xf84>
+ a384: f7fe ee7a blx 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
- a388: f7fe be76 b\.w 9078 <aaf1-0xf88>
+ a388: f7fe be76 b\.w 9078 <tbf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
- a38c: f43e ae74 beq\.w 9078 <aaf1-0xf88>
+ a38c: f43e ae74 beq\.w 9078 <tbf4@plt>
a390: 4c00 ldr r4, \[pc, #0\] ; \(a394 <_thumb\+0x190>\)
a392: 4c01 ldr r4, \[pc, #4\] ; \(a398 <_thumb\+0x194>\)
#------------------------------------------------------------------------------
diff --git a/ld/testsuite/ld-arm/ifunc-9.dd b/ld/testsuite/ld-arm/ifunc-9.dd
index 36139d9..af7ec4b 100644
--- a/ld/testsuite/ld-arm/ifunc-9.dd
+++ b/ld/testsuite/ld-arm/ifunc-9.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f3-0x1c>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
@@ -71,7 +72,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f1's .iplt entry
#------------------------------------------------------------------------------
- a034: ebfffbf9 bl 9020 <f3-0xc>
+ a034: ebfffbf9 bl 9020 <f2@plt\+0xc>
a038: e59f400c ldr r4, \[pc, #12\] ; a04c <_start\+0x44>
a03c: e59f400c ldr r4, \[pc, #12\] ; a050 <_start\+0x48>
a040: e59f400c ldr r4, \[pc, #12\] ; a054 <_start\+0x4c>
@@ -100,7 +101,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
- a060: ebfffbeb bl 9014 <f3-0x18>
+ a060: ebfffbeb bl 9014 <f2@plt>
a064: e59f400c ldr r4, \[pc, #12\] ; a078 <_start\+0x70>
a068: e59f400c ldr r4, \[pc, #12\] ; a07c <_start\+0x74>
a06c: e59f400c ldr r4, \[pc, #12\] ; a080 <_start\+0x78>
diff --git a/ld/testsuite/ld-arm/long-plt-format.d b/ld/testsuite/ld-arm/long-plt-format.d
index c64b42f..b0a1abc 100644
--- a/ld/testsuite/ld-arm/long-plt-format.d
+++ b/ld/testsuite/ld-arm/long-plt-format.d
@@ -3,12 +3,13 @@
Disassembly of section .plt:
-.* <.plt>:
+.* <foo@plt-0x14>:
.*: .*
.*: .*
.*: .*
.*: .*
.*: .* .word .*
+.* <foo@plt>:
.*: .* add ip, pc, #-268435456 ; 0xf0000000
.*: .* add ip, ip, #0, 12
.*: .* add ip, ip, #0, 20
diff --git a/ld/testsuite/ld-arm/mixed-app-v5.d b/ld/testsuite/ld-arm/mixed-app-v5.d
index 82013f3..92b5ebb 100644
--- a/ld/testsuite/ld-arm/mixed-app-v5.d
+++ b/ld/testsuite/ld-arm/mixed-app-v5.d
@@ -6,15 +6,17 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -48,7 +50,7 @@ Disassembly of section .text:
.* <app_tfunc>:
.*: b500 push {lr}
- .*: f7ff efc. blx .* <_start-0x..>
+ .*: f7ff efc. blx .* <lib_func2@plt>
.*: bd00 pop {pc}
.*: 4770 bx lr
.*: 46c0 nop ; \(mov r8, r8\)
diff --git a/ld/testsuite/ld-arm/mixed-app.d b/ld/testsuite/ld-arm/mixed-app.d
index 4de8e57..06166f0 100644
--- a/ld/testsuite/ld-arm/mixed-app.d
+++ b/ld/testsuite/ld-arm/mixed-app.d
@@ -6,17 +6,19 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func2@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -50,7 +52,7 @@ Disassembly of section .text:
.* <app_tfunc>:
.*: b500 push {lr}
- .*: f7ff ffc. bl .* <_start-0x..>
+ .*: f7ff ffc. bl .* <lib_func2@plt>
.*: bd00 pop {pc}
.*: 4770 bx lr
.*: 46c0 nop ; \(mov r8, r8\)
diff --git a/ld/testsuite/ld-arm/mixed-lib.d b/ld/testsuite/ld-arm/mixed-lib.d
index d3a9ff9..6b344a5 100644
--- a/ld/testsuite/ld-arm/mixed-lib.d
+++ b/ld/testsuite/ld-arm/mixed-lib.d
@@ -6,12 +6,13 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x.*>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -20,7 +21,7 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff. bl .* <lib_func1-0x..?>
+ .*: ebfffff. bl .* <app_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
.*: e1a00000 nop ; \(mov r0, r0\)
diff --git a/ld/testsuite/ld-arm/thumb2-bl-undefweak.d b/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
index 5c286bee9..c501aa2 100644
--- a/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
+++ b/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
@@ -6,4 +6,4 @@
Disassembly of section .text:
.* <foo>:
- +[0-9a-f]+: .... .... bl. [0-9a-f]+ <foo-0x[0-9a-f]+>
+ +[0-9a-f]+: .... .... bl. [0-9a-f]+ <bar@plt>
diff --git a/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d b/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d
index a6907f5..806f66c 100644
--- a/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d
+++ b/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d
@@ -6,4 +6,4 @@
Disassembly of section .text:
.* <foo>:
- +[0-9a-f]+: ........ bl [0-9a-f]+ <foo-0x[0-9a-f]+>
+ +[0-9a-f]+: ........ bl [0-9a-f]+ <bar@plt>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH][PING] Pretty-printing plt entries on ARM (second try)
2014-03-17 12:06 ` Yury Gribov
@ 2014-03-24 4:48 ` Yury Gribov
2014-03-27 14:27 ` Nicholas Clifton
0 siblings, 1 reply; 7+ messages in thread
From: Yury Gribov @ 2014-03-24 4:48 UTC (permalink / raw)
To: binutils; +Cc: nick clifton, Viacheslav Garbuzov, Pavel Fedin
[-- Attachment #1: Type: text/plain, Size: 644 bytes --]
Nicholas Clifton wrote:
> Why does your patch not support Thumb2 PLT entries ?
>
> The one and only reason is that code to analyze them would probably be
> rather ugly (I need to mask out imm which is spread all across
> instruction).
> I can add it if you find it necessary.
Attaching the Thumb2-friendly implementation which turned out to not be
as ugly as I feared.
I've rebased the code on top of current Binutils trunk and checked
eabi/gnueabi/symbianelf/nacl.
I'm not sure how to autotest Thumb-only platforms. Are those already
checked when I configure for standard gnueabi/eabi targets?
Or should I use some special triplet?
-Y
[-- Attachment #2: arm_pretty_plt_dumps_2.diff --]
[-- Type: text/x-diff, Size: 156305 bytes --]
commit da04fea4d722c6d24efe7888ae2da248b9f5c0f9
Author: Yury Gribov <y.gribov@samsung.com>
Date: Wed Mar 12 15:59:30 2014 +0400
2014-03-11 Yury Gribov <y.gribov@samsung.com>
Pavel Fedin <p.fedin@samsung.com>
Support limited pretty-printing of PLT entries on eabi and nacl ARM targets.
bfd/
* elf32-arm.c (elf32_arm_get_synthetic_symtab): Add new callback.
(elf32_arm_nacl_plt_sym_val): Likewise.
(elf32_arm_plt0_size): Add helper function.
(elf32_arm_plt_size): Likewise.
ld/testsuite/
* ld-arm/arm-app-abs32.d: Updated test.
* ld-arm/arm-app.d: Likewise.
* ld-arm/arm-lib-plt32.d: Likewise.
* ld-arm/arm-lib.d: Likewise.
* ld-arm/armthumb-lib.d: Likewise.
* ld-arm/cortex-a8-fix-b-plt.d: Likewise.
* ld-arm/cortex-a8-fix-bcc-plt.d: Likewise.
* ld-arm/cortex-a8-fix-bl-plt.d: Likewise.
* ld-arm/cortex-a8-fix-bl-rel-plt.d: Likewise.
* ld-arm/cortex-a8-fix-blx-plt.d: Likewise.
* ld-arm/farcall-mixed-app-v5.d: Likewise.
* ld-arm/farcall-mixed-app.d: Likewise.
* ld-arm/farcall-mixed-lib-v4t.d: Likewise.
* ld-arm/farcall-mixed-lib.d: Likewise.
* ld-arm/ifunc-10.dd: Likewise.
* ld-arm/ifunc-14.dd: Likewise.
* ld-arm/ifunc-15.dd: Likewise.
* ld-arm/ifunc-3.dd: Likewise.
* ld-arm/ifunc-4.dd: Likewise.
* ld-arm/ifunc-7.dd: Likewise.
* ld-arm/ifunc-8.dd: Likewise.
* ld-arm/ifunc-9.dd: Likewise.
* ld-arm/long-plt-format.d: Likewise.
* ld-arm/mixed-app-v5.d: Likewise.
* ld-arm/mixed-app.d: Likewise.
* ld-arm/mixed-lib.d: Likewise.
* ld-arm/thumb2-bl-undefweak.d: Likewise.
* ld-arm/thumb2-bl-undefweak1.d: Likewise.
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index db9566b..8301aea 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -15900,6 +15900,187 @@ const struct elf_size_info elf32_arm_size_info =
bfd_elf32_swap_reloca_out
};
+/* Return size of plt0 entry starting at ADDR
+ or (bfd_vma) -1 if size can not be determined. */
+
+static bfd_vma
+elf32_arm_plt0_size (const bfd *abfd, const bfd_byte *addr)
+{
+ bfd_vma first_word;
+ bfd_vma plt0_size;
+
+ first_word = H_GET_32(abfd, addr);
+
+ if (first_word == elf32_arm_plt0_entry[0])
+ plt0_size = 4 * ARRAY_SIZE(elf32_arm_plt0_entry);
+ else if (first_word == elf32_thumb2_plt0_entry[0])
+ plt0_size = 4 * ARRAY_SIZE (elf32_thumb2_plt0_entry);
+ else
+ /* We don't yet handle this PLT format */
+ return (bfd_vma) -1;
+
+ return plt0_size;
+}
+
+/* Return size of plt entry starting at offset OFFSET
+ of plt section located at address START
+ or (bfd_vma) -1 if size can not be determined. */
+
+static bfd_vma
+elf32_arm_plt_size (const bfd *abfd, const bfd_byte *start, bfd_vma offset)
+{
+ bfd_vma first_insn;
+ bfd_vma plt_size = 0;
+ const bfd_byte *addr = start + offset;
+
+ /* PLT entry size if fixed on Thumb-only platforms */
+ if (H_GET_32(abfd, start) == elf32_thumb2_plt0_entry[0])
+ return 4 * ARRAY_SIZE(elf32_thumb2_plt_entry);
+
+ /* Respect Thumb stub if necessary. */
+ if (H_GET_16(abfd, addr) == elf32_arm_plt_thumb_stub[0])
+ {
+ plt_size += 2 * ARRAY_SIZE(elf32_arm_plt_thumb_stub);
+ }
+
+ /* Strip immediate from first add. */
+ first_insn = H_GET_32(abfd, addr + plt_size) & 0xffffff00;
+
+#ifdef FOUR_WORD_PLT
+ if (first_insn == elf32_arm_plt_entry[0])
+ plt_size += 4 * ARRAY_SIZE(elf32_arm_plt_entry);
+#else
+ if (first_insn == elf32_arm_plt_entry_long[0])
+ plt_size += 4 * ARRAY_SIZE(elf32_arm_plt_entry_long);
+ else if (first_insn == elf32_arm_plt_entry_short[0])
+ plt_size += 4 * ARRAY_SIZE(elf32_arm_plt_entry_short);
+#endif
+ else
+ /* We don't yet handle this PLT format */
+ return (bfd_vma) -1;
+
+ return plt_size;
+}
+
+static long
+elf32_arm_get_synthetic_symtab (bfd *abfd,
+ long symcount ATTRIBUTE_UNUSED,
+ asymbol **syms ATTRIBUTE_UNUSED,
+ long dynsymcount,
+ asymbol **dynsyms,
+ asymbol **ret)
+{
+ /* Implementation is shamelessly borrowed from _bfd_elf_get_synthetic_symtab. */
+
+ asection *relplt;
+ asymbol *s;
+ arelent *p;
+ long count, i, n;
+ size_t size;
+ Elf_Internal_Shdr *hdr;
+ char *names;
+ asection *plt;
+ bfd_vma offset;
+ bfd_byte *data;
+
+ *ret = NULL;
+
+ if ((abfd->flags & (DYNAMIC | EXEC_P)) == 0)
+ return 0;
+
+ if (dynsymcount <= 0)
+ return 0;
+
+ relplt = bfd_get_section_by_name (abfd, ".rel.plt");
+ if (relplt == NULL)
+ return 0;
+
+ hdr = &elf_section_data (relplt)->this_hdr;
+ if (hdr->sh_link != elf_dynsymtab (abfd)
+ || (hdr->sh_type != SHT_REL && hdr->sh_type != SHT_RELA))
+ return 0;
+
+ plt = bfd_get_section_by_name (abfd, ".plt");
+ if (plt == NULL)
+ return 0;
+
+ if (!elf32_arm_size_info.slurp_reloc_table (abfd, relplt, dynsyms, TRUE))
+ return -1;
+
+ data = plt->contents;
+ if (data == NULL)
+ {
+ if (!bfd_get_full_section_contents(abfd, (asection *)plt, &data) || data == NULL)
+ return -1;
+ bfd_cache_section_contents((asection *)plt, data);
+ }
+
+ count = relplt->size / hdr->sh_entsize;
+ size = count * sizeof (asymbol);
+ p = relplt->relocation;
+ for (i = 0; i < count; i++, p += elf32_arm_size_info.int_rels_per_ext_rel)
+ {
+ size += strlen ((*p->sym_ptr_ptr)->name) + sizeof ("@plt");
+ if (p->addend != 0)
+ {
+ size += sizeof ("+0x") - 1 + 8;
+ }
+ }
+
+ s = *ret = (asymbol *) bfd_malloc (size);
+ if (s == NULL)
+ return -1;
+
+ offset = elf32_arm_plt0_size (abfd, data);
+ if (offset == (bfd_vma) -1)
+ return -1;
+
+ names = (char *) (s + count);
+ p = relplt->relocation;
+ n = 0;
+ for (i = 0; i < count; i++, p += elf32_arm_size_info.int_rels_per_ext_rel)
+ {
+ size_t len;
+
+ bfd_vma plt_size = elf32_arm_plt_size (abfd, data, offset);
+ if (plt_size == (bfd_vma) -1)
+ break;
+
+ *s = **p->sym_ptr_ptr;
+ /* Undefined syms won't have BSF_LOCAL or BSF_GLOBAL set. Since
+ we are defining a symbol, ensure one of them is set. */
+ if ((s->flags & BSF_LOCAL) == 0)
+ s->flags |= BSF_GLOBAL;
+ s->flags |= BSF_SYNTHETIC;
+ s->section = plt;
+ s->value = offset;
+ s->name = names;
+ s->udata.p = NULL;
+ len = strlen ((*p->sym_ptr_ptr)->name);
+ memcpy (names, (*p->sym_ptr_ptr)->name, len);
+ names += len;
+ if (p->addend != 0)
+ {
+ char buf[30], *a;
+
+ memcpy (names, "+0x", sizeof ("+0x") - 1);
+ names += sizeof ("+0x") - 1;
+ bfd_sprintf_vma (abfd, buf, p->addend);
+ for (a = buf; *a == '0'; ++a)
+ ;
+ len = strlen (a);
+ memcpy (names, a, len);
+ names += len;
+ }
+ memcpy (names, "@plt", sizeof ("@plt"));
+ names += sizeof ("@plt");
+ ++s, ++n;
+ offset += plt_size;
+ }
+
+ return n;
+}
+
#define ELF_ARCH bfd_arch_arm
#define ELF_TARGET_ID ARM_ELF_DATA
#define ELF_MACHINE_CODE EM_ARM
@@ -15926,6 +16107,7 @@ const struct elf_size_info elf32_arm_size_info =
#define bfd_elf32_new_section_hook elf32_arm_new_section_hook
#define bfd_elf32_bfd_is_target_special_symbol elf32_arm_is_target_special_symbol
#define bfd_elf32_bfd_final_link elf32_arm_final_link
+#define bfd_elf32_get_synthetic_symtab elf32_arm_get_synthetic_symtab
#define elf_backend_get_symbol_type elf32_arm_get_symbol_type
#define elf_backend_gc_mark_hook elf32_arm_gc_mark_hook
@@ -16030,6 +16212,15 @@ elf32_arm_nacl_final_write_processing (bfd *abfd, bfd_boolean linker)
nacl_final_write_processing (abfd, linker);
}
+static bfd_vma
+elf32_arm_nacl_plt_sym_val (bfd_vma i, const asection *plt,
+ const arelent *rel ATTRIBUTE_UNUSED)
+{
+ return plt->vma + 4 * (
+ ARRAY_SIZE(elf32_arm_nacl_plt0_entry) +
+ i * ARRAY_SIZE(elf32_arm_nacl_plt_entry));
+}
+
#undef elf32_bed
#define elf32_bed elf32_arm_nacl_bed
@@ -16044,6 +16235,9 @@ elf32_arm_nacl_final_write_processing (bfd *abfd, bfd_boolean linker)
#define elf_backend_modify_program_headers nacl_modify_program_headers
#undef elf_backend_final_write_processing
#define elf_backend_final_write_processing elf32_arm_nacl_final_write_processing
+#undef bfd_elf32_get_synthetic_symtab
+#undef elf_backend_plt_sym_val
+#define elf_backend_plt_sym_val elf32_arm_nacl_plt_sym_val
#undef ELF_MAXPAGESIZE
#define ELF_MAXPAGESIZE 0x10000
diff --git a/ld/testsuite/ld-arm/arm-app-abs32.d b/ld/testsuite/ld-arm/arm-app-abs32.d
index e6c4632..2f56c08 100644
--- a/ld/testsuite/ld-arm/arm-app-abs32.d
+++ b/ld/testsuite/ld-arm/arm-app-abs32.d
@@ -6,12 +6,13 @@ start address .*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func1@plt-0x14>:
+.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- +.*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x10>
+ +.*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1@plt-0x4>
+.*: e08fe00e add lr, pc, lr
+.*: e5bef008 ldr pc, \[lr, #8\]!
+.*: .* .*
+.* <lib_func1@plt>:
+.*: e28fc6.* add ip, pc, #.*
+.*: e28cca.* add ip, ip, #.* ; .*
+.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
diff --git a/ld/testsuite/ld-arm/arm-app.d b/ld/testsuite/ld-arm/arm-app.d
index 88169af..9788db0 100644
--- a/ld/testsuite/ld-arm/arm-app.d
+++ b/ld/testsuite/ld-arm/arm-app.d
@@ -6,12 +6,13 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func1@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x10>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -27,7 +28,7 @@ Disassembly of section .text:
.* <app_func>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff4 bl .* <_start-0xc>
+ .*: ebfffff4 bl .* <lib_func1@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
diff --git a/ld/testsuite/ld-arm/arm-lib-plt32.d b/ld/testsuite/ld-arm/arm-lib-plt32.d
index 279ea5a..e04adb8 100644
--- a/ld/testsuite/ld-arm/arm-lib-plt32.d
+++ b/ld/testsuite/ld-arm/arm-lib-plt32.d
@@ -6,12 +6,13 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x10>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -20,7 +21,7 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff9 bl .* <lib_func1-0xc>
+ .*: ebfffff9 bl .* <app_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
diff --git a/ld/testsuite/ld-arm/arm-lib.d b/ld/testsuite/ld-arm/arm-lib.d
index 22e21d5..887880f 100644
--- a/ld/testsuite/ld-arm/arm-lib.d
+++ b/ld/testsuite/ld-arm/arm-lib.d
@@ -6,12 +6,13 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x10>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -20,7 +21,7 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff9 bl .* <lib_func1-0xc>
+ .*: ebfffff9 bl .* <app_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
diff --git a/ld/testsuite/ld-arm/armthumb-lib.d b/ld/testsuite/ld-arm/armthumb-lib.d
index dae72ed..b63e3e6 100644
--- a/ld/testsuite/ld-arm/armthumb-lib.d
+++ b/ld/testsuite/ld-arm/armthumb-lib.d
@@ -6,12 +6,13 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x1.>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -20,7 +21,7 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff. bl .* <lib_func1-0x..?>
+ .*: ebfffff. bl .* <app_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
.*: e1a00000 nop ; \(mov r0, r0\)
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
index 4f1078d..0f40861 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-b-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008000 <\.plt>:
+00008000 <bar@plt-0x14>:
8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <foo-0xfe0>
+ 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <bar@plt-0x4>
8008: e08fe00e add lr, pc, lr
800c: e5bef008 ldr pc, \[lr, #8\]!
8010: 00000ffc \.word 0x00000ffc
+00008014 <bar@plt>:
8014: 4778 bx pc
8016: 46c0 nop ; \(mov r8, r8\)
8018: e28fc600 add ip, pc, #0, 12
@@ -27,4 +28,4 @@ Disassembly of section \.text:
9002: 0000 movs r0, r0
9004: 0000 movs r0, r0
9006: 0000 movs r0, r0
- 9008: f7ff b804 b\.w 8014 <foo-0xfdc>
+ 9008: f7ff b804 b\.w 8014 <bar@plt>
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
index 1e0cab2..b6e6fff 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-bcc-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008000 <\.plt>:
+00008000 <bar@plt-0x14>:
8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <foo-0xfe0>
+ 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <bar@plt-0x4>
8008: e08fe00e add lr, pc, lr
800c: e5bef008 ldr pc, \[lr, #8\]!
8010: 00001004 \.word 0x00001004
+00008014 <bar@plt>:
8014: 4778 bx pc
8016: 46c0 nop ; \(mov r8, r8\)
8018: e28fc600 add ip, pc, #0, 12
@@ -29,4 +30,4 @@ Disassembly of section \.text:
9006: 0000 movs r0, r0
9008: d001 beq\.n 900e <foo\+0x1e>
900a: f7ff bffa b\.w 9002 <foo\+0x12>
- 900e: f7ff b801 b\.w 8014 <foo-0xfdc>
+ 900e: f7ff b801 b\.w 8014 <bar@plt>
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
index ebb480f..baad3d0 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-bl-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008000 <\.plt>:
+00008000 <bar@plt-0x14>:
8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <foo-0xfe0>
+ 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <bar@plt-0x4>
8008: e08fe00e add lr, pc, lr
800c: e5bef008 ldr pc, \[lr, #8\]!
8010: 00000ffc \.word 0x00000ffc
+00008014 <bar@plt>:
8014: e28fc600 add ip, pc, #0, 12
8018: e28cca00 add ip, ip, #0, 20
801c: e5bcfffc ldr pc, \[ip, #4092\]! ; 0xffc
@@ -25,4 +26,4 @@ Disassembly of section \.text:
9002: 0000 movs r0, r0
9004: 0000 movs r0, r0
9006: 0000 movs r0, r0
- 9008: eafffc01 b 8014 <foo-0xfdc>
+ 9008: eafffc01 b 8014 <bar@plt>
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
index f8a9c24..e2fd8ac 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-bl-rel-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008e00 <\.plt>:
+00008e00 <targetfn@plt-0x14>:
8e00: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8e04: e59fe004 ldr lr, \[pc, #4\] ; 8e10 <targetfn-0xf0>
+ 8e04: e59fe004 ldr lr, \[pc, #4\] ; 8e10 <targetfn@plt-0x4>
8e08: e08fe00e add lr, pc, lr
8e0c: e5bef008 ldr pc, \[lr, #8\]!
8e10: 0000827c \.word 0x0000827c
+00008e14 <targetfn@plt>:
8e14: e28fc600 add ip, pc, #0, 12
8e18: e28cca08 add ip, ip, #8, 20 ; 0x8000
8e1c: e5bcf27c ldr pc, \[ip, #636\]! ; 0x27c
@@ -24,69 +25,69 @@ Disassembly of section \.text:
00008f08 <_start>:
8f08: bf00 nop
8f0a: eb01 0002 add\.w r0, r1, r2
- 8f0e: f7ff ef82 blx 8e14 <targetfn-0xec>
+ 8f0e: f7ff ef82 blx 8e14 <targetfn@plt>
8f12: eb01 0002 add\.w r0, r1, r2
- 8f16: f7ff ef7e blx 8e14 <targetfn-0xec>
+ 8f16: f7ff ef7e blx 8e14 <targetfn@plt>
8f1a: eb01 0002 add\.w r0, r1, r2
- 8f1e: f7ff ef7a blx 8e14 <targetfn-0xec>
+ 8f1e: f7ff ef7a blx 8e14 <targetfn@plt>
8f22: eb01 0002 add\.w r0, r1, r2
- 8f26: f7ff ef76 blx 8e14 <targetfn-0xec>
+ 8f26: f7ff ef76 blx 8e14 <targetfn@plt>
8f2a: eb01 0002 add\.w r0, r1, r2
- 8f2e: f7ff ef72 blx 8e14 <targetfn-0xec>
+ 8f2e: f7ff ef72 blx 8e14 <targetfn@plt>
8f32: eb01 0002 add\.w r0, r1, r2
- 8f36: f7ff ef6e blx 8e14 <targetfn-0xec>
+ 8f36: f7ff ef6e blx 8e14 <targetfn@plt>
8f3a: eb01 0002 add\.w r0, r1, r2
- 8f3e: f7ff ef6a blx 8e14 <targetfn-0xec>
+ 8f3e: f7ff ef6a blx 8e14 <targetfn@plt>
8f42: eb01 0002 add\.w r0, r1, r2
- 8f46: f7ff ef66 blx 8e14 <targetfn-0xec>
+ 8f46: f7ff ef66 blx 8e14 <targetfn@plt>
8f4a: eb01 0002 add\.w r0, r1, r2
- 8f4e: f7ff ef62 blx 8e14 <targetfn-0xec>
+ 8f4e: f7ff ef62 blx 8e14 <targetfn@plt>
8f52: eb01 0002 add\.w r0, r1, r2
- 8f56: f7ff ef5e blx 8e14 <targetfn-0xec>
+ 8f56: f7ff ef5e blx 8e14 <targetfn@plt>
8f5a: eb01 0002 add\.w r0, r1, r2
- 8f5e: f7ff ef5a blx 8e14 <targetfn-0xec>
+ 8f5e: f7ff ef5a blx 8e14 <targetfn@plt>
8f62: eb01 0002 add\.w r0, r1, r2
- 8f66: f7ff ef56 blx 8e14 <targetfn-0xec>
+ 8f66: f7ff ef56 blx 8e14 <targetfn@plt>
8f6a: eb01 0002 add\.w r0, r1, r2
- 8f6e: f7ff ef52 blx 8e14 <targetfn-0xec>
+ 8f6e: f7ff ef52 blx 8e14 <targetfn@plt>
8f72: eb01 0002 add\.w r0, r1, r2
- 8f76: f7ff ef4e blx 8e14 <targetfn-0xec>
+ 8f76: f7ff ef4e blx 8e14 <targetfn@plt>
8f7a: eb01 0002 add\.w r0, r1, r2
- 8f7e: f7ff ef4a blx 8e14 <targetfn-0xec>
+ 8f7e: f7ff ef4a blx 8e14 <targetfn@plt>
8f82: eb01 0002 add\.w r0, r1, r2
- 8f86: f7ff ef46 blx 8e14 <targetfn-0xec>
+ 8f86: f7ff ef46 blx 8e14 <targetfn@plt>
8f8a: eb01 0002 add\.w r0, r1, r2
- 8f8e: f7ff ef42 blx 8e14 <targetfn-0xec>
+ 8f8e: f7ff ef42 blx 8e14 <targetfn@plt>
8f92: eb01 0002 add\.w r0, r1, r2
- 8f96: f7ff ef3e blx 8e14 <targetfn-0xec>
+ 8f96: f7ff ef3e blx 8e14 <targetfn@plt>
8f9a: eb01 0002 add\.w r0, r1, r2
- 8f9e: f7ff ef3a blx 8e14 <targetfn-0xec>
+ 8f9e: f7ff ef3a blx 8e14 <targetfn@plt>
8fa2: eb01 0002 add\.w r0, r1, r2
- 8fa6: f7ff ef36 blx 8e14 <targetfn-0xec>
+ 8fa6: f7ff ef36 blx 8e14 <targetfn@plt>
8faa: eb01 0002 add\.w r0, r1, r2
- 8fae: f7ff ef32 blx 8e14 <targetfn-0xec>
+ 8fae: f7ff ef32 blx 8e14 <targetfn@plt>
8fb2: eb01 0002 add\.w r0, r1, r2
- 8fb6: f7ff ef2e blx 8e14 <targetfn-0xec>
+ 8fb6: f7ff ef2e blx 8e14 <targetfn@plt>
8fba: eb01 0002 add\.w r0, r1, r2
- 8fbe: f7ff ef2a blx 8e14 <targetfn-0xec>
+ 8fbe: f7ff ef2a blx 8e14 <targetfn@plt>
8fc2: eb01 0002 add\.w r0, r1, r2
- 8fc6: f7ff ef26 blx 8e14 <targetfn-0xec>
+ 8fc6: f7ff ef26 blx 8e14 <targetfn@plt>
8fca: eb01 0002 add\.w r0, r1, r2
- 8fce: f7ff ef22 blx 8e14 <targetfn-0xec>
+ 8fce: f7ff ef22 blx 8e14 <targetfn@plt>
8fd2: eb01 0002 add\.w r0, r1, r2
- 8fd6: f7ff ef1e blx 8e14 <targetfn-0xec>
+ 8fd6: f7ff ef1e blx 8e14 <targetfn@plt>
8fda: eb01 0002 add\.w r0, r1, r2
- 8fde: f7ff ef1a blx 8e14 <targetfn-0xec>
+ 8fde: f7ff ef1a blx 8e14 <targetfn@plt>
8fe2: eb01 0002 add\.w r0, r1, r2
- 8fe6: f7ff ef16 blx 8e14 <targetfn-0xec>
+ 8fe6: f7ff ef16 blx 8e14 <targetfn@plt>
8fea: eb01 0002 add\.w r0, r1, r2
- 8fee: f7ff ef12 blx 8e14 <targetfn-0xec>
+ 8fee: f7ff ef12 blx 8e14 <targetfn@plt>
8ff2: eb01 0002 add\.w r0, r1, r2
- 8ff6: f7ff ef0e blx 8e14 <targetfn-0xec>
+ 8ff6: f7ff ef0e blx 8e14 <targetfn@plt>
8ffa: eb01 0002 add\.w r0, r1, r2
8ffe: f000 e808 blx 9010 <_start\+0x108>
9002: eb01 0002 add\.w r0, r1, r2
- 9006: f7ff ef06 blx 8e14 <targetfn-0xec>
+ 9006: f7ff ef06 blx 8e14 <targetfn@plt>
900a: 4770 bx lr
900c: f3af 8000 nop\.w
- 9010: eaffff7f b 8e14 <targetfn-0xec>
+ 9010: eaffff7f b 8e14 <targetfn@plt>
diff --git a/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d b/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
index ebb480f..baad3d0 100644
--- a/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
+++ b/ld/testsuite/ld-arm/cortex-a8-fix-blx-plt.d
@@ -4,12 +4,13 @@
Disassembly of section \.plt:
-00008000 <\.plt>:
+00008000 <bar@plt-0x14>:
8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <foo-0xfe0>
+ 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 <bar@plt-0x4>
8008: e08fe00e add lr, pc, lr
800c: e5bef008 ldr pc, \[lr, #8\]!
8010: 00000ffc \.word 0x00000ffc
+00008014 <bar@plt>:
8014: e28fc600 add ip, pc, #0, 12
8018: e28cca00 add ip, ip, #0, 20
801c: e5bcfffc ldr pc, \[ip, #4092\]! ; 0xffc
@@ -25,4 +26,4 @@ Disassembly of section \.text:
9002: 0000 movs r0, r0
9004: 0000 movs r0, r0
9006: 0000 movs r0, r0
- 9008: eafffc01 b 8014 <foo-0xfdc>
+ 9008: eafffc01 b 8014 <bar@plt>
diff --git a/ld/testsuite/ld-arm/farcall-mixed-app-v5.d b/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
index 781b972..7466883 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-app-v5.d
@@ -6,15 +6,17 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -25,15 +27,15 @@ Disassembly of section .text:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
.*: eb000008 bl .* <__app_func_veneer>
- .*: ebfffff5 bl .* <_start-0x18>
- .*: ebfffff1 bl .* <_start-0x24>
+ .*: ebfffff5 bl .* <lib_func1@plt>
+ .*: ebfffff1 bl .* <lib_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
.*: e1a00000 nop ; \(mov r0, r0\)
.* <app_tfunc_close>:
.*: b500 push {lr}
- .*: f7ff efdc blx .* <_start-0x24>
+ .*: f7ff efdc blx .* <lib_func2@plt>
.*: bd00 pop {pc}
.*: 4770 bx lr
.*: 46c0 nop ; \(mov r8, r8\)
diff --git a/ld/testsuite/ld-arm/farcall-mixed-app.d b/ld/testsuite/ld-arm/farcall-mixed-app.d
index b6cc2d0..cfe31a4 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-app.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-app.d
@@ -6,17 +6,19 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func2@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -27,15 +29,15 @@ Disassembly of section .text:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
.*: eb000008 bl .* <__app_func_veneer>
- .*: ebfffff6 bl .* <_start-0x14>
- .*: ebfffff2 bl .* <_start-0x20>
+ .*: ebfffff6 bl .* <lib_func1@plt>
+ .*: ebfffff2 bl .* <lib_func2@plt\+0x4>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
.*: e1a00000 nop ; \(mov r0, r0\)
.* <app_tfunc_close>:
.*: b500 push {lr}
- .*: f7ff ffdb bl 81dc <_start-0x24>
+ .*: f7ff ffdb bl 81dc <lib_func2@plt>
.*: bd00 pop {pc}
.*: 4770 bx lr
.*: 46c0 nop ; \(mov r8, r8\)
diff --git a/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d b/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
index 3be297b..eec8de6 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-lib-v4t.d
@@ -5,27 +5,31 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x.*>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .* .word .*
+.* <app_func@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]! ; .*
+.* <app_func_weak@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]! ; 0x.*
+.* <lib_func3@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]! ; 0x.*
+.* <lib_func4@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
@@ -37,10 +41,10 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebffff.. bl .* <lib_func1-0x.*>
- .*: ebffff.. bl .* <lib_func1-0x.*>
- .*: ebffff.. bl .* <lib_func1-0x.*>
- .*: ebffff.. bl .* <lib_func1-0x.*>
+ .*: ebffff.. bl .* <app_func@plt\+0x.*>
+ .*: ebffff.. bl .* <app_func_weak@plt\+0x.*>
+ .*: ebffff.. bl .* <lib_func3@plt\+0x.*>
+ .*: ebffff.. bl .* <lib_func4@plt\+0x.*>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
...
diff --git a/ld/testsuite/ld-arm/farcall-mixed-lib.d b/ld/testsuite/ld-arm/farcall-mixed-lib.d
index 05578f4..9577af9 100644
--- a/ld/testsuite/ld-arm/farcall-mixed-lib.d
+++ b/ld/testsuite/ld-arm/farcall-mixed-lib.d
@@ -5,21 +5,25 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x.*>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <app_func_weak@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func3@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func4@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -29,10 +33,10 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebffff.. bl .* <lib_func1-0x..?>
- .*: ebffff.. bl .* <lib_func1-0x..?>
- .*: ebfffff. bl .* <lib_func1-0x..?>
- .*: ebfffff. bl .* <lib_func1-0x..?>
+ .*: ebffff.. bl .* <app_func@plt>
+ .*: ebffff.. bl .* <app_func_weak@plt>
+ .*: ebfffff. bl .* <lib_func3@plt>
+ .*: ebfffff. bl .* <lib_func4@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
...
diff --git a/ld/testsuite/ld-arm/ifunc-10.dd b/ld/testsuite/ld-arm/ifunc-10.dd
index 105b09b..88bae50 100644
--- a/ld/testsuite/ld-arm/ifunc-10.dd
+++ b/ld/testsuite/ld-arm/ifunc-10.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <atf2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <atf3-0x110>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <atf2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
+00009014 <atf2@plt>:
9014: 4778 bx pc
9016: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -27,12 +28,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
+00009024 <aaf4@plt>:
9024: e28fc600 add ip, pc, #0, 12
9028: e28cca07 add ip, ip, #28672 ; 0x7000
902c: e5bcffe4 ldr pc, \[ip, #4068\]! ; 0xfe4
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
+00009030 <ttf2@plt>:
9030: 4778 bx pc
9032: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -44,6 +47,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
+00009040 <tbf2@plt>:
9040: 4778 bx pc
9042: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -55,18 +59,21 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
+00009050 <taf2@plt>:
9050: e28fc600 add ip, pc, #0, 12
9054: e28cca07 add ip, ip, #28672 ; 0x7000
9058: e5bcffc4 ldr pc, \[ip, #4036\]! ; 0xfc4
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
+0000905c <aaf2@plt>:
905c: e28fc600 add ip, pc, #0, 12
9060: e28cca07 add ip, ip, #28672 ; 0x7000
9064: e5bcffbc ldr pc, \[ip, #4028\]! ; 0xfbc
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
+00009068 <abf4@plt>:
9068: 4778 bx pc
906a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -78,6 +85,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
+00009078 <tbf4@plt>:
9078: 4778 bx pc
907a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -89,6 +97,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
+00009088 <ttf4@plt>:
9088: 4778 bx pc
908a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -100,6 +109,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
+00009098 <atf4@plt>:
9098: 4778 bx pc
909a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -111,12 +121,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
+000090a8 <taf4@plt>:
90a8: e28fc600 add ip, pc, #0, 12
90ac: e28cca07 add ip, ip, #28672 ; 0x7000
90b0: e5bcff84 ldr pc, \[ip, #3972\]! ; 0xf84
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
+000090b4 <abf2@plt>:
90b4: 4778 bx pc
90b6: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -281,15 +293,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a044: ebfffc1e bl 90c4 <atf3-0x5c>
+ a044: ebfffc1e bl 90c4 <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a048: eafffc1d b 90c4 <atf3-0x5c>
+ a048: eafffc1d b 90c4 <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a04c: 0afffc1c beq 90c4 <atf3-0x5c>
+ a04c: 0afffc1c beq 90c4 <abf2@plt\+0x10>
a050: e59f4000 ldr r4, \[pc\] ; a058 <_start\+0x30>
a054: e59f4000 ldr r4, \[pc\] ; a05c <_start\+0x34>
#------------------------------------------------------------------------------
@@ -303,15 +315,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a060: ebfffc22 bl 90f0 <atf3-0x30>
+ a060: ebfffc22 bl 90f0 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a064: eafffc21 b 90f0 <atf3-0x30>
+ a064: eafffc21 b 90f0 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a068: 0afffc20 beq 90f0 <atf3-0x30>
+ a068: 0afffc20 beq 90f0 <abf2@plt\+0x3c>
a06c: e59f4000 ldr r4, \[pc\] ; a074 <_start\+0x4c>
a070: e59f4000 ldr r4, \[pc\] ; a078 <_start\+0x50>
#------------------------------------------------------------------------------
@@ -325,15 +337,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a07c: ebfffc18 bl 90e4 <atf3-0x3c>
+ a07c: ebfffc18 bl 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a080: eafffc17 b 90e4 <atf3-0x3c>
+ a080: eafffc17 b 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a084: 0afffc16 beq 90e4 <atf3-0x3c>
+ a084: 0afffc16 beq 90e4 <abf2@plt\+0x30>
a088: e59f4000 ldr r4, \[pc\] ; a090 <_start\+0x68>
a08c: e59f4000 ldr r4, \[pc\] ; a094 <_start\+0x6c>
#------------------------------------------------------------------------------
@@ -347,15 +359,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a098: ebfffc1c bl 9110 <atf3-0x10>
+ a098: ebfffc1c bl 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a09c: eafffc1b b 9110 <atf3-0x10>
+ a09c: eafffc1b b 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0a0: 0afffc1a beq 9110 <atf3-0x10>
+ a0a0: 0afffc1a beq 9110 <abf2@plt\+0x5c>
a0a4: e59f4000 ldr r4, \[pc\] ; a0ac <_start\+0x84>
a0a8: e59f4000 ldr r4, \[pc\] ; a0b0 <_start\+0x88>
#------------------------------------------------------------------------------
@@ -369,15 +381,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0b4: ebfffbe8 bl 905c <atf3-0xc4>
+ a0b4: ebfffbe8 bl 905c <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0b8: eafffbe7 b 905c <atf3-0xc4>
+ a0b8: eafffbe7 b 905c <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0bc: 0afffbe6 beq 905c <atf3-0xc4>
+ a0bc: 0afffbe6 beq 905c <aaf2@plt>
a0c0: e59f4000 ldr r4, \[pc\] ; a0c8 <_start\+0xa0>
a0c4: e59f4000 ldr r4, \[pc\] ; a0cc <_start\+0xa4>
#------------------------------------------------------------------------------
@@ -391,15 +403,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d0: ebfffbde bl 9050 <atf3-0xd0>
+ a0d0: ebfffbde bl 9050 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d4: eafffbdd b 9050 <atf3-0xd0>
+ a0d4: eafffbdd b 9050 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d8: 0afffbdc beq 9050 <atf3-0xd0>
+ a0d8: 0afffbdc beq 9050 <taf2@plt>
a0dc: e59f4000 ldr r4, \[pc\] ; a0e4 <_start\+0xbc>
a0e0: e59f4000 ldr r4, \[pc\] ; a0e8 <_start\+0xc0>
#------------------------------------------------------------------------------
@@ -413,15 +425,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0ec: ebfffbf1 bl 90b8 <atf3-0x68>
+ a0ec: ebfffbf1 bl 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0f0: eafffbf0 b 90b8 <atf3-0x68>
+ a0f0: eafffbf0 b 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0f4: 0afffbef beq 90b8 <atf3-0x68>
+ a0f4: 0afffbef beq 90b8 <abf2@plt\+0x4>
a0f8: e59f4000 ldr r4, \[pc\] ; a100 <_start\+0xd8>
a0fc: e59f4000 ldr r4, \[pc\] ; a104 <_start\+0xdc>
#------------------------------------------------------------------------------
@@ -435,15 +447,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a108: ebfffbcd bl 9044 <atf3-0xdc>
+ a108: ebfffbcd bl 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a10c: eafffbcc b 9044 <atf3-0xdc>
+ a10c: eafffbcc b 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a110: 0afffbcb beq 9044 <atf3-0xdc>
+ a110: 0afffbcb beq 9044 <tbf2@plt\+0x4>
a114: e59f4000 ldr r4, \[pc\] ; a11c <_start\+0xf4>
a118: e59f4000 ldr r4, \[pc\] ; a120 <_start\+0xf8>
#------------------------------------------------------------------------------
@@ -509,15 +521,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a194: ebfffba2 bl 9024 <atf3-0xfc>
+ a194: ebfffba2 bl 9024 <aaf4@plt>
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a198: eafffba1 b 9024 <atf3-0xfc>
+ a198: eafffba1 b 9024 <aaf4@plt>
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a19c: 0afffba0 beq 9024 <atf3-0xfc>
+ a19c: 0afffba0 beq 9024 <aaf4@plt>
a1a0: e59f4000 ldr r4, \[pc\] ; a1a8 <_start\+0x180>
a1a4: e59f4000 ldr r4, \[pc\] ; a1ac <_start\+0x184>
#------------------------------------------------------------------------------
@@ -531,15 +543,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b0: ebfffbbc bl 90a8 <atf3-0x78>
+ a1b0: ebfffbbc bl 90a8 <taf4@plt>
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b4: eafffbbb b 90a8 <atf3-0x78>
+ a1b4: eafffbbb b 90a8 <taf4@plt>
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b8: 0afffbba beq 90a8 <atf3-0x78>
+ a1b8: 0afffbba beq 90a8 <taf4@plt>
a1bc: e59f4000 ldr r4, \[pc\] ; a1c4 <_start\+0x19c>
a1c0: e59f4000 ldr r4, \[pc\] ; a1c8 <_start\+0x1a0>
#------------------------------------------------------------------------------
@@ -553,15 +565,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1cc: ebfffba6 bl 906c <atf3-0xb4>
+ a1cc: ebfffba6 bl 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1d0: eafffba5 b 906c <atf3-0xb4>
+ a1d0: eafffba5 b 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1d4: 0afffba4 beq 906c <atf3-0xb4>
+ a1d4: 0afffba4 beq 906c <abf4@plt\+0x4>
a1d8: e59f4000 ldr r4, \[pc\] ; a1e0 <_start\+0x1b8>
a1dc: e59f4000 ldr r4, \[pc\] ; a1e4 <_start\+0x1bc>
#------------------------------------------------------------------------------
@@ -575,15 +587,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1e8: ebfffba3 bl 907c <atf3-0xa4>
+ a1e8: ebfffba3 bl 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1ec: eafffba2 b 907c <atf3-0xa4>
+ a1ec: eafffba2 b 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1f0: 0afffba1 beq 907c <atf3-0xa4>
+ a1f0: 0afffba1 beq 907c <tbf4@plt\+0x4>
a1f4: e59f4000 ldr r4, \[pc\] ; a1fc <_start\+0x1d4>
a1f8: e59f4000 ldr r4, \[pc\] ; a200 <_start\+0x1d8>
#------------------------------------------------------------------------------
@@ -612,15 +624,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf1's .iplt entry
#------------------------------------------------------------------------------
- a21c: f7fe ef5a blx 90d4 <atf3-0x4c>
+ a21c: f7fe ef5a blx 90d4 <abf2@plt\+0x20>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a220: f7fe bf56 b\.w 90d0 <atf3-0x50>
+ a220: f7fe bf56 b\.w 90d0 <abf2@plt\+0x1c>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a224: f43e af54 beq\.w 90d0 <atf3-0x50>
+ a224: f43e af54 beq\.w 90d0 <abf2@plt\+0x1c>
a228: 4c00 ldr r4, \[pc, #0\] ; \(a22c <_thumb\+0x28>\)
a22a: 4c01 ldr r4, \[pc, #4\] ; \(a230 <_thumb\+0x2c>\)
#------------------------------------------------------------------------------
@@ -634,15 +646,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf1's .iplt entry
#------------------------------------------------------------------------------
- a234: f7fe ef64 blx 9100 <atf3-0x20>
+ a234: f7fe ef64 blx 9100 <abf2@plt\+0x4c>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a238: f7fe bf60 b\.w 90fc <atf3-0x24>
+ a238: f7fe bf60 b\.w 90fc <abf2@plt\+0x48>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a23c: f43e af5e beq\.w 90fc <atf3-0x24>
+ a23c: f43e af5e beq\.w 90fc <abf2@plt\+0x48>
a240: 4c00 ldr r4, \[pc, #0\] ; \(a244 <_thumb\+0x40>\)
a242: 4c01 ldr r4, \[pc, #4\] ; \(a248 <_thumb\+0x44>\)
#------------------------------------------------------------------------------
@@ -656,15 +668,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a24c: f7fe ef4a blx 90e4 <atf3-0x3c>
+ a24c: f7fe ef4a blx 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a250: f7fe bf46 b\.w 90e0 <atf3-0x40>
+ a250: f7fe bf46 b\.w 90e0 <abf2@plt\+0x2c>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a254: f43e af44 beq\.w 90e0 <atf3-0x40>
+ a254: f43e af44 beq\.w 90e0 <abf2@plt\+0x2c>
a258: 4c00 ldr r4, \[pc, #0\] ; \(a25c <_thumb\+0x58>\)
a25a: 4c01 ldr r4, \[pc, #4\] ; \(a260 <_thumb\+0x5c>\)
#------------------------------------------------------------------------------
@@ -678,15 +690,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a264: f7fe ef54 blx 9110 <atf3-0x10>
+ a264: f7fe ef54 blx 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a268: f7fe bf50 b\.w 910c <atf3-0x14>
+ a268: f7fe bf50 b\.w 910c <abf2@plt\+0x58>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a26c: f43e af4e beq\.w 910c <atf3-0x14>
+ a26c: f43e af4e beq\.w 910c <abf2@plt\+0x58>
a270: 4c00 ldr r4, \[pc, #0\] ; \(a274 <_thumb\+0x70>\)
a272: 4c01 ldr r4, \[pc, #4\] ; \(a278 <_thumb\+0x74>\)
#------------------------------------------------------------------------------
@@ -700,15 +712,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf2's .plt entry
#------------------------------------------------------------------------------
- a27c: f7fe eecc blx 9018 <atf3-0x108>
+ a27c: f7fe eecc blx 9018 <atf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a280: f7fe bec8 b\.w 9014 <atf3-0x10c>
+ a280: f7fe bec8 b\.w 9014 <atf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a284: f43e aec6 beq\.w 9014 <atf3-0x10c>
+ a284: f43e aec6 beq\.w 9014 <atf2@plt>
a288: 4c00 ldr r4, \[pc, #0\] ; \(a28c <_thumb\+0x88>\)
a28a: 4c01 ldr r4, \[pc, #4\] ; \(a290 <_thumb\+0x8c>\)
#------------------------------------------------------------------------------
@@ -722,15 +734,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf2's .plt entry
#------------------------------------------------------------------------------
- a294: f7fe eece blx 9034 <atf3-0xec>
+ a294: f7fe eece blx 9034 <ttf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a298: f7fe beca b\.w 9030 <atf3-0xf0>
+ a298: f7fe beca b\.w 9030 <ttf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a29c: f43e aec8 beq\.w 9030 <atf3-0xf0>
+ a29c: f43e aec8 beq\.w 9030 <ttf2@plt>
a2a0: 4c00 ldr r4, \[pc, #0\] ; \(a2a4 <_thumb\+0xa0>\)
a2a2: 4c01 ldr r4, \[pc, #4\] ; \(a2a8 <_thumb\+0xa4>\)
#------------------------------------------------------------------------------
@@ -744,15 +756,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a2ac: f7fe ef04 blx 90b8 <atf3-0x68>
+ a2ac: f7fe ef04 blx 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2b0: f7fe bf00 b\.w 90b4 <atf3-0x6c>
+ a2b0: f7fe bf00 b\.w 90b4 <abf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2b4: f43e aefe beq\.w 90b4 <atf3-0x6c>
+ a2b4: f43e aefe beq\.w 90b4 <abf2@plt>
a2b8: 4c00 ldr r4, \[pc, #0\] ; \(a2bc <_thumb\+0xb8>\)
a2ba: 4c01 ldr r4, \[pc, #4\] ; \(a2c0 <_thumb\+0xbc>\)
#------------------------------------------------------------------------------
@@ -766,15 +778,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a2c4: f7fe eebe blx 9044 <atf3-0xdc>
+ a2c4: f7fe eebe blx 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2c8: f7fe beba b\.w 9040 <atf3-0xe0>
+ a2c8: f7fe beba b\.w 9040 <tbf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2cc: f43e aeb8 beq\.w 9040 <atf3-0xe0>
+ a2cc: f43e aeb8 beq\.w 9040 <tbf2@plt>
a2d0: 4c00 ldr r4, \[pc, #0\] ; \(a2d4 <_thumb\+0xd0>\)
a2d2: 4c01 ldr r4, \[pc, #4\] ; \(a2d8 <_thumb\+0xd4>\)
#------------------------------------------------------------------------------
@@ -789,11 +801,11 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ thumb entry to atf3
#------------------------------------------------------------------------------
- a2e0: f7fe bf1c b\.w 911c <atf3-0x4>
+ a2e0: f7fe bf1c b\.w 911c <abf2@plt\+0x68>
#------------------------------------------------------------------------------
#------ thumb entry to atf3
#------------------------------------------------------------------------------
- a2e4: f43e af1a beq\.w 911c <atf3-0x4>
+ a2e4: f43e af1a beq\.w 911c <abf2@plt\+0x68>
a2e8: 4c00 ldr r4, \[pc, #0\] ; \(a2ec <_thumb\+0xe8>\)
a2ea: 4c01 ldr r4, \[pc, #4\] ; \(a2f0 <_thumb\+0xec>\)
#------------------------------------------------------------------------------
@@ -864,15 +876,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf4's .plt entry
#------------------------------------------------------------------------------
- a33c: f7fe eeae blx 909c <atf3-0x84>
+ a33c: f7fe eeae blx 909c <atf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
- a340: f7fe beaa b\.w 9098 <atf3-0x88>
+ a340: f7fe beaa b\.w 9098 <atf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
- a344: f43e aea8 beq\.w 9098 <atf3-0x88>
+ a344: f43e aea8 beq\.w 9098 <atf4@plt>
a348: 4c00 ldr r4, \[pc, #0\] ; \(a34c <_thumb\+0x148>\)
a34a: 4c01 ldr r4, \[pc, #4\] ; \(a350 <_thumb\+0x14c>\)
#------------------------------------------------------------------------------
@@ -886,15 +898,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf4's .plt entry
#------------------------------------------------------------------------------
- a354: f7fe ee9a blx 908c <atf3-0x94>
+ a354: f7fe ee9a blx 908c <ttf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
- a358: f7fe be96 b\.w 9088 <atf3-0x98>
+ a358: f7fe be96 b\.w 9088 <ttf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
- a35c: f43e ae94 beq\.w 9088 <atf3-0x98>
+ a35c: f43e ae94 beq\.w 9088 <ttf4@plt>
a360: 4c00 ldr r4, \[pc, #0\] ; \(a364 <_thumb\+0x160>\)
a362: 4c01 ldr r4, \[pc, #4\] ; \(a368 <_thumb\+0x164>\)
#------------------------------------------------------------------------------
@@ -908,15 +920,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a36c: f7fe ee7e blx 906c <atf3-0xb4>
+ a36c: f7fe ee7e blx 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
- a370: f7fe be7a b\.w 9068 <atf3-0xb8>
+ a370: f7fe be7a b\.w 9068 <abf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
- a374: f43e ae78 beq\.w 9068 <atf3-0xb8>
+ a374: f43e ae78 beq\.w 9068 <abf4@plt>
a378: 4c00 ldr r4, \[pc, #0\] ; \(a37c <_thumb\+0x178>\)
a37a: 4c01 ldr r4, \[pc, #4\] ; \(a380 <_thumb\+0x17c>\)
#------------------------------------------------------------------------------
@@ -930,15 +942,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a384: f7fe ee7a blx 907c <atf3-0xa4>
+ a384: f7fe ee7a blx 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
- a388: f7fe be76 b\.w 9078 <atf3-0xa8>
+ a388: f7fe be76 b\.w 9078 <tbf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
- a38c: f43e ae74 beq\.w 9078 <atf3-0xa8>
+ a38c: f43e ae74 beq\.w 9078 <tbf4@plt>
a390: 4c00 ldr r4, \[pc, #0\] ; \(a394 <_thumb\+0x190>\)
a392: 4c01 ldr r4, \[pc, #4\] ; \(a398 <_thumb\+0x194>\)
#------------------------------------------------------------------------------
diff --git a/ld/testsuite/ld-arm/ifunc-14.dd b/ld/testsuite/ld-arm/ifunc-14.dd
index 861f687..cbad1c8 100644
--- a/ld/testsuite/ld-arm/ifunc-14.dd
+++ b/ld/testsuite/ld-arm/ifunc-14.dd
@@ -4,7 +4,7 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2t@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <__irel_end\+0xff0>
9008: e08fe00e add lr, pc, lr
@@ -16,12 +16,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2t's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2t@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009020 <f2@plt>:
9020: e28fc600 add ip, pc, #0, 12
9024: e28cca07 add ip, ip, #28672 ; 0x7000
9028: e5bcffe8 ldr pc, \[ip, #4072\]! ; 0xfe8
diff --git a/ld/testsuite/ld-arm/ifunc-15.dd b/ld/testsuite/ld-arm/ifunc-15.dd
index d764841..f23e8e8 100644
--- a/ld/testsuite/ld-arm/ifunc-15.dd
+++ b/ld/testsuite/ld-arm/ifunc-15.dd
@@ -4,7 +4,7 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2t@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <__irel_end\+0xff0>
9008: e08fe00e add lr, pc, lr
@@ -16,12 +16,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2t's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2t@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009020 <f2@plt>:
9020: e28fc600 add ip, pc, #0, 12
9024: e28cca07 add ip, ip, #28672 ; 0x7000
9028: e5bcffe8 ldr pc, \[ip, #4072\]! ; 0xfe8
diff --git a/ld/testsuite/ld-arm/ifunc-3.dd b/ld/testsuite/ld-arm/ifunc-3.dd
index a1fb37a..b267bf1 100644
--- a/ld/testsuite/ld-arm/ifunc-3.dd
+++ b/ld/testsuite/ld-arm/ifunc-3.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f1-0xff0>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
@@ -71,7 +72,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f1's .iplt entry
#------------------------------------------------------------------------------
- a024: ebfffbfd bl 9020 <f1-0xfe0>
+ a024: ebfffbfd bl 9020 <f2@plt\+0xc>
a028: e59f4000 ldr r4, \[pc\] ; a030 <arm\+0x20>
a02c: e59f4000 ldr r4, \[pc\] ; a034 <arm\+0x24>
#------------------------------------------------------------------------------
@@ -85,7 +86,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
- a038: ebfffbf5 bl 9014 <f1-0xfec>
+ a038: ebfffbf5 bl 9014 <f2@plt>
a03c: e59f4000 ldr r4, \[pc\] ; a044 <arm\+0x34>
a040: e59f4000 ldr r4, \[pc\] ; a048 <arm\+0x38>
#------------------------------------------------------------------------------
@@ -99,7 +100,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f3's .iplt entry
#------------------------------------------------------------------------------
- a04c: ebfffbf6 bl 902c <f1-0xfd4>
+ a04c: ebfffbf6 bl 902c <f2@plt\+0x18>
a050: e59f4000 ldr r4, \[pc\] ; a058 <arm\+0x48>
a054: e59f4000 ldr r4, \[pc\] ; a05c <arm\+0x4c>
#------------------------------------------------------------------------------
@@ -113,7 +114,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f4's .iplt entry
#------------------------------------------------------------------------------
- a060: ebfffbf4 bl 9038 <f1-0xfc8>
+ a060: ebfffbf4 bl 9038 <f2@plt\+0x24>
a064: e59f4000 ldr r4, \[pc\] ; a06c <arm\+0x5c>
a068: e59f4000 ldr r4, \[pc\] ; a070 <arm\+0x60>
#------------------------------------------------------------------------------
diff --git a/ld/testsuite/ld-arm/ifunc-4.dd b/ld/testsuite/ld-arm/ifunc-4.dd
index f5a4d91..6ce996b 100644
--- a/ld/testsuite/ld-arm/ifunc-4.dd
+++ b/ld/testsuite/ld-arm/ifunc-4.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <atf2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <aaf1-0xff0>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <atf2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
+00009014 <atf2@plt>:
9014: 4778 bx pc
9016: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -27,6 +28,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
+00009024 <ttf2@plt>:
9024: 4778 bx pc
9026: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -38,6 +40,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
+00009034 <tbf2@plt>:
9034: 4778 bx pc
9036: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -49,18 +52,21 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
+00009044 <taf2@plt>:
9044: e28fc600 add ip, pc, #0, 12
9048: e28cca07 add ip, ip, #28672 ; 0x7000
904c: e5bcffcc ldr pc, \[ip, #4044\]! ; 0xfcc
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
+00009050 <aaf2@plt>:
9050: e28fc600 add ip, pc, #0, 12
9054: e28cca07 add ip, ip, #28672 ; 0x7000
9058: e5bcffc4 ldr pc, \[ip, #4036\]! ; 0xfc4
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
+0000905c <abf2@plt>:
905c: 4778 bx pc
905e: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -337,15 +343,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a06c: ebfffbfe bl 906c <aaf1-0xf94>
+ a06c: ebfffbfe bl 906c <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a070: eafffbfd b 906c <aaf1-0xf94>
+ a070: eafffbfd b 906c <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a074: 0afffbfc beq 906c <aaf1-0xf94>
+ a074: 0afffbfc beq 906c <abf2@plt\+0x10>
a078: e59f4000 ldr r4, \[pc\] ; a080 <arm\+0x30>
a07c: e59f4000 ldr r4, \[pc\] ; a084 <arm\+0x34>
#------------------------------------------------------------------------------
@@ -359,15 +365,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a088: ebfffc02 bl 9098 <aaf1-0xf68>
+ a088: ebfffc02 bl 9098 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a08c: eafffc01 b 9098 <aaf1-0xf68>
+ a08c: eafffc01 b 9098 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a090: 0afffc00 beq 9098 <aaf1-0xf68>
+ a090: 0afffc00 beq 9098 <abf2@plt\+0x3c>
a094: e59f4000 ldr r4, \[pc\] ; a09c <arm\+0x4c>
a098: e59f4000 ldr r4, \[pc\] ; a0a0 <arm\+0x50>
#------------------------------------------------------------------------------
@@ -381,15 +387,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a0a4: ebfffbf8 bl 908c <aaf1-0xf74>
+ a0a4: ebfffbf8 bl 908c <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a0a8: eafffbf7 b 908c <aaf1-0xf74>
+ a0a8: eafffbf7 b 908c <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a0ac: 0afffbf6 beq 908c <aaf1-0xf74>
+ a0ac: 0afffbf6 beq 908c <abf2@plt\+0x30>
a0b0: e59f4000 ldr r4, \[pc\] ; a0b8 <arm\+0x68>
a0b4: e59f4000 ldr r4, \[pc\] ; a0bc <arm\+0x6c>
#------------------------------------------------------------------------------
@@ -403,15 +409,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0c0: ebfffbfc bl 90b8 <aaf1-0xf48>
+ a0c0: ebfffbfc bl 90b8 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0c4: eafffbfb b 90b8 <aaf1-0xf48>
+ a0c4: eafffbfb b 90b8 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0c8: 0afffbfa beq 90b8 <aaf1-0xf48>
+ a0c8: 0afffbfa beq 90b8 <abf2@plt\+0x5c>
a0cc: e59f4000 ldr r4, \[pc\] ; a0d4 <arm\+0x84>
a0d0: e59f4000 ldr r4, \[pc\] ; a0d8 <arm\+0x88>
#------------------------------------------------------------------------------
@@ -425,15 +431,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0dc: ebfffbdb bl 9050 <aaf1-0xfb0>
+ a0dc: ebfffbdb bl 9050 <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0e0: eafffbda b 9050 <aaf1-0xfb0>
+ a0e0: eafffbda b 9050 <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0e4: 0afffbd9 beq 9050 <aaf1-0xfb0>
+ a0e4: 0afffbd9 beq 9050 <aaf2@plt>
a0e8: e59f4000 ldr r4, \[pc\] ; a0f0 <arm\+0xa0>
a0ec: e59f4000 ldr r4, \[pc\] ; a0f4 <arm\+0xa4>
#------------------------------------------------------------------------------
@@ -447,15 +453,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0f8: ebfffbd1 bl 9044 <aaf1-0xfbc>
+ a0f8: ebfffbd1 bl 9044 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0fc: eafffbd0 b 9044 <aaf1-0xfbc>
+ a0fc: eafffbd0 b 9044 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a100: 0afffbcf beq 9044 <aaf1-0xfbc>
+ a100: 0afffbcf beq 9044 <taf2@plt>
a104: e59f4000 ldr r4, \[pc\] ; a10c <arm\+0xbc>
a108: e59f4000 ldr r4, \[pc\] ; a110 <arm\+0xc0>
#------------------------------------------------------------------------------
@@ -469,15 +475,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a114: ebfffbd1 bl 9060 <aaf1-0xfa0>
+ a114: ebfffbd1 bl 9060 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a118: eafffbd0 b 9060 <aaf1-0xfa0>
+ a118: eafffbd0 b 9060 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a11c: 0afffbcf beq 9060 <aaf1-0xfa0>
+ a11c: 0afffbcf beq 9060 <abf2@plt\+0x4>
a120: e59f4000 ldr r4, \[pc\] ; a128 <arm\+0xd8>
a124: e59f4000 ldr r4, \[pc\] ; a12c <arm\+0xdc>
#------------------------------------------------------------------------------
@@ -491,15 +497,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a130: ebfffbc0 bl 9038 <aaf1-0xfc8>
+ a130: ebfffbc0 bl 9038 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a134: eafffbbf b 9038 <aaf1-0xfc8>
+ a134: eafffbbf b 9038 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a138: 0afffbbe beq 9038 <aaf1-0xfc8>
+ a138: 0afffbbe beq 9038 <tbf2@plt\+0x4>
a13c: e59f4000 ldr r4, \[pc\] ; a144 <arm\+0xf4>
a140: e59f4000 ldr r4, \[pc\] ; a148 <arm\+0xf8>
#------------------------------------------------------------------------------
@@ -513,15 +519,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a14c: ebfffbfe bl 914c <aaf1-0xeb4>
+ a14c: ebfffbfe bl 914c <abf2@plt\+0xf0>
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a150: eafffbfd b 914c <aaf1-0xeb4>
+ a150: eafffbfd b 914c <abf2@plt\+0xf0>
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a154: 0afffbfc beq 914c <aaf1-0xeb4>
+ a154: 0afffbfc beq 914c <abf2@plt\+0xf0>
a158: e59f4000 ldr r4, \[pc\] ; a160 <arm\+0x110>
a15c: e59f4000 ldr r4, \[pc\] ; a164 <arm\+0x114>
#------------------------------------------------------------------------------
@@ -535,15 +541,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a168: ebfffbe8 bl 9110 <aaf1-0xef0>
+ a168: ebfffbe8 bl 9110 <abf2@plt\+0xb4>
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a16c: eafffbe7 b 9110 <aaf1-0xef0>
+ a16c: eafffbe7 b 9110 <abf2@plt\+0xb4>
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a170: 0afffbe6 beq 9110 <aaf1-0xef0>
+ a170: 0afffbe6 beq 9110 <abf2@plt\+0xb4>
a174: e59f4000 ldr r4, \[pc\] ; a17c <arm\+0x12c>
a178: e59f4000 ldr r4, \[pc\] ; a180 <arm\+0x130>
#------------------------------------------------------------------------------
@@ -557,15 +563,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a184: ebfffbd6 bl 90e4 <aaf1-0xf1c>
+ a184: ebfffbd6 bl 90e4 <abf2@plt\+0x88>
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a188: eafffbd5 b 90e4 <aaf1-0xf1c>
+ a188: eafffbd5 b 90e4 <abf2@plt\+0x88>
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a18c: 0afffbd4 beq 90e4 <aaf1-0xf1c>
+ a18c: 0afffbd4 beq 90e4 <abf2@plt\+0x88>
a190: e59f4000 ldr r4, \[pc\] ; a198 <arm\+0x148>
a194: e59f4000 ldr r4, \[pc\] ; a19c <arm\+0x14c>
#------------------------------------------------------------------------------
@@ -579,15 +585,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a1a0: ebfffbd7 bl 9104 <aaf1-0xefc>
+ a1a0: ebfffbd7 bl 9104 <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a1a4: eafffbd6 b 9104 <aaf1-0xefc>
+ a1a4: eafffbd6 b 9104 <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a1a8: 0afffbd5 beq 9104 <aaf1-0xefc>
+ a1a8: 0afffbd5 beq 9104 <abf2@plt\+0xa8>
a1ac: e59f4000 ldr r4, \[pc\] ; a1b4 <arm\+0x164>
a1b0: e59f4000 ldr r4, \[pc\] ; a1b8 <arm\+0x168>
#------------------------------------------------------------------------------
@@ -601,15 +607,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf4's .iplt entry
#------------------------------------------------------------------------------
- a1bc: ebfffbc0 bl 90c4 <aaf1-0xf3c>
+ a1bc: ebfffbc0 bl 90c4 <abf2@plt\+0x68>
#------------------------------------------------------------------------------
#------ aaf4's .iplt entry
#------------------------------------------------------------------------------
- a1c0: eafffbbf b 90c4 <aaf1-0xf3c>
+ a1c0: eafffbbf b 90c4 <abf2@plt\+0x68>
#------------------------------------------------------------------------------
#------ aaf4's .iplt entry
#------------------------------------------------------------------------------
- a1c4: 0afffbbe beq 90c4 <aaf1-0xf3c>
+ a1c4: 0afffbbe beq 90c4 <abf2@plt\+0x68>
a1c8: e59f4000 ldr r4, \[pc\] ; a1d0 <arm\+0x180>
a1cc: e59f4000 ldr r4, \[pc\] ; a1d4 <arm\+0x184>
#------------------------------------------------------------------------------
@@ -623,15 +629,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf4's .iplt entry
#------------------------------------------------------------------------------
- a1d8: ebfffbe2 bl 9168 <aaf1-0xe98>
+ a1d8: ebfffbe2 bl 9168 <abf2@plt\+0x10c>
#------------------------------------------------------------------------------
#------ taf4's .iplt entry
#------------------------------------------------------------------------------
- a1dc: eafffbe1 b 9168 <aaf1-0xe98>
+ a1dc: eafffbe1 b 9168 <abf2@plt\+0x10c>
#------------------------------------------------------------------------------
#------ taf4's .iplt entry
#------------------------------------------------------------------------------
- a1e0: 0afffbe0 beq 9168 <aaf1-0xe98>
+ a1e0: 0afffbe0 beq 9168 <abf2@plt\+0x10c>
a1e4: e59f4000 ldr r4, \[pc\] ; a1ec <arm\+0x19c>
a1e8: e59f4000 ldr r4, \[pc\] ; a1f0 <arm\+0x1a0>
#------------------------------------------------------------------------------
@@ -645,15 +651,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .iplt entry
#------------------------------------------------------------------------------
- a1f4: ebfffbc9 bl 9120 <aaf1-0xee0>
+ a1f4: ebfffbc9 bl 9120 <abf2@plt\+0xc4>
#------------------------------------------------------------------------------
#------ abf4's .iplt entry
#------------------------------------------------------------------------------
- a1f8: eafffbc8 b 9120 <aaf1-0xee0>
+ a1f8: eafffbc8 b 9120 <abf2@plt\+0xc4>
#------------------------------------------------------------------------------
#------ abf4's .iplt entry
#------------------------------------------------------------------------------
- a1fc: 0afffbc7 beq 9120 <aaf1-0xee0>
+ a1fc: 0afffbc7 beq 9120 <abf2@plt\+0xc4>
a200: e59f4000 ldr r4, \[pc\] ; a208 <arm\+0x1b8>
a204: e59f4000 ldr r4, \[pc\] ; a20c <arm\+0x1bc>
#------------------------------------------------------------------------------
@@ -667,15 +673,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .iplt entry
#------------------------------------------------------------------------------
- a210: ebfffbc6 bl 9130 <aaf1-0xed0>
+ a210: ebfffbc6 bl 9130 <abf2@plt\+0xd4>
#------------------------------------------------------------------------------
#------ tbf4's .iplt entry
#------------------------------------------------------------------------------
- a214: eafffbc5 b 9130 <aaf1-0xed0>
+ a214: eafffbc5 b 9130 <abf2@plt\+0xd4>
#------------------------------------------------------------------------------
#------ tbf4's .iplt entry
#------------------------------------------------------------------------------
- a218: 0afffbc4 beq 9130 <aaf1-0xed0>
+ a218: 0afffbc4 beq 9130 <abf2@plt\+0xd4>
a21c: e59f4000 ldr r4, \[pc\] ; a224 <arm\+0x1d4>
a220: e59f4000 ldr r4, \[pc\] ; a228 <arm\+0x1d8>
#------------------------------------------------------------------------------
@@ -704,15 +710,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf1's .iplt entry
#------------------------------------------------------------------------------
- a244: f7fe ef1a blx 907c <aaf1-0xf84>
+ a244: f7fe ef1a blx 907c <abf2@plt\+0x20>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a248: f7fe bf16 b\.w 9078 <aaf1-0xf88>
+ a248: f7fe bf16 b\.w 9078 <abf2@plt\+0x1c>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a24c: f43e af14 beq\.w 9078 <aaf1-0xf88>
+ a24c: f43e af14 beq\.w 9078 <abf2@plt\+0x1c>
a250: 4c00 ldr r4, \[pc, #0\] ; \(a254 <_thumb\+0x28>\)
a252: 4c01 ldr r4, \[pc, #4\] ; \(a258 <_thumb\+0x2c>\)
#------------------------------------------------------------------------------
@@ -726,15 +732,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf1's .iplt entry
#------------------------------------------------------------------------------
- a25c: f7fe ef24 blx 90a8 <aaf1-0xf58>
+ a25c: f7fe ef24 blx 90a8 <abf2@plt\+0x4c>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a260: f7fe bf20 b\.w 90a4 <aaf1-0xf5c>
+ a260: f7fe bf20 b\.w 90a4 <abf2@plt\+0x48>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a264: f43e af1e beq\.w 90a4 <aaf1-0xf5c>
+ a264: f43e af1e beq\.w 90a4 <abf2@plt\+0x48>
a268: 4c00 ldr r4, \[pc, #0\] ; \(a26c <_thumb\+0x40>\)
a26a: 4c01 ldr r4, \[pc, #4\] ; \(a270 <_thumb\+0x44>\)
#------------------------------------------------------------------------------
@@ -748,15 +754,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a274: f7fe ef0a blx 908c <aaf1-0xf74>
+ a274: f7fe ef0a blx 908c <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a278: f7fe bf06 b\.w 9088 <aaf1-0xf78>
+ a278: f7fe bf06 b\.w 9088 <abf2@plt\+0x2c>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a27c: f43e af04 beq\.w 9088 <aaf1-0xf78>
+ a27c: f43e af04 beq\.w 9088 <abf2@plt\+0x2c>
a280: 4c00 ldr r4, \[pc, #0\] ; \(a284 <_thumb\+0x58>\)
a282: 4c01 ldr r4, \[pc, #4\] ; \(a288 <_thumb\+0x5c>\)
#------------------------------------------------------------------------------
@@ -770,15 +776,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a28c: f7fe ef14 blx 90b8 <aaf1-0xf48>
+ a28c: f7fe ef14 blx 90b8 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a290: f7fe bf10 b\.w 90b4 <aaf1-0xf4c>
+ a290: f7fe bf10 b\.w 90b4 <abf2@plt\+0x58>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a294: f43e af0e beq\.w 90b4 <aaf1-0xf4c>
+ a294: f43e af0e beq\.w 90b4 <abf2@plt\+0x58>
a298: 4c00 ldr r4, \[pc, #0\] ; \(a29c <_thumb\+0x70>\)
a29a: 4c01 ldr r4, \[pc, #4\] ; \(a2a0 <_thumb\+0x74>\)
#------------------------------------------------------------------------------
@@ -792,15 +798,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf2's .plt entry
#------------------------------------------------------------------------------
- a2a4: f7fe eeb8 blx 9018 <aaf1-0xfe8>
+ a2a4: f7fe eeb8 blx 9018 <atf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a2a8: f7fe beb4 b\.w 9014 <aaf1-0xfec>
+ a2a8: f7fe beb4 b\.w 9014 <atf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a2ac: f43e aeb2 beq\.w 9014 <aaf1-0xfec>
+ a2ac: f43e aeb2 beq\.w 9014 <atf2@plt>
a2b0: 4c00 ldr r4, \[pc, #0\] ; \(a2b4 <_thumb\+0x88>\)
a2b2: 4c01 ldr r4, \[pc, #4\] ; \(a2b8 <_thumb\+0x8c>\)
#------------------------------------------------------------------------------
@@ -814,15 +820,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf2's .plt entry
#------------------------------------------------------------------------------
- a2bc: f7fe eeb4 blx 9028 <aaf1-0xfd8>
+ a2bc: f7fe eeb4 blx 9028 <ttf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a2c0: f7fe beb0 b\.w 9024 <aaf1-0xfdc>
+ a2c0: f7fe beb0 b\.w 9024 <ttf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a2c4: f43e aeae beq\.w 9024 <aaf1-0xfdc>
+ a2c4: f43e aeae beq\.w 9024 <ttf2@plt>
a2c8: 4c00 ldr r4, \[pc, #0\] ; \(a2cc <_thumb\+0xa0>\)
a2ca: 4c01 ldr r4, \[pc, #4\] ; \(a2d0 <_thumb\+0xa4>\)
#------------------------------------------------------------------------------
@@ -836,15 +842,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a2d4: f7fe eec4 blx 9060 <aaf1-0xfa0>
+ a2d4: f7fe eec4 blx 9060 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2d8: f7fe bec0 b\.w 905c <aaf1-0xfa4>
+ a2d8: f7fe bec0 b\.w 905c <abf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2dc: f43e aebe beq\.w 905c <aaf1-0xfa4>
+ a2dc: f43e aebe beq\.w 905c <abf2@plt>
a2e0: 4c00 ldr r4, \[pc, #0\] ; \(a2e4 <_thumb\+0xb8>\)
a2e2: 4c01 ldr r4, \[pc, #4\] ; \(a2e8 <_thumb\+0xbc>\)
#------------------------------------------------------------------------------
@@ -858,15 +864,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a2ec: f7fe eea4 blx 9038 <aaf1-0xfc8>
+ a2ec: f7fe eea4 blx 9038 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2f0: f7fe bea0 b\.w 9034 <aaf1-0xfcc>
+ a2f0: f7fe bea0 b\.w 9034 <tbf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2f4: f43e ae9e beq\.w 9034 <aaf1-0xfcc>
+ a2f4: f43e ae9e beq\.w 9034 <tbf2@plt>
a2f8: 4c00 ldr r4, \[pc, #0\] ; \(a2fc <_thumb\+0xd0>\)
a2fa: 4c01 ldr r4, \[pc, #4\] ; \(a300 <_thumb\+0xd4>\)
#------------------------------------------------------------------------------
@@ -880,15 +886,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf3's .iplt entry
#------------------------------------------------------------------------------
- a304: f7fe eee6 blx 90d4 <aaf1-0xf2c>
+ a304: f7fe eee6 blx 90d4 <abf2@plt\+0x78>
#------------------------------------------------------------------------------
#------ thumb entry to atf3's .iplt entry
#------------------------------------------------------------------------------
- a308: f7fe bee2 b\.w 90d0 <aaf1-0xf30>
+ a308: f7fe bee2 b\.w 90d0 <abf2@plt\+0x74>
#------------------------------------------------------------------------------
#------ thumb entry to atf3's .iplt entry
#------------------------------------------------------------------------------
- a30c: f43e aee0 beq\.w 90d0 <aaf1-0xf30>
+ a30c: f43e aee0 beq\.w 90d0 <abf2@plt\+0x74>
a310: 4c00 ldr r4, \[pc, #0\] ; \(a314 <_thumb\+0xe8>\)
a312: 4c01 ldr r4, \[pc, #4\] ; \(a318 <_thumb\+0xec>\)
#------------------------------------------------------------------------------
@@ -902,15 +908,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf3's .iplt entry
#------------------------------------------------------------------------------
- a31c: f7fe eeea blx 90f4 <aaf1-0xf0c>
+ a31c: f7fe eeea blx 90f4 <abf2@plt\+0x98>
#------------------------------------------------------------------------------
#------ thumb entry to ttf3's .iplt entry
#------------------------------------------------------------------------------
- a320: f7fe bee6 b\.w 90f0 <aaf1-0xf10>
+ a320: f7fe bee6 b\.w 90f0 <abf2@plt\+0x94>
#------------------------------------------------------------------------------
#------ thumb entry to ttf3's .iplt entry
#------------------------------------------------------------------------------
- a324: f43e aee4 beq\.w 90f0 <aaf1-0xf10>
+ a324: f43e aee4 beq\.w 90f0 <abf2@plt\+0x94>
a328: 4c00 ldr r4, \[pc, #0\] ; \(a32c <_thumb\+0x100>\)
a32a: 4c01 ldr r4, \[pc, #4\] ; \(a330 <_thumb\+0x104>\)
#------------------------------------------------------------------------------
@@ -924,15 +930,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a334: f7fe eed6 blx 90e4 <aaf1-0xf1c>
+ a334: f7fe eed6 blx 90e4 <abf2@plt\+0x88>
#------------------------------------------------------------------------------
#------ thumb entry to abf3's .iplt entry
#------------------------------------------------------------------------------
- a338: f7fe bed2 b\.w 90e0 <aaf1-0xf20>
+ a338: f7fe bed2 b\.w 90e0 <abf2@plt\+0x84>
#------------------------------------------------------------------------------
#------ thumb entry to abf3's .iplt entry
#------------------------------------------------------------------------------
- a33c: f43e aed0 beq\.w 90e0 <aaf1-0xf20>
+ a33c: f43e aed0 beq\.w 90e0 <abf2@plt\+0x84>
a340: 4c00 ldr r4, \[pc, #0\] ; \(a344 <_thumb\+0x118>\)
a342: 4c01 ldr r4, \[pc, #4\] ; \(a348 <_thumb\+0x11c>\)
#------------------------------------------------------------------------------
@@ -946,15 +952,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a34c: f7fe eeda blx 9104 <aaf1-0xefc>
+ a34c: f7fe eeda blx 9104 <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ thumb entry to tbf3's .iplt entry
#------------------------------------------------------------------------------
- a350: f7fe bed6 b\.w 9100 <aaf1-0xf00>
+ a350: f7fe bed6 b\.w 9100 <abf2@plt\+0xa4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf3's .iplt entry
#------------------------------------------------------------------------------
- a354: f43e aed4 beq\.w 9100 <aaf1-0xf00>
+ a354: f43e aed4 beq\.w 9100 <abf2@plt\+0xa4>
a358: 4c00 ldr r4, \[pc, #0\] ; \(a35c <_thumb\+0x130>\)
a35a: 4c01 ldr r4, \[pc, #4\] ; \(a360 <_thumb\+0x134>\)
#------------------------------------------------------------------------------
@@ -968,15 +974,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf4's .iplt entry
#------------------------------------------------------------------------------
- a364: f7fe eefa blx 915c <aaf1-0xea4>
+ a364: f7fe eefa blx 915c <abf2@plt\+0x100>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .iplt entry
#------------------------------------------------------------------------------
- a368: f7fe bef6 b\.w 9158 <aaf1-0xea8>
+ a368: f7fe bef6 b\.w 9158 <abf2@plt\+0xfc>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .iplt entry
#------------------------------------------------------------------------------
- a36c: f43e aef4 beq\.w 9158 <aaf1-0xea8>
+ a36c: f43e aef4 beq\.w 9158 <abf2@plt\+0xfc>
a370: 4c00 ldr r4, \[pc, #0\] ; \(a374 <_thumb\+0x148>\)
a372: 4c01 ldr r4, \[pc, #4\] ; \(a378 <_thumb\+0x14c>\)
#------------------------------------------------------------------------------
@@ -990,15 +996,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf4's .iplt entry
#------------------------------------------------------------------------------
- a37c: f7fe eee0 blx 9140 <aaf1-0xec0>
+ a37c: f7fe eee0 blx 9140 <abf2@plt\+0xe4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .iplt entry
#------------------------------------------------------------------------------
- a380: f7fe bedc b\.w 913c <aaf1-0xec4>
+ a380: f7fe bedc b\.w 913c <abf2@plt\+0xe0>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .iplt entry
#------------------------------------------------------------------------------
- a384: f43e aeda beq\.w 913c <aaf1-0xec4>
+ a384: f43e aeda beq\.w 913c <abf2@plt\+0xe0>
a388: 4c00 ldr r4, \[pc, #0\] ; \(a38c <_thumb\+0x160>\)
a38a: 4c01 ldr r4, \[pc, #4\] ; \(a390 <_thumb\+0x164>\)
#------------------------------------------------------------------------------
@@ -1012,15 +1018,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .iplt entry
#------------------------------------------------------------------------------
- a394: f7fe eec4 blx 9120 <aaf1-0xee0>
+ a394: f7fe eec4 blx 9120 <abf2@plt\+0xc4>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .iplt entry
#------------------------------------------------------------------------------
- a398: f7fe bec0 b\.w 911c <aaf1-0xee4>
+ a398: f7fe bec0 b\.w 911c <abf2@plt\+0xc0>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .iplt entry
#------------------------------------------------------------------------------
- a39c: f43e aebe beq\.w 911c <aaf1-0xee4>
+ a39c: f43e aebe beq\.w 911c <abf2@plt\+0xc0>
a3a0: 4c00 ldr r4, \[pc, #0\] ; \(a3a4 <_thumb\+0x178>\)
a3a2: 4c01 ldr r4, \[pc, #4\] ; \(a3a8 <_thumb\+0x17c>\)
#------------------------------------------------------------------------------
@@ -1034,15 +1040,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .iplt entry
#------------------------------------------------------------------------------
- a3ac: f7fe eec0 blx 9130 <aaf1-0xed0>
+ a3ac: f7fe eec0 blx 9130 <abf2@plt\+0xd4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .iplt entry
#------------------------------------------------------------------------------
- a3b0: f7fe bebc b\.w 912c <aaf1-0xed4>
+ a3b0: f7fe bebc b\.w 912c <abf2@plt\+0xd0>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .iplt entry
#------------------------------------------------------------------------------
- a3b4: f43e aeba beq\.w 912c <aaf1-0xed4>
+ a3b4: f43e aeba beq\.w 912c <abf2@plt\+0xd0>
a3b8: 4c00 ldr r4, \[pc, #0\] ; \(a3bc <_thumb\+0x190>\)
a3ba: 4c01 ldr r4, \[pc, #4\] ; \(a3c0 <_thumb\+0x194>\)
#------------------------------------------------------------------------------
diff --git a/ld/testsuite/ld-arm/ifunc-7.dd b/ld/testsuite/ld-arm/ifunc-7.dd
index e9a9681..f82fd37 100644
--- a/ld/testsuite/ld-arm/ifunc-7.dd
+++ b/ld/testsuite/ld-arm/ifunc-7.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f1-0xff0>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,12 +16,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
#------------------------------------------------------------------------------
#------ f4's .plt entry
#------------------------------------------------------------------------------
+00009020 <f4@plt>:
9020: e28fc600 add ip, pc, #0, 12
9024: e28cca07 add ip, ip, #28672 ; 0x7000
9028: e5bcffe8 ldr pc, \[ip, #4072\]! ; 0xfe8
@@ -65,7 +67,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f1's .iplt entry
#------------------------------------------------------------------------------
- a01c: ebfffc02 bl 902c <f1-0xfd4>
+ a01c: ebfffc02 bl 902c <f4@plt\+0xc>
a020: e59f4000 ldr r4, \[pc\] ; a028 <arm\+0x20>
a024: e59f4000 ldr r4, \[pc\] ; a02c <arm\+0x24>
#------------------------------------------------------------------------------
@@ -79,7 +81,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
- a030: ebfffbf7 bl 9014 <f1-0xfec>
+ a030: ebfffbf7 bl 9014 <f2@plt>
a034: e59f4000 ldr r4, \[pc\] ; a03c <arm\+0x34>
a038: e59f4000 ldr r4, \[pc\] ; a040 <arm\+0x38>
#------------------------------------------------------------------------------
@@ -93,7 +95,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f3's .iplt entry
#------------------------------------------------------------------------------
- a044: ebfffbfb bl 9038 <f1-0xfc8>
+ a044: ebfffbfb bl 9038 <f4@plt\+0x18>
a048: e59f4000 ldr r4, \[pc\] ; a050 <arm\+0x48>
a04c: e59f4000 ldr r4, \[pc\] ; a054 <arm\+0x4c>
#------------------------------------------------------------------------------
@@ -107,7 +109,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f4's .plt entry
#------------------------------------------------------------------------------
- a058: ebfffbf0 bl 9020 <f1-0xfe0>
+ a058: ebfffbf0 bl 9020 <f4@plt>
a05c: e59f4000 ldr r4, \[pc\] ; a064 <arm\+0x5c>
a060: e59f4000 ldr r4, \[pc\] ; a068 <arm\+0x60>
#------------------------------------------------------------------------------
diff --git a/ld/testsuite/ld-arm/ifunc-8.dd b/ld/testsuite/ld-arm/ifunc-8.dd
index 5b255e2..3cca17c 100644
--- a/ld/testsuite/ld-arm/ifunc-8.dd
+++ b/ld/testsuite/ld-arm/ifunc-8.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <atf2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <aaf1-0xff0>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <atf2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
+00009014 <atf2@plt>:
9014: 4778 bx pc
9016: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -27,12 +28,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
+00009024 <aaf4@plt>:
9024: e28fc600 add ip, pc, #0, 12
9028: e28cca07 add ip, ip, #28672 ; 0x7000
902c: e5bcffe4 ldr pc, \[ip, #4068\]! ; 0xfe4
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
+00009030 <ttf2@plt>:
9030: 4778 bx pc
9032: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -44,6 +47,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
+00009040 <tbf2@plt>:
9040: 4778 bx pc
9042: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -55,18 +59,21 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
+00009050 <taf2@plt>:
9050: e28fc600 add ip, pc, #0, 12
9054: e28cca07 add ip, ip, #28672 ; 0x7000
9058: e5bcffc4 ldr pc, \[ip, #4036\]! ; 0xfc4
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
+0000905c <aaf2@plt>:
905c: e28fc600 add ip, pc, #0, 12
9060: e28cca07 add ip, ip, #28672 ; 0x7000
9064: e5bcffbc ldr pc, \[ip, #4028\]! ; 0xfbc
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
+00009068 <abf4@plt>:
9068: 4778 bx pc
906a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -78,6 +85,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
+00009078 <tbf4@plt>:
9078: 4778 bx pc
907a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -89,6 +97,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
+00009088 <ttf4@plt>:
9088: 4778 bx pc
908a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -100,6 +109,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
+00009098 <atf4@plt>:
9098: 4778 bx pc
909a: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -111,12 +121,14 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
+000090a8 <taf4@plt>:
90a8: e28fc600 add ip, pc, #0, 12
90ac: e28cca07 add ip, ip, #28672 ; 0x7000
90b0: e5bcff84 ldr pc, \[ip, #3972\]! ; 0xf84
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
+000090b4 <abf2@plt>:
90b4: 4778 bx pc
90b6: 46c0 nop ; \(mov r8, r8\)
#------------------------------------------------------------------------------
@@ -299,15 +311,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a044: ebfffc1e bl 90c4 <aaf1-0xf3c>
+ a044: ebfffc1e bl 90c4 <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a048: eafffc1d b 90c4 <aaf1-0xf3c>
+ a048: eafffc1d b 90c4 <abf2@plt\+0x10>
#------------------------------------------------------------------------------
#------ aaf1's .iplt entry
#------------------------------------------------------------------------------
- a04c: 0afffc1c beq 90c4 <aaf1-0xf3c>
+ a04c: 0afffc1c beq 90c4 <abf2@plt\+0x10>
a050: e59f4000 ldr r4, \[pc\] ; a058 <arm\+0x30>
a054: e59f4000 ldr r4, \[pc\] ; a05c <arm\+0x34>
#------------------------------------------------------------------------------
@@ -321,15 +333,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a060: ebfffc22 bl 90f0 <aaf1-0xf10>
+ a060: ebfffc22 bl 90f0 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a064: eafffc21 b 90f0 <aaf1-0xf10>
+ a064: eafffc21 b 90f0 <abf2@plt\+0x3c>
#------------------------------------------------------------------------------
#------ taf1's .iplt entry
#------------------------------------------------------------------------------
- a068: 0afffc20 beq 90f0 <aaf1-0xf10>
+ a068: 0afffc20 beq 90f0 <abf2@plt\+0x3c>
a06c: e59f4000 ldr r4, \[pc\] ; a074 <arm\+0x4c>
a070: e59f4000 ldr r4, \[pc\] ; a078 <arm\+0x50>
#------------------------------------------------------------------------------
@@ -343,15 +355,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a07c: ebfffc18 bl 90e4 <aaf1-0xf1c>
+ a07c: ebfffc18 bl 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a080: eafffc17 b 90e4 <aaf1-0xf1c>
+ a080: eafffc17 b 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a084: 0afffc16 beq 90e4 <aaf1-0xf1c>
+ a084: 0afffc16 beq 90e4 <abf2@plt\+0x30>
a088: e59f4000 ldr r4, \[pc\] ; a090 <arm\+0x68>
a08c: e59f4000 ldr r4, \[pc\] ; a094 <arm\+0x6c>
#------------------------------------------------------------------------------
@@ -365,15 +377,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a098: ebfffc1c bl 9110 <aaf1-0xef0>
+ a098: ebfffc1c bl 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a09c: eafffc1b b 9110 <aaf1-0xef0>
+ a09c: eafffc1b b 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a0a0: 0afffc1a beq 9110 <aaf1-0xef0>
+ a0a0: 0afffc1a beq 9110 <abf2@plt\+0x5c>
a0a4: e59f4000 ldr r4, \[pc\] ; a0ac <arm\+0x84>
a0a8: e59f4000 ldr r4, \[pc\] ; a0b0 <arm\+0x88>
#------------------------------------------------------------------------------
@@ -387,15 +399,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0b4: ebfffbe8 bl 905c <aaf1-0xfa4>
+ a0b4: ebfffbe8 bl 905c <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0b8: eafffbe7 b 905c <aaf1-0xfa4>
+ a0b8: eafffbe7 b 905c <aaf2@plt>
#------------------------------------------------------------------------------
#------ aaf2's .plt entry
#------------------------------------------------------------------------------
- a0bc: 0afffbe6 beq 905c <aaf1-0xfa4>
+ a0bc: 0afffbe6 beq 905c <aaf2@plt>
a0c0: e59f4000 ldr r4, \[pc\] ; a0c8 <arm\+0xa0>
a0c4: e59f4000 ldr r4, \[pc\] ; a0cc <arm\+0xa4>
#------------------------------------------------------------------------------
@@ -409,15 +421,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d0: ebfffbde bl 9050 <aaf1-0xfb0>
+ a0d0: ebfffbde bl 9050 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d4: eafffbdd b 9050 <aaf1-0xfb0>
+ a0d4: eafffbdd b 9050 <taf2@plt>
#------------------------------------------------------------------------------
#------ taf2's .plt entry
#------------------------------------------------------------------------------
- a0d8: 0afffbdc beq 9050 <aaf1-0xfb0>
+ a0d8: 0afffbdc beq 9050 <taf2@plt>
a0dc: e59f4000 ldr r4, \[pc\] ; a0e4 <arm\+0xbc>
a0e0: e59f4000 ldr r4, \[pc\] ; a0e8 <arm\+0xc0>
#------------------------------------------------------------------------------
@@ -431,15 +443,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0ec: ebfffbf1 bl 90b8 <aaf1-0xf48>
+ a0ec: ebfffbf1 bl 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0f0: eafffbf0 b 90b8 <aaf1-0xf48>
+ a0f0: eafffbf0 b 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a0f4: 0afffbef beq 90b8 <aaf1-0xf48>
+ a0f4: 0afffbef beq 90b8 <abf2@plt\+0x4>
a0f8: e59f4000 ldr r4, \[pc\] ; a100 <arm\+0xd8>
a0fc: e59f4000 ldr r4, \[pc\] ; a104 <arm\+0xdc>
#------------------------------------------------------------------------------
@@ -453,15 +465,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a108: ebfffbcd bl 9044 <aaf1-0xfbc>
+ a108: ebfffbcd bl 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a10c: eafffbcc b 9044 <aaf1-0xfbc>
+ a10c: eafffbcc b 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a110: 0afffbcb beq 9044 <aaf1-0xfbc>
+ a110: 0afffbcb beq 9044 <tbf2@plt\+0x4>
a114: e59f4000 ldr r4, \[pc\] ; a11c <arm\+0xf4>
a118: e59f4000 ldr r4, \[pc\] ; a120 <arm\+0xf8>
#------------------------------------------------------------------------------
@@ -475,15 +487,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a124: ebfffc0f bl 9168 <aaf1-0xe98>
+ a124: ebfffc0f bl 9168 <abf2@plt\+0xb4>
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a128: eafffc0e b 9168 <aaf1-0xe98>
+ a128: eafffc0e b 9168 <abf2@plt\+0xb4>
#------------------------------------------------------------------------------
#------ aaf3's .iplt entry
#------------------------------------------------------------------------------
- a12c: 0afffc0d beq 9168 <aaf1-0xe98>
+ a12c: 0afffc0d beq 9168 <abf2@plt\+0xb4>
a130: e59f4000 ldr r4, \[pc\] ; a138 <arm\+0x110>
a134: e59f4000 ldr r4, \[pc\] ; a13c <arm\+0x114>
#------------------------------------------------------------------------------
@@ -497,15 +509,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a140: ebfffc05 bl 915c <aaf1-0xea4>
+ a140: ebfffc05 bl 915c <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a144: eafffc04 b 915c <aaf1-0xea4>
+ a144: eafffc04 b 915c <abf2@plt\+0xa8>
#------------------------------------------------------------------------------
#------ taf3's .iplt entry
#------------------------------------------------------------------------------
- a148: 0afffc03 beq 915c <aaf1-0xea4>
+ a148: 0afffc03 beq 915c <abf2@plt\+0xa8>
a14c: e59f4000 ldr r4, \[pc\] ; a154 <arm\+0x12c>
a150: e59f4000 ldr r4, \[pc\] ; a158 <arm\+0x130>
#------------------------------------------------------------------------------
@@ -519,15 +531,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a15c: ebfffbf3 bl 9130 <aaf1-0xed0>
+ a15c: ebfffbf3 bl 9130 <abf2@plt\+0x7c>
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a160: eafffbf2 b 9130 <aaf1-0xed0>
+ a160: eafffbf2 b 9130 <abf2@plt\+0x7c>
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a164: 0afffbf1 beq 9130 <aaf1-0xed0>
+ a164: 0afffbf1 beq 9130 <abf2@plt\+0x7c>
a168: e59f4000 ldr r4, \[pc\] ; a170 <arm\+0x148>
a16c: e59f4000 ldr r4, \[pc\] ; a174 <arm\+0x14c>
#------------------------------------------------------------------------------
@@ -541,15 +553,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a178: ebfffbf4 bl 9150 <aaf1-0xeb0>
+ a178: ebfffbf4 bl 9150 <abf2@plt\+0x9c>
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a17c: eafffbf3 b 9150 <aaf1-0xeb0>
+ a17c: eafffbf3 b 9150 <abf2@plt\+0x9c>
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a180: 0afffbf2 beq 9150 <aaf1-0xeb0>
+ a180: 0afffbf2 beq 9150 <abf2@plt\+0x9c>
a184: e59f4000 ldr r4, \[pc\] ; a18c <arm\+0x164>
a188: e59f4000 ldr r4, \[pc\] ; a190 <arm\+0x168>
#------------------------------------------------------------------------------
@@ -563,15 +575,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a194: ebfffba2 bl 9024 <aaf1-0xfdc>
+ a194: ebfffba2 bl 9024 <aaf4@plt>
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a198: eafffba1 b 9024 <aaf1-0xfdc>
+ a198: eafffba1 b 9024 <aaf4@plt>
#------------------------------------------------------------------------------
#------ aaf4's .plt entry
#------------------------------------------------------------------------------
- a19c: 0afffba0 beq 9024 <aaf1-0xfdc>
+ a19c: 0afffba0 beq 9024 <aaf4@plt>
a1a0: e59f4000 ldr r4, \[pc\] ; a1a8 <arm\+0x180>
a1a4: e59f4000 ldr r4, \[pc\] ; a1ac <arm\+0x184>
#------------------------------------------------------------------------------
@@ -585,15 +597,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b0: ebfffbbc bl 90a8 <aaf1-0xf58>
+ a1b0: ebfffbbc bl 90a8 <taf4@plt>
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b4: eafffbbb b 90a8 <aaf1-0xf58>
+ a1b4: eafffbbb b 90a8 <taf4@plt>
#------------------------------------------------------------------------------
#------ taf4's .plt entry
#------------------------------------------------------------------------------
- a1b8: 0afffbba beq 90a8 <aaf1-0xf58>
+ a1b8: 0afffbba beq 90a8 <taf4@plt>
a1bc: e59f4000 ldr r4, \[pc\] ; a1c4 <arm\+0x19c>
a1c0: e59f4000 ldr r4, \[pc\] ; a1c8 <arm\+0x1a0>
#------------------------------------------------------------------------------
@@ -607,15 +619,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1cc: ebfffba6 bl 906c <aaf1-0xf94>
+ a1cc: ebfffba6 bl 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1d0: eafffba5 b 906c <aaf1-0xf94>
+ a1d0: eafffba5 b 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a1d4: 0afffba4 beq 906c <aaf1-0xf94>
+ a1d4: 0afffba4 beq 906c <abf4@plt\+0x4>
a1d8: e59f4000 ldr r4, \[pc\] ; a1e0 <arm\+0x1b8>
a1dc: e59f4000 ldr r4, \[pc\] ; a1e4 <arm\+0x1bc>
#------------------------------------------------------------------------------
@@ -629,15 +641,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1e8: ebfffba3 bl 907c <aaf1-0xf84>
+ a1e8: ebfffba3 bl 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1ec: eafffba2 b 907c <aaf1-0xf84>
+ a1ec: eafffba2 b 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a1f0: 0afffba1 beq 907c <aaf1-0xf84>
+ a1f0: 0afffba1 beq 907c <tbf4@plt\+0x4>
a1f4: e59f4000 ldr r4, \[pc\] ; a1fc <arm\+0x1d4>
a1f8: e59f4000 ldr r4, \[pc\] ; a200 <arm\+0x1d8>
#------------------------------------------------------------------------------
@@ -666,15 +678,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf1's .iplt entry
#------------------------------------------------------------------------------
- a21c: f7fe ef5a blx 90d4 <aaf1-0xf2c>
+ a21c: f7fe ef5a blx 90d4 <abf2@plt\+0x20>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a220: f7fe bf56 b\.w 90d0 <aaf1-0xf30>
+ a220: f7fe bf56 b\.w 90d0 <abf2@plt\+0x1c>
#------------------------------------------------------------------------------
#------ thumb entry to atf1's .iplt entry
#------------------------------------------------------------------------------
- a224: f43e af54 beq\.w 90d0 <aaf1-0xf30>
+ a224: f43e af54 beq\.w 90d0 <abf2@plt\+0x1c>
a228: 4c00 ldr r4, \[pc, #0\] ; \(a22c <_thumb\+0x28>\)
a22a: 4c01 ldr r4, \[pc, #4\] ; \(a230 <_thumb\+0x2c>\)
#------------------------------------------------------------------------------
@@ -688,15 +700,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf1's .iplt entry
#------------------------------------------------------------------------------
- a234: f7fe ef64 blx 9100 <aaf1-0xf00>
+ a234: f7fe ef64 blx 9100 <abf2@plt\+0x4c>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a238: f7fe bf60 b\.w 90fc <aaf1-0xf04>
+ a238: f7fe bf60 b\.w 90fc <abf2@plt\+0x48>
#------------------------------------------------------------------------------
#------ thumb entry to ttf1's .iplt entry
#------------------------------------------------------------------------------
- a23c: f43e af5e beq\.w 90fc <aaf1-0xf04>
+ a23c: f43e af5e beq\.w 90fc <abf2@plt\+0x48>
a240: 4c00 ldr r4, \[pc, #0\] ; \(a244 <_thumb\+0x40>\)
a242: 4c01 ldr r4, \[pc, #4\] ; \(a248 <_thumb\+0x44>\)
#------------------------------------------------------------------------------
@@ -710,15 +722,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf1's .iplt entry
#------------------------------------------------------------------------------
- a24c: f7fe ef4a blx 90e4 <aaf1-0xf1c>
+ a24c: f7fe ef4a blx 90e4 <abf2@plt\+0x30>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a250: f7fe bf46 b\.w 90e0 <aaf1-0xf20>
+ a250: f7fe bf46 b\.w 90e0 <abf2@plt\+0x2c>
#------------------------------------------------------------------------------
#------ thumb entry to abf1's .iplt entry
#------------------------------------------------------------------------------
- a254: f43e af44 beq\.w 90e0 <aaf1-0xf20>
+ a254: f43e af44 beq\.w 90e0 <abf2@plt\+0x2c>
a258: 4c00 ldr r4, \[pc, #0\] ; \(a25c <_thumb\+0x58>\)
a25a: 4c01 ldr r4, \[pc, #4\] ; \(a260 <_thumb\+0x5c>\)
#------------------------------------------------------------------------------
@@ -732,15 +744,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf1's .iplt entry
#------------------------------------------------------------------------------
- a264: f7fe ef54 blx 9110 <aaf1-0xef0>
+ a264: f7fe ef54 blx 9110 <abf2@plt\+0x5c>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a268: f7fe bf50 b\.w 910c <aaf1-0xef4>
+ a268: f7fe bf50 b\.w 910c <abf2@plt\+0x58>
#------------------------------------------------------------------------------
#------ thumb entry to tbf1's .iplt entry
#------------------------------------------------------------------------------
- a26c: f43e af4e beq\.w 910c <aaf1-0xef4>
+ a26c: f43e af4e beq\.w 910c <abf2@plt\+0x58>
a270: 4c00 ldr r4, \[pc, #0\] ; \(a274 <_thumb\+0x70>\)
a272: 4c01 ldr r4, \[pc, #4\] ; \(a278 <_thumb\+0x74>\)
#------------------------------------------------------------------------------
@@ -754,15 +766,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf2's .plt entry
#------------------------------------------------------------------------------
- a27c: f7fe eecc blx 9018 <aaf1-0xfe8>
+ a27c: f7fe eecc blx 9018 <atf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a280: f7fe bec8 b\.w 9014 <aaf1-0xfec>
+ a280: f7fe bec8 b\.w 9014 <atf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf2's .plt entry
#------------------------------------------------------------------------------
- a284: f43e aec6 beq\.w 9014 <aaf1-0xfec>
+ a284: f43e aec6 beq\.w 9014 <atf2@plt>
a288: 4c00 ldr r4, \[pc, #0\] ; \(a28c <_thumb\+0x88>\)
a28a: 4c01 ldr r4, \[pc, #4\] ; \(a290 <_thumb\+0x8c>\)
#------------------------------------------------------------------------------
@@ -776,15 +788,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf2's .plt entry
#------------------------------------------------------------------------------
- a294: f7fe eece blx 9034 <aaf1-0xfcc>
+ a294: f7fe eece blx 9034 <ttf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a298: f7fe beca b\.w 9030 <aaf1-0xfd0>
+ a298: f7fe beca b\.w 9030 <ttf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf2's .plt entry
#------------------------------------------------------------------------------
- a29c: f43e aec8 beq\.w 9030 <aaf1-0xfd0>
+ a29c: f43e aec8 beq\.w 9030 <ttf2@plt>
a2a0: 4c00 ldr r4, \[pc, #0\] ; \(a2a4 <_thumb\+0xa0>\)
a2a2: 4c01 ldr r4, \[pc, #4\] ; \(a2a8 <_thumb\+0xa4>\)
#------------------------------------------------------------------------------
@@ -798,15 +810,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf2's .plt entry
#------------------------------------------------------------------------------
- a2ac: f7fe ef04 blx 90b8 <aaf1-0xf48>
+ a2ac: f7fe ef04 blx 90b8 <abf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2b0: f7fe bf00 b\.w 90b4 <aaf1-0xf4c>
+ a2b0: f7fe bf00 b\.w 90b4 <abf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf2's .plt entry
#------------------------------------------------------------------------------
- a2b4: f43e aefe beq\.w 90b4 <aaf1-0xf4c>
+ a2b4: f43e aefe beq\.w 90b4 <abf2@plt>
a2b8: 4c00 ldr r4, \[pc, #0\] ; \(a2bc <_thumb\+0xb8>\)
a2ba: 4c01 ldr r4, \[pc, #4\] ; \(a2c0 <_thumb\+0xbc>\)
#------------------------------------------------------------------------------
@@ -820,15 +832,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf2's .plt entry
#------------------------------------------------------------------------------
- a2c4: f7fe eebe blx 9044 <aaf1-0xfbc>
+ a2c4: f7fe eebe blx 9044 <tbf2@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2c8: f7fe beba b\.w 9040 <aaf1-0xfc0>
+ a2c8: f7fe beba b\.w 9040 <tbf2@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf2's .plt entry
#------------------------------------------------------------------------------
- a2cc: f43e aeb8 beq\.w 9040 <aaf1-0xfc0>
+ a2cc: f43e aeb8 beq\.w 9040 <tbf2@plt>
a2d0: 4c00 ldr r4, \[pc, #0\] ; \(a2d4 <_thumb\+0xd0>\)
a2d2: 4c01 ldr r4, \[pc, #4\] ; \(a2d8 <_thumb\+0xd4>\)
#------------------------------------------------------------------------------
@@ -842,15 +854,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf3's .iplt entry
#------------------------------------------------------------------------------
- a2dc: f7fe ef20 blx 9120 <aaf1-0xee0>
+ a2dc: f7fe ef20 blx 9120 <abf2@plt\+0x6c>
#------------------------------------------------------------------------------
#------ thumb entry to atf3's .iplt entry
#------------------------------------------------------------------------------
- a2e0: f7fe bf1c b\.w 911c <aaf1-0xee4>
+ a2e0: f7fe bf1c b\.w 911c <abf2@plt\+0x68>
#------------------------------------------------------------------------------
#------ thumb entry to atf3's .iplt entry
#------------------------------------------------------------------------------
- a2e4: f43e af1a beq\.w 911c <aaf1-0xee4>
+ a2e4: f43e af1a beq\.w 911c <abf2@plt\+0x68>
a2e8: 4c00 ldr r4, \[pc, #0\] ; \(a2ec <_thumb\+0xe8>\)
a2ea: 4c01 ldr r4, \[pc, #4\] ; \(a2f0 <_thumb\+0xec>\)
#------------------------------------------------------------------------------
@@ -864,15 +876,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf3's .iplt entry
#------------------------------------------------------------------------------
- a2f4: f7fe ef24 blx 9140 <aaf1-0xec0>
+ a2f4: f7fe ef24 blx 9140 <abf2@plt\+0x8c>
#------------------------------------------------------------------------------
#------ thumb entry to ttf3's .iplt entry
#------------------------------------------------------------------------------
- a2f8: f7fe bf20 b\.w 913c <aaf1-0xec4>
+ a2f8: f7fe bf20 b\.w 913c <abf2@plt\+0x88>
#------------------------------------------------------------------------------
#------ thumb entry to ttf3's .iplt entry
#------------------------------------------------------------------------------
- a2fc: f43e af1e beq\.w 913c <aaf1-0xec4>
+ a2fc: f43e af1e beq\.w 913c <abf2@plt\+0x88>
a300: 4c00 ldr r4, \[pc, #0\] ; \(a304 <_thumb\+0x100>\)
a302: 4c01 ldr r4, \[pc, #4\] ; \(a308 <_thumb\+0x104>\)
#------------------------------------------------------------------------------
@@ -886,15 +898,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf3's .iplt entry
#------------------------------------------------------------------------------
- a30c: f7fe ef10 blx 9130 <aaf1-0xed0>
+ a30c: f7fe ef10 blx 9130 <abf2@plt\+0x7c>
#------------------------------------------------------------------------------
#------ thumb entry to abf3's .iplt entry
#------------------------------------------------------------------------------
- a310: f7fe bf0c b\.w 912c <aaf1-0xed4>
+ a310: f7fe bf0c b\.w 912c <abf2@plt\+0x78>
#------------------------------------------------------------------------------
#------ thumb entry to abf3's .iplt entry
#------------------------------------------------------------------------------
- a314: f43e af0a beq\.w 912c <aaf1-0xed4>
+ a314: f43e af0a beq\.w 912c <abf2@plt\+0x78>
a318: 4c00 ldr r4, \[pc, #0\] ; \(a31c <_thumb\+0x118>\)
a31a: 4c01 ldr r4, \[pc, #4\] ; \(a320 <_thumb\+0x11c>\)
#------------------------------------------------------------------------------
@@ -908,15 +920,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf3's .iplt entry
#------------------------------------------------------------------------------
- a324: f7fe ef14 blx 9150 <aaf1-0xeb0>
+ a324: f7fe ef14 blx 9150 <abf2@plt\+0x9c>
#------------------------------------------------------------------------------
#------ thumb entry to tbf3's .iplt entry
#------------------------------------------------------------------------------
- a328: f7fe bf10 b\.w 914c <aaf1-0xeb4>
+ a328: f7fe bf10 b\.w 914c <abf2@plt\+0x98>
#------------------------------------------------------------------------------
#------ thumb entry to tbf3's .iplt entry
#------------------------------------------------------------------------------
- a32c: f43e af0e beq\.w 914c <aaf1-0xeb4>
+ a32c: f43e af0e beq\.w 914c <abf2@plt\+0x98>
a330: 4c00 ldr r4, \[pc, #0\] ; \(a334 <_thumb\+0x130>\)
a332: 4c01 ldr r4, \[pc, #4\] ; \(a338 <_thumb\+0x134>\)
#------------------------------------------------------------------------------
@@ -930,15 +942,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ atf4's .plt entry
#------------------------------------------------------------------------------
- a33c: f7fe eeae blx 909c <aaf1-0xf64>
+ a33c: f7fe eeae blx 909c <atf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
- a340: f7fe beaa b\.w 9098 <aaf1-0xf68>
+ a340: f7fe beaa b\.w 9098 <atf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to atf4's .plt entry
#------------------------------------------------------------------------------
- a344: f43e aea8 beq\.w 9098 <aaf1-0xf68>
+ a344: f43e aea8 beq\.w 9098 <atf4@plt>
a348: 4c00 ldr r4, \[pc, #0\] ; \(a34c <_thumb\+0x148>\)
a34a: 4c01 ldr r4, \[pc, #4\] ; \(a350 <_thumb\+0x14c>\)
#------------------------------------------------------------------------------
@@ -952,15 +964,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ ttf4's .plt entry
#------------------------------------------------------------------------------
- a354: f7fe ee9a blx 908c <aaf1-0xf74>
+ a354: f7fe ee9a blx 908c <ttf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
- a358: f7fe be96 b\.w 9088 <aaf1-0xf78>
+ a358: f7fe be96 b\.w 9088 <ttf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to ttf4's .plt entry
#------------------------------------------------------------------------------
- a35c: f43e ae94 beq\.w 9088 <aaf1-0xf78>
+ a35c: f43e ae94 beq\.w 9088 <ttf4@plt>
a360: 4c00 ldr r4, \[pc, #0\] ; \(a364 <_thumb\+0x160>\)
a362: 4c01 ldr r4, \[pc, #4\] ; \(a368 <_thumb\+0x164>\)
#------------------------------------------------------------------------------
@@ -974,15 +986,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ abf4's .plt entry
#------------------------------------------------------------------------------
- a36c: f7fe ee7e blx 906c <aaf1-0xf94>
+ a36c: f7fe ee7e blx 906c <abf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
- a370: f7fe be7a b\.w 9068 <aaf1-0xf98>
+ a370: f7fe be7a b\.w 9068 <abf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to abf4's .plt entry
#------------------------------------------------------------------------------
- a374: f43e ae78 beq\.w 9068 <aaf1-0xf98>
+ a374: f43e ae78 beq\.w 9068 <abf4@plt>
a378: 4c00 ldr r4, \[pc, #0\] ; \(a37c <_thumb\+0x178>\)
a37a: 4c01 ldr r4, \[pc, #4\] ; \(a380 <_thumb\+0x17c>\)
#------------------------------------------------------------------------------
@@ -996,15 +1008,15 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ tbf4's .plt entry
#------------------------------------------------------------------------------
- a384: f7fe ee7a blx 907c <aaf1-0xf84>
+ a384: f7fe ee7a blx 907c <tbf4@plt\+0x4>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
- a388: f7fe be76 b\.w 9078 <aaf1-0xf88>
+ a388: f7fe be76 b\.w 9078 <tbf4@plt>
#------------------------------------------------------------------------------
#------ thumb entry to tbf4's .plt entry
#------------------------------------------------------------------------------
- a38c: f43e ae74 beq\.w 9078 <aaf1-0xf88>
+ a38c: f43e ae74 beq\.w 9078 <tbf4@plt>
a390: 4c00 ldr r4, \[pc, #0\] ; \(a394 <_thumb\+0x190>\)
a392: 4c01 ldr r4, \[pc, #4\] ; \(a398 <_thumb\+0x194>\)
#------------------------------------------------------------------------------
diff --git a/ld/testsuite/ld-arm/ifunc-9.dd b/ld/testsuite/ld-arm/ifunc-9.dd
index 36139d9..af7ec4b 100644
--- a/ld/testsuite/ld-arm/ifunc-9.dd
+++ b/ld/testsuite/ld-arm/ifunc-9.dd
@@ -4,9 +4,9 @@
Disassembly of section \.plt:
-00009000 <\.plt>:
+00009000 <f2@plt-0x14>:
9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f3-0x1c>
+ 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 <f2@plt-0x4>
9008: e08fe00e add lr, pc, lr
900c: e5bef008 ldr pc, \[lr, #8\]!
#------------------------------------------------------------------------------
@@ -16,6 +16,7 @@ Disassembly of section \.plt:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
+00009014 <f2@plt>:
9014: e28fc600 add ip, pc, #0, 12
9018: e28cca07 add ip, ip, #28672 ; 0x7000
901c: e5bcfff0 ldr pc, \[ip, #4080\]! ; 0xff0
@@ -71,7 +72,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f1's .iplt entry
#------------------------------------------------------------------------------
- a034: ebfffbf9 bl 9020 <f3-0xc>
+ a034: ebfffbf9 bl 9020 <f2@plt\+0xc>
a038: e59f400c ldr r4, \[pc, #12\] ; a04c <_start\+0x44>
a03c: e59f400c ldr r4, \[pc, #12\] ; a050 <_start\+0x48>
a040: e59f400c ldr r4, \[pc, #12\] ; a054 <_start\+0x4c>
@@ -100,7 +101,7 @@ Disassembly of section \.text:
#------------------------------------------------------------------------------
#------ f2's .plt entry
#------------------------------------------------------------------------------
- a060: ebfffbeb bl 9014 <f3-0x18>
+ a060: ebfffbeb bl 9014 <f2@plt>
a064: e59f400c ldr r4, \[pc, #12\] ; a078 <_start\+0x70>
a068: e59f400c ldr r4, \[pc, #12\] ; a07c <_start\+0x74>
a06c: e59f400c ldr r4, \[pc, #12\] ; a080 <_start\+0x78>
diff --git a/ld/testsuite/ld-arm/long-plt-format.d b/ld/testsuite/ld-arm/long-plt-format.d
index c64b42f..b0a1abc 100644
--- a/ld/testsuite/ld-arm/long-plt-format.d
+++ b/ld/testsuite/ld-arm/long-plt-format.d
@@ -3,12 +3,13 @@
Disassembly of section .plt:
-.* <.plt>:
+.* <foo@plt-0x14>:
.*: .*
.*: .*
.*: .*
.*: .*
.*: .* .word .*
+.* <foo@plt>:
.*: .* add ip, pc, #-268435456 ; 0xf0000000
.*: .* add ip, ip, #0, 12
.*: .* add ip, ip, #0, 20
diff --git a/ld/testsuite/ld-arm/mixed-app-v5.d b/ld/testsuite/ld-arm/mixed-app-v5.d
index 82013f3..92b5ebb 100644
--- a/ld/testsuite/ld-arm/mixed-app-v5.d
+++ b/ld/testsuite/ld-arm/mixed-app-v5.d
@@ -6,15 +6,17 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -48,7 +50,7 @@ Disassembly of section .text:
.* <app_tfunc>:
.*: b500 push {lr}
- .*: f7ff efc. blx .* <_start-0x..>
+ .*: f7ff efc. blx .* <lib_func2@plt>
.*: bd00 pop {pc}
.*: 4770 bx lr
.*: 46c0 nop ; \(mov r8, r8\)
diff --git a/ld/testsuite/ld-arm/mixed-app.d b/ld/testsuite/ld-arm/mixed-app.d
index 4de8e57..06166f0 100644
--- a/ld/testsuite/ld-arm/mixed-app.d
+++ b/ld/testsuite/ld-arm/mixed-app.d
@@ -6,17 +6,19 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <lib_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <lib_func2@plt>:
.*: 4778 bx pc
.*: 46c0 nop ; \(mov r8, r8\)
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
+.* <lib_func1@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -50,7 +52,7 @@ Disassembly of section .text:
.* <app_tfunc>:
.*: b500 push {lr}
- .*: f7ff ffc. bl .* <_start-0x..>
+ .*: f7ff ffc. bl .* <lib_func2@plt>
.*: bd00 pop {pc}
.*: 4770 bx lr
.*: 46c0 nop ; \(mov r8, r8\)
diff --git a/ld/testsuite/ld-arm/mixed-lib.d b/ld/testsuite/ld-arm/mixed-lib.d
index d3a9ff9..6b344a5 100644
--- a/ld/testsuite/ld-arm/mixed-lib.d
+++ b/ld/testsuite/ld-arm/mixed-lib.d
@@ -6,12 +6,13 @@ start address 0x.*
Disassembly of section .plt:
-.* <.plt>:
+.* <app_func2@plt-0x14>:
.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\)
- .*: e59fe004 ldr lr, \[pc, #4\] ; .* <lib_func1-0x.*>
+ .*: e59fe004 ldr lr, \[pc, #4\] ; .* <app_func2@plt-0x4>
.*: e08fe00e add lr, pc, lr
.*: e5bef008 ldr pc, \[lr, #8\]!
.*: .*
+.* <app_func2@plt>:
.*: e28fc6.* add ip, pc, #.*
.*: e28cca.* add ip, ip, #.* ; 0x.*
.*: e5bcf.* ldr pc, \[ip, #.*\]!.*
@@ -20,7 +21,7 @@ Disassembly of section .text:
.* <lib_func1>:
.*: e1a0c00d mov ip, sp
.*: e92dd800 push {fp, ip, lr, pc}
- .*: ebfffff. bl .* <lib_func1-0x..?>
+ .*: ebfffff. bl .* <app_func2@plt>
.*: e89d6800 ldm sp, {fp, sp, lr}
.*: e12fff1e bx lr
.*: e1a00000 nop ; \(mov r0, r0\)
diff --git a/ld/testsuite/ld-arm/thumb2-bl-undefweak.d b/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
index 5c286bee9..c501aa2 100644
--- a/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
+++ b/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
@@ -6,4 +6,4 @@
Disassembly of section .text:
.* <foo>:
- +[0-9a-f]+: .... .... bl. [0-9a-f]+ <foo-0x[0-9a-f]+>
+ +[0-9a-f]+: .... .... bl. [0-9a-f]+ <bar@plt>
diff --git a/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d b/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d
index a6907f5..806f66c 100644
--- a/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d
+++ b/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d
@@ -6,4 +6,4 @@
Disassembly of section .text:
.* <foo>:
- +[0-9a-f]+: ........ bl [0-9a-f]+ <foo-0x[0-9a-f]+>
+ +[0-9a-f]+: ........ bl [0-9a-f]+ <bar@plt>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH][PING] Pretty-printing plt entries on ARM (second try)
2014-03-24 4:48 ` [PATCH][PING] " Yury Gribov
@ 2014-03-27 14:27 ` Nicholas Clifton
2014-03-31 12:20 ` Yury Gribov
0 siblings, 1 reply; 7+ messages in thread
From: Nicholas Clifton @ 2014-03-27 14:27 UTC (permalink / raw)
To: Yury Gribov, binutils; +Cc: Viacheslav Garbuzov, Pavel Fedin
Hi Yury,
> I'm not sure how to autotest Thumb-only platforms. Are those already
> checked when I configure for standard gnueabi/eabi targets?
No.
> Or should I use some special triplet?
Yes try building a toolchain configure with:
--target=arm-eabi --with-cpu=cortex-m3
and then run the testsuite with -mthumb specified on the command line.
Or you could just let me do that and tell you that it works and so have
checked your patch in. (Sorry that it tool me so long to getting round
to doing this).
Cheers
Nick
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH][PING] Pretty-printing plt entries on ARM (second try)
2014-03-27 14:27 ` Nicholas Clifton
@ 2014-03-31 12:20 ` Yury Gribov
0 siblings, 0 replies; 7+ messages in thread
From: Yury Gribov @ 2014-03-31 12:20 UTC (permalink / raw)
To: Nicholas Clifton, binutils; +Cc: Viacheslav Garbuzov, Pavel Fedin
Nicholas Clifton wrote:
>> Or should I use some special triplet?
>
> Yes try building a toolchain configure with:
> --target=arm-eabi --with-cpu=cortex-m3
> and then run the testsuite with -mthumb specified on the command line.
Ok, I see no regressions after compiling for cortex-m3 and forcedly
setting ASFLAGS to -mthumb in default.exp.
Still not sure that's enough: many assembler tests failed to compile
under -mthumb because they were written for ARM ISA.
Let me know if you run into any regressions.
And thanks for commiting the patch!
-Y
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-03-31 12:20 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-12 9:10 [PATCH] Pretty-printing plt entries on ARM (second try) Yury Gribov
2014-03-14 11:32 ` Nicholas Clifton
2014-03-14 12:35 ` Yury Gribov
2014-03-17 12:06 ` Yury Gribov
2014-03-24 4:48 ` [PATCH][PING] " Yury Gribov
2014-03-27 14:27 ` Nicholas Clifton
2014-03-31 12:20 ` Yury Gribov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).