[PR gdb/25939] Move push_target call earlier in procfs.c

[deliverable/binutils-gdb.git] / bfd / elf64-ppc.c

diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index 1ea4c402e041c8c5b3a304a5b8c032a98eead42a..8d710848ba60bd89ab5c5ef039d01cd7c4208a66 100644 (file)
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -125,6 +125,7 @@ static bfd_vma opd_entry_value
 #define elf_backend_finish_dynamic_sections   ppc64_elf_finish_dynamic_sections
 #define elf_backend_link_output_symbol_hook   ppc64_elf_output_symbol_hook
 #define elf_backend_special_sections         ppc64_elf_special_sections
 #define elf_backend_finish_dynamic_sections   ppc64_elf_finish_dynamic_sections
 #define elf_backend_link_output_symbol_hook   ppc64_elf_output_symbol_hook
 #define elf_backend_special_sections         ppc64_elf_special_sections

+#define elf_backend_section_flags            ppc64_elf_section_flags

 #define elf_backend_merge_symbol_attribute    ppc64_elf_merge_symbol_attribute
 #define elf_backend_merge_symbol             ppc64_elf_merge_symbol
 #define elf_backend_get_reloc_section        bfd_get_section_by_name
 #define elf_backend_merge_symbol_attribute    ppc64_elf_merge_symbol_attribute
 #define elf_backend_merge_symbol             ppc64_elf_merge_symbol
 #define elf_backend_get_reloc_section        bfd_get_section_by_name


@@ -929,16 +930,16 @@ static reloc_howto_type ppc64_elf_howto_raw[] =
   HOW (R_PPC64_DTPREL34, 4, 34, 0x3ffff0000ffffULL, 0, FALSE, signed,
        ppc64_elf_unhandled_reloc),
 
   HOW (R_PPC64_DTPREL34, 4, 34, 0x3ffff0000ffffULL, 0, FALSE, signed,
        ppc64_elf_unhandled_reloc),
 

-  HOW (R_PPC64_GOT_TLSGD34, 4, 34, 0x3ffff0000ffffULL, 0, TRUE, signed,
+  HOW (R_PPC64_GOT_TLSGD_PCREL34, 4, 34, 0x3ffff0000ffffULL, 0, TRUE, signed,

        ppc64_elf_unhandled_reloc),
 
        ppc64_elf_unhandled_reloc),
 

-  HOW (R_PPC64_GOT_TLSLD34, 4, 34, 0x3ffff0000ffffULL, 0, TRUE, signed,
+  HOW (R_PPC64_GOT_TLSLD_PCREL34, 4, 34, 0x3ffff0000ffffULL, 0, TRUE, signed,

        ppc64_elf_unhandled_reloc),
 
        ppc64_elf_unhandled_reloc),
 

-  HOW (R_PPC64_GOT_TPREL34, 4, 34, 0x3ffff0000ffffULL, 0, TRUE, signed,
+  HOW (R_PPC64_GOT_TPREL_PCREL34, 4, 34, 0x3ffff0000ffffULL, 0, TRUE, signed,

        ppc64_elf_unhandled_reloc),
 
        ppc64_elf_unhandled_reloc),
 

-  HOW (R_PPC64_GOT_DTPREL34, 4, 34, 0x3ffff0000ffffULL, 0, TRUE, signed,
+  HOW (R_PPC64_GOT_DTPREL_PCREL34, 4, 34, 0x3ffff0000ffffULL, 0, TRUE, signed,

        ppc64_elf_unhandled_reloc),
 
   HOW (R_PPC64_ADDR16_HIGHER34, 1, 16, 0xffff, 34, FALSE, dont,
        ppc64_elf_unhandled_reloc),
 
   HOW (R_PPC64_ADDR16_HIGHER34, 1, 16, 0xffff, 34, FALSE, dont,


@@ -998,8 +999,7 @@ ppc_howto_init (void)
 }
 
 static reloc_howto_type *
 }
 
 static reloc_howto_type *

-ppc64_elf_reloc_type_lookup (bfd *abfd,
-                            bfd_reloc_code_real_type code)
+ppc64_elf_reloc_type_lookup (bfd *abfd, bfd_reloc_code_real_type code)

 {
   enum elf_ppc64_reloc_type r = R_PPC64_NONE;
 
 {
   enum elf_ppc64_reloc_type r = R_PPC64_NONE;
 


@@ -1279,13 +1279,13 @@ ppc64_elf_reloc_type_lookup (bfd *abfd,
       break;
     case BFD_RELOC_PPC64_DTPREL34:             r = R_PPC64_DTPREL34;
       break;
       break;
     case BFD_RELOC_PPC64_DTPREL34:             r = R_PPC64_DTPREL34;
       break;

-    case BFD_RELOC_PPC64_GOT_TLSGD34:          r = R_PPC64_GOT_TLSGD34;
+    case BFD_RELOC_PPC64_GOT_TLSGD_PCREL34:    r = R_PPC64_GOT_TLSGD_PCREL34;

       break;
       break;

-    case BFD_RELOC_PPC64_GOT_TLSLD34:          r = R_PPC64_GOT_TLSLD34;
+    case BFD_RELOC_PPC64_GOT_TLSLD_PCREL34:    r = R_PPC64_GOT_TLSLD_PCREL34;

       break;
       break;

-    case BFD_RELOC_PPC64_GOT_TPREL34:          r = R_PPC64_GOT_TPREL34;
+    case BFD_RELOC_PPC64_GOT_TPREL_PCREL34:    r = R_PPC64_GOT_TPREL_PCREL34;

       break;
       break;

-    case BFD_RELOC_PPC64_GOT_DTPREL34:         r = R_PPC64_GOT_DTPREL34;
+    case BFD_RELOC_PPC64_GOT_DTPREL_PCREL34:   r = R_PPC64_GOT_DTPREL_PCREL34;

       break;
     case BFD_RELOC_PPC64_ADDR16_HIGHER34:      r = R_PPC64_ADDR16_HIGHER34;
       break;
       break;
     case BFD_RELOC_PPC64_ADDR16_HIGHER34:      r = R_PPC64_ADDR16_HIGHER34;
       break;


@@ -1317,16 +1317,33 @@ ppc64_elf_reloc_type_lookup (bfd *abfd,
 };
 
 static reloc_howto_type *
 };
 
 static reloc_howto_type *

-ppc64_elf_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
-                            const char *r_name)
+ppc64_elf_reloc_name_lookup (bfd *abfd, const char *r_name)

 {
   unsigned int i;
 {
   unsigned int i;

+  static char *compat_map[][2] = {
+    { "R_PPC64_GOT_TLSGD34", "R_PPC64_GOT_TLSGD_PCREL34" },
+    { "R_PPC64_GOT_TLSLD34", "R_PPC64_GOT_TLSLD_PCREL34" },
+    { "R_PPC64_GOT_TPREL34", "R_PPC64_GOT_TPREL_PCREL34" },
+    { "R_PPC64_GOT_DTPREL34", "R_PPC64_GOT_DTPREL_PCREL34" }
+  };

 
   for (i = 0; i < ARRAY_SIZE (ppc64_elf_howto_raw); i++)
     if (ppc64_elf_howto_raw[i].name != NULL
        && strcasecmp (ppc64_elf_howto_raw[i].name, r_name) == 0)
       return &ppc64_elf_howto_raw[i];
 
 
   for (i = 0; i < ARRAY_SIZE (ppc64_elf_howto_raw); i++)
     if (ppc64_elf_howto_raw[i].name != NULL
        && strcasecmp (ppc64_elf_howto_raw[i].name, r_name) == 0)
       return &ppc64_elf_howto_raw[i];
 

+  /* Handle old names of relocations in case they were used by
+     .reloc directives.
+     FIXME: Remove this soon.  Mapping the reloc names is very likely
+     completely unnecessary.  */
+  for (i = 0; i < ARRAY_SIZE (compat_map); i++)
+    if (strcasecmp (compat_map[i][0], r_name) == 0)
+      {
+       _bfd_error_handler (_("warning: %s should be used rather than %s"),
+                           compat_map[i][1], compat_map[i][0]);
+       return ppc64_elf_reloc_name_lookup (abfd, compat_map[i][1]);
+      }
+

   return NULL;
 }
 
   return NULL;
 }
 


@@ -2011,6 +2028,18 @@ ppc64_elf_new_section_hook (bfd *abfd, asection *sec)
   return _bfd_elf_new_section_hook (abfd, sec);
 }
 
   return _bfd_elf_new_section_hook (abfd, sec);
 }
 

