[AArch64] Enable overflow check for R_AARCH64_TLSLE_ADD_TPREL_HI12

  bfd/
    PR ld/17415
    * elfnn-aarch64.c (elfNN_aarch64_howto_table): Mark
    R_AARCH64_TLSLE_ADD_TPREL_HI12 as complain_overflow_unsigned.
    * elfxx-aarch64.c (_bfd_aarch64_elf_resolve_relocation): Correct the bit
    mask.

  ld/testsuite/
    PR ld/17415
    * ld-aarch64/pr17415.s: Source file for new test.
    * ld-aarch64/pr17415.d: Expect file for new test.
    * ld-aarch64/aarch64-elf.exp: Run the new test.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a3e1d8f4082b2692879d5edd29e2f625d93c1805..e7630abcc1306b1998e856a52ec83e3887b8b308 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2015-01-13  Jiong Wang  <jiong.wang@arm.com>
+
+       PR ld/17415
+       * elfnn-aarch64.c (elfNN_aarch64_howto_table): Mark
+       R_AARCH64_TLSLE_ADD_TPREL_HI12 as complain_overflow_unsigned.
+       * elfxx-aarch64.c (_bfd_aarch64_elf_resolve_relocation): Correct the
+       bit mask.
+
 2015-01-12  Terry Guo  <terry.guo@arm.com>
 
        * elflink.c (_bfd_elf_gc_mark_debug_special_section_group): New

diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 3554a87c8d642e800a0093b3d62a446fa04a3fc5..f632eee0dd09d495a1679f9eacc49e1799efaa07 100644 (file)
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -1038,7 +1038,7 @@ static reloc_howto_type elfNN_aarch64_howto_table[] =
         12,                    /* bitsize */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
+        complain_overflow_unsigned,    /* complain_on_overflow */
         bfd_elf_generic_reloc, /* special_function */
         AARCH64_R_STR (TLSLE_ADD_TPREL_HI12),  /* name */
         FALSE,                 /* partial_inplace */

diff --git a/bfd/elfxx-aarch64.c b/bfd/elfxx-aarch64.c
index 54b69fda8590d69956991dc4666913481be9e44c..25a6228713d45146ae334ac0fc2ec8c8e5bef1cf 100644 (file)
--- a/bfd/elfxx-aarch64.c
+++ b/bfd/elfxx-aarch64.c
@@ -450,7 +450,9 @@ _bfd_aarch64_elf_resolve_relocation (bfd_reloc_code_real_type r_type,
       value = (value + addend) & (bfd_vma) 0xffff0000;
       break;
     case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_HI12:
-      value = (value + addend) & (bfd_vma) 0xfff000;
+      /* Mask off low 12bits, keep all other high bits, so that the later
+        generic code could check whehter there is overflow.  */
+      value = (value + addend) & ~(bfd_vma) 0xfff;
       break;
 
     case BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G0:

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index e6903f7f21063dfbf32055c50eab85d26520d683..14cd6f6c1ec5d6642b7528a45198c291d237c8f0 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-13  Jiong Wang  <jiong.wang@arm.com>
+
+       PR ld/17415
+       * ld-aarch64/pr17415.s: Source file for new test.
+       * ld-aarch64/pr17415.d: Expect file for new test.
+       * ld-aarch64/aarch64-elf.exp: Run the new test.
+
 2015-01-11  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/17827

diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp
index 0eae20ac356f0894399eb79075077e2d7aea98f9..9b715bbf8d357398777b24fd7ad06c6afae5de08 100644 (file)
--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp
+++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp
@@ -130,6 +130,7 @@ run_dump_test "gc-tls-relocs"
 run_dump_test "gc-plt-relocs"
 run_dump_test "gc-relocs-257-dyn"
 run_dump_test "gc-relocs-257"
+run_dump_test "pr17415"
 
 # ifunc tests
 run_dump_test "ifunc-1"

diff --git a/ld/testsuite/ld-aarch64/pr17415.d b/ld/testsuite/ld-aarch64/pr17415.d
new file mode 100644 (file)
index 0000000..3f5eb7d
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/pr17415.d
@@ -0,0 +1,6 @@
+#name: TLS offset out of range
+#source: pr17415.s
+#as:
+#ld: -e0
+#error: .*\(.text\+0x\d+\): relocation truncated to fit: R_AARCH64_TLSLE_ADD_TPREL_HI12 against symbol `i' .*
+

diff --git a/ld/testsuite/ld-aarch64/pr17415.s b/ld/testsuite/ld-aarch64/pr17415.s
new file mode 100644 (file)
index 0000000..397bacb
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/pr17415.s
@@ -0,0 +1,43 @@
+       .cpu generic
+       .global ff
+       .section        .tbss,"awT",%nobits
+       .align  3
+       .type   ff, %object
+       .size   ff, 67108864
+ff:
+       .zero   67108864
+       .global i
+       .align  2
+       .type   i, %object
+       .size   i, 4
+i:
+       .zero   4
+       .text
+       .align  2
+       .global main
+       .type   main, %function
+main:
+       sub     sp, sp, #16
+       str     wzr, [sp,12]
+       b       .L2
+.L3:
+       mrs     x0, tpidr_el0
+       add     x1, x0, #:tprel_hi12:ff
+       add     x1, x1, #:tprel_lo12_nc:ff
+       ldrsw   x0, [sp,12]
+       mov     w2, 7
+       strb    w2, [x1,x0]
+       ldr     w0, [sp,12]
+       add     w0, w0, 1
+       str     w0, [sp,12]
+.L2:
+       ldr     w0, [sp,12]
+       cmp     w0, 999
+       ble     .L3
+       mrs     x0, tpidr_el0
+       add     x0, x0, #:tprel_hi12:i
+       add     x0, x0, #:tprel_lo12_nc:i
+       ldr     w0, [x0]
+       add     sp, sp, 16
+       ret
+       .size   main, .-main