diff options
| author | Yury Norov <ynorov@caviumnetworks.com> | 2016-12-03 18:50:43 +0530 |
|---|---|---|
| committer | Yury Norov <ynorov@caviumnetworks.com> | 2016-12-14 12:00:59 +0530 |
| commit | c1fc2d7ee590f3bc87ee79c36e7216b0b6bb054b (patch) | |
| tree | 5a4a940369040820724ee0ceecd8236eb6adf441 /ld | |
| parent | 7acd51d6971f12b832cd7281f669a7ae7feddf45 (diff) | |
| download | fsf-binutils-gdb-c1fc2d7ee590f3bc87ee79c36e7216b0b6bb054b.zip fsf-binutils-gdb-c1fc2d7ee590f3bc87ee79c36e7216b0b6bb054b.tar.gz fsf-binutils-gdb-c1fc2d7ee590f3bc87ee79c36e7216b0b6bb054b.tar.bz2 | |
ld: aarch64: fix TLS relaxation where TCB_SIZE is used
TCB_SIZE is 2*sizeof(void *), which is 0x10 for lp64, and 0x8 for
ilp32. During relaxation, ld goes to do a replace:
bl __tls_get_addr => add R0, R0, TCB_SIZE
But actual implementation is:
bfd_putl32 (0x91004000, contents + rel->r_offset + 4);
Which is equivalent of add x0, x0, 0x10. This is wrong for ilp32.
The possible fix for it is:
bfd_putl32 (0x91000000 | (TCB_SIZE<<10), contents + rel->r_offset + 4);
But ilp32 also needs w-registers, so it's simpler to put proper
instruction in #if/#else condition.
There are 2 such relaxations in elfNN_aarch64_tls_relax(), and so 2 new
tests added for ilp32 mode to test it.
Yury
* bfd/elfnn-aarch64.c: fix TLS relaxations for ilp32 where
TCB_SIZE is used.
* ld/testsuite/ld-aarch64/aarch64-elf.exp: Add tests for the case.
* ld/testsuite/ld-aarch64/tls-relax-ld-le-small-ilp32.d: New file.
* ld/testsuite/ld-aarch64/tls-relax-ld-le-tiny-ilp32.d: New file.
Signed-off-by: Yury Norov <ynorov@caviumnetworks.com>
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 7 | ||||
| -rw-r--r-- | ld/testsuite/ld-aarch64/aarch64-elf.exp | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-aarch64/tls-relax-ld-le-small-ilp32.d | 14 | ||||
| -rw-r--r-- | ld/testsuite/ld-aarch64/tls-relax-ld-le-tiny-ilp32.d | 13 |
4 files changed, 36 insertions, 0 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index e910acc..086434a 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2016-12-14 Yury Norov <ynorov@caviumnetworks.com> + + * ld/testsuite/ld-aarch64/aarch64-elf.exp: Add tests for tiny and + small ld-le relaxations in ilp32 mode. + * ld/testsuite/ld-aarch64/tls-relax-ld-le-small-ilp32.d: New file. + * ld/testsuite/ld-aarch64/tls-relax-ld-le-tiny-ilp32.d: New file. + 2016-12-13 Jiong Wang <jiong.wang@arm.com> * testsuite/ld-aarch64/aarch64-elf.exp (aarch64_choose_lp64_emul): New diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp index de158fe..8fba231 100644 --- a/ld/testsuite/ld-aarch64/aarch64-elf.exp +++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp @@ -228,7 +228,9 @@ run_dump_test_lp64 "tls-relax-large-desc-le-be" run_dump_test "tls-relax-gdesc-ie" run_dump_test "tls-relax-ie-le" run_dump_test "tls-relax-ld-le-small" +run_dump_test "tls-relax-ld-le-small-ilp32" run_dump_test "tls-relax-ld-le-tiny" +run_dump_test "tls-relax-ld-le-tiny-ilp32" run_dump_test "tls-desc-ie" run_dump_test "tls-relax-gdesc-ie-2" run_dump_test "tls-relax-gdesc-le-2" diff --git a/ld/testsuite/ld-aarch64/tls-relax-ld-le-small-ilp32.d b/ld/testsuite/ld-aarch64/tls-relax-ld-le-small-ilp32.d new file mode 100644 index 0000000..0f86d93 --- /dev/null +++ b/ld/testsuite/ld-aarch64/tls-relax-ld-le-small-ilp32.d @@ -0,0 +1,14 @@ +#source: tls-relax-ld-le-small.s +#as: -mabi=ilp32 +#ld: -m [aarch64_choose_ilp32_emul] -T relocs-ilp32.ld -e0 +#objdump: -dr +#... + +10000: 910003fd mov x29, sp + +10004: d53bd040 mrs x0, tpidr_el0 + +10008: 11002000 add w0, w0, #0x8 + +1000c: d503201f nop + +10010: d503201f nop + +10014: 91400001 add x1, x0, #0x0, lsl #12 + +10018: 91000021 add x1, x1, #0x0 + +1001c: 90000000 adrp x0, 10000 <.*> + +10020: d65f03c0 ret diff --git a/ld/testsuite/ld-aarch64/tls-relax-ld-le-tiny-ilp32.d b/ld/testsuite/ld-aarch64/tls-relax-ld-le-tiny-ilp32.d new file mode 100644 index 0000000..e2a4250 --- /dev/null +++ b/ld/testsuite/ld-aarch64/tls-relax-ld-le-tiny-ilp32.d @@ -0,0 +1,13 @@ +#source: tls-relax-ld-le-tiny.s +#as: -mabi=ilp32 +#ld: -m [aarch64_choose_ilp32_emul] -T relocs-ilp32.ld -e0 +#objdump: -dr +#... + +10000: 910003fd mov x29, sp + +10004: d53bd040 mrs x0, tpidr_el0 + +10008: 11002000 add w0, w0, #0x8 + +1000c: d503201f nop + +10010: 91400001 add x1, x0, #0x0, lsl #12 + +10014: 91000021 add x1, x1, #0x0 + +10018: 90000000 adrp x0, 10000 <main> + +1001c: d65f03c0 ret |