x86 map file textrel

bfd/
	* elfxx-x86.c (readonly_dynrelocs): New function.
	(maybe_set_textrel): New function.  Always prints via minfo and
	correct "readonly" to "read-only" in warning message., replacing..
	(_bfd_x86_elf_readonly_dynrelocs): ..this.
	(_bfd_x86_elf_size_dynamic_sections): Correct "readonly" to
	"read-only" in warning message.  Formatting.
	(_bfd_x86_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
	* linker.c (bfd_link_hash_traverse): Comment typo fix.
ld/
	* testsuite/ld-i386/pr17935-1.d: Adjust expected error.
	* testsuite/ld-i386/pr17935-2.d: Likewise.
	* testsuite/ld-x86-64/pr17935-1.d: Likewise.
	* testsuite/ld-x86-64/pr17935-2.d: Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 95fb5cdf2bb2a960f7981e543df04001ad145ada..b20003b6d8681b2e0f271981f3b9fa6913196fb4 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,14 @@
+2017-12-04  Alan Modra  <amodra@gmail.com>
+
+       * elfxx-x86.c (readonly_dynrelocs): New function.
+       (maybe_set_textrel): New function.  Always prints via minfo and
+       correct "readonly" to "read-only" in warning message., replacing..
+       (_bfd_x86_elf_readonly_dynrelocs): ..this.
+       (_bfd_x86_elf_size_dynamic_sections): Correct "readonly" to
+       "read-only" in warning message.  Formatting.
+       (_bfd_x86_elf_adjust_dynamic_symbol): Use readonly_dynrelocs.
+       * linker.c (bfd_link_hash_traverse): Comment typo fix.
+
 2017-12-01  H.J. Lu  <hongjiu.lu@intel.com>
 
        * elfxx-x86.c (_bfd_x86_elf_readonly_dynrelocs): Print symbol

diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
index 3899c137dcfd6709a536ded60d19158fcc6aa025..1a9e5ef7d07e0aed46b7ad9b4599eab5d9da9b2a 100644 (file)
--- a/bfd/elfxx-x86.c
+++ b/bfd/elfxx-x86.c
@@ -521,45 +521,58 @@ elf_x86_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
   return TRUE;
 }
 
-/* Find any dynamic relocs that apply to read-only sections.  */
+/* Find dynamic relocs for H that apply to read-only sections.  */
 
-bfd_boolean
-_bfd_x86_elf_readonly_dynrelocs (struct elf_link_hash_entry *h,
-                                void *inf)
+static asection *
+readonly_dynrelocs (struct elf_link_hash_entry *h)
 {
-  struct elf_x86_link_hash_entry *eh;
   struct elf_dyn_relocs *p;
 
+  for (p = elf_x86_hash_entry (h)->dyn_relocs; p != NULL; p = p->next)
+    {
+      asection *s = p->sec->output_section;
+
+      if (s != NULL && (s->flags & SEC_READONLY) != 0)
+       return p->sec;
+    }
+  return NULL;
+}
+
+/* Set DF_TEXTREL if we find any dynamic relocs that apply to
+   read-only sections.  */
+
+static bfd_boolean
+maybe_set_textrel (struct elf_link_hash_entry *h, void *inf)
+{
+  asection *sec;
+
+  if (h->root.type == bfd_link_hash_indirect)
+    return TRUE;
+
   /* Skip local IFUNC symbols. */
   if (h->forced_local && h->type == STT_GNU_IFUNC)
     return TRUE;
 
-  eh = (struct elf_x86_link_hash_entry *) h;
-  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+  sec = readonly_dynrelocs (h);
+  if (sec != NULL)
     {
-      asection *s = p->sec->output_section;
-
-      if (s != NULL && (s->flags & SEC_READONLY) != 0)
-       {
-         struct bfd_link_info *info = (struct bfd_link_info *) inf;
+      struct bfd_link_info *info = (struct bfd_link_info *) inf;
 
-         info->flags |= DF_TEXTREL;
+      info->flags |= DF_TEXTREL;
+      /* xgettext:c-format */
+      info->callbacks->minfo (_("%B: dynamic relocation against `%T' "
+                               "in read-only section `%A'\n"),
+                             sec->owner, h->root.root.string, sec);
 
-         if ((info->warn_shared_textrel && bfd_link_pic (info))
-             || info->error_textrel)
-           /* xgettext:c-format */
-           info->callbacks->einfo (_("%P: %B: warning: relocation against `%s' in readonly section `%A'\n"),
-                                   p->sec->owner, h->root.root.string,
-                                   p->sec);
-         else
-           /* xgettext:c-format */
-           info->callbacks->minfo
-             (_("%B: dynamic relocation against `%T' in read-only section `%A'\n"),
-              p->sec->owner, h->root.root.string, p->sec);
+      if ((info->warn_shared_textrel && bfd_link_pic (info))
+         || info->error_textrel)
+       /* xgettext:c-format */
+       info->callbacks->einfo (_("%P: %B: warning: relocation against `%s' "
+                                 "in read-only section `%A'\n"),
+                               sec->owner, h->root.root.string, sec);
 
-         /* Not an error, just cut short the traversal.  */
-         return FALSE;
-       }
+      /* Not an error, just cut short the traversal.  */
+      return FALSE;
     }
   return TRUE;
 }
@@ -937,8 +950,10 @@ _bfd_x86_elf_size_dynamic_sections (bfd *output_bfd,
                      if ((info->warn_shared_textrel && bfd_link_pic (info))
                          || info->error_textrel)
                        /* xgettext:c-format */
-                       info->callbacks->einfo (_("%P: %B: warning: relocation in readonly section `%A'\n"),
-                                               p->sec->owner, p->sec);
+                       info->callbacks->einfo
+                         (_("%P: %B: warning: relocation "
+                            "in read-only section `%A'\n"),
+                          p->sec->owner, p->sec);
                    }
                }
            }
