[binutils-gdb] [AArch64] Enable overflow check for R_AARCH64_TLSLE_ADD_TPREL_HI12

[Jiong Wang <jiwang at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=bab91cce20e052822e128c672e0570c8f3f58131

commit bab91cce20e052822e128c672e0570c8f3f58131
Author: Jiong Wang <jiong.wang@arm.com>
Date:   Tue Jan 13 11:18:10 2015 +0000

    [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:
---
 bfd/ChangeLog                           |  8 ++++++
 bfd/elfnn-aarch64.c                     |  2 +-
 bfd/elfxx-aarch64.c                     |  4 ++-
 ld/testsuite/ChangeLog                  |  7 ++++++
 ld/testsuite/ld-aarch64/aarch64-elf.exp |  1 +
 ld/testsuite/ld-aarch64/pr17415.d       |  6 +++++
 ld/testsuite/ld-aarch64/pr17415.s       | 43 +++++++++++++++++++++++++++++++++
 7 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a3e1d8f..e7630ab 100644
--- 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 3554a87..f632eee 100644
--- 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 54b69fd..25a6228 100644
--- 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 e6903f7..14cd6f6 100644
--- 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 0eae20a..9b715bb 100644
--- 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
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
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