aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiong Wang <jiong.wang@arm.com>2015-06-23 12:12:06 +0100
committerJiong Wang <jiong.wang@arm.com>2015-06-23 12:12:06 +0100
commitc217058957a45a93481da35e1531ed120750d739 (patch)
tree9e94faaacc0df0173b25dcc96cbefff844ca98dd
parente5ee3fe285c698f1ce3d9bbb596bcda6219f5f3a (diff)
downloadbinutils-c217058957a45a93481da35e1531ed120750d739.zip
binutils-c217058957a45a93481da35e1531ed120750d739.tar.gz
binutils-c217058957a45a93481da35e1531ed120750d739.tar.bz2
[AArch64] Generate DT_TEXTREL for relocation against read-only section
2015-06-23 Jiong Wang <jiong.wang@arm.com> bfd/ * elfnn-aarch64.c (aarch64_readonly_dynrelocs): New function. (elfNN_aarch64_size_dynamic_sections): Traverse hash table to check relocations against read-only sections. ld/testsuite/ * ld-aarch64/dt_textrel.s: New testcase. * ld-aarch64/dt_textrel.d: New expectation file. * ld-aarch64/aarch64-elf.exp: Run new testcase.
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elfnn-aarch64.c30
-rw-r--r--ld/testsuite/ChangeLog6
-rw-r--r--ld/testsuite/ld-aarch64/aarch64-elf.exp2
-rw-r--r--ld/testsuite/ld-aarch64/dt_textrel.d7
-rw-r--r--ld/testsuite/ld-aarch64/dt_textrel.s9
6 files changed, 60 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 626d49a..157e7f7 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-23 Jiong Wang <jiong.wang@arm.com>
+
+ * elfnn-aarch64.c (aarch64_readonly_dynrelocs): New function.
+ (elfNN_aarch64_size_dynamic_sections): Traverse hash table to check
+ relocations against read-only sections.
+
2015-06-18 Nick Clifton <nickc@redhat.com>
PR 18481
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 1c55058..b13f5db 100644
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -7545,6 +7545,32 @@ elfNN_aarch64_allocate_local_ifunc_dynrelocs (void **slot, void *inf)
return elfNN_aarch64_allocate_ifunc_dynrelocs (h, inf);
}
+/* Find any dynamic relocs that apply to read-only sections. */
+
+static bfd_boolean
+aarch64_readonly_dynrelocs (struct elf_link_hash_entry * h, void * inf)
+{
+ struct elf_aarch64_link_hash_entry * eh;
+ struct elf_dyn_relocs * p;
+
+ eh = (struct elf_aarch64_link_hash_entry *) h;
+ for (p = eh->dyn_relocs; p != NULL; p = p->next)
+ {
+ asection *s = p->sec;
+
+ if (s != NULL && (s->flags & SEC_READONLY) != 0)
+ {
+ struct bfd_link_info *info = (struct bfd_link_info *) inf;
+
+ info->flags |= DF_TEXTREL;
+
+ /* Not an error, just cut short the traversal. */
+ return FALSE;
+ }
+ }
+ return TRUE;
+}
+
/* This is the most important function of all . Innocuosly named
though ! */
static bfd_boolean
@@ -7832,6 +7858,10 @@ elfNN_aarch64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
/* If any dynamic relocs apply to a read-only section,
then we need a DT_TEXTREL entry. */
+ if ((info->flags & DF_TEXTREL) == 0)
+ elf_link_hash_traverse (& htab->root, aarch64_readonly_dynrelocs,
+ info);
+
if ((info->flags & DF_TEXTREL) != 0)
{
if (!add_dynamic_entry (DT_TEXTREL, 0))
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index e81e616..812549c 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-06-23 Jiong Wang <jiong.wang@arm.com>
+
+ * ld-aarch64/dt_textrel.s: New testcase.
+ * ld-aarch64/dt_textrel.d: New expectation file.
+ * ld-aarch64/aarch64-elf.exp: Run new testcase.
+
2015-06-17 Jiong Wang <jiong.wang@arm.com>
* ld-aarch64/aarch64-elf.exp (aarch64_choose_ilp32_emul): New function.
diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp
index 531ec0e..ac21d14 100644
--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp
+++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp
@@ -203,6 +203,8 @@ run_dump_test "ifunc-22"
run_dump_test "relasz"
run_dump_test "relocs-257-symbolic-func"
+run_dump_test "dt_textrel"
+
set aarch64elflinktests {
{"ld-aarch64/so with global symbol" "-shared" "" "" {copy-reloc-so.s}
{} "copy-reloc-so.so"}
diff --git a/ld/testsuite/ld-aarch64/dt_textrel.d b/ld/testsuite/ld-aarch64/dt_textrel.d
new file mode 100644
index 0000000..2dbbd2f
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/dt_textrel.d
@@ -0,0 +1,7 @@
+#source: dt_textrel.s
+#ld: -shared
+#readelf: -d
+#...
+.*TEXTREL.*
+.*
+
diff --git a/ld/testsuite/ld-aarch64/dt_textrel.s b/ld/testsuite/ld-aarch64/dt_textrel.s
new file mode 100644
index 0000000..f37f456
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/dt_textrel.s
@@ -0,0 +1,9 @@
+ .cpu generic+fp+simd
+ .global p
+ .comm x,4,4
+ .section .rodata
+ .align 3
+ .type p, %object
+ .size p, 8
+p:
+ .xword x