+static bfd_boolean
+ppc64_elf_section_flags (const Elf_Internal_Shdr *hdr)
+{
+  const char *name = hdr->bfd_section->name;
+
+  if (strncmp (name, ".sbss", 5) == 0
+      || strncmp (name, ".sdata", 6) == 0)
+    hdr->bfd_section->flags |= SEC_SMALL_DATA;
+
+  return TRUE;
+}
+

 static struct _opd_sec_data *
 get_opd_info (asection * sec)
 {
 static struct _opd_sec_data *
 get_opd_info (asection * sec)
 {


@@ -2409,8 +2438,7 @@ ppc64_elf_get_synthetic_symtab (bfd *abfd,
        free_contents_and_exit_err:
          count = -1;
        free_contents_and_exit:
        free_contents_and_exit_err:
          count = -1;
        free_contents_and_exit:

-         if (contents)
-           free (contents);
+         free (contents);

          goto done;
        }
 
          goto done;
        }
 


@@ -2901,7 +2929,7 @@ must_be_dyn_reloc (struct bfd_link_info *info,
    .   mtctr   %r12
    .   bctr
 
    .   mtctr   %r12
    .   bctr
 

-   There are also ELFv1 powerxx variants of these stubs.
+   There are also ELFv1 power10 variants of these stubs.

    ppc_stub_long_branch_notoc:
    .   pla     %r12,dest@pcrel
    .   b       dest
    ppc_stub_long_branch_notoc:
    .   pla     %r12,dest@pcrel
    .   b       dest


@@ -2924,7 +2952,7 @@ must_be_dyn_reloc (struct bfd_link_info *info,
 
    In cases where the high instructions would add zero, they are
    omitted and following instructions modified in some cases.
 
    In cases where the high instructions would add zero, they are
    omitted and following instructions modified in some cases.

-   For example, a powerxx ppc_stub_plt_call_notoc might simplify down
+   For example, a power10 ppc_stub_plt_call_notoc might simplify down

    to
    .   pld     %r12,xxx@pcrel
    .   mtctr   %r12
    to
    .   pld     %r12,xxx@pcrel
    .   mtctr   %r12


@@ -3063,9 +3091,6 @@ struct ppc_link_hash_entry
     struct ppc_link_hash_entry *next_dot_sym;
   } u;
 
     struct ppc_link_hash_entry *next_dot_sym;
   } u;
 

-  /* Track dynamic relocs copied for this symbol.  */
-  struct elf_dyn_relocs *dyn_relocs;
-

   /* Link between function code and descriptor symbols.  */
   struct ppc_link_hash_entry *oh;
 
   /* Link between function code and descriptor symbols.  */
   struct ppc_link_hash_entry *oh;
 


@@ -3214,19 +3239,14 @@ struct ppc_link_hash_table
   /* Whether func_desc_adjust needs to be run over symbols.  */
   unsigned int need_func_desc_adj:1;
 
   /* Whether func_desc_adjust needs to be run over symbols.  */
   unsigned int need_func_desc_adj:1;
 

-  /* Whether there exist local gnu indirect function resolvers,
-     referenced by dynamic relocations.  */
-  unsigned int local_ifunc_resolver:1;
-  unsigned int maybe_local_ifunc_resolver:1;
-

   /* Whether plt calls for ELFv2 localentry:0 funcs have been optimized.  */
   unsigned int has_plt_localentry0:1;
 
   /* Whether calls are made via the PLT from NOTOC functions.  */
   unsigned int notoc_plt:1;
 
   /* Whether plt calls for ELFv2 localentry:0 funcs have been optimized.  */
   unsigned int has_plt_localentry0:1;
 
   /* Whether calls are made via the PLT from NOTOC functions.  */
   unsigned int notoc_plt:1;
 

-  /* Whether to use powerxx instructions in linkage stubs.  */
-  unsigned int powerxx_stubs:1;
+  /* Whether to use power10 instructions in linkage stubs.  */
+  unsigned int power10_stubs:1;

 
   /* Incremented every time we size stubs.  */
   unsigned int stub_iteration;
 
   /* Incremented every time we size stubs.  */
   unsigned int stub_iteration;


@@ -3894,20 +3914,20 @@ ppc64_elf_copy_indirect_symbol (struct bfd_link_info *info,
     return;
 
   /* Copy over any dynamic relocs we may have on the indirect sym.  */
     return;
 
   /* Copy over any dynamic relocs we may have on the indirect sym.  */

-  if (eind->dyn_relocs != NULL)
+  if (ind->dyn_relocs != NULL)

     {
     {

-      if (edir->dyn_relocs != NULL)
+      if (dir->dyn_relocs != NULL)

        {
          struct elf_dyn_relocs **pp;
          struct elf_dyn_relocs *p;
 
          /* Add reloc counts against the indirect sym to the direct sym
             list.  Merge any entries against the same section.  */
        {
          struct elf_dyn_relocs **pp;
          struct elf_dyn_relocs *p;
 
          /* Add reloc counts against the indirect sym to the direct sym
             list.  Merge any entries against the same section.  */

-         for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
+         for (pp = &ind->dyn_relocs; (p = *pp) != NULL; )

            {
              struct elf_dyn_relocs *q;
 
            {
              struct elf_dyn_relocs *q;
 

-             for (q = edir->dyn_relocs; q != NULL; q = q->next)
+             for (q = dir->dyn_relocs; q != NULL; q = q->next)

                if (q->sec == p->sec)
                  {
                    q->pc_count += p->pc_count;
                if (q->sec == p->sec)
                  {
                    q->pc_count += p->pc_count;


@@ -3918,11 +3938,11 @@ ppc64_elf_copy_indirect_symbol (struct bfd_link_info *info,
              if (q == NULL)
                pp = &p->next;
            }
              if (q == NULL)
                pp = &p->next;
            }

-         *pp = edir->dyn_relocs;
+         *pp = dir->dyn_relocs;

        }
 
        }
 

-      edir->dyn_relocs = eind->dyn_relocs;
-      eind->dyn_relocs = NULL;
+      dir->dyn_relocs = ind->dyn_relocs;
+      ind->dyn_relocs = NULL;

     }
 
   /* Copy over got entries that we may have already seen to the
     }
 
   /* Copy over got entries that we may have already seen to the


@@ -4527,15 +4547,6 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
   if (bfd_link_relocatable (info))
     return TRUE;
 
   if (bfd_link_relocatable (info))
     return TRUE;
 

-  /* Don't do anything special with non-loaded, non-alloced sections.
-     In particular, any relocs in such sections should not affect GOT
-     and PLT reference counting (ie. we don't allow them to create GOT
-     or PLT entries), there's no possibility or desire to optimize TLS
-     relocs, and there's not much point in propagating relocs to shared
-     libs that the dynamic linker won't relocate.  */
-  if ((sec->flags & SEC_ALLOC) == 0)
-    return TRUE;
-

   BFD_ASSERT (is_ppc64_elf (abfd));
 
   htab = ppc_hash_table (info);
   BFD_ASSERT (is_ppc64_elf (abfd));
 
   htab = ppc_hash_table (info);


@@ -4584,14 +4595,14 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
        case R_PPC64_DTPREL34:
        case R_PPC64_PCREL34:
        case R_PPC64_GOT_PCREL34:
        case R_PPC64_DTPREL34:
        case R_PPC64_PCREL34:
        case R_PPC64_GOT_PCREL34:

-       case R_PPC64_GOT_TLSGD34:
-       case R_PPC64_GOT_TLSLD34:
-       case R_PPC64_GOT_TPREL34:
-       case R_PPC64_GOT_DTPREL34:
+       case R_PPC64_GOT_TLSGD_PCREL34:
+       case R_PPC64_GOT_TLSLD_PCREL34:
+       case R_PPC64_GOT_TPREL_PCREL34:
+       case R_PPC64_GOT_DTPREL_PCREL34:

        case R_PPC64_PLT_PCREL34:
        case R_PPC64_PLT_PCREL34_NOTOC:
        case R_PPC64_PCREL28:
        case R_PPC64_PLT_PCREL34:
        case R_PPC64_PLT_PCREL34_NOTOC:
        case R_PPC64_PCREL28:

-         htab->powerxx_stubs = 1;
+         htab->power10_stubs = 1;

          break;
        default:
          break;
          break;
        default:
          break;


@@ -4671,7 +4682,7 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
        case R_PPC64_GOT_TLSLD16_LO:
        case R_PPC64_GOT_TLSLD16_HI:
        case R_PPC64_GOT_TLSLD16_HA:
        case R_PPC64_GOT_TLSLD16_LO:
        case R_PPC64_GOT_TLSLD16_HI:
        case R_PPC64_GOT_TLSLD16_HA:

-       case R_PPC64_GOT_TLSLD34:
+       case R_PPC64_GOT_TLSLD_PCREL34:

          tls_type = TLS_TLS | TLS_LD;
          goto dogottls;
 
          tls_type = TLS_TLS | TLS_LD;
          goto dogottls;
 


@@ -4679,7 +4690,7 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
        case R_PPC64_GOT_TLSGD16_LO:
        case R_PPC64_GOT_TLSGD16_HI:
        case R_PPC64_GOT_TLSGD16_HA:
        case R_PPC64_GOT_TLSGD16_LO:
        case R_PPC64_GOT_TLSGD16_HI:
        case R_PPC64_GOT_TLSGD16_HA:

-       case R_PPC64_GOT_TLSGD34:
+       case R_PPC64_GOT_TLSGD_PCREL34:

          tls_type = TLS_TLS | TLS_GD;
          goto dogottls;
 
          tls_type = TLS_TLS | TLS_GD;
          goto dogottls;
 


@@ -4687,7 +4698,7 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
        case R_PPC64_GOT_TPREL16_LO_DS:
        case R_PPC64_GOT_TPREL16_HI:
        case R_PPC64_GOT_TPREL16_HA:
        case R_PPC64_GOT_TPREL16_LO_DS:
        case R_PPC64_GOT_TPREL16_HI:
        case R_PPC64_GOT_TPREL16_HA:

-       case R_PPC64_GOT_TPREL34:
+       case R_PPC64_GOT_TPREL_PCREL34:

          if (bfd_link_dll (info))
            info->flags |= DF_STATIC_TLS;
          tls_type = TLS_TLS | TLS_TPREL;
          if (bfd_link_dll (info))
            info->flags |= DF_STATIC_TLS;
          tls_type = TLS_TLS | TLS_TPREL;


@@ -4697,7 +4708,7 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
        case R_PPC64_GOT_DTPREL16_LO_DS:
        case R_PPC64_GOT_DTPREL16_HI:
        case R_PPC64_GOT_DTPREL16_HA:
        case R_PPC64_GOT_DTPREL16_LO_DS:
        case R_PPC64_GOT_DTPREL16_HI:
        case R_PPC64_GOT_DTPREL16_HA:

-       case R_PPC64_GOT_DTPREL34:
+       case R_PPC64_GOT_DTPREL_PCREL34:

          tls_type = TLS_TLS | TLS_DTPREL;
        dogottls:
          sec->has_tls_reloc = 1;
          tls_type = TLS_TLS | TLS_DTPREL;
        dogottls:
          sec->has_tls_reloc = 1;


@@ -4761,14 +4772,6 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
            if (!update_local_sym_info (abfd, symtab_hdr, r_symndx,
                                        rel->r_addend, tls_type))
              return FALSE;
            if (!update_local_sym_info (abfd, symtab_hdr, r_symndx,
                                        rel->r_addend, tls_type))
              return FALSE;

-
-         /* We may also need a plt entry if the symbol turns out to be
-            an ifunc.  */
-         if (h != NULL && !bfd_link_pic (info) && abiversion (abfd) != 1)
-           {
-             if (!update_plt_info (abfd, &h->plt.plist, rel->r_addend))
-               return FALSE;
-           }

          break;
 
        case R_PPC64_PLT16_HA:
          break;
 
        case R_PPC64_PLT16_HA:


@@ -5161,7 +5164,7 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
                  struct elf_dyn_relocs *p;
                  struct elf_dyn_relocs **head;
 
                  struct elf_dyn_relocs *p;
                  struct elf_dyn_relocs **head;
 

-                 head = &ppc_elf_hash_entry (h)->dyn_relocs;
+                 head = &h->dyn_relocs;

                  p = *head;
                  if (p == NULL || p->sec != sec)
                    {
                  p = *head;
                  if (p == NULL || p->sec != sec)
                    {


@@ -6355,24 +6358,6 @@ ppc64_elf_func_desc_adjust (bfd *obfd ATTRIBUTE_UNUSED,
   return TRUE;
 }
 
   return TRUE;
 }
 

-/* Find dynamic relocs for H that apply to read-only sections.  */
-
-static asection *
-readonly_dynrelocs (struct elf_link_hash_entry *h)
-{
-  struct ppc_link_hash_entry *eh = ppc_elf_hash_entry (h);
-  struct elf_dyn_relocs *p;
-
-  for (p = eh->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;
-}
-

 /* Return true if we have dynamic relocs against H or any of its weak
    aliases, that apply to read-only sections.  Cannot be used after
    size_dynamic_sections.  */
 /* Return true if we have dynamic relocs against H or any of its weak
    aliases, that apply to read-only sections.  Cannot be used after
    size_dynamic_sections.  */


@@ -6383,7 +6368,7 @@ alias_readonly_dynrelocs (struct elf_link_hash_entry *h)
   struct ppc_link_hash_entry *eh = ppc_elf_hash_entry (h);
   do
     {
   struct ppc_link_hash_entry *eh = ppc_elf_hash_entry (h);
   do
     {

-      if (readonly_dynrelocs (&eh->elf))
+      if (_bfd_elf_readonly_dynrelocs (&eh->elf))

        return TRUE;
       eh = ppc_elf_hash_entry (eh->elf.u.alias);
     }
        return TRUE;
       eh = ppc_elf_hash_entry (eh->elf.u.alias);
     }


@@ -6399,7 +6384,7 @@ pc_dynrelocs (struct ppc_link_hash_entry *eh)
 {
   struct elf_dyn_relocs *p;
 
 {
   struct elf_dyn_relocs *p;
 

-  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+  for (p = eh->elf.dyn_relocs; p != NULL; p = p->next)

     if (p->pc_count != 0)
       return TRUE;
   return FALSE;
     if (p->pc_count != 0)
       return TRUE;
   return FALSE;


@@ -6462,7 +6447,7 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
       if (!bfd_link_pic (info)
          && h->type != STT_GNU_IFUNC
          && local)
       if (!bfd_link_pic (info)
          && h->type != STT_GNU_IFUNC
          && local)

-       ppc_elf_hash_entry (h)->dyn_relocs = NULL;
+       h->dyn_relocs = NULL;

 
       /* Clear procedure linkage table information for any symbol that
         won't need a .plt entry.  */
 
       /* Clear procedure linkage table information for any symbol that
         won't need a .plt entry.  */


@@ -6492,7 +6477,7 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
             extra work in ld.so when resolving these symbols.  */
          if (global_entry_stub (h))
            {
             extra work in ld.so when resolving these symbols.  */
          if (global_entry_stub (h))
            {

-             if (!readonly_dynrelocs (h))
+             if (!_bfd_elf_readonly_dynrelocs (h))

                {
                  h->pointer_equality_needed = 0;
                  /* If we haven't seen a branch reloc and the symbol
                {
                  h->pointer_equality_needed = 0;
                  /* If we haven't seen a branch reloc and the symbol


@@ -6503,14 +6488,14 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
              else if (!bfd_link_pic (info))
                /* We are going to be defining the function symbol on the
                   plt stub, so no dyn_relocs needed when non-pic.  */
              else if (!bfd_link_pic (info))
                /* We are going to be defining the function symbol on the
                   plt stub, so no dyn_relocs needed when non-pic.  */

-               ppc_elf_hash_entry (h)->dyn_relocs = NULL;
+               h->dyn_relocs = NULL;

            }
 
          /* ELFv2 function symbols can't have copy relocs.  */
          return TRUE;
        }
       else if (!h->needs_plt
            }
 
          /* ELFv2 function symbols can't have copy relocs.  */
          return TRUE;
        }
       else if (!h->needs_plt

-              && !readonly_dynrelocs (h))
+              && !_bfd_elf_readonly_dynrelocs (h))

        {
          /* If we haven't seen a branch reloc and the symbol isn't an
             ifunc then we don't need a plt entry.  */
        {
          /* If we haven't seen a branch reloc and the symbol isn't an
             ifunc then we don't need a plt entry.  */


@@ -6533,7 +6518,7 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
       h->root.u.def.value = def->root.u.def.value;
       if (def->root.u.def.section == htab->elf.sdynbss
          || def->root.u.def.section == htab->elf.sdynrelro)
       h->root.u.def.value = def->root.u.def.value;
       if (def->root.u.def.section == htab->elf.sdynbss
          || def->root.u.def.section == htab->elf.sdynrelro)

-       ppc_elf_hash_entry (h)->dyn_relocs = NULL;
+       h->dyn_relocs = NULL;

       return TRUE;
     }
 
       return TRUE;
     }
 


@@ -6623,7 +6608,7 @@ ppc64_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
     }
 
   /* We no longer want dyn_relocs.  */
     }
 
   /* We no longer want dyn_relocs.  */

-  ppc_elf_hash_entry (h)->dyn_relocs = NULL;
+  h->dyn_relocs = NULL;

   return _bfd_elf_adjust_dynamic_copy (info, h, s);
 }
 
   return _bfd_elf_adjust_dynamic_copy (info, h, s);
 }
 


@@ -7045,7 +7030,7 @@ dec_dynrel_count (bfd_vma r_info,
     {
       struct elf_dyn_relocs *p;
       struct elf_dyn_relocs **pp;
     {
       struct elf_dyn_relocs *p;
       struct elf_dyn_relocs **pp;

-      pp = &ppc_elf_hash_entry (h)->dyn_relocs;
+      pp = &h->dyn_relocs;

 
       /* elf_gc_sweep may have already removed all dyn relocs associated
         with local syms for a given section.  Also, symbol flags are
 
       /* elf_gc_sweep may have already removed all dyn relocs associated
         with local syms for a given section.  Also, symbol flags are


@@ -7298,11 +7283,9 @@ ppc64_elf_edit_opd (struct bfd_link_info *info)
              bfd_byte *loc;
              if (!bfd_malloc_and_get_section (ibfd, sec, &loc))
                {
              bfd_byte *loc;
              if (!bfd_malloc_and_get_section (ibfd, sec, &loc))
                {

-                 if (loc != NULL)
-                   free (loc);
+                 free (loc);

                error_ret:
                error_ret:

-                 if (local_syms != NULL
-                     && symtab_hdr->contents != (unsigned char *) local_syms)
+                 if (symtab_hdr->contents != (unsigned char *) local_syms)

                    free (local_syms);
                  if (elf_section_data (sec)->relocs != relstart)
                    free (relstart);
                    free (local_syms);
                  if (elf_section_data (sec)->relocs != relstart)
                    free (relstart);


@@ -7608,7 +7591,7 @@ ppc64_elf_inline_plt (struct bfd_link_info *info)
              return FALSE;
 
            relend = relstart + sec->reloc_count;
              return FALSE;
 
            relend = relstart + sec->reloc_count;

-           for (rel = relstart; rel < relend; )
+           for (rel = relstart; rel < relend; rel++)

              {
                enum elf_ppc64_reloc_type r_type;
                unsigned long r_symndx;
              {
                enum elf_ppc64_reloc_type r_type;
                unsigned long r_symndx;


@@ -7628,8 +7611,7 @@ ppc64_elf_inline_plt (struct bfd_link_info *info)
                  {
                    if (elf_section_data (sec)->relocs != relstart)
                      free (relstart);
                  {
                    if (elf_section_data (sec)->relocs != relstart)
                      free (relstart);

-                   if (local_syms != NULL
-                       && symtab_hdr->contents != (bfd_byte *) local_syms)
+                   if (symtab_hdr->contents != (bfd_byte *) local_syms)

                      free (local_syms);
                    return FALSE;
                  }
                      free (local_syms);
                    return FALSE;
                  }


@@ -7970,11 +7952,9 @@ ppc64_elf_tls_optimize (struct bfd_link_info *info)
                    err_free_rel:
                      if (elf_section_data (sec)->relocs != relstart)
                        free (relstart);
                    err_free_rel:
                      if (elf_section_data (sec)->relocs != relstart)
                        free (relstart);

-                     if (toc_ref != NULL)
-                       free (toc_ref);
-                     if (locsyms != NULL
-                         && (elf_symtab_hdr (ibfd).contents
-                             != (unsigned char *) locsyms))
+                     free (toc_ref);
+                     if (elf_symtab_hdr (ibfd).contents
+                         != (unsigned char *) locsyms)

                        free (locsyms);
                      return ret;
                    }
                        free (locsyms);
                      return ret;
                    }


@@ -8046,7 +8026,7 @@ ppc64_elf_tls_optimize (struct bfd_link_info *info)
                    {
                    case R_PPC64_GOT_TLSLD16:
                    case R_PPC64_GOT_TLSLD16_LO:
                    {
                    case R_PPC64_GOT_TLSLD16:
                    case R_PPC64_GOT_TLSLD16_LO:

-                   case R_PPC64_GOT_TLSLD34:
+                   case R_PPC64_GOT_TLSLD_PCREL34:

                      expecting_tls_get_addr = 1;
                      found_tls_get_addr_arg = 1;
                      /* Fall through.  */
                      expecting_tls_get_addr = 1;
                      found_tls_get_addr_arg = 1;
                      /* Fall through.  */


@@ -8067,7 +8047,7 @@ ppc64_elf_tls_optimize (struct bfd_link_info *info)
 
                    case R_PPC64_GOT_TLSGD16:
                    case R_PPC64_GOT_TLSGD16_LO:
 
                    case R_PPC64_GOT_TLSGD16:
                    case R_PPC64_GOT_TLSGD16_LO:

-                   case R_PPC64_GOT_TLSGD34:
+                   case R_PPC64_GOT_TLSGD_PCREL34:

                      expecting_tls_get_addr = 1;
                      found_tls_get_addr_arg = 1;
                      /* Fall through. */
                      expecting_tls_get_addr = 1;
                      found_tls_get_addr_arg = 1;
                      /* Fall through. */


@@ -8084,7 +8064,7 @@ ppc64_elf_tls_optimize (struct bfd_link_info *info)
                      tls_type = TLS_TLS | TLS_GD;
                      break;
 
                      tls_type = TLS_TLS | TLS_GD;
                      break;
 

-                   case R_PPC64_GOT_TPREL34:
+                   case R_PPC64_GOT_TPREL_PCREL34:

                    case R_PPC64_GOT_TPREL16_DS:
                    case R_PPC64_GOT_TPREL16_LO_DS:
                    case R_PPC64_GOT_TPREL16_HI:
                    case R_PPC64_GOT_TPREL16_DS:
                    case R_PPC64_GOT_TPREL16_LO_DS:
                    case R_PPC64_GOT_TPREL16_HI:


@@ -8389,8 +8369,7 @@ ppc64_elf_tls_optimize (struct bfd_link_info *info)
          }
       }
 
          }
       }
 

-  if (toc_ref != NULL)
-    free (toc_ref);
+  free (toc_ref);

   htab->do_tls_opt = 1;
   return TRUE;
 }
   htab->do_tls_opt = 1;
   return TRUE;
 }


@@ -8600,6 +8579,15 @@ xlate_pcrel_opt (uint64_t *pinsn1, uint64_t *pinsn2, bfd_signed_vma *poff)
       off = insn2 & 0xffff;
       break;
 
       off = insn2 & 0xffff;
       break;
 

+    case 6: /* lxvp, stxvp */
+      if ((insn2 & 0xe) != 0)
+       return FALSE;
+      insn1 = ((1ULL << 58) | (1ULL << 52)
+              | ((insn2 & 1) == 0 ? 58ULL << 26 : 62ULL << 26)
+              | (insn2 & (31ULL << 21)));
+      off = insn2 & 0xfff0;
+      break;
+

     case 62: /* std, stq */
       if ((insn2 & 1) != 0)
        return FALSE;
     case 62: /* std, stq */
       if ((insn2 & 1) != 0)
        return FALSE;


@@ -8821,18 +8809,14 @@ ppc64_elf_edit_toc (struct bfd_link_info *info)
       if (used == NULL)
        {
        error_ret:
       if (used == NULL)
        {
        error_ret:

-         if (local_syms != NULL
-             && symtab_hdr->contents != (unsigned char *) local_syms)
+         if (symtab_hdr->contents != (unsigned char *) local_syms)

            free (local_syms);
          if (sec != NULL
            free (local_syms);
          if (sec != NULL

-             && relstart != NULL

              && elf_section_data (sec)->relocs != relstart)
            free (relstart);
              && elf_section_data (sec)->relocs != relstart)
            free (relstart);

-         if (toc_relocs != NULL
-             && elf_section_data (toc)->relocs != toc_relocs)
+         if (elf_section_data (toc)->relocs != toc_relocs)

            free (toc_relocs);
            free (toc_relocs);

-         if (skip != NULL)
-           free (skip);
+         free (skip);

          return FALSE;
        }
 
          return FALSE;
        }
 


@@ -9199,8 +9183,7 @@ ppc64_elf_edit_toc (struct bfd_link_info *info)
              rel_hdr->sh_size = toc->reloc_count * sz;
            }
        }
              rel_hdr->sh_size = toc->reloc_count * sz;
            }
        }

