diff options
| author | Christophe Lyon <christophe.lyon@st.com> | 2014-01-14 15:53:50 +0100 |
|---|---|---|
| committer | Christophe Lyon <christophe.lyon@st.com> | 2014-01-14 15:53:50 +0100 |
| commit | f44a1f8e513b37bcc52ba9ea0c172c3e94852756 (patch) | |
| tree | 5ca70b272e89a0609b21494ffed8881fcdcbd9ca /bfd | |
| parent | 7ec1862d1ac21dd92a3ea76a5a15eda4cf7b41ce (diff) | |
| download | gdb-f44a1f8e513b37bcc52ba9ea0c172c3e94852756.zip gdb-f44a1f8e513b37bcc52ba9ea0c172c3e94852756.tar.gz gdb-f44a1f8e513b37bcc52ba9ea0c172c3e94852756.tar.bz2 | |
2014-01-14 Michael Hudson-Doyle <michael.hudson@linaro.org>
Kugan Vivekanandarajah <kugan.vivekanandarajah@linaro.org>
bfd/
* elfnn-aarch64.c (elfNN_aarch64_final_link_relocate): Use correct
offset while calculating relocation address.
(elfNN_aarch64_create_small_pltn_entry): Likewise.
(elfNN_aarch64_init_small_plt0_entry): Likewise.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 8 | ||||
| -rw-r--r-- | bfd/elfnn-aarch64.c | 9 |
2 files changed, 12 insertions, 5 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 17fe759..a8f1f94 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2014-01-14 Michael Hudson-Doyle <michael.hudson@linaro.org> + Kugan Vivekanandarajah <kugan.vivekanandarajah@linaro.org> + + * elfnn-aarch64.c (elfNN_aarch64_final_link_relocate): Use correct + offset while calculating relocation address. + (elfNN_aarch64_create_small_pltn_entry): Likewise. + (elfNN_aarch64_init_small_plt0_entry): Likewise. + 2014-01-13 Ma Jiang <ma.jiang@zte.com.cn> PR ld/16202 diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 0573d6a..2bba824 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -3844,7 +3844,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, value = (symbol_got_offset (input_bfd, h, r_symndx) + globals->root.sgot->output_section->vma - + globals->root.sgot->output_section->output_offset); + + globals->root.sgot->output_offset); value = _bfd_aarch64_elf_resolve_relocation (bfd_r_type, place, value, 0, weak_undef_p); @@ -3873,10 +3873,9 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, case BFD_RELOC_AARCH64_TLSDESC_LDR: if (globals->root.sgot == NULL) return bfd_reloc_notsupported; - value = (symbol_tlsdesc_got_offset (input_bfd, h, r_symndx) + globals->root.sgotplt->output_section->vma - + globals->root.sgotplt->output_section->output_offset + + globals->root.sgotplt->output_offset + globals->sgotplt_jump_table_size); value = _bfd_aarch64_elf_resolve_relocation (bfd_r_type, place, value, @@ -6627,7 +6626,7 @@ elfNN_aarch64_create_small_pltn_entry (struct elf_link_hash_entry *h, plt_entry = plt->contents + h->plt.offset; plt_entry_address = plt->output_section->vma - + plt->output_section->output_offset + h->plt.offset; + + plt->output_offset + h->plt.offset; gotplt_entry_address = gotplt->output_section->vma + gotplt->output_offset + got_offset; @@ -6934,7 +6933,7 @@ elfNN_aarch64_init_small_plt0_entry (bfd *output_bfd ATTRIBUTE_UNUSED, + GOT_ENTRY_SIZE * 2); plt_base = htab->root.splt->output_section->vma + - htab->root.splt->output_section->output_offset; + htab->root.splt->output_offset; /* Fill in the top 21 bits for this: ADRP x16, PLT_GOT + n * 8. ADRP: ((PG(S+A)-PG(P)) >> 12) & 0x1fffff */ |