@@ -1262,16 +1277,15 @@ _bfd_x86_elf_size_dynamic_sections (bfd *output_bfd,
          /* 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->elf,
-                                   _bfd_x86_elf_readonly_dynrelocs,
-                                   info);
+           elf_link_hash_traverse (&htab->elf, maybe_set_textrel, info);
 
          if ((info->flags & DF_TEXTREL) != 0)
            {
              if (htab->readonly_dynrelocs_against_ifunc)
                {
                  info->callbacks->einfo
-                   (_("%P%X: read-only segment has dynamic IFUNC relocations; recompile with -fPIC\n"));
+                   (_("%P%X: read-only segment has dynamic IFUNC relocations;"
+                      " recompile with -fPIC\n"));
                  bfd_set_error (bfd_error_bad_value);
                  return FALSE;
                }
@@ -1824,17 +1838,10 @@ _bfd_x86_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
          || (!eh->gotoff_ref
              && htab->target_os != is_vxworks)))
     {
-      for (p = eh->dyn_relocs; p != NULL; p = p->next)
-       {
-         s = p->sec->output_section;
-         if (s != NULL && (s->flags & SEC_READONLY) != 0)
-           break;
-       }
-
-      /* If we didn't find any dynamic relocs in read-only sections,
+      /* 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 (p == NULL)
+      if (!readonly_dynrelocs (h))
        {
          h->non_got_ref = 0;
          return TRUE;

diff --git a/bfd/linker.c b/bfd/linker.c
index 9c19df4e5707b7739bf4006cd2fa810a6dfc661c..77e20327f6453efcf3fbe9dbcd1c28deb1da4b42 100644 (file)
--- a/bfd/linker.c
+++ b/bfd/linker.c
@@ -632,7 +632,7 @@ unwrap_hash_lookup (struct bfd_link_info *info,
 /* Traverse a generic link hash table.  Differs from bfd_hash_traverse
    in the treatment of warning symbols.  When warning symbols are
    created they replace the real symbol, so you don't get to see the
-   real symbol in a bfd_hash_travere.  This traversal calls func with
+   real symbol in a bfd_hash_traverse.  This traversal calls func with
    the real symbol.  */
 
 void

diff --git a/ld/ChangeLog b/ld/ChangeLog
index c970625af05fa976fbf00270afad6fa9ebc26c4a..6b0e026b5824bc78f3daf746d06418c9856bd5e4 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2017-12-04  Alan Modra  <amodra@gmail.com>
+
+       * testsuite/ld-i386/pr17935-1.d: Adjust expected error.
+       * testsuite/ld-i386/pr17935-2.d: Likewise.
+       * testsuite/ld-x86-64/pr17935-1.d: Likewise.
+       * testsuite/ld-x86-64/pr17935-2.d: Likewise.
+
 2017-12-04  Alan Modra  <amodra@gmail.com>
 
        * testsuite/ld-powerpc/powerpc.exp (ppceabitests): Add -a32 -mbig

diff --git a/ld/testsuite/ld-i386/pr17935-1.d b/ld/testsuite/ld-i386/pr17935-1.d
index 5303ea22a7b312bfe0f0309c0660895797696c54..e73da5948e174291caa344a4f58fdbe7ee35968c 100644 (file)
--- a/ld/testsuite/ld-i386/pr17935-1.d
+++ b/ld/testsuite/ld-i386/pr17935-1.d
@@ -1,3 +1,3 @@
 # as: --32
 # ld: -m elf_i386 -shared -z text
-# error: warning: relocation against `foo' in readonly section `.text'
+# error: warning: relocation against `foo' in read-only section `.text'

diff --git a/ld/testsuite/ld-i386/pr17935-2.d b/ld/testsuite/ld-i386/pr17935-2.d
index c1080f4ee0e75c04ff9b84fc783d2be3c731ee5b..2b1046ef6c757b1cf206e2366d3157fd1ad0e498 100644 (file)
--- a/ld/testsuite/ld-i386/pr17935-2.d
+++ b/ld/testsuite/ld-i386/pr17935-2.d
@@ -1,3 +1,3 @@
 # as: --32
 # ld: -m elf_i386 -shared -z text
-# error: warning: relocation in readonly section `.text'
+# error: warning: relocation in read-only section `.text'

diff --git a/ld/testsuite/ld-x86-64/pr17935-1.d b/ld/testsuite/ld-x86-64/pr17935-1.d
index 5734eab1b40935862d3d2d276d1531b16b7e00b0..b3329bd99286bd950666b167a0dcbd70b108f862 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr17935-1.d
+++ b/ld/testsuite/ld-x86-64/pr17935-1.d
@@ -1,3 +1,3 @@
 # as: --64
 # ld: -m elf_x86_64 -shared -z text
-# error: warning: relocation against `foo' in readonly section `.text'
+# error: warning: relocation against `foo' in read-only section `.text'

diff --git a/ld/testsuite/ld-x86-64/pr17935-2.d b/ld/testsuite/ld-x86-64/pr17935-2.d
index 81df652c11aa2ab3919aa260da1cfaa20438978d..c15a79b48c998070bb0dfaec8ed699dd4c654066 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr17935-2.d
+++ b/ld/testsuite/ld-x86-64/pr17935-2.d
@@ -1,3 +1,3 @@
 # as: --64
 # ld: -m elf_x86_64 -shared -z text
-# error: warning: relocation in readonly section `.text'
+# error: warning: relocation in read-only section `.text'