-      else if (toc_relocs != NULL
-              && elf_section_data (toc)->relocs != toc_relocs)
+      else if (elf_section_data (toc)->relocs != toc_relocs)

        free (toc_relocs);
 
       if (local_syms != NULL
        free (toc_relocs);
 
       if (local_syms != NULL


@@ -9251,11 +9234,9 @@ ppc64_elf_edit_toc (struct bfd_link_info *info)
          if (relstart == NULL)
            {
            got_error_ret:
          if (relstart == NULL)
            {
            got_error_ret:

-             if (local_syms != NULL
-                 && symtab_hdr->contents != (unsigned char *) local_syms)
+             if (symtab_hdr->contents != (unsigned char *) local_syms)

                free (local_syms);
              if (sec != NULL
                free (local_syms);
              if (sec != NULL

-                 && relstart != NULL

                  && elf_section_data (sec)->relocs != relstart)
                free (relstart);
              return FALSE;
                  && elf_section_data (sec)->relocs != relstart)
                free (relstart);
              return FALSE;


@@ -9358,6 +9339,9 @@ ppc64_elf_edit_toc (struct bfd_link_info *info)
                  || discarded_section (sym_sec))
                continue;
 
                  || discarded_section (sym_sec))
                continue;
 

+             if ((h ? h->type : ELF_ST_TYPE (sym->st_info)) == STT_GNU_IFUNC)
+               continue;
+

              if (!SYMBOL_REFERENCES_LOCAL (info, h))
                continue;
 
              if (!SYMBOL_REFERENCES_LOCAL (info, h))
                continue;
 


@@ -9627,19 +9611,19 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
      IFUNCs which are handled even in static executables.  */
   if (!htab->elf.dynamic_sections_created
       && h->type != STT_GNU_IFUNC)
      IFUNCs which are handled even in static executables.  */
   if (!htab->elf.dynamic_sections_created
       && h->type != STT_GNU_IFUNC)

-    eh->dyn_relocs = NULL;
+    h->dyn_relocs = NULL;

 
   /* Discard relocs on undefined symbols that must be local.  */
   else if (h->root.type == bfd_link_hash_undefined
           && ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
 
   /* Discard relocs on undefined symbols that must be local.  */
   else if (h->root.type == bfd_link_hash_undefined
           && ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)

-    eh->dyn_relocs = NULL;
+    h->dyn_relocs = NULL;

 
   /* Also discard relocs on undefined weak syms with non-default
      visibility, or when dynamic_undefined_weak says so.  */
   else if (UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))
 
   /* Also discard relocs on undefined weak syms with non-default
      visibility, or when dynamic_undefined_weak says so.  */
   else if (UNDEFWEAK_NO_DYNAMIC_RELOC (info, h))

-    eh->dyn_relocs = NULL;
+    h->dyn_relocs = NULL;

 
 

-  if (eh->dyn_relocs != NULL)
+  if (h->dyn_relocs != NULL)

     {
       struct elf_dyn_relocs *p, **pp;
 
     {
       struct elf_dyn_relocs *p, **pp;
 


@@ -9659,7 +9643,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
             avoid writing weird assembly.  */
          if (SYMBOL_CALLS_LOCAL (info, h))
            {
             avoid writing weird assembly.  */
          if (SYMBOL_CALLS_LOCAL (info, h))
            {

-             for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+             for (pp = &h->dyn_relocs; (p = *pp) != NULL; )

                {
                  p->count -= p->pc_count;
                  p->pc_count = 0;
                {
                  p->count -= p->pc_count;
                  p->pc_count = 0;


@@ -9670,7 +9654,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
                }
            }
 
                }
            }
 

-         if (eh->dyn_relocs != NULL)
+         if (h->dyn_relocs != NULL)

            {
              /* Ensure we catch all the cases where this symbol
                 should be made dynamic.  */
            {
              /* Ensure we catch all the cases where this symbol
                 should be made dynamic.  */


@@ -9694,14 +9678,14 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
 
              /* But if that didn't work out, discard dynamic relocs.  */
              if (h->dynindx == -1)
 
              /* But if that didn't work out, discard dynamic relocs.  */
              if (h->dynindx == -1)

-               eh->dyn_relocs = NULL;
+               h->dyn_relocs = NULL;

            }
          else
            }
          else

-           eh->dyn_relocs = NULL;
+           h->dyn_relocs = NULL;

        }
 
       /* Finally, allocate space.  */
        }
 
       /* Finally, allocate space.  */

-      for (p = eh->dyn_relocs; p != NULL; p = p->next)
+      for (p = h->dyn_relocs; p != NULL; p = p->next)

        {
          asection *sreloc = elf_section_data (p->sec)->sreloc;
          if (eh->elf.type == STT_GNU_IFUNC)
        {
          asection *sreloc = elf_section_data (p->sec)->sreloc;
          if (eh->elf.type == STT_GNU_IFUNC)


@@ -9880,33 +9864,6 @@ size_global_entry_stubs (struct elf_link_hash_entry *h, void *inf)
   return TRUE;
 }
 
   return TRUE;
 }
 

-/* 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;
-
-  sec = readonly_dynrelocs (h);
-  if (sec != NULL)
-    {
-      struct bfd_link_info *info = (struct bfd_link_info *) inf;
-
-      info->flags |= DF_TEXTREL;
-      info->callbacks->minfo (_("%pB: dynamic relocation against `%pT'"
-                               " in read-only section `%pA'\n"),
-                             sec->owner, h->root.root.string, sec);
-
-      /* Not an error, just cut short the traversal.  */
-      return FALSE;
-    }
-  return TRUE;
-}
-

 /* Set the sizes of the dynamic sections.  */
 
 static bfd_boolean
 /* Set the sizes of the dynamic sections.  */
 
 static bfd_boolean


