From: Yury Gribov Date: Thu, 27 Mar 2014 13:54:03 +0000 (+0000) Subject: Add support for limited pretty-printing of ARM PLT entries on eabi and nacl targets. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6a631e86cfc2ddd979f9dc4b4da01133d9d3610f;p=binutils-gdb.git Add support for limited pretty-printing of ARM PLT entries on eabi and nacl targets. * 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-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/ChangeLog b/bfd/ChangeLog index a7ca2d08f44..badd4c925e9 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +2014-03-27 Yury Gribov + Pavel Fedin + + * elf32-arm.c: Add support for limited pretty-printing of PLT + entries on eabi and nacl targets. + (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. + 2014-03-27 Tristan Gingold * mach-o.c (bfd_mach_o_read_dylinker): Remove assert. diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index 81be93f1f2a..16467a44943 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -2569,7 +2569,7 @@ enum elf32_arm_stub_type { arm_stub_none, DEF_STUBS - /* Note the first a8_veneer type */ + /* Note the first a8_veneer type. */ arm_stub_a8_veneer_lwm = arm_stub_a8_veneer_b_cond }; #undef DEF_STUB @@ -3783,7 +3783,7 @@ arm_type_of_stub (struct bfd_link_info *info, (info->shared | globals->pic_veneer) /* PIC stubs. */ ? (r_type == R_ARM_THM_TLS_CALL - /* TLS PIC stubs */ + /* TLS PIC stubs. */ ? (globals->use_blx ? arm_stub_long_branch_any_tls_pic : arm_stub_long_branch_v4t_thumb_tls_pic) : ((globals->use_blx && r_type == R_ARM_THM_CALL) @@ -3860,7 +3860,7 @@ arm_type_of_stub (struct bfd_link_info *info, (info->shared | globals->pic_veneer) /* PIC stubs. */ ? (r_type == R_ARM_TLS_CALL - /* TLS PIC Stub */ + /* TLS PIC Stub. */ ? arm_stub_long_branch_any_tls_pic : (globals->nacl_p ? arm_stub_long_branch_arm_nacl_pic @@ -5195,7 +5195,7 @@ elf32_arm_size_stubs (bfd *output_bfd, if (!sym_sec) /* This is an undefined symbol. It can never - be resolved. */ + be resolved. */ continue; if (ELF_ST_TYPE (sym->st_info) != STT_SECTION) @@ -8075,7 +8075,7 @@ elf32_arm_tls_relax (struct elf32_arm_link_hash_table *globals, break; case R_ARM_THM_TLS_CALL: - /* GD->IE relaxation */ + /* GD->IE relaxation. */ if (!is_local) /* add r0,pc; ldr r0, [r0] */ insn = 0x44786800; @@ -9743,7 +9743,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto, else { lower_insn = 0xc000; - /* Round up the offset to a word boundary */ + /* Round up the offset to a word boundary. */ offset = (offset + 2) & ~2; } @@ -9762,7 +9762,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto, /* These relocations needs special care, as besides the fact they point somewhere in .gotplt, the addend must be adjusted accordingly depending on the type of instruction - we refer to */ + we refer to. */ else if ((r_type == R_ARM_TLS_GOTDESC) && (tls_type & GOT_TLS_GDESC)) { unsigned long data, insn; @@ -10714,7 +10714,7 @@ elf32_arm_relocate_section (bfd * output_bfd, done, i.e., the relaxation produced the final output we want, and we won't let anybody mess with it. Also, we have to do addend adjustments in case of a R_ARM_TLS_GOTDESC relocation - both in relaxed and non-relaxed cases */ + both in relaxed and non-relaxed cases. */ if ((elf32_arm_tls_transition (info, r_type, h) != (unsigned)r_type) || (IS_ARM_TLS_GNU_RELOC (r_type) && !((h ? elf32_arm_hash_entry (h)->tls_type : @@ -11731,7 +11731,7 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd) { case Tag_CPU_raw_name: case Tag_CPU_name: - /* These are merged after Tag_CPU_arch. */ + /* These are merged after Tag_CPU_arch. */ break; case Tag_ABI_optimization_goals: @@ -11885,7 +11885,7 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd) else if (in_attr[i].i == 0 || (in_attr[i].i == 'S' && (out_attr[i].i == 'A' || out_attr[i].i == 'R'))) - ; /* Do nothing. */ + ; /* Do nothing. */ else { _bfd_error_handler @@ -12735,7 +12735,7 @@ elf32_arm_check_relocs (bfd *abfd, struct bfd_link_info *info, /* If the symbol is accessed in both IE and GDESC method, we're able to relax. Turn off the GDESC flag, without messing up with any other kind of tls types - that may be involved */ + that may be involved. */ if ((tls_type & GOT_TLS_IE) && (tls_type & GOT_TLS_GDESC)) tls_type &= ~GOT_TLS_GDESC; @@ -14864,7 +14864,7 @@ elf32_arm_output_plt_map_1 (output_arch_syminfo *osi, { if (!elf32_arm_output_map_sym (osi, ARM_MAP_THUMB, addr)) return FALSE; - } + } else { bfd_boolean thumb_stub_p; @@ -15908,6 +15908,185 @@ 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; +} + +/* Implementation is shamelessly borrowed from _bfd_elf_get_synthetic_symtab. */ + +static long +elf32_arm_get_synthetic_symtab (bfd *abfd, + long symcount ATTRIBUTE_UNUSED, + asymbol **syms ATTRIBUTE_UNUSED, + long dynsymcount, + asymbol **dynsyms, + asymbol **ret) +{ + 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 @@ -15934,6 +16113,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 @@ -16038,20 +16218,31 @@ 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 +#define elf32_bed elf32_arm_nacl_bed #undef bfd_elf32_bfd_link_hash_table_create #define bfd_elf32_bfd_link_hash_table_create \ elf32_arm_nacl_link_hash_table_create #undef elf_backend_plt_alignment -#define elf_backend_plt_alignment 4 +#define elf_backend_plt_alignment 4 #undef elf_backend_modify_segment_map #define elf_backend_modify_segment_map elf32_arm_nacl_modify_segment_map #undef elf_backend_modify_program_headers #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/ChangeLog b/ld/testsuite/ChangeLog index 279958e9122..d35eb0421fb 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,36 @@ +2014-03-27 Yury Gribov + Pavel Fedin + + * ld-arm/arm-app-abs32.d: Update expected disassembly, taking into + account the pretty printing of PLT entries. + * 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. + 2014-03-26 Alan Modra * ld-powerpc/startv1.s, * ld-powerpc/startv2.s, * ld-powerpc/funref.s, diff --git a/ld/testsuite/ld-arm/arm-app-abs32.d b/ld/testsuite/ld-arm/arm-app-abs32.d index e6c463220de..2f56c08bcd0 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>: +.* : +.*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - +.*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x10> + +.*: e59fe004 ldr lr, \[pc, #4\] ; .* +.*: e08fe00e add lr, pc, lr +.*: e5bef008 ldr pc, \[lr, #8\]! +.*: .* .* +.* : +.*: 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 88169af17de..9788db04cb5 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>: +.* : .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x10> + .*: e59fe004 ldr lr, \[pc, #4\] ; .* .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* +.* : .*: e28fc6.* add ip, pc, #.* .*: e28cca.* add ip, ip, #.* ; 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* @@ -27,7 +28,7 @@ Disassembly of section .text: .* : .*: e1a0c00d mov ip, sp .*: e92dd800 push {fp, ip, lr, pc} - .*: ebfffff4 bl .* <_start-0xc> + .*: ebfffff4 bl .* .*: 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 279ea5a49df..e04adb80806 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>: +.* : .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* + .*: e59fe004 ldr lr, \[pc, #4\] ; .* .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* +.* : .*: e28fc6.* add ip, pc, #.* .*: e28cca.* add ip, ip, #.* ; 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* @@ -20,7 +21,7 @@ Disassembly of section .text: .* : .*: e1a0c00d mov ip, sp .*: e92dd800 push {fp, ip, lr, pc} - .*: ebfffff9 bl .* + .*: ebfffff9 bl .* .*: 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 22e21d5936e..887880f2f6d 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>: +.* : .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* + .*: e59fe004 ldr lr, \[pc, #4\] ; .* .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* +.* : .*: e28fc6.* add ip, pc, #.* .*: e28cca.* add ip, ip, #.* ; 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* @@ -20,7 +21,7 @@ Disassembly of section .text: .* : .*: e1a0c00d mov ip, sp .*: e92dd800 push {fp, ip, lr, pc} - .*: ebfffff9 bl .* + .*: ebfffff9 bl .* .*: 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 dae72ed1555..b63e3e60467 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>: +.* : .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* + .*: e59fe004 ldr lr, \[pc, #4\] ; .* .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* +.* : .*: e28fc6.* add ip, pc, #.* .*: e28cca.* add ip, ip, #.* ; 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* @@ -20,7 +21,7 @@ Disassembly of section .text: .* : .*: e1a0c00d mov ip, sp .*: e92dd800 push {fp, ip, lr, pc} - .*: ebfffff. bl .* + .*: ebfffff. bl .* .*: 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 4f1078d644e..0f40861bbc5 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 : 8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 + 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 8008: e08fe00e add lr, pc, lr 800c: e5bef008 ldr pc, \[lr, #8\]! 8010: 00000ffc \.word 0x00000ffc +00008014 : 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 + 9008: f7ff b804 b\.w 8014 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 1e0cab2d339..b6e6fff0109 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 : 8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 + 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 8008: e08fe00e add lr, pc, lr 800c: e5bef008 ldr pc, \[lr, #8\]! 8010: 00001004 \.word 0x00001004 +00008014 : 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 900a: f7ff bffa b\.w 9002 - 900e: f7ff b801 b\.w 8014 + 900e: f7ff b801 b\.w 8014 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 ebb480f0f6e..baad3d07cd5 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 : 8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 + 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 8008: e08fe00e add lr, pc, lr 800c: e5bef008 ldr pc, \[lr, #8\]! 8010: 00000ffc \.word 0x00000ffc +00008014 : 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 + 9008: eafffc01 b 8014 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 f8a9c24295b..e2fd8acc26f 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 : 8e00: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 8e04: e59fe004 ldr lr, \[pc, #4\] ; 8e10 + 8e04: e59fe004 ldr lr, \[pc, #4\] ; 8e10 8e08: e08fe00e add lr, pc, lr 8e0c: e5bef008 ldr pc, \[lr, #8\]! 8e10: 0000827c \.word 0x0000827c +00008e14 : 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 + 8f0e: f7ff ef82 blx 8e14 8f12: eb01 0002 add\.w r0, r1, r2 - 8f16: f7ff ef7e blx 8e14 + 8f16: f7ff ef7e blx 8e14 8f1a: eb01 0002 add\.w r0, r1, r2 - 8f1e: f7ff ef7a blx 8e14 + 8f1e: f7ff ef7a blx 8e14 8f22: eb01 0002 add\.w r0, r1, r2 - 8f26: f7ff ef76 blx 8e14 + 8f26: f7ff ef76 blx 8e14 8f2a: eb01 0002 add\.w r0, r1, r2 - 8f2e: f7ff ef72 blx 8e14 + 8f2e: f7ff ef72 blx 8e14 8f32: eb01 0002 add\.w r0, r1, r2 - 8f36: f7ff ef6e blx 8e14 + 8f36: f7ff ef6e blx 8e14 8f3a: eb01 0002 add\.w r0, r1, r2 - 8f3e: f7ff ef6a blx 8e14 + 8f3e: f7ff ef6a blx 8e14 8f42: eb01 0002 add\.w r0, r1, r2 - 8f46: f7ff ef66 blx 8e14 + 8f46: f7ff ef66 blx 8e14 8f4a: eb01 0002 add\.w r0, r1, r2 - 8f4e: f7ff ef62 blx 8e14 + 8f4e: f7ff ef62 blx 8e14 8f52: eb01 0002 add\.w r0, r1, r2 - 8f56: f7ff ef5e blx 8e14 + 8f56: f7ff ef5e blx 8e14 8f5a: eb01 0002 add\.w r0, r1, r2 - 8f5e: f7ff ef5a blx 8e14 + 8f5e: f7ff ef5a blx 8e14 8f62: eb01 0002 add\.w r0, r1, r2 - 8f66: f7ff ef56 blx 8e14 + 8f66: f7ff ef56 blx 8e14 8f6a: eb01 0002 add\.w r0, r1, r2 - 8f6e: f7ff ef52 blx 8e14 + 8f6e: f7ff ef52 blx 8e14 8f72: eb01 0002 add\.w r0, r1, r2 - 8f76: f7ff ef4e blx 8e14 + 8f76: f7ff ef4e blx 8e14 8f7a: eb01 0002 add\.w r0, r1, r2 - 8f7e: f7ff ef4a blx 8e14 + 8f7e: f7ff ef4a blx 8e14 8f82: eb01 0002 add\.w r0, r1, r2 - 8f86: f7ff ef46 blx 8e14 + 8f86: f7ff ef46 blx 8e14 8f8a: eb01 0002 add\.w r0, r1, r2 - 8f8e: f7ff ef42 blx 8e14 + 8f8e: f7ff ef42 blx 8e14 8f92: eb01 0002 add\.w r0, r1, r2 - 8f96: f7ff ef3e blx 8e14 + 8f96: f7ff ef3e blx 8e14 8f9a: eb01 0002 add\.w r0, r1, r2 - 8f9e: f7ff ef3a blx 8e14 + 8f9e: f7ff ef3a blx 8e14 8fa2: eb01 0002 add\.w r0, r1, r2 - 8fa6: f7ff ef36 blx 8e14 + 8fa6: f7ff ef36 blx 8e14 8faa: eb01 0002 add\.w r0, r1, r2 - 8fae: f7ff ef32 blx 8e14 + 8fae: f7ff ef32 blx 8e14 8fb2: eb01 0002 add\.w r0, r1, r2 - 8fb6: f7ff ef2e blx 8e14 + 8fb6: f7ff ef2e blx 8e14 8fba: eb01 0002 add\.w r0, r1, r2 - 8fbe: f7ff ef2a blx 8e14 + 8fbe: f7ff ef2a blx 8e14 8fc2: eb01 0002 add\.w r0, r1, r2 - 8fc6: f7ff ef26 blx 8e14 + 8fc6: f7ff ef26 blx 8e14 8fca: eb01 0002 add\.w r0, r1, r2 - 8fce: f7ff ef22 blx 8e14 + 8fce: f7ff ef22 blx 8e14 8fd2: eb01 0002 add\.w r0, r1, r2 - 8fd6: f7ff ef1e blx 8e14 + 8fd6: f7ff ef1e blx 8e14 8fda: eb01 0002 add\.w r0, r1, r2 - 8fde: f7ff ef1a blx 8e14 + 8fde: f7ff ef1a blx 8e14 8fe2: eb01 0002 add\.w r0, r1, r2 - 8fe6: f7ff ef16 blx 8e14 + 8fe6: f7ff ef16 blx 8e14 8fea: eb01 0002 add\.w r0, r1, r2 - 8fee: f7ff ef12 blx 8e14 + 8fee: f7ff ef12 blx 8e14 8ff2: eb01 0002 add\.w r0, r1, r2 - 8ff6: f7ff ef0e blx 8e14 + 8ff6: f7ff ef0e blx 8e14 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 + 9006: f7ff ef06 blx 8e14 900a: 4770 bx lr 900c: f3af 8000 nop\.w - 9010: eaffff7f b 8e14 + 9010: eaffff7f b 8e14 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 ebb480f0f6e..baad3d07cd5 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 : 8000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 + 8004: e59fe004 ldr lr, \[pc, #4\] ; 8010 8008: e08fe00e add lr, pc, lr 800c: e5bef008 ldr pc, \[lr, #8\]! 8010: 00000ffc \.word 0x00000ffc +00008014 : 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 + 9008: eafffc01 b 8014 diff --git a/ld/testsuite/ld-arm/farcall-mixed-app-v5.d b/ld/testsuite/ld-arm/farcall-mixed-app-v5.d index 781b972780e..74668837556 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>: +.* : .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28> + .*: e59fe004 ldr lr, \[pc, #4\] ; .* .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* +.* : .*: e28fc6.* add ip, pc, #.* .*: e28cca.* add ip, ip, #.* ; 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* +.* : .*: 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 .* + .*: ebfffff1 bl .* .*: e89d6800 ldm sp, {fp, sp, lr} .*: e12fff1e bx lr .*: e1a00000 nop ; \(mov r0, r0\) .* : .*: b500 push {lr} - .*: f7ff efdc blx .* <_start-0x24> + .*: f7ff efdc blx .* .*: 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 b6cc2d0d25c..cfe31a45a6f 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>: +.* : .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28> + .*: e59fe004 ldr lr, \[pc, #4\] ; .* .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* +.* : .*: 4778 bx pc .*: 46c0 nop ; \(mov r8, r8\) .*: e28fc6.* add ip, pc, #.* .*: e28cca.* add ip, ip, #.* ; 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* +.* : .*: 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 .* + .*: ebfffff2 bl .* .*: e89d6800 ldm sp, {fp, sp, lr} .*: e12fff1e bx lr .*: e1a00000 nop ; \(mov r0, r0\) .* : .*: b500 push {lr} - .*: f7ff ffdb bl 81dc <_start-0x24> + .*: f7ff ffdb bl 81dc .*: 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 3be297bc8d9..eec8de680f0 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>: +.* : .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* + .*: e59fe004 ldr lr, \[pc, #4\] ; .* .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* .word .* +.* : .*: 4778 bx pc .*: 46c0 nop ; \(mov r8, r8\) .*: e28fc6.* add ip, pc, #.* .*: e28cca.* add ip, ip, #.* ; 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]! ; .* +.* : .*: 4778 bx pc .*: 46c0 nop ; \(mov r8, r8\) .*: e28fc6.* add ip, pc, #.* .*: e28cca.* add ip, ip, #.* ; 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]! ; 0x.* +.* : .*: 4778 bx pc .*: 46c0 nop ; \(mov r8, r8\) .*: e28fc6.* add ip, pc, #.* .*: e28cca.* add ip, ip, #.* ; 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]! ; 0x.* +.* : .*: 4778 bx pc .*: 46c0 nop ; \(mov r8, r8\) .*: e28fc6.* add ip, pc, #.* @@ -37,10 +41,10 @@ Disassembly of section .text: .* : .*: e1a0c00d mov ip, sp .*: e92dd800 push {fp, ip, lr, pc} - .*: ebffff.. bl .* - .*: ebffff.. bl .* - .*: ebffff.. bl .* - .*: ebffff.. bl .* + .*: ebffff.. bl .* + .*: ebffff.. bl .* + .*: ebffff.. bl .* + .*: ebffff.. bl .* .*: 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 05578f47f4c..9577af9d223 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>: +.* : .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* + .*: e59fe004 ldr lr, \[pc, #4\] ; .* .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* +.* : .*: e28fc6.* add ip, pc, #.* .*: e28cca.* add ip, ip, #.* ; 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* +.* : .*: e28fc6.* add ip, pc, #.* .*: e28cca.* add ip, ip, #.* ; 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* +.* : .*: e28fc6.* add ip, pc, #.* .*: e28cca.* add ip, ip, #.* ; 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* +.* : .*: e28fc6.* add ip, pc, #.* .*: e28cca.* add ip, ip, #.* ; 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* @@ -29,10 +33,10 @@ Disassembly of section .text: .* : .*: e1a0c00d mov ip, sp .*: e92dd800 push {fp, ip, lr, pc} - .*: ebffff.. bl .* - .*: ebffff.. bl .* - .*: ebfffff. bl .* - .*: ebfffff. bl .* + .*: ebffff.. bl .* + .*: ebffff.. bl .* + .*: ebfffff. bl .* + .*: ebfffff. bl .* .*: 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 105b09b9c63..88bae50a66b 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 : 9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 + 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 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 : 9014: 4778 bx pc 9016: 46c0 nop ; \(mov r8, r8\) #------------------------------------------------------------------------------ @@ -27,12 +28,14 @@ Disassembly of section \.plt: #------------------------------------------------------------------------------ #------ aaf4's .plt entry #------------------------------------------------------------------------------ +00009024 : 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 : 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 : 9040: 4778 bx pc 9042: 46c0 nop ; \(mov r8, r8\) #------------------------------------------------------------------------------ @@ -55,18 +59,21 @@ Disassembly of section \.plt: #------------------------------------------------------------------------------ #------ taf2's .plt entry #------------------------------------------------------------------------------ +00009050 : 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 : 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 : 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 : 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 : 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 : 9098: 4778 bx pc 909a: 46c0 nop ; \(mov r8, r8\) #------------------------------------------------------------------------------ @@ -111,12 +121,14 @@ Disassembly of section \.plt: #------------------------------------------------------------------------------ #------ taf4's .plt entry #------------------------------------------------------------------------------ +000090a8 : 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 : 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 + a044: ebfffc1e bl 90c4 #------------------------------------------------------------------------------ #------ aaf1's .iplt entry #------------------------------------------------------------------------------ - a048: eafffc1d b 90c4 + a048: eafffc1d b 90c4 #------------------------------------------------------------------------------ #------ aaf1's .iplt entry #------------------------------------------------------------------------------ - a04c: 0afffc1c beq 90c4 + a04c: 0afffc1c beq 90c4 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 + a060: ebfffc22 bl 90f0 #------------------------------------------------------------------------------ #------ taf1's .iplt entry #------------------------------------------------------------------------------ - a064: eafffc21 b 90f0 + a064: eafffc21 b 90f0 #------------------------------------------------------------------------------ #------ taf1's .iplt entry #------------------------------------------------------------------------------ - a068: 0afffc20 beq 90f0 + a068: 0afffc20 beq 90f0 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 + a07c: ebfffc18 bl 90e4 #------------------------------------------------------------------------------ #------ abf1's .iplt entry #------------------------------------------------------------------------------ - a080: eafffc17 b 90e4 + a080: eafffc17 b 90e4 #------------------------------------------------------------------------------ #------ abf1's .iplt entry #------------------------------------------------------------------------------ - a084: 0afffc16 beq 90e4 + a084: 0afffc16 beq 90e4 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 + a098: ebfffc1c bl 9110 #------------------------------------------------------------------------------ #------ tbf1's .iplt entry #------------------------------------------------------------------------------ - a09c: eafffc1b b 9110 + a09c: eafffc1b b 9110 #------------------------------------------------------------------------------ #------ tbf1's .iplt entry #------------------------------------------------------------------------------ - a0a0: 0afffc1a beq 9110 + a0a0: 0afffc1a beq 9110 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 + a0b4: ebfffbe8 bl 905c #------------------------------------------------------------------------------ #------ aaf2's .plt entry #------------------------------------------------------------------------------ - a0b8: eafffbe7 b 905c + a0b8: eafffbe7 b 905c #------------------------------------------------------------------------------ #------ aaf2's .plt entry #------------------------------------------------------------------------------ - a0bc: 0afffbe6 beq 905c + a0bc: 0afffbe6 beq 905c 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 + a0d0: ebfffbde bl 9050 #------------------------------------------------------------------------------ #------ taf2's .plt entry #------------------------------------------------------------------------------ - a0d4: eafffbdd b 9050 + a0d4: eafffbdd b 9050 #------------------------------------------------------------------------------ #------ taf2's .plt entry #------------------------------------------------------------------------------ - a0d8: 0afffbdc beq 9050 + a0d8: 0afffbdc beq 9050 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 + a0ec: ebfffbf1 bl 90b8 #------------------------------------------------------------------------------ #------ abf2's .plt entry #------------------------------------------------------------------------------ - a0f0: eafffbf0 b 90b8 + a0f0: eafffbf0 b 90b8 #------------------------------------------------------------------------------ #------ abf2's .plt entry #------------------------------------------------------------------------------ - a0f4: 0afffbef beq 90b8 + a0f4: 0afffbef beq 90b8 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 + a108: ebfffbcd bl 9044 #------------------------------------------------------------------------------ #------ tbf2's .plt entry #------------------------------------------------------------------------------ - a10c: eafffbcc b 9044 + a10c: eafffbcc b 9044 #------------------------------------------------------------------------------ #------ tbf2's .plt entry #------------------------------------------------------------------------------ - a110: 0afffbcb beq 9044 + a110: 0afffbcb beq 9044 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 + a194: ebfffba2 bl 9024 #------------------------------------------------------------------------------ #------ aaf4's .plt entry #------------------------------------------------------------------------------ - a198: eafffba1 b 9024 + a198: eafffba1 b 9024 #------------------------------------------------------------------------------ #------ aaf4's .plt entry #------------------------------------------------------------------------------ - a19c: 0afffba0 beq 9024 + a19c: 0afffba0 beq 9024 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 + a1b0: ebfffbbc bl 90a8 #------------------------------------------------------------------------------ #------ taf4's .plt entry #------------------------------------------------------------------------------ - a1b4: eafffbbb b 90a8 + a1b4: eafffbbb b 90a8 #------------------------------------------------------------------------------ #------ taf4's .plt entry #------------------------------------------------------------------------------ - a1b8: 0afffbba beq 90a8 + a1b8: 0afffbba beq 90a8 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 + a1cc: ebfffba6 bl 906c #------------------------------------------------------------------------------ #------ abf4's .plt entry #------------------------------------------------------------------------------ - a1d0: eafffba5 b 906c + a1d0: eafffba5 b 906c #------------------------------------------------------------------------------ #------ abf4's .plt entry #------------------------------------------------------------------------------ - a1d4: 0afffba4 beq 906c + a1d4: 0afffba4 beq 906c 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 + a1e8: ebfffba3 bl 907c #------------------------------------------------------------------------------ #------ tbf4's .plt entry #------------------------------------------------------------------------------ - a1ec: eafffba2 b 907c + a1ec: eafffba2 b 907c #------------------------------------------------------------------------------ #------ tbf4's .plt entry #------------------------------------------------------------------------------ - a1f0: 0afffba1 beq 907c + a1f0: 0afffba1 beq 907c 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 + a21c: f7fe ef5a blx 90d4 #------------------------------------------------------------------------------ #------ thumb entry to atf1's .iplt entry #------------------------------------------------------------------------------ - a220: f7fe bf56 b\.w 90d0 + a220: f7fe bf56 b\.w 90d0 #------------------------------------------------------------------------------ #------ thumb entry to atf1's .iplt entry #------------------------------------------------------------------------------ - a224: f43e af54 beq\.w 90d0 + a224: f43e af54 beq\.w 90d0 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 + a234: f7fe ef64 blx 9100 #------------------------------------------------------------------------------ #------ thumb entry to ttf1's .iplt entry #------------------------------------------------------------------------------ - a238: f7fe bf60 b\.w 90fc + a238: f7fe bf60 b\.w 90fc #------------------------------------------------------------------------------ #------ thumb entry to ttf1's .iplt entry #------------------------------------------------------------------------------ - a23c: f43e af5e beq\.w 90fc + a23c: f43e af5e beq\.w 90fc 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 + a24c: f7fe ef4a blx 90e4 #------------------------------------------------------------------------------ #------ thumb entry to abf1's .iplt entry #------------------------------------------------------------------------------ - a250: f7fe bf46 b\.w 90e0 + a250: f7fe bf46 b\.w 90e0 #------------------------------------------------------------------------------ #------ thumb entry to abf1's .iplt entry #------------------------------------------------------------------------------ - a254: f43e af44 beq\.w 90e0 + a254: f43e af44 beq\.w 90e0 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 + a264: f7fe ef54 blx 9110 #------------------------------------------------------------------------------ #------ thumb entry to tbf1's .iplt entry #------------------------------------------------------------------------------ - a268: f7fe bf50 b\.w 910c + a268: f7fe bf50 b\.w 910c #------------------------------------------------------------------------------ #------ thumb entry to tbf1's .iplt entry #------------------------------------------------------------------------------ - a26c: f43e af4e beq\.w 910c + a26c: f43e af4e beq\.w 910c 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 + a27c: f7fe eecc blx 9018 #------------------------------------------------------------------------------ #------ thumb entry to atf2's .plt entry #------------------------------------------------------------------------------ - a280: f7fe bec8 b\.w 9014 + a280: f7fe bec8 b\.w 9014 #------------------------------------------------------------------------------ #------ thumb entry to atf2's .plt entry #------------------------------------------------------------------------------ - a284: f43e aec6 beq\.w 9014 + a284: f43e aec6 beq\.w 9014 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 + a294: f7fe eece blx 9034 #------------------------------------------------------------------------------ #------ thumb entry to ttf2's .plt entry #------------------------------------------------------------------------------ - a298: f7fe beca b\.w 9030 + a298: f7fe beca b\.w 9030 #------------------------------------------------------------------------------ #------ thumb entry to ttf2's .plt entry #------------------------------------------------------------------------------ - a29c: f43e aec8 beq\.w 9030 + a29c: f43e aec8 beq\.w 9030 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 + a2ac: f7fe ef04 blx 90b8 #------------------------------------------------------------------------------ #------ thumb entry to abf2's .plt entry #------------------------------------------------------------------------------ - a2b0: f7fe bf00 b\.w 90b4 + a2b0: f7fe bf00 b\.w 90b4 #------------------------------------------------------------------------------ #------ thumb entry to abf2's .plt entry #------------------------------------------------------------------------------ - a2b4: f43e aefe beq\.w 90b4 + a2b4: f43e aefe beq\.w 90b4 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 + a2c4: f7fe eebe blx 9044 #------------------------------------------------------------------------------ #------ thumb entry to tbf2's .plt entry #------------------------------------------------------------------------------ - a2c8: f7fe beba b\.w 9040 + a2c8: f7fe beba b\.w 9040 #------------------------------------------------------------------------------ #------ thumb entry to tbf2's .plt entry #------------------------------------------------------------------------------ - a2cc: f43e aeb8 beq\.w 9040 + a2cc: f43e aeb8 beq\.w 9040 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 + a2e0: f7fe bf1c b\.w 911c #------------------------------------------------------------------------------ #------ thumb entry to atf3 #------------------------------------------------------------------------------ - a2e4: f43e af1a beq\.w 911c + a2e4: f43e af1a beq\.w 911c 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 + a33c: f7fe eeae blx 909c #------------------------------------------------------------------------------ #------ thumb entry to atf4's .plt entry #------------------------------------------------------------------------------ - a340: f7fe beaa b\.w 9098 + a340: f7fe beaa b\.w 9098 #------------------------------------------------------------------------------ #------ thumb entry to atf4's .plt entry #------------------------------------------------------------------------------ - a344: f43e aea8 beq\.w 9098 + a344: f43e aea8 beq\.w 9098 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 + a354: f7fe ee9a blx 908c #------------------------------------------------------------------------------ #------ thumb entry to ttf4's .plt entry #------------------------------------------------------------------------------ - a358: f7fe be96 b\.w 9088 + a358: f7fe be96 b\.w 9088 #------------------------------------------------------------------------------ #------ thumb entry to ttf4's .plt entry #------------------------------------------------------------------------------ - a35c: f43e ae94 beq\.w 9088 + a35c: f43e ae94 beq\.w 9088 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 + a36c: f7fe ee7e blx 906c #------------------------------------------------------------------------------ #------ thumb entry to abf4's .plt entry #------------------------------------------------------------------------------ - a370: f7fe be7a b\.w 9068 + a370: f7fe be7a b\.w 9068 #------------------------------------------------------------------------------ #------ thumb entry to abf4's .plt entry #------------------------------------------------------------------------------ - a374: f43e ae78 beq\.w 9068 + a374: f43e ae78 beq\.w 9068 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 + a384: f7fe ee7a blx 907c #------------------------------------------------------------------------------ #------ thumb entry to tbf4's .plt entry #------------------------------------------------------------------------------ - a388: f7fe be76 b\.w 9078 + a388: f7fe be76 b\.w 9078 #------------------------------------------------------------------------------ #------ thumb entry to tbf4's .plt entry #------------------------------------------------------------------------------ - a38c: f43e ae74 beq\.w 9078 + a38c: f43e ae74 beq\.w 9078 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 861f687733a..cbad1c8c6d1 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 : 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 : 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 : 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 d7648410cc9..f23e8e8a564 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 : 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 : 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 : 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 a1fb37a8e91..b267bf1e99b 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 : 9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 + 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 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 : 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 + a024: ebfffbfd bl 9020 a028: e59f4000 ldr r4, \[pc\] ; a030 a02c: e59f4000 ldr r4, \[pc\] ; a034 #------------------------------------------------------------------------------ @@ -85,7 +86,7 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ f2's .plt entry #------------------------------------------------------------------------------ - a038: ebfffbf5 bl 9014 + a038: ebfffbf5 bl 9014 a03c: e59f4000 ldr r4, \[pc\] ; a044 a040: e59f4000 ldr r4, \[pc\] ; a048 #------------------------------------------------------------------------------ @@ -99,7 +100,7 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ f3's .iplt entry #------------------------------------------------------------------------------ - a04c: ebfffbf6 bl 902c + a04c: ebfffbf6 bl 902c a050: e59f4000 ldr r4, \[pc\] ; a058 a054: e59f4000 ldr r4, \[pc\] ; a05c #------------------------------------------------------------------------------ @@ -113,7 +114,7 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ f4's .iplt entry #------------------------------------------------------------------------------ - a060: ebfffbf4 bl 9038 + a060: ebfffbf4 bl 9038 a064: e59f4000 ldr r4, \[pc\] ; a06c a068: e59f4000 ldr r4, \[pc\] ; a070 #------------------------------------------------------------------------------ diff --git a/ld/testsuite/ld-arm/ifunc-4.dd b/ld/testsuite/ld-arm/ifunc-4.dd index f5a4d9190b9..6ce996b250a 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 : 9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 + 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 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 : 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 : 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 : 9034: 4778 bx pc 9036: 46c0 nop ; \(mov r8, r8\) #------------------------------------------------------------------------------ @@ -49,18 +52,21 @@ Disassembly of section \.plt: #------------------------------------------------------------------------------ #------ taf2's .plt entry #------------------------------------------------------------------------------ +00009044 : 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 : 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 : 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 + a06c: ebfffbfe bl 906c #------------------------------------------------------------------------------ #------ aaf1's .iplt entry #------------------------------------------------------------------------------ - a070: eafffbfd b 906c + a070: eafffbfd b 906c #------------------------------------------------------------------------------ #------ aaf1's .iplt entry #------------------------------------------------------------------------------ - a074: 0afffbfc beq 906c + a074: 0afffbfc beq 906c a078: e59f4000 ldr r4, \[pc\] ; a080 a07c: e59f4000 ldr r4, \[pc\] ; a084 #------------------------------------------------------------------------------ @@ -359,15 +365,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ taf1's .iplt entry #------------------------------------------------------------------------------ - a088: ebfffc02 bl 9098 + a088: ebfffc02 bl 9098 #------------------------------------------------------------------------------ #------ taf1's .iplt entry #------------------------------------------------------------------------------ - a08c: eafffc01 b 9098 + a08c: eafffc01 b 9098 #------------------------------------------------------------------------------ #------ taf1's .iplt entry #------------------------------------------------------------------------------ - a090: 0afffc00 beq 9098 + a090: 0afffc00 beq 9098 a094: e59f4000 ldr r4, \[pc\] ; a09c a098: e59f4000 ldr r4, \[pc\] ; a0a0 #------------------------------------------------------------------------------ @@ -381,15 +387,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ abf1's .iplt entry #------------------------------------------------------------------------------ - a0a4: ebfffbf8 bl 908c + a0a4: ebfffbf8 bl 908c #------------------------------------------------------------------------------ #------ abf1's .iplt entry #------------------------------------------------------------------------------ - a0a8: eafffbf7 b 908c + a0a8: eafffbf7 b 908c #------------------------------------------------------------------------------ #------ abf1's .iplt entry #------------------------------------------------------------------------------ - a0ac: 0afffbf6 beq 908c + a0ac: 0afffbf6 beq 908c a0b0: e59f4000 ldr r4, \[pc\] ; a0b8 a0b4: e59f4000 ldr r4, \[pc\] ; a0bc #------------------------------------------------------------------------------ @@ -403,15 +409,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ tbf1's .iplt entry #------------------------------------------------------------------------------ - a0c0: ebfffbfc bl 90b8 + a0c0: ebfffbfc bl 90b8 #------------------------------------------------------------------------------ #------ tbf1's .iplt entry #------------------------------------------------------------------------------ - a0c4: eafffbfb b 90b8 + a0c4: eafffbfb b 90b8 #------------------------------------------------------------------------------ #------ tbf1's .iplt entry #------------------------------------------------------------------------------ - a0c8: 0afffbfa beq 90b8 + a0c8: 0afffbfa beq 90b8 a0cc: e59f4000 ldr r4, \[pc\] ; a0d4 a0d0: e59f4000 ldr r4, \[pc\] ; a0d8 #------------------------------------------------------------------------------ @@ -425,15 +431,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ aaf2's .plt entry #------------------------------------------------------------------------------ - a0dc: ebfffbdb bl 9050 + a0dc: ebfffbdb bl 9050 #------------------------------------------------------------------------------ #------ aaf2's .plt entry #------------------------------------------------------------------------------ - a0e0: eafffbda b 9050 + a0e0: eafffbda b 9050 #------------------------------------------------------------------------------ #------ aaf2's .plt entry #------------------------------------------------------------------------------ - a0e4: 0afffbd9 beq 9050 + a0e4: 0afffbd9 beq 9050 a0e8: e59f4000 ldr r4, \[pc\] ; a0f0 a0ec: e59f4000 ldr r4, \[pc\] ; a0f4 #------------------------------------------------------------------------------ @@ -447,15 +453,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ taf2's .plt entry #------------------------------------------------------------------------------ - a0f8: ebfffbd1 bl 9044 + a0f8: ebfffbd1 bl 9044 #------------------------------------------------------------------------------ #------ taf2's .plt entry #------------------------------------------------------------------------------ - a0fc: eafffbd0 b 9044 + a0fc: eafffbd0 b 9044 #------------------------------------------------------------------------------ #------ taf2's .plt entry #------------------------------------------------------------------------------ - a100: 0afffbcf beq 9044 + a100: 0afffbcf beq 9044 a104: e59f4000 ldr r4, \[pc\] ; a10c a108: e59f4000 ldr r4, \[pc\] ; a110 #------------------------------------------------------------------------------ @@ -469,15 +475,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ abf2's .plt entry #------------------------------------------------------------------------------ - a114: ebfffbd1 bl 9060 + a114: ebfffbd1 bl 9060 #------------------------------------------------------------------------------ #------ abf2's .plt entry #------------------------------------------------------------------------------ - a118: eafffbd0 b 9060 + a118: eafffbd0 b 9060 #------------------------------------------------------------------------------ #------ abf2's .plt entry #------------------------------------------------------------------------------ - a11c: 0afffbcf beq 9060 + a11c: 0afffbcf beq 9060 a120: e59f4000 ldr r4, \[pc\] ; a128 a124: e59f4000 ldr r4, \[pc\] ; a12c #------------------------------------------------------------------------------ @@ -491,15 +497,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ tbf2's .plt entry #------------------------------------------------------------------------------ - a130: ebfffbc0 bl 9038 + a130: ebfffbc0 bl 9038 #------------------------------------------------------------------------------ #------ tbf2's .plt entry #------------------------------------------------------------------------------ - a134: eafffbbf b 9038 + a134: eafffbbf b 9038 #------------------------------------------------------------------------------ #------ tbf2's .plt entry #------------------------------------------------------------------------------ - a138: 0afffbbe beq 9038 + a138: 0afffbbe beq 9038 a13c: e59f4000 ldr r4, \[pc\] ; a144 a140: e59f4000 ldr r4, \[pc\] ; a148 #------------------------------------------------------------------------------ @@ -513,15 +519,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ aaf3's .iplt entry #------------------------------------------------------------------------------ - a14c: ebfffbfe bl 914c + a14c: ebfffbfe bl 914c #------------------------------------------------------------------------------ #------ aaf3's .iplt entry #------------------------------------------------------------------------------ - a150: eafffbfd b 914c + a150: eafffbfd b 914c #------------------------------------------------------------------------------ #------ aaf3's .iplt entry #------------------------------------------------------------------------------ - a154: 0afffbfc beq 914c + a154: 0afffbfc beq 914c a158: e59f4000 ldr r4, \[pc\] ; a160 a15c: e59f4000 ldr r4, \[pc\] ; a164 #------------------------------------------------------------------------------ @@ -535,15 +541,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ taf3's .iplt entry #------------------------------------------------------------------------------ - a168: ebfffbe8 bl 9110 + a168: ebfffbe8 bl 9110 #------------------------------------------------------------------------------ #------ taf3's .iplt entry #------------------------------------------------------------------------------ - a16c: eafffbe7 b 9110 + a16c: eafffbe7 b 9110 #------------------------------------------------------------------------------ #------ taf3's .iplt entry #------------------------------------------------------------------------------ - a170: 0afffbe6 beq 9110 + a170: 0afffbe6 beq 9110 a174: e59f4000 ldr r4, \[pc\] ; a17c a178: e59f4000 ldr r4, \[pc\] ; a180 #------------------------------------------------------------------------------ @@ -557,15 +563,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ abf3's .iplt entry #------------------------------------------------------------------------------ - a184: ebfffbd6 bl 90e4 + a184: ebfffbd6 bl 90e4 #------------------------------------------------------------------------------ #------ abf3's .iplt entry #------------------------------------------------------------------------------ - a188: eafffbd5 b 90e4 + a188: eafffbd5 b 90e4 #------------------------------------------------------------------------------ #------ abf3's .iplt entry #------------------------------------------------------------------------------ - a18c: 0afffbd4 beq 90e4 + a18c: 0afffbd4 beq 90e4 a190: e59f4000 ldr r4, \[pc\] ; a198 a194: e59f4000 ldr r4, \[pc\] ; a19c #------------------------------------------------------------------------------ @@ -579,15 +585,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ tbf3's .iplt entry #------------------------------------------------------------------------------ - a1a0: ebfffbd7 bl 9104 + a1a0: ebfffbd7 bl 9104 #------------------------------------------------------------------------------ #------ tbf3's .iplt entry #------------------------------------------------------------------------------ - a1a4: eafffbd6 b 9104 + a1a4: eafffbd6 b 9104 #------------------------------------------------------------------------------ #------ tbf3's .iplt entry #------------------------------------------------------------------------------ - a1a8: 0afffbd5 beq 9104 + a1a8: 0afffbd5 beq 9104 a1ac: e59f4000 ldr r4, \[pc\] ; a1b4 a1b0: e59f4000 ldr r4, \[pc\] ; a1b8 #------------------------------------------------------------------------------ @@ -601,15 +607,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ aaf4's .iplt entry #------------------------------------------------------------------------------ - a1bc: ebfffbc0 bl 90c4 + a1bc: ebfffbc0 bl 90c4 #------------------------------------------------------------------------------ #------ aaf4's .iplt entry #------------------------------------------------------------------------------ - a1c0: eafffbbf b 90c4 + a1c0: eafffbbf b 90c4 #------------------------------------------------------------------------------ #------ aaf4's .iplt entry #------------------------------------------------------------------------------ - a1c4: 0afffbbe beq 90c4 + a1c4: 0afffbbe beq 90c4 a1c8: e59f4000 ldr r4, \[pc\] ; a1d0 a1cc: e59f4000 ldr r4, \[pc\] ; a1d4 #------------------------------------------------------------------------------ @@ -623,15 +629,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ taf4's .iplt entry #------------------------------------------------------------------------------ - a1d8: ebfffbe2 bl 9168 + a1d8: ebfffbe2 bl 9168 #------------------------------------------------------------------------------ #------ taf4's .iplt entry #------------------------------------------------------------------------------ - a1dc: eafffbe1 b 9168 + a1dc: eafffbe1 b 9168 #------------------------------------------------------------------------------ #------ taf4's .iplt entry #------------------------------------------------------------------------------ - a1e0: 0afffbe0 beq 9168 + a1e0: 0afffbe0 beq 9168 a1e4: e59f4000 ldr r4, \[pc\] ; a1ec a1e8: e59f4000 ldr r4, \[pc\] ; a1f0 #------------------------------------------------------------------------------ @@ -645,15 +651,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ abf4's .iplt entry #------------------------------------------------------------------------------ - a1f4: ebfffbc9 bl 9120 + a1f4: ebfffbc9 bl 9120 #------------------------------------------------------------------------------ #------ abf4's .iplt entry #------------------------------------------------------------------------------ - a1f8: eafffbc8 b 9120 + a1f8: eafffbc8 b 9120 #------------------------------------------------------------------------------ #------ abf4's .iplt entry #------------------------------------------------------------------------------ - a1fc: 0afffbc7 beq 9120 + a1fc: 0afffbc7 beq 9120 a200: e59f4000 ldr r4, \[pc\] ; a208 a204: e59f4000 ldr r4, \[pc\] ; a20c #------------------------------------------------------------------------------ @@ -667,15 +673,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ tbf4's .iplt entry #------------------------------------------------------------------------------ - a210: ebfffbc6 bl 9130 + a210: ebfffbc6 bl 9130 #------------------------------------------------------------------------------ #------ tbf4's .iplt entry #------------------------------------------------------------------------------ - a214: eafffbc5 b 9130 + a214: eafffbc5 b 9130 #------------------------------------------------------------------------------ #------ tbf4's .iplt entry #------------------------------------------------------------------------------ - a218: 0afffbc4 beq 9130 + a218: 0afffbc4 beq 9130 a21c: e59f4000 ldr r4, \[pc\] ; a224 a220: e59f4000 ldr r4, \[pc\] ; a228 #------------------------------------------------------------------------------ @@ -704,15 +710,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ atf1's .iplt entry #------------------------------------------------------------------------------ - a244: f7fe ef1a blx 907c + a244: f7fe ef1a blx 907c #------------------------------------------------------------------------------ #------ thumb entry to atf1's .iplt entry #------------------------------------------------------------------------------ - a248: f7fe bf16 b\.w 9078 + a248: f7fe bf16 b\.w 9078 #------------------------------------------------------------------------------ #------ thumb entry to atf1's .iplt entry #------------------------------------------------------------------------------ - a24c: f43e af14 beq\.w 9078 + a24c: f43e af14 beq\.w 9078 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 + a25c: f7fe ef24 blx 90a8 #------------------------------------------------------------------------------ #------ thumb entry to ttf1's .iplt entry #------------------------------------------------------------------------------ - a260: f7fe bf20 b\.w 90a4 + a260: f7fe bf20 b\.w 90a4 #------------------------------------------------------------------------------ #------ thumb entry to ttf1's .iplt entry #------------------------------------------------------------------------------ - a264: f43e af1e beq\.w 90a4 + a264: f43e af1e beq\.w 90a4 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 + a274: f7fe ef0a blx 908c #------------------------------------------------------------------------------ #------ thumb entry to abf1's .iplt entry #------------------------------------------------------------------------------ - a278: f7fe bf06 b\.w 9088 + a278: f7fe bf06 b\.w 9088 #------------------------------------------------------------------------------ #------ thumb entry to abf1's .iplt entry #------------------------------------------------------------------------------ - a27c: f43e af04 beq\.w 9088 + a27c: f43e af04 beq\.w 9088 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 + a28c: f7fe ef14 blx 90b8 #------------------------------------------------------------------------------ #------ thumb entry to tbf1's .iplt entry #------------------------------------------------------------------------------ - a290: f7fe bf10 b\.w 90b4 + a290: f7fe bf10 b\.w 90b4 #------------------------------------------------------------------------------ #------ thumb entry to tbf1's .iplt entry #------------------------------------------------------------------------------ - a294: f43e af0e beq\.w 90b4 + a294: f43e af0e beq\.w 90b4 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 + a2a4: f7fe eeb8 blx 9018 #------------------------------------------------------------------------------ #------ thumb entry to atf2's .plt entry #------------------------------------------------------------------------------ - a2a8: f7fe beb4 b\.w 9014 + a2a8: f7fe beb4 b\.w 9014 #------------------------------------------------------------------------------ #------ thumb entry to atf2's .plt entry #------------------------------------------------------------------------------ - a2ac: f43e aeb2 beq\.w 9014 + a2ac: f43e aeb2 beq\.w 9014 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 + a2bc: f7fe eeb4 blx 9028 #------------------------------------------------------------------------------ #------ thumb entry to ttf2's .plt entry #------------------------------------------------------------------------------ - a2c0: f7fe beb0 b\.w 9024 + a2c0: f7fe beb0 b\.w 9024 #------------------------------------------------------------------------------ #------ thumb entry to ttf2's .plt entry #------------------------------------------------------------------------------ - a2c4: f43e aeae beq\.w 9024 + a2c4: f43e aeae beq\.w 9024 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 + a2d4: f7fe eec4 blx 9060 #------------------------------------------------------------------------------ #------ thumb entry to abf2's .plt entry #------------------------------------------------------------------------------ - a2d8: f7fe bec0 b\.w 905c + a2d8: f7fe bec0 b\.w 905c #------------------------------------------------------------------------------ #------ thumb entry to abf2's .plt entry #------------------------------------------------------------------------------ - a2dc: f43e aebe beq\.w 905c + a2dc: f43e aebe beq\.w 905c 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 + a2ec: f7fe eea4 blx 9038 #------------------------------------------------------------------------------ #------ thumb entry to tbf2's .plt entry #------------------------------------------------------------------------------ - a2f0: f7fe bea0 b\.w 9034 + a2f0: f7fe bea0 b\.w 9034 #------------------------------------------------------------------------------ #------ thumb entry to tbf2's .plt entry #------------------------------------------------------------------------------ - a2f4: f43e ae9e beq\.w 9034 + a2f4: f43e ae9e beq\.w 9034 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 + a304: f7fe eee6 blx 90d4 #------------------------------------------------------------------------------ #------ thumb entry to atf3's .iplt entry #------------------------------------------------------------------------------ - a308: f7fe bee2 b\.w 90d0 + a308: f7fe bee2 b\.w 90d0 #------------------------------------------------------------------------------ #------ thumb entry to atf3's .iplt entry #------------------------------------------------------------------------------ - a30c: f43e aee0 beq\.w 90d0 + a30c: f43e aee0 beq\.w 90d0 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 + a31c: f7fe eeea blx 90f4 #------------------------------------------------------------------------------ #------ thumb entry to ttf3's .iplt entry #------------------------------------------------------------------------------ - a320: f7fe bee6 b\.w 90f0 + a320: f7fe bee6 b\.w 90f0 #------------------------------------------------------------------------------ #------ thumb entry to ttf3's .iplt entry #------------------------------------------------------------------------------ - a324: f43e aee4 beq\.w 90f0 + a324: f43e aee4 beq\.w 90f0 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 + a334: f7fe eed6 blx 90e4 #------------------------------------------------------------------------------ #------ thumb entry to abf3's .iplt entry #------------------------------------------------------------------------------ - a338: f7fe bed2 b\.w 90e0 + a338: f7fe bed2 b\.w 90e0 #------------------------------------------------------------------------------ #------ thumb entry to abf3's .iplt entry #------------------------------------------------------------------------------ - a33c: f43e aed0 beq\.w 90e0 + a33c: f43e aed0 beq\.w 90e0 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 + a34c: f7fe eeda blx 9104 #------------------------------------------------------------------------------ #------ thumb entry to tbf3's .iplt entry #------------------------------------------------------------------------------ - a350: f7fe bed6 b\.w 9100 + a350: f7fe bed6 b\.w 9100 #------------------------------------------------------------------------------ #------ thumb entry to tbf3's .iplt entry #------------------------------------------------------------------------------ - a354: f43e aed4 beq\.w 9100 + a354: f43e aed4 beq\.w 9100 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 + a364: f7fe eefa blx 915c #------------------------------------------------------------------------------ #------ thumb entry to atf4's .iplt entry #------------------------------------------------------------------------------ - a368: f7fe bef6 b\.w 9158 + a368: f7fe bef6 b\.w 9158 #------------------------------------------------------------------------------ #------ thumb entry to atf4's .iplt entry #------------------------------------------------------------------------------ - a36c: f43e aef4 beq\.w 9158 + a36c: f43e aef4 beq\.w 9158 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 + a37c: f7fe eee0 blx 9140 #------------------------------------------------------------------------------ #------ thumb entry to ttf4's .iplt entry #------------------------------------------------------------------------------ - a380: f7fe bedc b\.w 913c + a380: f7fe bedc b\.w 913c #------------------------------------------------------------------------------ #------ thumb entry to ttf4's .iplt entry #------------------------------------------------------------------------------ - a384: f43e aeda beq\.w 913c + a384: f43e aeda beq\.w 913c 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 + a394: f7fe eec4 blx 9120 #------------------------------------------------------------------------------ #------ thumb entry to abf4's .iplt entry #------------------------------------------------------------------------------ - a398: f7fe bec0 b\.w 911c + a398: f7fe bec0 b\.w 911c #------------------------------------------------------------------------------ #------ thumb entry to abf4's .iplt entry #------------------------------------------------------------------------------ - a39c: f43e aebe beq\.w 911c + a39c: f43e aebe beq\.w 911c 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 + a3ac: f7fe eec0 blx 9130 #------------------------------------------------------------------------------ #------ thumb entry to tbf4's .iplt entry #------------------------------------------------------------------------------ - a3b0: f7fe bebc b\.w 912c + a3b0: f7fe bebc b\.w 912c #------------------------------------------------------------------------------ #------ thumb entry to tbf4's .iplt entry #------------------------------------------------------------------------------ - a3b4: f43e aeba beq\.w 912c + a3b4: f43e aeba beq\.w 912c 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 e9a96814643..f82fd3769f1 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 : 9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 + 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 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 : 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 : 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 + a01c: ebfffc02 bl 902c a020: e59f4000 ldr r4, \[pc\] ; a028 a024: e59f4000 ldr r4, \[pc\] ; a02c #------------------------------------------------------------------------------ @@ -79,7 +81,7 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ f2's .plt entry #------------------------------------------------------------------------------ - a030: ebfffbf7 bl 9014 + a030: ebfffbf7 bl 9014 a034: e59f4000 ldr r4, \[pc\] ; a03c a038: e59f4000 ldr r4, \[pc\] ; a040 #------------------------------------------------------------------------------ @@ -93,7 +95,7 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ f3's .iplt entry #------------------------------------------------------------------------------ - a044: ebfffbfb bl 9038 + a044: ebfffbfb bl 9038 a048: e59f4000 ldr r4, \[pc\] ; a050 a04c: e59f4000 ldr r4, \[pc\] ; a054 #------------------------------------------------------------------------------ @@ -107,7 +109,7 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ f4's .plt entry #------------------------------------------------------------------------------ - a058: ebfffbf0 bl 9020 + a058: ebfffbf0 bl 9020 a05c: e59f4000 ldr r4, \[pc\] ; a064 a060: e59f4000 ldr r4, \[pc\] ; a068 #------------------------------------------------------------------------------ diff --git a/ld/testsuite/ld-arm/ifunc-8.dd b/ld/testsuite/ld-arm/ifunc-8.dd index 5b255e2e5fb..3cca17cfcd7 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 : 9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 + 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 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 : 9014: 4778 bx pc 9016: 46c0 nop ; \(mov r8, r8\) #------------------------------------------------------------------------------ @@ -27,12 +28,14 @@ Disassembly of section \.plt: #------------------------------------------------------------------------------ #------ aaf4's .plt entry #------------------------------------------------------------------------------ +00009024 : 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 : 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 : 9040: 4778 bx pc 9042: 46c0 nop ; \(mov r8, r8\) #------------------------------------------------------------------------------ @@ -55,18 +59,21 @@ Disassembly of section \.plt: #------------------------------------------------------------------------------ #------ taf2's .plt entry #------------------------------------------------------------------------------ +00009050 : 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 : 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 : 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 : 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 : 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 : 9098: 4778 bx pc 909a: 46c0 nop ; \(mov r8, r8\) #------------------------------------------------------------------------------ @@ -111,12 +121,14 @@ Disassembly of section \.plt: #------------------------------------------------------------------------------ #------ taf4's .plt entry #------------------------------------------------------------------------------ +000090a8 : 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 : 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 + a044: ebfffc1e bl 90c4 #------------------------------------------------------------------------------ #------ aaf1's .iplt entry #------------------------------------------------------------------------------ - a048: eafffc1d b 90c4 + a048: eafffc1d b 90c4 #------------------------------------------------------------------------------ #------ aaf1's .iplt entry #------------------------------------------------------------------------------ - a04c: 0afffc1c beq 90c4 + a04c: 0afffc1c beq 90c4 a050: e59f4000 ldr r4, \[pc\] ; a058 a054: e59f4000 ldr r4, \[pc\] ; a05c #------------------------------------------------------------------------------ @@ -321,15 +333,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ taf1's .iplt entry #------------------------------------------------------------------------------ - a060: ebfffc22 bl 90f0 + a060: ebfffc22 bl 90f0 #------------------------------------------------------------------------------ #------ taf1's .iplt entry #------------------------------------------------------------------------------ - a064: eafffc21 b 90f0 + a064: eafffc21 b 90f0 #------------------------------------------------------------------------------ #------ taf1's .iplt entry #------------------------------------------------------------------------------ - a068: 0afffc20 beq 90f0 + a068: 0afffc20 beq 90f0 a06c: e59f4000 ldr r4, \[pc\] ; a074 a070: e59f4000 ldr r4, \[pc\] ; a078 #------------------------------------------------------------------------------ @@ -343,15 +355,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ abf1's .iplt entry #------------------------------------------------------------------------------ - a07c: ebfffc18 bl 90e4 + a07c: ebfffc18 bl 90e4 #------------------------------------------------------------------------------ #------ abf1's .iplt entry #------------------------------------------------------------------------------ - a080: eafffc17 b 90e4 + a080: eafffc17 b 90e4 #------------------------------------------------------------------------------ #------ abf1's .iplt entry #------------------------------------------------------------------------------ - a084: 0afffc16 beq 90e4 + a084: 0afffc16 beq 90e4 a088: e59f4000 ldr r4, \[pc\] ; a090 a08c: e59f4000 ldr r4, \[pc\] ; a094 #------------------------------------------------------------------------------ @@ -365,15 +377,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ tbf1's .iplt entry #------------------------------------------------------------------------------ - a098: ebfffc1c bl 9110 + a098: ebfffc1c bl 9110 #------------------------------------------------------------------------------ #------ tbf1's .iplt entry #------------------------------------------------------------------------------ - a09c: eafffc1b b 9110 + a09c: eafffc1b b 9110 #------------------------------------------------------------------------------ #------ tbf1's .iplt entry #------------------------------------------------------------------------------ - a0a0: 0afffc1a beq 9110 + a0a0: 0afffc1a beq 9110 a0a4: e59f4000 ldr r4, \[pc\] ; a0ac a0a8: e59f4000 ldr r4, \[pc\] ; a0b0 #------------------------------------------------------------------------------ @@ -387,15 +399,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ aaf2's .plt entry #------------------------------------------------------------------------------ - a0b4: ebfffbe8 bl 905c + a0b4: ebfffbe8 bl 905c #------------------------------------------------------------------------------ #------ aaf2's .plt entry #------------------------------------------------------------------------------ - a0b8: eafffbe7 b 905c + a0b8: eafffbe7 b 905c #------------------------------------------------------------------------------ #------ aaf2's .plt entry #------------------------------------------------------------------------------ - a0bc: 0afffbe6 beq 905c + a0bc: 0afffbe6 beq 905c a0c0: e59f4000 ldr r4, \[pc\] ; a0c8 a0c4: e59f4000 ldr r4, \[pc\] ; a0cc #------------------------------------------------------------------------------ @@ -409,15 +421,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ taf2's .plt entry #------------------------------------------------------------------------------ - a0d0: ebfffbde bl 9050 + a0d0: ebfffbde bl 9050 #------------------------------------------------------------------------------ #------ taf2's .plt entry #------------------------------------------------------------------------------ - a0d4: eafffbdd b 9050 + a0d4: eafffbdd b 9050 #------------------------------------------------------------------------------ #------ taf2's .plt entry #------------------------------------------------------------------------------ - a0d8: 0afffbdc beq 9050 + a0d8: 0afffbdc beq 9050 a0dc: e59f4000 ldr r4, \[pc\] ; a0e4 a0e0: e59f4000 ldr r4, \[pc\] ; a0e8 #------------------------------------------------------------------------------ @@ -431,15 +443,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ abf2's .plt entry #------------------------------------------------------------------------------ - a0ec: ebfffbf1 bl 90b8 + a0ec: ebfffbf1 bl 90b8 #------------------------------------------------------------------------------ #------ abf2's .plt entry #------------------------------------------------------------------------------ - a0f0: eafffbf0 b 90b8 + a0f0: eafffbf0 b 90b8 #------------------------------------------------------------------------------ #------ abf2's .plt entry #------------------------------------------------------------------------------ - a0f4: 0afffbef beq 90b8 + a0f4: 0afffbef beq 90b8 a0f8: e59f4000 ldr r4, \[pc\] ; a100 a0fc: e59f4000 ldr r4, \[pc\] ; a104 #------------------------------------------------------------------------------ @@ -453,15 +465,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ tbf2's .plt entry #------------------------------------------------------------------------------ - a108: ebfffbcd bl 9044 + a108: ebfffbcd bl 9044 #------------------------------------------------------------------------------ #------ tbf2's .plt entry #------------------------------------------------------------------------------ - a10c: eafffbcc b 9044 + a10c: eafffbcc b 9044 #------------------------------------------------------------------------------ #------ tbf2's .plt entry #------------------------------------------------------------------------------ - a110: 0afffbcb beq 9044 + a110: 0afffbcb beq 9044 a114: e59f4000 ldr r4, \[pc\] ; a11c a118: e59f4000 ldr r4, \[pc\] ; a120 #------------------------------------------------------------------------------ @@ -475,15 +487,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ aaf3's .iplt entry #------------------------------------------------------------------------------ - a124: ebfffc0f bl 9168 + a124: ebfffc0f bl 9168 #------------------------------------------------------------------------------ #------ aaf3's .iplt entry #------------------------------------------------------------------------------ - a128: eafffc0e b 9168 + a128: eafffc0e b 9168 #------------------------------------------------------------------------------ #------ aaf3's .iplt entry #------------------------------------------------------------------------------ - a12c: 0afffc0d beq 9168 + a12c: 0afffc0d beq 9168 a130: e59f4000 ldr r4, \[pc\] ; a138 a134: e59f4000 ldr r4, \[pc\] ; a13c #------------------------------------------------------------------------------ @@ -497,15 +509,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ taf3's .iplt entry #------------------------------------------------------------------------------ - a140: ebfffc05 bl 915c + a140: ebfffc05 bl 915c #------------------------------------------------------------------------------ #------ taf3's .iplt entry #------------------------------------------------------------------------------ - a144: eafffc04 b 915c + a144: eafffc04 b 915c #------------------------------------------------------------------------------ #------ taf3's .iplt entry #------------------------------------------------------------------------------ - a148: 0afffc03 beq 915c + a148: 0afffc03 beq 915c a14c: e59f4000 ldr r4, \[pc\] ; a154 a150: e59f4000 ldr r4, \[pc\] ; a158 #------------------------------------------------------------------------------ @@ -519,15 +531,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ abf3's .iplt entry #------------------------------------------------------------------------------ - a15c: ebfffbf3 bl 9130 + a15c: ebfffbf3 bl 9130 #------------------------------------------------------------------------------ #------ abf3's .iplt entry #------------------------------------------------------------------------------ - a160: eafffbf2 b 9130 + a160: eafffbf2 b 9130 #------------------------------------------------------------------------------ #------ abf3's .iplt entry #------------------------------------------------------------------------------ - a164: 0afffbf1 beq 9130 + a164: 0afffbf1 beq 9130 a168: e59f4000 ldr r4, \[pc\] ; a170 a16c: e59f4000 ldr r4, \[pc\] ; a174 #------------------------------------------------------------------------------ @@ -541,15 +553,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ tbf3's .iplt entry #------------------------------------------------------------------------------ - a178: ebfffbf4 bl 9150 + a178: ebfffbf4 bl 9150 #------------------------------------------------------------------------------ #------ tbf3's .iplt entry #------------------------------------------------------------------------------ - a17c: eafffbf3 b 9150 + a17c: eafffbf3 b 9150 #------------------------------------------------------------------------------ #------ tbf3's .iplt entry #------------------------------------------------------------------------------ - a180: 0afffbf2 beq 9150 + a180: 0afffbf2 beq 9150 a184: e59f4000 ldr r4, \[pc\] ; a18c a188: e59f4000 ldr r4, \[pc\] ; a190 #------------------------------------------------------------------------------ @@ -563,15 +575,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ aaf4's .plt entry #------------------------------------------------------------------------------ - a194: ebfffba2 bl 9024 + a194: ebfffba2 bl 9024 #------------------------------------------------------------------------------ #------ aaf4's .plt entry #------------------------------------------------------------------------------ - a198: eafffba1 b 9024 + a198: eafffba1 b 9024 #------------------------------------------------------------------------------ #------ aaf4's .plt entry #------------------------------------------------------------------------------ - a19c: 0afffba0 beq 9024 + a19c: 0afffba0 beq 9024 a1a0: e59f4000 ldr r4, \[pc\] ; a1a8 a1a4: e59f4000 ldr r4, \[pc\] ; a1ac #------------------------------------------------------------------------------ @@ -585,15 +597,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ taf4's .plt entry #------------------------------------------------------------------------------ - a1b0: ebfffbbc bl 90a8 + a1b0: ebfffbbc bl 90a8 #------------------------------------------------------------------------------ #------ taf4's .plt entry #------------------------------------------------------------------------------ - a1b4: eafffbbb b 90a8 + a1b4: eafffbbb b 90a8 #------------------------------------------------------------------------------ #------ taf4's .plt entry #------------------------------------------------------------------------------ - a1b8: 0afffbba beq 90a8 + a1b8: 0afffbba beq 90a8 a1bc: e59f4000 ldr r4, \[pc\] ; a1c4 a1c0: e59f4000 ldr r4, \[pc\] ; a1c8 #------------------------------------------------------------------------------ @@ -607,15 +619,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ abf4's .plt entry #------------------------------------------------------------------------------ - a1cc: ebfffba6 bl 906c + a1cc: ebfffba6 bl 906c #------------------------------------------------------------------------------ #------ abf4's .plt entry #------------------------------------------------------------------------------ - a1d0: eafffba5 b 906c + a1d0: eafffba5 b 906c #------------------------------------------------------------------------------ #------ abf4's .plt entry #------------------------------------------------------------------------------ - a1d4: 0afffba4 beq 906c + a1d4: 0afffba4 beq 906c a1d8: e59f4000 ldr r4, \[pc\] ; a1e0 a1dc: e59f4000 ldr r4, \[pc\] ; a1e4 #------------------------------------------------------------------------------ @@ -629,15 +641,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ tbf4's .plt entry #------------------------------------------------------------------------------ - a1e8: ebfffba3 bl 907c + a1e8: ebfffba3 bl 907c #------------------------------------------------------------------------------ #------ tbf4's .plt entry #------------------------------------------------------------------------------ - a1ec: eafffba2 b 907c + a1ec: eafffba2 b 907c #------------------------------------------------------------------------------ #------ tbf4's .plt entry #------------------------------------------------------------------------------ - a1f0: 0afffba1 beq 907c + a1f0: 0afffba1 beq 907c a1f4: e59f4000 ldr r4, \[pc\] ; a1fc a1f8: e59f4000 ldr r4, \[pc\] ; a200 #------------------------------------------------------------------------------ @@ -666,15 +678,15 @@ Disassembly of section \.text: #------------------------------------------------------------------------------ #------ atf1's .iplt entry #------------------------------------------------------------------------------ - a21c: f7fe ef5a blx 90d4 + a21c: f7fe ef5a blx 90d4 #------------------------------------------------------------------------------ #------ thumb entry to atf1's .iplt entry #------------------------------------------------------------------------------ - a220: f7fe bf56 b\.w 90d0 + a220: f7fe bf56 b\.w 90d0 #------------------------------------------------------------------------------ #------ thumb entry to atf1's .iplt entry #------------------------------------------------------------------------------ - a224: f43e af54 beq\.w 90d0 + a224: f43e af54 beq\.w 90d0 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 + a234: f7fe ef64 blx 9100 #------------------------------------------------------------------------------ #------ thumb entry to ttf1's .iplt entry #------------------------------------------------------------------------------ - a238: f7fe bf60 b\.w 90fc + a238: f7fe bf60 b\.w 90fc #------------------------------------------------------------------------------ #------ thumb entry to ttf1's .iplt entry #------------------------------------------------------------------------------ - a23c: f43e af5e beq\.w 90fc + a23c: f43e af5e beq\.w 90fc 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 + a24c: f7fe ef4a blx 90e4 #------------------------------------------------------------------------------ #------ thumb entry to abf1's .iplt entry #------------------------------------------------------------------------------ - a250: f7fe bf46 b\.w 90e0 + a250: f7fe bf46 b\.w 90e0 #------------------------------------------------------------------------------ #------ thumb entry to abf1's .iplt entry #------------------------------------------------------------------------------ - a254: f43e af44 beq\.w 90e0 + a254: f43e af44 beq\.w 90e0 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 + a264: f7fe ef54 blx 9110 #------------------------------------------------------------------------------ #------ thumb entry to tbf1's .iplt entry #------------------------------------------------------------------------------ - a268: f7fe bf50 b\.w 910c + a268: f7fe bf50 b\.w 910c #------------------------------------------------------------------------------ #------ thumb entry to tbf1's .iplt entry #------------------------------------------------------------------------------ - a26c: f43e af4e beq\.w 910c + a26c: f43e af4e beq\.w 910c 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 + a27c: f7fe eecc blx 9018 #------------------------------------------------------------------------------ #------ thumb entry to atf2's .plt entry #------------------------------------------------------------------------------ - a280: f7fe bec8 b\.w 9014 + a280: f7fe bec8 b\.w 9014 #------------------------------------------------------------------------------ #------ thumb entry to atf2's .plt entry #------------------------------------------------------------------------------ - a284: f43e aec6 beq\.w 9014 + a284: f43e aec6 beq\.w 9014 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 + a294: f7fe eece blx 9034 #------------------------------------------------------------------------------ #------ thumb entry to ttf2's .plt entry #------------------------------------------------------------------------------ - a298: f7fe beca b\.w 9030 + a298: f7fe beca b\.w 9030 #------------------------------------------------------------------------------ #------ thumb entry to ttf2's .plt entry #------------------------------------------------------------------------------ - a29c: f43e aec8 beq\.w 9030 + a29c: f43e aec8 beq\.w 9030 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 + a2ac: f7fe ef04 blx 90b8 #------------------------------------------------------------------------------ #------ thumb entry to abf2's .plt entry #------------------------------------------------------------------------------ - a2b0: f7fe bf00 b\.w 90b4 + a2b0: f7fe bf00 b\.w 90b4 #------------------------------------------------------------------------------ #------ thumb entry to abf2's .plt entry #------------------------------------------------------------------------------ - a2b4: f43e aefe beq\.w 90b4 + a2b4: f43e aefe beq\.w 90b4 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 + a2c4: f7fe eebe blx 9044 #------------------------------------------------------------------------------ #------ thumb entry to tbf2's .plt entry #------------------------------------------------------------------------------ - a2c8: f7fe beba b\.w 9040 + a2c8: f7fe beba b\.w 9040 #------------------------------------------------------------------------------ #------ thumb entry to tbf2's .plt entry #------------------------------------------------------------------------------ - a2cc: f43e aeb8 beq\.w 9040 + a2cc: f43e aeb8 beq\.w 9040 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 + a2dc: f7fe ef20 blx 9120 #------------------------------------------------------------------------------ #------ thumb entry to atf3's .iplt entry #------------------------------------------------------------------------------ - a2e0: f7fe bf1c b\.w 911c + a2e0: f7fe bf1c b\.w 911c #------------------------------------------------------------------------------ #------ thumb entry to atf3's .iplt entry #------------------------------------------------------------------------------ - a2e4: f43e af1a beq\.w 911c + a2e4: f43e af1a beq\.w 911c 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 + a2f4: f7fe ef24 blx 9140 #------------------------------------------------------------------------------ #------ thumb entry to ttf3's .iplt entry #------------------------------------------------------------------------------ - a2f8: f7fe bf20 b\.w 913c + a2f8: f7fe bf20 b\.w 913c #------------------------------------------------------------------------------ #------ thumb entry to ttf3's .iplt entry #------------------------------------------------------------------------------ - a2fc: f43e af1e beq\.w 913c + a2fc: f43e af1e beq\.w 913c 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 + a30c: f7fe ef10 blx 9130 #------------------------------------------------------------------------------ #------ thumb entry to abf3's .iplt entry #------------------------------------------------------------------------------ - a310: f7fe bf0c b\.w 912c + a310: f7fe bf0c b\.w 912c #------------------------------------------------------------------------------ #------ thumb entry to abf3's .iplt entry #------------------------------------------------------------------------------ - a314: f43e af0a beq\.w 912c + a314: f43e af0a beq\.w 912c 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 + a324: f7fe ef14 blx 9150 #------------------------------------------------------------------------------ #------ thumb entry to tbf3's .iplt entry #------------------------------------------------------------------------------ - a328: f7fe bf10 b\.w 914c + a328: f7fe bf10 b\.w 914c #------------------------------------------------------------------------------ #------ thumb entry to tbf3's .iplt entry #------------------------------------------------------------------------------ - a32c: f43e af0e beq\.w 914c + a32c: f43e af0e beq\.w 914c 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 + a33c: f7fe eeae blx 909c #------------------------------------------------------------------------------ #------ thumb entry to atf4's .plt entry #------------------------------------------------------------------------------ - a340: f7fe beaa b\.w 9098 + a340: f7fe beaa b\.w 9098 #------------------------------------------------------------------------------ #------ thumb entry to atf4's .plt entry #------------------------------------------------------------------------------ - a344: f43e aea8 beq\.w 9098 + a344: f43e aea8 beq\.w 9098 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 + a354: f7fe ee9a blx 908c #------------------------------------------------------------------------------ #------ thumb entry to ttf4's .plt entry #------------------------------------------------------------------------------ - a358: f7fe be96 b\.w 9088 + a358: f7fe be96 b\.w 9088 #------------------------------------------------------------------------------ #------ thumb entry to ttf4's .plt entry #------------------------------------------------------------------------------ - a35c: f43e ae94 beq\.w 9088 + a35c: f43e ae94 beq\.w 9088 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 + a36c: f7fe ee7e blx 906c #------------------------------------------------------------------------------ #------ thumb entry to abf4's .plt entry #------------------------------------------------------------------------------ - a370: f7fe be7a b\.w 9068 + a370: f7fe be7a b\.w 9068 #------------------------------------------------------------------------------ #------ thumb entry to abf4's .plt entry #------------------------------------------------------------------------------ - a374: f43e ae78 beq\.w 9068 + a374: f43e ae78 beq\.w 9068 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 + a384: f7fe ee7a blx 907c #------------------------------------------------------------------------------ #------ thumb entry to tbf4's .plt entry #------------------------------------------------------------------------------ - a388: f7fe be76 b\.w 9078 + a388: f7fe be76 b\.w 9078 #------------------------------------------------------------------------------ #------ thumb entry to tbf4's .plt entry #------------------------------------------------------------------------------ - a38c: f43e ae74 beq\.w 9078 + a38c: f43e ae74 beq\.w 9078 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 36139d9c4ba..af7ec4b0875 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 : 9000: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 + 9004: e59fe004 ldr lr, \[pc, #4\] ; 9010 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 : 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 + a034: ebfffbf9 bl 9020 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 + a060: ebfffbeb bl 9014 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 c64b42fdf37..b0a1abc2c2a 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>: +.* : .*: .* .*: .* .*: .* .*: .* .*: .* .word .* +.* : .*: .* 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 82013f380d8..92b5ebb2f2a 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>: +.* : .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28> + .*: e59fe004 ldr lr, \[pc, #4\] ; .* .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* +.* : .*: e28fc6.* add ip, pc, #.* .*: e28cca.* add ip, ip, #.* ; 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* +.* : .*: e28fc6.* add ip, pc, #.* .*: e28cca.* add ip, ip, #.* ; 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* @@ -48,7 +50,7 @@ Disassembly of section .text: .* : .*: b500 push {lr} - .*: f7ff efc. blx .* <_start-0x..> + .*: f7ff efc. blx .* .*: 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 4de8e57cbe6..06166f0e15c 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>: +.* : .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* <_start-0x28> + .*: e59fe004 ldr lr, \[pc, #4\] ; .* .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* +.* : .*: 4778 bx pc .*: 46c0 nop ; \(mov r8, r8\) .*: e28fc6.* add ip, pc, #.* .*: e28cca.* add ip, ip, #.* ; 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* +.* : .*: e28fc6.* add ip, pc, #.* .*: e28cca.* add ip, ip, #.* ; 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* @@ -50,7 +52,7 @@ Disassembly of section .text: .* : .*: b500 push {lr} - .*: f7ff ffc. bl .* <_start-0x..> + .*: f7ff ffc. bl .* .*: 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 d3a9ff966c3..6b344a5b8c5 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>: +.* : .*: e52de004 push {lr} ; \(str lr, \[sp, #-4\]!\) - .*: e59fe004 ldr lr, \[pc, #4\] ; .* + .*: e59fe004 ldr lr, \[pc, #4\] ; .* .*: e08fe00e add lr, pc, lr .*: e5bef008 ldr pc, \[lr, #8\]! .*: .* +.* : .*: e28fc6.* add ip, pc, #.* .*: e28cca.* add ip, ip, #.* ; 0x.* .*: e5bcf.* ldr pc, \[ip, #.*\]!.* @@ -20,7 +21,7 @@ Disassembly of section .text: .* : .*: e1a0c00d mov ip, sp .*: e92dd800 push {fp, ip, lr, pc} - .*: ebfffff. bl .* + .*: ebfffff. bl .* .*: 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 5c286bee972..c501aa2c1f5 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: .* : - +[0-9a-f]+: .... .... bl. [0-9a-f]+ + +[0-9a-f]+: .... .... bl. [0-9a-f]+ diff --git a/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d b/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d index a6907f5e71e..806f66c6516 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: .* : - +[0-9a-f]+: ........ bl [0-9a-f]+ + +[0-9a-f]+: ........ bl [0-9a-f]+