[AArch64] Remove redundant tls relax in elfNN_aarch64_final_link_relocate

bfd/
  * elfnn-aarch64.c (elfNN_aarch64_final_link_relocate): Remove redundant
  aarch64_tls_transition check.
This commit is contained in:
Jiong Wang 2016-05-11 11:55:02 +01:00
parent 4179a6a209
commit 4e7fbb34f0
2 changed files with 8 additions and 13 deletions

View File

@ -1,3 +1,8 @@
2016-05-10 Jiong Wang <jiong.wang@arm.com>
* elfnn-aarch64.c (elfNN_aarch64_final_link_relocate): Remove redundant
aarch64_tls_transition check.
2016-05-10 Thomas Preud'homme <thomas.preudhomme@arm.com>
* elf32-arm.c (enum elf32_arm_stub_type): New max_stub_type

View File

@ -4895,7 +4895,9 @@ elfNN_aarch64_write_section (bfd *output_bfd ATTRIBUTE_UNUSED,
return FALSE;
}
/* Perform a relocation as part of a final link. */
/* Perform a relocation as part of a final link. The input relocation type
should be TLS relaxed. */
static bfd_reloc_status_type
elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
bfd *input_bfd,
@ -4916,7 +4918,6 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
unsigned int r_type = howto->type;
bfd_reloc_code_real_type bfd_r_type
= elfNN_aarch64_bfd_reloc_from_howto (howto);
bfd_reloc_code_real_type new_bfd_r_type;
unsigned long r_symndx;
bfd_byte *hit_data = contents + rel->r_offset;
bfd_vma place, off;
@ -4933,17 +4934,6 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
r_symndx = ELFNN_R_SYM (rel->r_info);
/* It is possible to have linker relaxations on some TLS access
models. Update our information here. */
new_bfd_r_type = aarch64_tls_transition (input_bfd, info, r_type, h, r_symndx);
if (new_bfd_r_type != bfd_r_type)
{
bfd_r_type = new_bfd_r_type;
howto = elfNN_aarch64_howto_from_bfd_reloc (bfd_r_type);
BFD_ASSERT (howto != NULL);
r_type = howto->type;
}
place = input_section->output_section->vma
+ input_section->output_offset + rel->r_offset;