@@ -10282,7 +10239,8 @@ ppc64_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)
          /* 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, maybe_set_textrel, info);
+           elf_link_hash_traverse (&htab->elf,
+                                   _bfd_elf_maybe_set_textrel, info);

 
          if ((info->flags & DF_TEXTREL) != 0)
            {
 
          if ((info->flags & DF_TEXTREL) != 0)
            {


@@ -10589,7 +10547,7 @@ emit_relocs_for_offset (struct bfd_link_info *info, Elf_Internal_Rela *r,
 }
 
 static bfd_byte *
 }
 
 static bfd_byte *

-build_powerxx_offset (bfd *abfd, bfd_byte *p, bfd_vma off, int odd,
+build_power10_offset (bfd *abfd, bfd_byte *p, bfd_vma off, int odd,

                      bfd_boolean load)
 {
   uint64_t insn;
                      bfd_boolean load)
 {
   uint64_t insn;


@@ -10671,7 +10629,7 @@ build_powerxx_offset (bfd *abfd, bfd_byte *p, bfd_vma off, int odd,
 }
 
 static unsigned int
 }
 
 static unsigned int

-size_powerxx_offset (bfd_vma off, int odd)
+size_power10_offset (bfd_vma off, int odd)

 {
   if (off - odd + (1ULL << 33) < 1ULL << 34)
     return odd + 8;
 {
   if (off - odd + (1ULL << 33) < 1ULL << 34)
     return odd + 8;


@@ -10682,7 +10640,7 @@ size_powerxx_offset (bfd_vma off, int odd)
 }
 
 static unsigned int
 }
 
 static unsigned int

-num_relocs_for_powerxx_offset (bfd_vma off, int odd)
+num_relocs_for_power10_offset (bfd_vma off, int odd)

 {
   if (off - odd + (1ULL << 33) < 1ULL << 34)
     return 1;
 {
   if (off - odd + (1ULL << 33) < 1ULL << 34)
     return 1;


@@ -10693,7 +10651,7 @@ num_relocs_for_powerxx_offset (bfd_vma off, int odd)
 }
 
 static Elf_Internal_Rela *
 }
 
 static Elf_Internal_Rela *

-emit_relocs_for_powerxx_offset (struct bfd_link_info *info,
+emit_relocs_for_power10_offset (struct bfd_link_info *info,

                                Elf_Internal_Rela *r, bfd_vma roff,
                                bfd_vma targ, bfd_vma off, int odd)
 {
                                Elf_Internal_Rela *r, bfd_vma roff,
                                bfd_vma targ, bfd_vma off, int odd)
 {


@@ -10805,14 +10763,14 @@ plt_stub_size (struct ppc_link_hash_table *htab,
 
   if (stub_entry->stub_type >= ppc_stub_plt_call_notoc)
     {
 
   if (stub_entry->stub_type >= ppc_stub_plt_call_notoc)
     {

-      if (htab->powerxx_stubs)
+      if (htab->power10_stubs)

        {
          bfd_vma start = (stub_entry->stub_offset
                           + stub_entry->group->stub_sec->output_offset
                           + stub_entry->group->stub_sec->output_section->vma);
          if (stub_entry->stub_type > ppc_stub_plt_call_notoc)
            start += 4;
        {
          bfd_vma start = (stub_entry->stub_offset
                           + stub_entry->group->stub_sec->output_offset
                           + stub_entry->group->stub_sec->output_section->vma);
          if (stub_entry->stub_type > ppc_stub_plt_call_notoc)
            start += 4;

-         size = 8 + size_powerxx_offset (off, start & 4);
+         size = 8 + size_power10_offset (off, start & 4);

        }
       else
        size = 8 + size_offset (off - 8);
        }
       else
        size = 8 + size_offset (off - 8);


@@ -11349,6 +11307,25 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
   stub_entry = (struct ppc_stub_hash_entry *) gen_entry;
   info = in_arg;
 
   stub_entry = (struct ppc_stub_hash_entry *) gen_entry;
   info = in_arg;
 

+  /* Fail if the target section could not be assigned to an output
+     section.  The user should fix his linker script.  */
+  if (stub_entry->target_section != NULL
+      && stub_entry->target_section->output_section == NULL
+      && info->non_contiguous_regions)
+    info->callbacks->einfo (_("%F%P: Could not assign '%pA' to an output section. "
+                             "Retry without --enable-non-contiguous-regions.\n"),
+                           stub_entry->target_section);
+
+  /* Same for the group.  */
+  if (stub_entry->group->stub_sec != NULL
+      && stub_entry->group->stub_sec->output_section == NULL
+      && info->non_contiguous_regions)
+    info->callbacks->einfo (_("%F%P: Could not assign group %pA target %pA to an "
+                             "output section. Retry without "
+                             "--enable-non-contiguous-regions.\n"),
+                           stub_entry->group->stub_sec,
+                           stub_entry->target_section);
+

   htab = ppc_hash_table (info);
   if (htab == NULL)
     return FALSE;
   htab = ppc_hash_table (info);
   if (htab == NULL)
     return FALSE;


