From 08d1f311bf9a6d7d341623aa89e5acc80001b8f9 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Tue, 9 Nov 2004 16:44:31 +0000 Subject: [PATCH] From David Poole : * elf32-arm.c (elf32_arm_readonly_dynrelocs): New function. (elf32_arm_size_dynamic_sections): Call it. --- bfd/ChangeLog | 6 ++++++ bfd/elf32-arm.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 12bc0ed..df51f6a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2004-11-09 Daniel Jacobowitz + + From David Poole : + * elf32-arm.c (elf32_arm_readonly_dynrelocs): New function. + (elf32_arm_size_dynamic_sections): Call it. + 2004-11-09 Alan Modra * Makefile.am (SOURCE_HFILES): Remove elf32-arm.h. diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index 8085109..2142b97 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -4607,6 +4607,35 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) return TRUE; } +/* Find any dynamic relocs that apply to read-only sections. */ + +static bfd_boolean +elf32_arm_readonly_dynrelocs (struct elf_link_hash_entry *h, PTR inf) +{ + struct elf32_arm_link_hash_entry *eh; + struct elf32_arm_relocs_copied *p; + + if (h->root.type == bfd_link_hash_warning) + h = (struct elf_link_hash_entry *) h->root.u.i.link; + + eh = (struct elf32_arm_link_hash_entry *) h; + for (p = eh->relocs_copied; p != NULL; p = p->next) + { + asection *s = p->section; + + 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; +} + /* Set the sizes of the dynamic sections. */ static bfd_boolean @@ -4815,6 +4844,12 @@ elf32_arm_size_dynamic_sections (bfd * output_bfd ATTRIBUTE_UNUSED, return FALSE; } + /* 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, elf32_arm_readonly_dynrelocs, + (PTR) info); + if ((info->flags & DF_TEXTREL) != 0) { if (!add_dynamic_entry (DT_TEXTREL, 0)) -- 2.7.4