diff options
Diffstat (limited to 'bfd')
-rw-r--r-- | bfd/ChangeLog | 11 | ||||
-rw-r--r-- | bfd/elf32-arm.c | 15 |
2 files changed, 24 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index aaa2319..0e52b95 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,14 @@ +2016-06-17 Thomas Preud'homme <thomas.preudhomme@arm.com> + Tony Wang <tony.wang@arm.com> + + * elf32-arm.c (elf32_arm_stub_long_branch_thumb2_only): Define stub + sequence. + (stub_long_branch_thumb2_only): Define stub. + (arm_stub_is_thumb): Add case for arm_stub_long_branch_thumb2_only. + (arm_stub_long_branch_thumb2_only): Likewise. + (arm_type_of_stub): Use arm_stub_long_branch_thumb2_only for Thumb-2 + capable targets. + 2016-06-17 Jose E. Marchesi <jose.marchesi@oracle.com> * archures.c (bfd_mach_sparc_v8plusc): Define. diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index 8de01b4..a7964c1 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -2402,6 +2402,13 @@ static const insn_sequence elf32_arm_stub_long_branch_thumb_only[] = DATA_WORD (0, R_ARM_ABS32, 0), /* dcd R_ARM_ABS32(X) */ }; +/* Thumb -> Thumb long branch stub in thumb2 encoding. Used on armv7. */ +static const insn_sequence elf32_arm_stub_long_branch_thumb2_only[] = +{ + THUMB32_INSN (0xf85ff000), /* ldr.w pc, [pc, #-0] */ + DATA_WORD (0, R_ARM_ABS32, 0), /* dcd R_ARM_ABS32(x) */ +}; + /* V4T Thumb -> Thumb long branch stub. Using the stack is not allowed. */ static const insn_sequence elf32_arm_stub_long_branch_v4t_thumb_thumb[] = @@ -2625,7 +2632,8 @@ static const insn_sequence elf32_arm_stub_a8_veneer_blx[] = DEF_STUB(a8_veneer_b_cond) \ DEF_STUB(a8_veneer_b) \ DEF_STUB(a8_veneer_bl) \ - DEF_STUB(a8_veneer_blx) + DEF_STUB(a8_veneer_blx) \ + DEF_STUB(long_branch_thumb2_only) \ #define DEF_STUB(x) arm_stub_##x, enum elf32_arm_stub_type @@ -3781,6 +3789,7 @@ arm_stub_is_thumb (enum elf32_arm_stub_type stub_type) switch (stub_type) { case arm_stub_long_branch_thumb_only: + case arm_stub_long_branch_thumb2_only: case arm_stub_long_branch_v4t_thumb_arm: case arm_stub_short_branch_v4t_thumb_arm: case arm_stub_long_branch_v4t_thumb_arm_pic: @@ -3945,7 +3954,8 @@ arm_type_of_stub (struct bfd_link_info *info, /* PIC stub. */ ? arm_stub_long_branch_thumb_only_pic /* non-PIC stub. */ - : arm_stub_long_branch_thumb_only; + : (thumb2 ? arm_stub_long_branch_thumb2_only + : arm_stub_long_branch_thumb_only); } } else @@ -4418,6 +4428,7 @@ arm_stub_required_alignment (enum elf32_arm_stub_type stub_type) case arm_stub_long_branch_any_any: case arm_stub_long_branch_v4t_arm_thumb: case arm_stub_long_branch_thumb_only: + case arm_stub_long_branch_thumb2_only: case arm_stub_long_branch_v4t_thumb_thumb: case arm_stub_long_branch_v4t_thumb_arm: case arm_stub_short_branch_v4t_thumb_arm: |