diff options
Diffstat (limited to 'bfd/elf32-arm.c')
| -rw-r--r-- | bfd/elf32-arm.c | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index 4761136..384063e 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -15264,7 +15264,7 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info, struct elf_link_hash_entry * h) { bfd * dynobj; - asection * s; + asection *s, *srel; struct elf32_arm_link_hash_entry * eh; struct elf32_arm_link_hash_table *globals; @@ -15363,20 +15363,24 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info, determine the address it must put in the global offset table, so both the dynamic object and the regular object will refer to the same memory location for the variable. */ - s = globals->root.sdynbss; - BFD_ASSERT (s != NULL); - /* If allowed, we must generate a R_ARM_COPY reloc to tell the dynamic linker to copy the initial value out of the dynamic object and into the runtime process image. We need to remember the offset into the .rel(a).bss section we are going to use. */ + if ((h->root.u.def.section->flags & SEC_READONLY) != 0) + { + s = globals->root.sdynrelro; + srel = globals->root.sreldynrelro; + } + else + { + s = globals->root.sdynbss; + srel = globals->root.srelbss; + } if (info->nocopyreloc == 0 && (h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0) { - asection *srel; - - srel = bfd_get_linker_section (dynobj, RELOC_SECTION (globals, ".bss")); elf32_arm_allocate_dynrelocs (info, srel, 1); h->needs_copy = 1; } @@ -16091,7 +16095,8 @@ elf32_arm_size_dynamic_sections (bfd * output_bfd ATTRIBUTE_UNUSED, && s != htab->root.sgotplt && s != htab->root.iplt && s != htab->root.igotplt - && s != htab->root.sdynbss) + && s != htab->root.sdynbss + && s != htab->root.sdynrelro) { /* It's not one of our sections, so don't allocate space. */ continue; @@ -16301,14 +16306,15 @@ elf32_arm_finish_dynamic_symbol (bfd * output_bfd, && (h->root.type == bfd_link_hash_defined || h->root.type == bfd_link_hash_defweak)); - s = htab->root.srelbss; - BFD_ASSERT (s != NULL); - rel.r_addend = 0; rel.r_offset = (h->root.u.def.value + h->root.u.def.section->output_section->vma + h->root.u.def.section->output_offset); rel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_COPY); + if ((h->root.u.def.section->flags & SEC_READONLY) != 0) + s = htab->root.sreldynrelro; + else + s = htab->root.srelbss; elf32_arm_add_dynreloc (output_bfd, info, s, &rel); } @@ -19389,6 +19395,7 @@ elf32_arm_backend_symbol_processing (bfd *abfd, asymbol *sym) #define elf_backend_plt_readonly 1 #define elf_backend_want_got_plt 1 #define elf_backend_want_plt_sym 0 +#define elf_backend_want_dynrelro 1 #define elf_backend_may_use_rel_p 1 #define elf_backend_may_use_rela_p 0 #define elf_backend_default_use_rela_p 0 |