@@ -11627,10 +11604,10 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
 
       relp = p;
       num_rel = 0;
 
       relp = p;
       num_rel = 0;

-      if (htab->powerxx_stubs)
+      if (htab->power10_stubs)

        {
          bfd_boolean load = stub_entry->stub_type >= ppc_stub_plt_call_notoc;
        {
          bfd_boolean load = stub_entry->stub_type >= ppc_stub_plt_call_notoc;

-         p = build_powerxx_offset (htab->params->stub_bfd, p, off, odd, load);
+         p = build_power10_offset (htab->params->stub_bfd, p, off, odd, load);

        }
       else
        {
        }
       else
        {


@@ -11666,8 +11643,8 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
       if (info->emitrelocations)
        {
          bfd_vma roff = relp - stub_entry->group->stub_sec->contents;
       if (info->emitrelocations)
        {
          bfd_vma roff = relp - stub_entry->group->stub_sec->contents;

-         if (htab->powerxx_stubs)
-           num_rel += num_relocs_for_powerxx_offset (off, odd);
+         if (htab->power10_stubs)
+           num_rel += num_relocs_for_power10_offset (off, odd);

          else
            {
              num_rel += num_relocs_for_offset (off);
          else
            {
              num_rel += num_relocs_for_offset (off);


@@ -11676,8 +11653,8 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
          r = get_relocs (stub_entry->group->stub_sec, num_rel);
          if (r == NULL)
            return FALSE;
          r = get_relocs (stub_entry->group->stub_sec, num_rel);
          if (r == NULL)
            return FALSE;

-         if (htab->powerxx_stubs)
-           r = emit_relocs_for_powerxx_offset (info, r, roff, targ, off, odd);
+         if (htab->power10_stubs)
+           r = emit_relocs_for_power10_offset (info, r, roff, targ, off, odd);

          else
            r = emit_relocs_for_offset (info, r, roff, targ, off);
          if (stub_entry->stub_type == ppc_stub_long_branch_notoc
          else
            r = emit_relocs_for_offset (info, r, roff, targ, off);
          if (stub_entry->stub_type == ppc_stub_long_branch_notoc


@@ -11694,7 +11671,7 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
            }
        }
 
            }
        }
 

-      if (!htab->powerxx_stubs
+      if (!htab->power10_stubs

          && htab->glink_eh_frame != NULL
          && htab->glink_eh_frame->size != 0)
        {
          && htab->glink_eh_frame != NULL
          && htab->glink_eh_frame->size != 0)
        {


@@ -11874,6 +11851,25 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
   if (htab == NULL)
     return FALSE;
 
   if (htab == NULL)
     return FALSE;
 

+  /* Fail if the target section could not be assigned to an output
+     section.  The user should fix his linker script.  */
+  if (stub_entry->target_section != NULL
+      && stub_entry->target_section->output_section == NULL
+      && info->non_contiguous_regions)
+    info->callbacks->einfo (_("%F%P: Could not assign %pA to an output section. "
+                             "Retry without --enable-non-contiguous-regions.\n"),
+                           stub_entry->target_section);
+
+  /* Same for the group.  */
+  if (stub_entry->group->stub_sec != NULL
+      && stub_entry->group->stub_sec->output_section == NULL
+      && info->non_contiguous_regions)
+    info->callbacks->einfo (_("%F%P: Could not assign group %pA target %pA to an "
+                             "output section. Retry without "
+                             "--enable-non-contiguous-regions.\n"),
+                           stub_entry->group->stub_sec,
+                           stub_entry->target_section);
+

   /* Make a note of the offset within the stubs for this entry.  */
   stub_entry->stub_offset = stub_entry->group->stub_sec->size;
 
   /* Make a note of the offset within the stubs for this entry.  */
   stub_entry->stub_offset = stub_entry->group->stub_sec->size;
 


@@ -12023,16 +12019,16 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
       if (info->emitrelocations)
        {
          unsigned int num_rel;
       if (info->emitrelocations)
        {
          unsigned int num_rel;

-         if (htab->powerxx_stubs)
-           num_rel = num_relocs_for_powerxx_offset (off, odd);
+         if (htab->power10_stubs)
+           num_rel = num_relocs_for_power10_offset (off, odd);

          else
            num_rel = num_relocs_for_offset (off - 8);
          stub_entry->group->stub_sec->reloc_count += num_rel;
          stub_entry->group->stub_sec->flags |= SEC_RELOC;
        }
 
          else
            num_rel = num_relocs_for_offset (off - 8);
          stub_entry->group->stub_sec->reloc_count += num_rel;
          stub_entry->group->stub_sec->flags |= SEC_RELOC;
        }
 

-      if (htab->powerxx_stubs)
-       extra = size_powerxx_offset (off, odd);
+      if (htab->power10_stubs)
+       extra = size_power10_offset (off, odd);

       else
        extra = size_offset (off - 8);
       /* Include branch insn plus those in the offset sequence.  */
       else
        extra = size_offset (off - 8);
       /* Include branch insn plus those in the offset sequence.  */


@@ -12042,7 +12038,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
         calculated.  */
       off -= extra;
 
         calculated.  */
       off -= extra;
 

-      if (!htab->powerxx_stubs)
+      if (!htab->power10_stubs)

        {
          /* After the bcl, lr has been modified so we need to emit
             .eh_frame info saying the return address is in r12.  */
        {
          /* After the bcl, lr has been modified so we need to emit
             .eh_frame info saying the return address is in r12.  */


@@ -12105,8 +12101,8 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
       if (info->emitrelocations)
        {
          unsigned int num_rel;
       if (info->emitrelocations)
        {
          unsigned int num_rel;

-         if (htab->powerxx_stubs)
-           num_rel = num_relocs_for_powerxx_offset (off, odd);
+         if (htab->power10_stubs)
+           num_rel = num_relocs_for_power10_offset (off, odd);

          else
            num_rel = num_relocs_for_offset (off - 8);
          stub_entry->group->stub_sec->reloc_count += num_rel;
          else
            num_rel = num_relocs_for_offset (off - 8);
          stub_entry->group->stub_sec->reloc_count += num_rel;


@@ -12115,7 +12111,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
 
       size = plt_stub_size (htab, stub_entry, off);
 
 
       size = plt_stub_size (htab, stub_entry, off);
 

-      if (!htab->powerxx_stubs)
+      if (!htab->power10_stubs)

        {
          /* After the bcl, lr has been modified so we need to emit
             .eh_frame info saying the return address is in r12.  */
        {
          /* After the bcl, lr has been modified so we need to emit
             .eh_frame info saying the return address is in r12.  */


@@ -12737,9 +12733,8 @@ toc_adjusting_stub_needed (struct bfd_link_info *info, asection *isec)
            }
        }
 
            }
        }
 

-      if (local_syms != NULL
-         && (elf_symtab_hdr (isec->owner).contents
-             != (unsigned char *) local_syms))
+      if (elf_symtab_hdr (isec->owner).contents
+         != (unsigned char *) local_syms)

        free (local_syms);
       if (elf_section_data (isec)->relocs != relstart)
        free (relstart);
        free (local_syms);
       if (elf_section_data (isec)->relocs != relstart)
        free (relstart);


@@ -13492,9 +13487,8 @@ ppc64_elf_size_stubs (struct bfd_link_info *info)
                      if (elf_section_data (section)->relocs == NULL)
                        free (internal_relocs);
                    error_ret_free_local:
                      if (elf_section_data (section)->relocs == NULL)
                        free (internal_relocs);
                    error_ret_free_local:

-                     if (local_syms != NULL
-                         && (symtab_hdr->contents
-                             != (unsigned char *) local_syms))
+                     if (symtab_hdr->contents
+                         != (unsigned char *) local_syms)

                        free (local_syms);
                      return FALSE;
                    }
                        free (local_syms);
                      return FALSE;
                    }


@@ -13726,6 +13720,8 @@ ppc64_elf_size_stubs (struct bfd_link_info *info)
     }
 
   maybe_strip_output (info, htab->brlt);
     }
 
   maybe_strip_output (info, htab->brlt);

+  if (htab->relbrlt != NULL)
+    maybe_strip_output (info, htab->relbrlt);

   if (htab->glink_eh_frame != NULL)
     maybe_strip_output (info, htab->glink_eh_frame);
 
   if (htab->glink_eh_frame != NULL)
     maybe_strip_output (info, htab->glink_eh_frame);
 


@@ -13880,7 +13876,7 @@ build_global_entry_stubs_and_plt (struct elf_link_hash_entry *h, void *inf)
              {
                plt = htab->elf.iplt;
                relplt = htab->elf.irelplt;
              {
                plt = htab->elf.iplt;
                relplt = htab->elf.irelplt;

-               htab->local_ifunc_resolver = 1;
+               htab->elf.ifunc_resolvers = TRUE;

                if (htab->opd_abi)
                  rela.r_info = ELF64_R_INFO (0, R_PPC64_JMP_IREL);
                else
                if (htab->opd_abi)
                  rela.r_info = ELF64_R_INFO (0, R_PPC64_JMP_IREL);
                else


@@ -13934,7 +13930,7 @@ build_global_entry_stubs_and_plt (struct elf_link_hash_entry *h, void *inf)
                   + ((ent->plt.offset - PLT_INITIAL_ENTRY_SIZE (htab))
                      / PLT_ENTRY_SIZE (htab) * sizeof (Elf64_External_Rela)));
            if (h->type == STT_GNU_IFUNC && is_static_defined (h))
                   + ((ent->plt.offset - PLT_INITIAL_ENTRY_SIZE (htab))
                      / PLT_ENTRY_SIZE (htab) * sizeof (Elf64_External_Rela)));
            if (h->type == STT_GNU_IFUNC && is_static_defined (h))

-             htab->maybe_local_ifunc_resolver = 1;
+             htab->elf.ifunc_resolvers = TRUE;

            bfd_elf64_swap_reloca_out (info->output_bfd, &rela, loc);
          }
       }
            bfd_elf64_swap_reloca_out (info->output_bfd, &rela, loc);
          }
       }


