diff options
Diffstat (limited to 'bfd/elf32-arm.c')
| -rw-r--r-- | bfd/elf32-arm.c | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index dced01a..b1bec39 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -16489,35 +16489,15 @@ elf32_arm_finish_dynamic_sections (bfd * output_bfd, struct bfd_link_info * info case DT_RELSZ: case DT_RELASZ: - if (!htab->symbian_p) - { - /* My reading of the SVR4 ABI indicates that the - procedure linkage table relocs (DT_JMPREL) should be - included in the overall relocs (DT_REL). This is - what Solaris does. However, UnixWare can not handle - that case. Therefore, we override the DT_RELSZ entry - here to make it not include the JMPREL relocs. Since - the linker script arranges for .rel(a).plt to follow all - other relocation sections, we don't have to worry - about changing the DT_REL entry. */ - s = htab->root.srelplt; - if (s != NULL) - dyn.d_un.d_val -= s->size; - bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon); - break; - } - /* Fall through. */ - case DT_REL: case DT_RELA: /* In the BPABI, the DT_REL tag must point at the file offset, not the VMA, of the first relocation section. So, we use code similar to that in elflink.c, but do not check for SHF_ALLOC on the - relcoation section, since relocations sections are - never allocated under the BPABI. The comments above - about Unixware notwithstanding, we include all of the - relocations here. */ + relocation section, since relocation sections are + never allocated under the BPABI. PLT relocs are also + included. */ if (htab->symbian_p) { unsigned int i; @@ -19419,6 +19399,7 @@ elf32_arm_backend_symbol_processing (bfd *abfd, asymbol *sym) #define elf_backend_may_use_rel_p 1 #define elf_backend_may_use_rela_p 0 #define elf_backend_default_use_rela_p 0 +#define elf_backend_dtrel_excludes_plt 1 #define elf_backend_got_header_size 12 #define elf_backend_extern_protected_data 1 @@ -19980,6 +19961,8 @@ elf32_arm_symbian_plt_sym_val (bfd_vma i, const asection *plt, #define elf_backend_default_use_rela_p 0 #undef elf_backend_want_plt_sym #define elf_backend_want_plt_sym 0 +#undef elf_backend_dtrel_excludes_plt +#define elf_backend_dtrel_excludes_plt 0 #undef ELF_MAXPAGESIZE #define ELF_MAXPAGESIZE 0x8000 |