From 98fa61facff8fb041205950d642f5403372bfd96 Mon Sep 17 00:00:00 2001 From: Yury Norov Date: Wed, 14 Dec 2016 11:56:54 +0530 Subject: [PATCH] Revert "ld: aarch64: fix TLS relaxation where TCB_SIZE is used" This reverts commit 6650f7bd18f8161b9f666d3e65a6346e23a9d85f. --- bfd/elfnn-aarch64.c | 18 +++--------------- ld/testsuite/ld-aarch64/aarch64-elf.exp | 2 -- .../ld-aarch64/tls-relax-ld-le-small-ilp32.d | 14 -------------- .../ld-aarch64/tls-relax-ld-le-tiny-ilp32.d | 13 ------------- 4 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 ld/testsuite/ld-aarch64/tls-relax-ld-le-small-ilp32.d delete mode 100644 ld/testsuite/ld-aarch64/tls-relax-ld-le-tiny-ilp32.d diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index b05e7cfa386..ffa8e6a9970 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -5951,9 +5951,7 @@ elfNN_aarch64_tls_relax (struct elf_aarch64_link_hash_table *globals, case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21: /* LD->LE relaxation (tiny): adr x0, :tlsldm:x => mrs x0, tpidr_el0 - bl __tls_get_addr => add R0, R0, TCB_SIZE - - Where R is x for lp64 mode, and w for ilp32 mode. + bl __tls_get_addr => add x0, x0, TCB_SIZE */ if (is_local) { @@ -5962,11 +5960,7 @@ elfNN_aarch64_tls_relax (struct elf_aarch64_link_hash_table *globals, /* No need of CALL26 relocation for tls_get_addr. */ rel[1].r_info = ELFNN_R_INFO (STN_UNDEF, R_AARCH64_NONE); bfd_putl32 (0xd53bd040, contents + rel->r_offset + 0); -#if ARCH_SIZE ==64 bfd_putl32 (0x91004000, contents + rel->r_offset + 4); -#else - bfd_putl32 (0x11002000, contents + rel->r_offset + 4); -#endif return bfd_reloc_ok; } return bfd_reloc_continue; @@ -5984,10 +5978,8 @@ elfNN_aarch64_tls_relax (struct elf_aarch64_link_hash_table *globals, case BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC: /* LD->LE relaxation (small): - add x0, #:tlsldm_lo12:x => add R0, R0, TCB_SIZE + add x0, #:tlsldm_lo12:x => add x0, x0, TCB_SIZE bl __tls_get_addr => nop - - Where R is x for lp64 mode, and w for ilp32 mode. */ if (is_local) { @@ -5995,12 +5987,8 @@ elfNN_aarch64_tls_relax (struct elf_aarch64_link_hash_table *globals, BFD_ASSERT (ELFNN_R_TYPE (rel[1].r_info) == AARCH64_R (CALL26)); /* No need of CALL26 relocation for tls_get_addr. */ rel[1].r_info = ELFNN_R_INFO (STN_UNDEF, R_AARCH64_NONE); -#if ARCH_SIZE ==64 bfd_putl32 (0x91004000, contents + rel->r_offset + 0); -#else - bfd_putl32 (0x11002000, contents + rel->r_offset + 0); -#endif - bfd_putl32 (INSN_NOP, contents + rel->r_offset + 4); + bfd_putl32 (0xd503201f, contents + rel->r_offset + 4); return bfd_reloc_ok; } return bfd_reloc_continue; diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp index 8fba2311e2a..de158fe1d1a 100644 --- a/ld/testsuite/ld-aarch64/aarch64-elf.exp +++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp @@ -228,9 +228,7 @@ 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 deleted file mode 100644 index 0f86d932ca5..00000000000 --- a/ld/testsuite/ld-aarch64/tls-relax-ld-le-small-ilp32.d +++ /dev/null @@ -1,14 +0,0 @@ -#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 deleted file mode 100644 index e2a42503f96..00000000000 --- a/ld/testsuite/ld-aarch64/tls-relax-ld-le-tiny-ilp32.d +++ /dev/null @@ -1,13 +0,0 @@ -#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
- +1001c: d65f03c0 ret