@@ -14063,8 +14059,7 @@ write_plt_relocs_for_local_syms (struct bfd_link_info *info)
              if (!get_sym_h (NULL, &sym, &sym_sec, NULL, &local_syms,
                              lplt - local_plt, ibfd))
                {
              if (!get_sym_h (NULL, &sym, &sym_sec, NULL, &local_syms,
                              lplt - local_plt, ibfd))
                {

-                 if (local_syms != NULL
-                     && symtab_hdr->contents != (unsigned char *) local_syms)
+                 if (symtab_hdr->contents != (unsigned char *) local_syms)

                    free (local_syms);
                  return FALSE;
                }
                    free (local_syms);
                  return FALSE;
                }


@@ -14077,7 +14072,7 @@ write_plt_relocs_for_local_syms (struct bfd_link_info *info)
 
              if (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
                {
 
              if (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
                {

-                 htab->local_ifunc_resolver = 1;
+                 htab->elf.ifunc_resolvers = TRUE;

                  plt = htab->elf.iplt;
                  relplt = htab->elf.irelplt;
                }
                  plt = htab->elf.iplt;
                  relplt = htab->elf.irelplt;
                }


@@ -14506,42 +14501,46 @@ ppc64_elf_build_stubs (struct bfd_link_info *info,
 
   if (stats != NULL)
     {
 
   if (stats != NULL)
     {

-      size_t len;
-      *stats = bfd_malloc (500);
-      if (*stats == NULL)
-       return FALSE;
-
-      len = sprintf (*stats,
-                    ngettext ("linker stubs in %u group\n",
-                              "linker stubs in %u groups\n",
-                              stub_sec_count),
-                    stub_sec_count);
-      sprintf (*stats + len, _("  branch         %lu\n"
-                              "  branch toc adj %lu\n"
-                              "  branch notoc   %lu\n"
-                              "  branch both    %lu\n"
-                              "  long branch    %lu\n"
-                              "  long toc adj   %lu\n"
-                              "  long notoc     %lu\n"
-                              "  long both      %lu\n"
-                              "  plt call       %lu\n"
-                              "  plt call save  %lu\n"
-                              "  plt call notoc %lu\n"
-                              "  plt call both  %lu\n"
-                              "  global entry   %lu"),
-              htab->stub_count[ppc_stub_long_branch - 1],
-              htab->stub_count[ppc_stub_long_branch_r2off - 1],
-              htab->stub_count[ppc_stub_long_branch_notoc - 1],
-              htab->stub_count[ppc_stub_long_branch_both - 1],
-              htab->stub_count[ppc_stub_plt_branch - 1],
-              htab->stub_count[ppc_stub_plt_branch_r2off - 1],
-              htab->stub_count[ppc_stub_plt_branch_notoc - 1],
-              htab->stub_count[ppc_stub_plt_branch_both - 1],
-              htab->stub_count[ppc_stub_plt_call - 1],
-              htab->stub_count[ppc_stub_plt_call_r2save - 1],
-              htab->stub_count[ppc_stub_plt_call_notoc - 1],
-              htab->stub_count[ppc_stub_plt_call_both - 1],
-              htab->stub_count[ppc_stub_global_entry - 1]);
+      char *groupmsg;
+      if (asprintf (&groupmsg,
+                   ngettext ("linker stubs in %u group\n",
+                             "linker stubs in %u groups\n",
+                             stub_sec_count),
+                   stub_sec_count) < 0)
+       *stats = NULL;
+      else
+       {
+         if (asprintf (stats, _("%s"
+                                "  branch         %lu\n"
+                                "  branch toc adj %lu\n"
+                                "  branch notoc   %lu\n"
+                                "  branch both    %lu\n"
+                                "  long branch    %lu\n"
+                                "  long toc adj   %lu\n"
+                                "  long notoc     %lu\n"
+                                "  long both      %lu\n"
+                                "  plt call       %lu\n"
+                                "  plt call save  %lu\n"
+                                "  plt call notoc %lu\n"
+                                "  plt call both  %lu\n"
+                                "  global entry   %lu"),
+                       groupmsg,
+                       htab->stub_count[ppc_stub_long_branch - 1],
+                       htab->stub_count[ppc_stub_long_branch_r2off - 1],
+                       htab->stub_count[ppc_stub_long_branch_notoc - 1],
+                       htab->stub_count[ppc_stub_long_branch_both - 1],
+                       htab->stub_count[ppc_stub_plt_branch - 1],
+                       htab->stub_count[ppc_stub_plt_branch_r2off - 1],
+                       htab->stub_count[ppc_stub_plt_branch_notoc - 1],
+                       htab->stub_count[ppc_stub_plt_branch_both - 1],
+                       htab->stub_count[ppc_stub_plt_call - 1],
+                       htab->stub_count[ppc_stub_plt_call_r2save - 1],
+                       htab->stub_count[ppc_stub_plt_call_notoc - 1],
+                       htab->stub_count[ppc_stub_plt_call_both - 1],
+                       htab->stub_count[ppc_stub_global_entry - 1]) < 0)
+           *stats = NULL;
+         free (groupmsg);
+       }

     }
   return TRUE;
 }
     }
   return TRUE;
 }


@@ -15031,7 +15030,7 @@ ppc64_elf_relocate_section (bfd *output_bfd,
            }
          break;
 
            }
          break;
 

