@@ -, +, @@ 
 sections
---
 bfd/elf32-arm.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)
--- a/bfd/elf32-arm.c	
+++ a/bfd/elf32-arm.c	
@@ -16014,6 +16014,21 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info,
   if (bfd_link_pic (info) || globals->root.is_relocatable_executable)
     return TRUE;
 
+  /* If -z nocopyreloc was given, we won't generate them either.  */
+  if (info->nocopyreloc)
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
+  /* If we don't find any dynamic relocs in read-only sections, then
+     we'll be keeping the dynamic relocs and avoiding the copy reloc.  */
+  if (!readonly_dynrelocs (h))
+    {
+      h->non_got_ref = 0;
+      return TRUE;
+    }
+
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
      an entry for this symbol in the .dynsym section.  The dynamic
@@ -16023,9 +16038,9 @@ 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.  */
-  /* 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
+  /* 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)
     {
@@ -16037,9 +16052,7 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info,
       s = globals->root.sdynbss;
       srel = globals->root.srelbss;
     }
-  if (info->nocopyreloc == 0
-      && (h->root.u.def.section->flags & SEC_ALLOC) != 0
-      && h->size != 0)
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
     {
       elf32_arm_allocate_dynrelocs (info, srel, 1);
       h->needs_copy = 1;
--