* elf32-ppc.c (ppc_elf_select_plt_layout): Force bss-plt when

	shared and call to _mcount will go via plt.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0b31af428b9945a464cada6a5cb68223760b1a90..d3ec83004349f2cadd9d46dba497cad43bd57af0 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-14  Alan Modra  <amodra@gmail.com>
+
+       * elf32-ppc.c (ppc_elf_select_plt_layout): Force bss-plt when
+       shared and call to _mcount will go via plt.
+
 2011-08-14  Alan Modra  <amodra@gmail.com>
 
        * elf64-ppc.c: Prefix all einfo error strings with "%P: ".

diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
index 7de93f619de10dcee02ac8ea1f43fb15f694d866..cfb473479f9dc84f0d61fe71d0d9ebc1b3335d59 100644 (file)
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
@@ -4256,8 +4256,27 @@ ppc_elf_select_plt_layout (bfd *output_bfd ATTRIBUTE_UNUSED,
 
   if (htab->plt_type == PLT_UNSET)
     {
+      struct elf_link_hash_entry *h;
+
       if (plt_style == PLT_OLD)
        htab->plt_type = PLT_OLD;
+      else if (info->shared
+              && htab->elf.dynamic_sections_created
+              && (h = elf_link_hash_lookup (&htab->elf, "_mcount",
+                                            FALSE, FALSE, TRUE)) != NULL
+              && (h->type == STT_FUNC
+                  || h->needs_plt)
+              && h->ref_regular
+              && !(SYMBOL_CALLS_LOCAL (info, h)
+                   || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+                       && h->root.type == bfd_link_hash_undefweak)))
+       {
+         /* Profiling of shared libs (and pies) is not supported with
+            secure plt, because ppc32 does profiling before a
+            function prologue and a secure plt pic call stubs needs
+            r30 to be set up.  */
+         htab->plt_type = PLT_OLD;
+       }
       else
        {
          bfd *ibfd;
@@ -4285,7 +4304,13 @@ ppc_elf_select_plt_layout (bfd *output_bfd ATTRIBUTE_UNUSED,
        }
     }
   if (htab->plt_type == PLT_OLD && plt_style == PLT_NEW)
-    info->callbacks->einfo (_("%P: bss-plt forced due to %B\n"), htab->old_bfd);
+    {
+      if (htab->old_bfd != NULL)
+       info->callbacks->einfo (_("%P: bss-plt forced due to %B\n"),
+                               htab->old_bfd);
+      else
+       info->callbacks->einfo (_("%P: bss-plt forced by profiling\n"));
+    }
 
   BFD_ASSERT (htab->plt_type != PLT_VXWORKS);