-       case R_PPC64_GOT_TPREL34:
+       case R_PPC64_GOT_TPREL_PCREL34:

          if ((tls_mask & TLS_TLS) != 0
              && (tls_mask & TLS_TPREL) == 0)
            {
          if ((tls_mask & TLS_TLS) != 0
              && (tls_mask & TLS_TPREL) == 0)
            {


@@ -15224,7 +15223,7 @@ ppc64_elf_relocate_section (bfd *output_bfd,
            }
          break;
 
            }
          break;
 

-       case R_PPC64_GOT_TLSGD34:
+       case R_PPC64_GOT_TLSGD_PCREL34:

          if ((tls_mask & TLS_TLS) != 0 && (tls_mask & TLS_GD) == 0)
            {
              pinsn = bfd_get_32 (input_bfd, contents + rel->r_offset);
          if ((tls_mask & TLS_TLS) != 0 && (tls_mask & TLS_GD) == 0)
            {
              pinsn = bfd_get_32 (input_bfd, contents + rel->r_offset);


@@ -15234,7 +15233,7 @@ ppc64_elf_relocate_section (bfd *output_bfd,
                {
                  /* IE, pla -> pld  */
                  pinsn += (-2ULL << 56) + (57ULL << 26) - (14ULL << 26);
                {
                  /* IE, pla -> pld  */
                  pinsn += (-2ULL << 56) + (57ULL << 26) - (14ULL << 26);

-                 r_type = R_PPC64_GOT_TPREL34;
+                 r_type = R_PPC64_GOT_TPREL_PCREL34;

                }
              else
                {
                }
              else
                {


@@ -15250,7 +15249,7 @@ ppc64_elf_relocate_section (bfd *output_bfd,
            }
          break;
 
            }
          break;
 

-       case R_PPC64_GOT_TLSLD34:
+       case R_PPC64_GOT_TLSLD_PCREL34:

          if ((tls_mask & TLS_TLS) != 0 && (tls_mask & TLS_LD) == 0)
            {
              pinsn = bfd_get_32 (input_bfd, contents + rel->r_offset);
          if ((tls_mask & TLS_TLS) != 0 && (tls_mask & TLS_LD) == 0)
            {
              pinsn = bfd_get_32 (input_bfd, contents + rel->r_offset);


@@ -15831,6 +15830,8 @@ ppc64_elf_relocate_section (bfd *output_bfd,
          break;
 
        case R_PPC64_GOT16_DS:
          break;
 
        case R_PPC64_GOT16_DS:

+         if ((h ? h->elf.type : ELF_ST_TYPE (sym->st_info)) == STT_GNU_IFUNC)
+           break;

          from = TOCstart + htab->sec_info[input_section->id].toc_off;
          if (relocation + addend - from + 0x8000 < 0x10000
              && SYMBOL_REFERENCES_LOCAL (info, &h->elf))
          from = TOCstart + htab->sec_info[input_section->id].toc_off;
          if (relocation + addend - from + 0x8000 < 0x10000
              && SYMBOL_REFERENCES_LOCAL (info, &h->elf))


@@ -15848,6 +15849,8 @@ ppc64_elf_relocate_section (bfd *output_bfd,
 
        case R_PPC64_GOT16_LO_DS:
        case R_PPC64_GOT16_HA:
 
        case R_PPC64_GOT16_LO_DS:
        case R_PPC64_GOT16_HA:

+         if ((h ? h->elf.type : ELF_ST_TYPE (sym->st_info)) == STT_GNU_IFUNC)
+           break;

          from = TOCstart + htab->sec_info[input_section->id].toc_off;
          if (relocation + addend - from + 0x80008000ULL < 0x100000000ULL
              && SYMBOL_REFERENCES_LOCAL (info, &h->elf))
          from = TOCstart + htab->sec_info[input_section->id].toc_off;
          if (relocation + addend - from + 0x80008000ULL < 0x100000000ULL
              && SYMBOL_REFERENCES_LOCAL (info, &h->elf))


@@ -15869,6 +15872,8 @@ ppc64_elf_relocate_section (bfd *output_bfd,
          break;
 
        case R_PPC64_GOT_PCREL34:
          break;
 
        case R_PPC64_GOT_PCREL34:

+         if ((h ? h->elf.type : ELF_ST_TYPE (sym->st_info)) == STT_GNU_IFUNC)
+           break;

          from = (rel->r_offset
                  + input_section->output_section->vma
                  + input_section->output_offset);
          from = (rel->r_offset
                  + input_section->output_section->vma
                  + input_section->output_offset);


@@ -15980,7 +15985,7 @@ ppc64_elf_relocate_section (bfd *output_bfd,
        case R_PPC64_GOT_TLSGD16_LO:
        case R_PPC64_GOT_TLSGD16_HI:
        case R_PPC64_GOT_TLSGD16_HA:
        case R_PPC64_GOT_TLSGD16_LO:
        case R_PPC64_GOT_TLSGD16_HI:
        case R_PPC64_GOT_TLSGD16_HA:

-       case R_PPC64_GOT_TLSGD34:
+       case R_PPC64_GOT_TLSGD_PCREL34:

          tls_type = TLS_TLS | TLS_GD;
          goto dogot;
 
          tls_type = TLS_TLS | TLS_GD;
          goto dogot;
 


@@ -15988,7 +15993,7 @@ ppc64_elf_relocate_section (bfd *output_bfd,
        case R_PPC64_GOT_TLSLD16_LO:
        case R_PPC64_GOT_TLSLD16_HI:
        case R_PPC64_GOT_TLSLD16_HA:
        case R_PPC64_GOT_TLSLD16_LO:
        case R_PPC64_GOT_TLSLD16_HI:
        case R_PPC64_GOT_TLSLD16_HA:

-       case R_PPC64_GOT_TLSLD34:
+       case R_PPC64_GOT_TLSLD_PCREL34:

          tls_type = TLS_TLS | TLS_LD;
          goto dogot;
 
          tls_type = TLS_TLS | TLS_LD;
          goto dogot;
 


@@ -15996,7 +16001,7 @@ ppc64_elf_relocate_section (bfd *output_bfd,
        case R_PPC64_GOT_TPREL16_LO_DS:
        case R_PPC64_GOT_TPREL16_HI:
        case R_PPC64_GOT_TPREL16_HA:
        case R_PPC64_GOT_TPREL16_LO_DS:
        case R_PPC64_GOT_TPREL16_HI:
        case R_PPC64_GOT_TPREL16_HA:

-       case R_PPC64_GOT_TPREL34:
+       case R_PPC64_GOT_TPREL_PCREL34:

          tls_type = TLS_TLS | TLS_TPREL;
          goto dogot;
 
          tls_type = TLS_TLS | TLS_TPREL;
          goto dogot;
 


@@ -16004,7 +16009,7 @@ ppc64_elf_relocate_section (bfd *output_bfd,
        case R_PPC64_GOT_DTPREL16_LO_DS:
        case R_PPC64_GOT_DTPREL16_HI:
        case R_PPC64_GOT_DTPREL16_HA:
        case R_PPC64_GOT_DTPREL16_LO_DS:
        case R_PPC64_GOT_DTPREL16_HI:
        case R_PPC64_GOT_DTPREL16_HA:

-       case R_PPC64_GOT_DTPREL34:
+       case R_PPC64_GOT_DTPREL_PCREL34:

          tls_type = TLS_TLS | TLS_DTPREL;
          goto dogot;
 
          tls_type = TLS_TLS | TLS_DTPREL;
          goto dogot;
 


@@ -16093,10 +16098,8 @@ ppc64_elf_relocate_section (bfd *output_bfd,
                if (ifunc)
                  {
                    relgot = htab->elf.irelplt;
                if (ifunc)
                  {
                    relgot = htab->elf.irelplt;

-                   if (indx == 0)
-                     htab->local_ifunc_resolver = 1;
-                   else if (is_static_defined (&h->elf))
-                     htab->maybe_local_ifunc_resolver = 1;
+                   if (indx == 0 || is_static_defined (&h->elf))
+                     htab->elf.ifunc_resolvers = TRUE;

                  }
                else if (indx != 0
                         || (bfd_link_pic (info)
                  }
                else if (indx != 0
                         || (bfd_link_pic (info)


@@ -16203,10 +16206,10 @@ ppc64_elf_relocate_section (bfd *output_bfd,
            relocation = got->output_section->vma + got->output_offset + off;
            addend = 0;
            if (!(r_type == R_PPC64_GOT_PCREL34
            relocation = got->output_section->vma + got->output_offset + off;
            addend = 0;
            if (!(r_type == R_PPC64_GOT_PCREL34

-                 || r_type == R_PPC64_GOT_TLSGD34
-                 || r_type == R_PPC64_GOT_TLSLD34
-                 || r_type == R_PPC64_GOT_TPREL34
-                 || r_type == R_PPC64_GOT_DTPREL34))
+                 || r_type == R_PPC64_GOT_TLSGD_PCREL34
+                 || r_type == R_PPC64_GOT_TLSLD_PCREL34
+                 || r_type == R_PPC64_GOT_TPREL_PCREL34
+                 || r_type == R_PPC64_GOT_DTPREL_PCREL34))

              addend = -(TOCstart + htab->sec_info[input_section->id].toc_off);
          }
          break;
              addend = -(TOCstart + htab->sec_info[input_section->id].toc_off);
          }
          break;


@@ -16460,11 +16463,11 @@ ppc64_elf_relocate_section (bfd *output_bfd,
 
          if (bfd_link_pic (info)
              ? ((h == NULL
 
          if (bfd_link_pic (info)
              ? ((h == NULL

-                 || h->dyn_relocs != NULL)
+                 || h->elf.dyn_relocs != NULL)

                 && ((h != NULL && pc_dynrelocs (h))
                     || must_be_dyn_reloc (info, r_type)))
              : (h != NULL
                 && ((h != NULL && pc_dynrelocs (h))
                     || must_be_dyn_reloc (info, r_type)))
              : (h != NULL

-                ? h->dyn_relocs != NULL
+                ? h->elf.dyn_relocs != NULL

                 : ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC))
            {
              bfd_boolean skip, relocate;
                 : ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC))
            {
              bfd_boolean skip, relocate;


@@ -16625,10 +16628,8 @@ ppc64_elf_relocate_section (bfd *output_bfd,
                  : ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
                {
                  sreloc = htab->elf.irelplt;
                  : ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
                {
                  sreloc = htab->elf.irelplt;

-                 if (indx == 0)
-                   htab->local_ifunc_resolver = 1;
-                 else if (is_static_defined (&h->elf))
-                   htab->maybe_local_ifunc_resolver = 1;
+                 if (indx == 0 || is_static_defined (&h->elf))
+                   htab->elf.ifunc_resolvers = TRUE;

                }
              if (sreloc == NULL)
                abort ();
                }
              if (sreloc == NULL)
                abort ();


@@ -17028,10 +17029,10 @@ ppc64_elf_relocate_section (bfd *output_bfd,
        case R_PPC64_GOT_PCREL34:
        case R_PPC64_TPREL34:
        case R_PPC64_DTPREL34:
        case R_PPC64_GOT_PCREL34:
        case R_PPC64_TPREL34:
        case R_PPC64_DTPREL34:

-       case R_PPC64_GOT_TLSGD34:
-       case R_PPC64_GOT_TLSLD34:
-       case R_PPC64_GOT_TPREL34:
-       case R_PPC64_GOT_DTPREL34:
+       case R_PPC64_GOT_TLSGD_PCREL34:
+       case R_PPC64_GOT_TLSLD_PCREL34:
+       case R_PPC64_GOT_TPREL_PCREL34:
+       case R_PPC64_GOT_DTPREL_PCREL34:

        case R_PPC64_PLT_PCREL34:
        case R_PPC64_PLT_PCREL34_NOTOC:
        case R_PPC64_D28:
        case R_PPC64_PLT_PCREL34:
        case R_PPC64_PLT_PCREL34_NOTOC:
        case R_PPC64_D28:


@@ -17132,8 +17133,7 @@ ppc64_elf_relocate_section (bfd *output_bfd,
                 reloc_name, sym_name, (int) r);
              ret = FALSE;
            }
                 reloc_name, sym_name, (int) r);
              ret = FALSE;
            }

-         if (more_info != NULL)
-           free (more_info);
+         free (more_info);

        }
     copy_reloc:
       if (wrel != rel)
        }
     copy_reloc:
       if (wrel != rel)


@@ -17393,11 +17393,7 @@ ppc64_elf_finish_dynamic_sections (bfd *output_bfd,
              break;
 
            case DT_TEXTREL:
              break;
 
            case DT_TEXTREL:

-             if (htab->local_ifunc_resolver)
-               info->callbacks->einfo
-                 (_("%X%P: text relocations and GNU indirect "
-                    "functions will result in a segfault at runtime\n"));
-             else if (htab->maybe_local_ifunc_resolver)
+             if (htab->elf.ifunc_resolvers)

                info->callbacks->einfo
                  (_("%P: warning: text relocations and GNU indirect "
                     "functions may result in a segfault at runtime\n"));
                info->callbacks->einfo
                  (_("%P: warning: text relocations and GNU indirect "
                     "functions may result in a segfault at runtime\n"));