This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Add support for Thumb-2 long branch veneers
- From: Thomas Preud'homme <thopre01 at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 17 Jun 2016 17:32:19 -0000
- Subject: [binutils-gdb] Add support for Thumb-2 long branch veneers
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=80c135e55489435f47bbeeb3715b42289c51e30e
commit 80c135e55489435f47bbeeb3715b42289c51e30e
Author: Thomas Preud'homme <thomas.preudhomme@arm.com>
Date: Fri Jun 17 18:26:08 2016 +0100
Add support for Thumb-2 long branch veneers
2016-06-17 Thomas Preud'homme <thomas.preudhomme@arm.com>
Tony Wang <tony.wang@arm.com>
bfd/
* 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.
ld/
* testsuite/ld-arm/arm-elf.exp (Thumb-Thumb farcall M profile):
Assemble for ARMv6-M.
(Thumb2-Thumb2 farcall M profile): New testcase.
* testsuite/ld-arm/farcall-thumb2-thumb2-m.d: New file.
* testsuite/ld-arm/jump-reloc-veneers-cond-long-backward.d: Update to
reflect the use of Thumb-2 veneers for Thumb-2 capable targets.
* testsuite/ld-arm/jump-reloc-veneers-cond-long.d: Likewise.
Diff:
---
bfd/ChangeLog | 11 +++++++++++
bfd/elf32-arm.c | 15 +++++++++++++--
ld/ChangeLog | 11 +++++++++++
ld/testsuite/ld-arm/arm-elf.exp | 5 ++++-
ld/testsuite/ld-arm/farcall-thumb2-thumb2-m.d | 17 +++++++++++++++++
.../ld-arm/jump-reloc-veneers-cond-long-backward.d | 7 +------
ld/testsuite/ld-arm/jump-reloc-veneers-cond-long.d | 7 +------
7 files changed, 58 insertions(+), 15 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:
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 361eef3..cd5f4e3 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,14 @@
+2016-06-17 Thomas Preud'homme <thomas.preudhomme@arm.com>
+ Tony Wang <tony.wang@arm.com>
+
+ * testsuite/ld-arm/arm-elf.exp (Thumb-Thumb farcall M profile):
+ Assemble for ARMv6-M.
+ (Thumb2-Thumb2 farcall M profile): New testcase.
+ * testsuite/ld-arm/farcall-thumb2-thumb2-m.d: New file.
+ * testsuite/ld-arm/jump-reloc-veneers-cond-long-backward.d: Update to
+ reflect the use of Thumb-2 veneers for Thumb-2 capable targets.
+ * testsuite/ld-arm/jump-reloc-veneers-cond-long.d: Likewise.
+
2016-06-16 H.J. Lu <hongjiu.lu@intel.com>
* testsuite/ld-i386/i386.exp: Run pr19636-2e-nacl.
diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp
index db25a8d..a5d4c87 100644
--- a/ld/testsuite/ld-arm/arm-elf.exp
+++ b/ld/testsuite/ld-arm/arm-elf.exp
@@ -474,9 +474,12 @@ set armeabitests_nonacl {
{"Thumb-Thumb farcall with BLX" "--no-fix-arm1176 -Ttext 0x1000 --section-start .foo=0x2001014" "" "-march=armv5t" {farcall-thumb-thumb.s}
{{objdump -d farcall-thumb-thumb-blx.d}}
"farcall-thumb-thumb-blx"}
- {"Thumb-Thumb farcall M profile" "-Ttext 0x1000 --section-start .foo=0x2001014" "" "-march=armv7-m" {farcall-thumb-thumb.s}
+ {"Thumb-Thumb farcall M profile" "-Ttext 0x1000 --section-start .foo=0x2001014" "" "-march=armv6-m" {farcall-thumb-thumb.s}
{{objdump -d farcall-thumb-thumb-m.d}}
"farcall-thumb-thumb-m"}
+ {"Thumb2-Thumb2 farcall M profile" "-Ttext 0x1000 --section-start .foo=0x2001014" "" "-march=armv7-m" {farcall-thumb-thumb.s}
+ {{objdump -d farcall-thumb2-thumb2-m.d}}
+ "farcall-thumb2-thumb2-m"}
{"Thumb-Thumb farcall v8-M Baseline" "-Ttext 0x1000 --section-start .foo=0x2001014" "" "-march=armv8-m.base" {farcall-thumb-thumb.s}
{{objdump -d farcall-thumb-thumb-m.d}}
"farcall-thumb-thumb-v8-m-base"}
diff --git a/ld/testsuite/ld-arm/farcall-thumb2-thumb2-m.d b/ld/testsuite/ld-arm/farcall-thumb2-thumb2-m.d
new file mode 100644
index 0000000..5809941
--- /dev/null
+++ b/ld/testsuite/ld-arm/farcall-thumb2-thumb2-m.d
@@ -0,0 +1,17 @@
+.*: file format .*
+
+Disassembly of section .text:
+
+00001000 <_start>:
+ 1000: f000 f802 bl 1008 <__bar_veneer>
+ 1004: 0000 movs r0, r0
+ \.\.\.
+
+00001008 <__bar_veneer>:
+ 1008: f85f f000 ldr.w pc, \[pc\] ; 100c <__bar_veneer\+0x4>
+ 100c: 02001015 .word 0x02001015
+
+Disassembly of section .foo:
+
+02001014 <bar>:
+ 2001014: 4770 bx lr
diff --git a/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long-backward.d b/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long-backward.d
index ee0709a..9424207 100644
--- a/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long-backward.d
+++ b/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long-backward.d
@@ -15,10 +15,5 @@ Disassembly of section .text:
...
001080.. <[^>]*>:
- 1080..: b401 push {r0}
- 1080..: 4802 ldr r0, \[pc, #8\] ; \(108014 <__dest_veneer\+0xc>\)
- 1080..: 4684 mov ip, r0
- 1080..: bc01 pop {r0}
- 1080..: 4760 bx ip
- 1080..: bf00 nop
+ 1080..: f85f f000 ldr.w pc, \[pc\] ; 10800c <__dest_veneer\+0x4>
1080..: 00008003 .word 0x00008003
diff --git a/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long.d b/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long.d
index 276a24e..d818cf5 100644
--- a/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long.d
+++ b/ld/testsuite/ld-arm/jump-reloc-veneers-cond-long.d
@@ -15,10 +15,5 @@ Disassembly of section .text:
...
000080.. <[^>]*>:
- 80..: b401 push {r0}
- 80..: 4802 ldr r0, \[pc, #8\] ; \(80.. <__dest_veneer\+0xc>\)
- 80..: 4684 mov ip, r0
- 80..: bc01 pop {r0}
- 80..: 4760 bx ip
- 80..: bf00 nop
+ 80..: f85f f000 ldr.w pc, \[pc\] ; 800c <__dest_veneer\+0x4>
80..: 00108005 .word 0x00108005