[ARM] PR target/20737, Bind defined symbol locally in PIE

Message ID 3556b9a5-4b42-8654-c93e-8bfe9389365e@foss.arm.com
State New
Headers show

Commit Message

Jiong Wang Nov. 22, 2016, 2:52 p.m.
On 07/11/16 17:57, Jiong Wang wrote:
> 2016-11-04  Jiong Wang  <jiong.wang@arm.com>

>

>         PR target/20737

>         * elfnn-aarch64.c (elfNN_aarch64_final_link_relocate): Bind defined

>         symbol locally in PIE.


Attached patch is a follow up fix on ARM, no regression on cross & native
arm-linux check.

ok for master?

Thanks.

bfd/
2016-11-22  Jiong Wang  <jiong.wang@arm.com>

         PR target/20737
         * elf32-arm.c (elf32_arm_final_link_relocate): Bind defined symbol
         locally in PIE.

ld/
2016-11-22  Jiong Wang  <jiong.wang@arm.com>

         PR target/20737
         * testsuite/ld-arm/pie-bind-locally-a.s: New test source.
         * testsuite/ld-arm/pie-bind-locally-b.s: Likewise.
         * testsuite/ld-arm/pie-bind-locally.d: New testcase.
         * testsuite/ld-arm/arm-elf.exp: Run new testcase.

Comments

Nick Clifton Nov. 24, 2016, 10:07 a.m. | #1
Hi Jiong,

> bfd/

> 2016-11-22  Jiong Wang  <jiong.wang@arm.com>

> 

>         PR target/20737

>         * elf32-arm.c (elf32_arm_final_link_relocate): Bind defined symbol

>         locally in PIE.

> 

> ld/

> 2016-11-22  Jiong Wang  <jiong.wang@arm.com>

> 

>         PR target/20737

>         * testsuite/ld-arm/pie-bind-locally-a.s: New test source.

>         * testsuite/ld-arm/pie-bind-locally-b.s: Likewise.

>         * testsuite/ld-arm/pie-bind-locally.d: New testcase.

>         * testsuite/ld-arm/arm-elf.exp: Run new testcase.


Approved - please apply.

Cheers
  Nick

Patch hide | download patch | download mbox

diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index dced01aa00d7f1270558a08ba5d5a2867fd990d9..049fd102f299222d5139c2f79fcae6236bf841f4 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -10147,7 +10147,8 @@  elf32_arm_final_link_relocate (reloc_howto_type *           howto,
 	  else if (h != NULL
 		   && h->dynindx != -1
 		   && (!bfd_link_pic (info)
-		       || !SYMBOLIC_BIND (info, h)
+		       || !(bfd_link_pie (info)
+			    || SYMBOLIC_BIND (info, h))
 		       || !h->def_regular))
 	    outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
 	  else
diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp
index 02a35f4729f1536b3f06260aaf3a6ca6ef0de994..2b1e5b8dea9e1245ff7648c067170eba0ff43711 100644
--- a/ld/testsuite/ld-arm/arm-elf.exp
+++ b/ld/testsuite/ld-arm/arm-elf.exp
@@ -345,6 +345,7 @@  run_dump_test "movw-shared-3"
 run_dump_test "movw-shared-4"
 run_dump_test "rel32-reject"
 run_dump_test "rel32-reject-pie"
+run_dump_test "pie-bind-locally"
 
 # Exclude non-ARM-EABI targets.
 
diff --git a/ld/testsuite/ld-arm/pie-bind-locally-a.s b/ld/testsuite/ld-arm/pie-bind-locally-a.s
new file mode 100644
index 0000000000000000000000000000000000000000..76a2f67d4387b018bedfb09e17267940d7644d6d
--- /dev/null
+++ b/ld/testsuite/ld-arm/pie-bind-locally-a.s
@@ -0,0 +1,5 @@ 
+	.text
+	.align	2
+	.global	_start
+_start:
+	.word	_start(GOT)
diff --git a/ld/testsuite/ld-arm/pie-bind-locally-b.s b/ld/testsuite/ld-arm/pie-bind-locally-b.s
new file mode 100644
index 0000000000000000000000000000000000000000..8e6ff4f0f981cbe3c1e6bff9b47b01f4b031d58c
--- /dev/null
+++ b/ld/testsuite/ld-arm/pie-bind-locally-b.s
@@ -0,0 +1,6 @@ 
+	.section	.data.rel,"aw",%progbits
+	.align	2
+	.type	q, %object
+	.size	q, 4
+q:
+	.word	_start
diff --git a/ld/testsuite/ld-arm/pie-bind-locally.d b/ld/testsuite/ld-arm/pie-bind-locally.d
new file mode 100644
index 0000000000000000000000000000000000000000..7ea031c79b4614b6d6527e81aeb7330caafa77d9
--- /dev/null
+++ b/ld/testsuite/ld-arm/pie-bind-locally.d
@@ -0,0 +1,9 @@ 
+#source: pie-bind-locally-a.s
+#source: pie-bind-locally-b.s
+#ld: -pie
+#readelf: -Wr
+
+Relocation section '\.rel\.dyn' at offset .* contains 2 entries:
+[ ]+Offset[ ]+Info[ ]+Type[ ]+.*
+[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_ARM_RELATIVE[ ].*
+[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_ARM_RELATIVE[ ].*