Automatic date update in version.in

[deliverable/binutils-gdb.git] / bfd / elf32-s390.c

diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c
index 0127eabe77896472c8656e77fdaf2547052d2fad..9480f7258ac44d646c543a54383fcad34edfe9eb 100644 (file)
--- a/bfd/elf32-s390.c
+++ b/bfd/elf32-s390.c
@@ -1,5 +1,5 @@
 /* IBM S/390-specific support for 32-bit ELF
 /* IBM S/390-specific support for 32-bit ELF

-   Copyright (C) 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2016 Free Software Foundation, Inc.

    Contributed by Carl B. Pedersen and Martin Schwidefsky.
 
    This file is part of BFD, the Binary File Descriptor library.
    Contributed by Carl B. Pedersen and Martin Schwidefsky.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -856,11 +856,11 @@ elf_s390_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info)
   htab->elf.splt = bfd_get_linker_section (dynobj, ".plt");
   htab->elf.srelplt = bfd_get_linker_section (dynobj, ".rela.plt");
   htab->sdynbss = bfd_get_linker_section (dynobj, ".dynbss");
   htab->elf.splt = bfd_get_linker_section (dynobj, ".plt");
   htab->elf.srelplt = bfd_get_linker_section (dynobj, ".rela.plt");
   htab->sdynbss = bfd_get_linker_section (dynobj, ".dynbss");

-  if (!info->shared)
+  if (!bfd_link_pic (info))

     htab->srelbss = bfd_get_linker_section (dynobj, ".rela.bss");
 
   if (!htab->elf.splt || !htab->elf.srelplt || !htab->sdynbss
     htab->srelbss = bfd_get_linker_section (dynobj, ".rela.bss");
 
   if (!htab->elf.splt || !htab->elf.srelplt || !htab->sdynbss

-      || (!info->shared && !htab->srelbss))
+      || (!bfd_link_pic (info) && !htab->srelbss))

     abort ();
 
   return TRUE;
     abort ();
 
   return TRUE;


@@ -937,7 +937,7 @@ elf_s390_tls_transition (struct bfd_link_info *info,
                         int r_type,
                         int is_local)
 {
                         int r_type,
                         int is_local)
 {

-  if (info->shared)
+  if (bfd_link_pic (info))

     return r_type;
 
   switch (r_type)
     return r_type;
 
   switch (r_type)


@@ -978,7 +978,7 @@ elf_s390_check_relocs (bfd *abfd,
   int tls_type, old_tls_type;
   Elf_Internal_Sym *isym;
 
   int tls_type, old_tls_type;
   Elf_Internal_Sym *isym;
 

-  if (info->relocatable)
+  if (bfd_link_relocatable (info))

     return TRUE;
 
   BFD_ASSERT (is_s390_elf (abfd));
     return TRUE;
 
   BFD_ASSERT (is_s390_elf (abfd));


@@ -1112,8 +1112,6 @@ elf_s390_check_relocs (bfd *abfd,
        }
       switch (r_type)
        {
        }
       switch (r_type)
        {

-       case R_390_GOTOFF16:
-       case R_390_GOTOFF32:

        case R_390_GOTPC:
        case R_390_GOTPCDBL:
          /* These relocs do not need a GOT slot.  They just load the
        case R_390_GOTPC:
        case R_390_GOTPCDBL:
          /* These relocs do not need a GOT slot.  They just load the


@@ -1121,6 +1119,10 @@ elf_s390_check_relocs (bfd *abfd,
             the GOT.  Since the GOT pointer has been set up above we
             are done.  */
          break;
             the GOT.  Since the GOT pointer has been set up above we
             are done.  */
          break;

+       case R_390_GOTOFF16:
+       case R_390_GOTOFF32:
+         if (h == NULL || !s390_is_ifunc_symbol_p (h) || !h->def_regular)
+           break;

 
        case R_390_PLT12DBL:
        case R_390_PLT16DBL:
 
        case R_390_PLT12DBL:
        case R_390_PLT16DBL:


@@ -1177,7 +1179,7 @@ elf_s390_check_relocs (bfd *abfd,
        case R_390_TLS_GOTIE20:
        case R_390_TLS_GOTIE32:
        case R_390_TLS_IEENT:
        case R_390_TLS_GOTIE20:
        case R_390_TLS_GOTIE32:
        case R_390_TLS_IEENT:

-         if (info->shared)
+         if (bfd_link_pic (info))

            info->flags |= DF_STATIC_TLS;
          /* Fall through.  */
 
            info->flags |= DF_STATIC_TLS;
          /* Fall through.  */
 


@@ -1253,10 +1255,10 @@ elf_s390_check_relocs (bfd *abfd,
          /* For static linking and executables this reloc will be
             calculated at linktime otherwise a TLS_TPOFF runtime
             reloc will be generated.  */
          /* For static linking and executables this reloc will be
             calculated at linktime otherwise a TLS_TPOFF runtime
             reloc will be generated.  */

-         if (r_type == R_390_TLS_LE32 && info->pie)
+         if (r_type == R_390_TLS_LE32 && bfd_link_pie (info))

            break;
 
            break;
 

-         if (!info->shared)
+         if (!bfd_link_pic (info))

            break;
          info->flags |= DF_STATIC_TLS;
          /* Fall through.  */
            break;
          info->flags |= DF_STATIC_TLS;
          /* Fall through.  */


@@ -1270,7 +1272,7 @@ elf_s390_check_relocs (bfd *abfd,
        case R_390_PC24DBL:
        case R_390_PC32DBL:
        case R_390_PC32:
        case R_390_PC24DBL:
        case R_390_PC32DBL:
        case R_390_PC32:

-         if (h != NULL)
+         if (h != NULL && bfd_link_executable (info))

            {
              /* If this reloc is in a read-only section, we might
                 need a copy reloc.  We can't check reliably at this
            {
              /* If this reloc is in a read-only section, we might
                 need a copy reloc.  We can't check reliably at this


@@ -1280,7 +1282,7 @@ elf_s390_check_relocs (bfd *abfd,
                 adjust_dynamic_symbol.  */
              h->non_got_ref = 1;
 
                 adjust_dynamic_symbol.  */
              h->non_got_ref = 1;
 

-             if (!info->shared)
+             if (!bfd_link_pic (info))

                {
                  /* We may need a .plt entry if the function this reloc
                     refers to is in a shared lib.  */
                {
                  /* We may need a .plt entry if the function this reloc
                     refers to is in a shared lib.  */


@@ -1309,7 +1311,7 @@ elf_s390_check_relocs (bfd *abfd,
             may need to keep relocations for symbols satisfied by a
             dynamic library if we manage to avoid copy relocs for the
             symbol.  */
             may need to keep relocations for symbols satisfied by a
             dynamic library if we manage to avoid copy relocs for the
             symbol.  */

-         if ((info->shared
+         if ((bfd_link_pic (info)

               && (sec->flags & SEC_ALLOC) != 0
               && ((ELF32_R_TYPE (rel->r_info) != R_390_PC16
                    && ELF32_R_TYPE (rel->r_info) != R_390_PC12DBL
               && (sec->flags & SEC_ALLOC) != 0
               && ((ELF32_R_TYPE (rel->r_info) != R_390_PC16
                    && ELF32_R_TYPE (rel->r_info) != R_390_PC12DBL


@@ -1322,7 +1324,7 @@ elf_s390_check_relocs (bfd *abfd,
                           || h->root.type == bfd_link_hash_defweak
                           || !h->def_regular))))
              || (ELIMINATE_COPY_RELOCS
                           || h->root.type == bfd_link_hash_defweak
                           || !h->def_regular))))
              || (ELIMINATE_COPY_RELOCS

-                 && !info->shared
+                 && !bfd_link_pic (info)

                  && (sec->flags & SEC_ALLOC) != 0
                  && h != NULL
                  && (h->root.type == bfd_link_hash_defweak
                  && (sec->flags & SEC_ALLOC) != 0
                  && h != NULL
                  && (h->root.type == bfd_link_hash_defweak


@@ -1459,7 +1461,7 @@ elf_s390_gc_sweep_hook (bfd *abfd,
   bfd_signed_vma *local_got_refcounts;
   const Elf_Internal_Rela *rel, *relend;
 
   bfd_signed_vma *local_got_refcounts;
   const Elf_Internal_Rela *rel, *relend;
 

-  if (info->relocatable)
+  if (bfd_link_relocatable (info))

     return TRUE;
 
   htab = elf_s390_hash_table (info);
     return TRUE;
 
   htab = elf_s390_hash_table (info);


@@ -1527,6 +1529,18 @@ elf_s390_gc_sweep_hook (bfd *abfd,
            elf_s390_hash_table (info)->tls_ldm_got.refcount -= 1;
          break;
 
            elf_s390_hash_table (info)->tls_ldm_got.refcount -= 1;
          break;
 

+       case R_390_GOTOFF16:
+       case R_390_GOTOFF32:
+         if (h != NULL && s390_is_ifunc_symbol_p (h) && h->def_regular)
+           {
+             h->plt.refcount--;
+             break;
+           }
+
+       case R_390_GOTPC:
+       case R_390_GOTPCDBL:
+         break;
+

        case R_390_TLS_GD32:
        case R_390_TLS_IE32:
        case R_390_TLS_GOTIE12:
        case R_390_TLS_GD32:
        case R_390_TLS_IE32:
        case R_390_TLS_GOTIE12:


@@ -1537,10 +1551,6 @@ elf_s390_gc_sweep_hook (bfd *abfd,
        case R_390_GOT16:
        case R_390_GOT20:
        case R_390_GOT32:
        case R_390_GOT16:
        case R_390_GOT20:
        case R_390_GOT32:

-       case R_390_GOTOFF16:
-       case R_390_GOTOFF32:
-       case R_390_GOTPC:
-       case R_390_GOTPCDBL:

        case R_390_GOTENT:
          if (h != NULL)
            {
        case R_390_GOTENT:
          if (h != NULL)
            {


@@ -1565,7 +1575,7 @@ elf_s390_gc_sweep_hook (bfd *abfd,
        case R_390_PC24DBL:
        case R_390_PC32DBL:
        case R_390_PC32:
        case R_390_PC24DBL:
        case R_390_PC32DBL:
        case R_390_PC32:

-         if (info->shared)
+         if (bfd_link_pic (info))

            break;
          /* Fall through.  */
 
            break;
          /* Fall through.  */
 


@@ -1648,7 +1658,47 @@ elf_s390_adjust_dynamic_symbol (struct bfd_link_info *info,
 
   /* STT_GNU_IFUNC symbol must go through PLT. */
   if (s390_is_ifunc_symbol_p (h))
 
   /* STT_GNU_IFUNC symbol must go through PLT. */
   if (s390_is_ifunc_symbol_p (h))

-    return TRUE;
+    {
+      /* All local STT_GNU_IFUNC references must be treated as local
+        calls via local PLT.  */
+      if (h->ref_regular && SYMBOL_CALLS_LOCAL (info, h))
+       {
+         bfd_size_type pc_count = 0, count = 0;
+         struct elf_dyn_relocs **pp;
+         struct elf_s390_link_hash_entry *eh;
+         struct elf_dyn_relocs *p;
+
+         eh = (struct elf_s390_link_hash_entry *) h;
+         for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+           {
+             pc_count += p->pc_count;
+             p->count -= p->pc_count;
+             p->pc_count = 0;
+             count += p->count;
+             if (p->count == 0)
+               *pp = p->next;
+             else
+               pp = &p->next;
+           }
+
+         if (pc_count || count)
+           {
+             h->needs_plt = 1;
+             h->non_got_ref = 1;
+             if (h->plt.refcount <= 0)
+               h->plt.refcount = 1;
+             else
+               h->plt.refcount += 1;
+           }
+       }
+
+      if (h->plt.refcount <= 0)
+       {
+         h->plt.offset = (bfd_vma) -1;
+         h->needs_plt = 0;
+       }
+      return TRUE;
+    }

 
   /* If this is a function, put it in the procedure linkage table.  We
      will fill in the contents of the procedure linkage table later
 
   /* If this is a function, put it in the procedure linkage table.  We
      will fill in the contents of the procedure linkage table later


@@ -1702,7 +1752,7 @@ elf_s390_adjust_dynamic_symbol (struct bfd_link_info *info,
      only references to the symbol are via the global offset table.
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */
      only references to the symbol are via the global offset table.
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */

-  if (info->shared)
+  if (bfd_link_pic (info))

     return TRUE;
 
   /* If there are no references to this symbol that do not use the
     return TRUE;
 
   /* If there are no references to this symbol that do not use the


@@ -1785,8 +1835,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
   /* Since STT_GNU_IFUNC symbol must go through PLT, we handle it
      here if it is defined and referenced in a non-shared object.  */
   if (s390_is_ifunc_symbol_p (h) && h->def_regular)
   /* Since STT_GNU_IFUNC symbol must go through PLT, we handle it
      here if it is defined and referenced in a non-shared object.  */
   if (s390_is_ifunc_symbol_p (h) && h->def_regular)

-    return s390_elf_allocate_ifunc_dyn_relocs (info, h,
-                                              &eh->dyn_relocs);
+    return s390_elf_allocate_ifunc_dyn_relocs (info, h);

   else if (htab->elf.dynamic_sections_created
           && h->plt.refcount > 0)
     {
   else if (htab->elf.dynamic_sections_created
           && h->plt.refcount > 0)
     {


@@ -1799,7 +1848,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
            return FALSE;
        }
 
            return FALSE;
        }
 

-      if (info->shared
+      if (bfd_link_pic (info)

          || WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, 0, h))
        {
          asection *s = htab->elf.splt;
          || WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, 0, h))
        {
          asection *s = htab->elf.splt;


@@ -1816,7 +1865,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
             location in the .plt.  This is required to make function
             pointers compare as equal between the normal executable and
             the shared library.  */
             location in the .plt.  This is required to make function
             pointers compare as equal between the normal executable and
             the shared library.  */

-         if (! info->shared
+         if (! bfd_link_pic (info)

              && !h->def_regular)
            {
              h->root.u.def.section = s;
              && !h->def_regular)
            {
              h->root.u.def.section = s;


@@ -1852,7 +1901,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
      to R_390_TLS_LE32 requiring no TLS entry. For GOTIE12 and IEENT
      we can save the dynamic TLS relocation.  */
   if (h->got.refcount > 0
      to R_390_TLS_LE32 requiring no TLS entry. For GOTIE12 and IEENT
      we can save the dynamic TLS relocation.  */
   if (h->got.refcount > 0

-      && !info->shared
+      && !bfd_link_pic (info)

       && h->dynindx == -1
       && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
     {
       && h->dynindx == -1
       && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
     {


@@ -1898,7 +1947,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
        htab->elf.srelgot->size += 2 * sizeof (Elf32_External_Rela);
       else if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
                || h->root.type != bfd_link_hash_undefweak)
        htab->elf.srelgot->size += 2 * sizeof (Elf32_External_Rela);
       else if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
                || h->root.type != bfd_link_hash_undefweak)

-              && (info->shared
+              && (bfd_link_pic (info)

                   || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h)))
        htab->elf.srelgot->size += sizeof (Elf32_External_Rela);
     }
                   || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h)))
        htab->elf.srelgot->size += sizeof (Elf32_External_Rela);
     }


@@ -1914,7 +1963,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
      space for pc-relative relocs that have become local due to symbol
      visibility changes.  */
 
      space for pc-relative relocs that have become local due to symbol
      visibility changes.  */
 

-  if (info->shared)
+  if (bfd_link_pic (info))

     {
       if (SYMBOL_CALLS_LOCAL (info, h))
        {
     {
       if (SYMBOL_CALLS_LOCAL (info, h))
        {


@@ -2039,7 +2088,7 @@ elf_s390_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
   if (htab->elf.dynamic_sections_created)
     {
       /* Set the contents of the .interp section to the interpreter.  */
   if (htab->elf.dynamic_sections_created)
     {
       /* Set the contents of the .interp section to the interpreter.  */

-      if (info->executable)
+      if (bfd_link_executable (info) && !info->nointerp)

        {
          s = bfd_get_linker_section (dynobj, ".interp");
          if (s == NULL)
        {
          s = bfd_get_linker_section (dynobj, ".interp");
          if (s == NULL)


@@ -2107,7 +2156,7 @@ elf_s390_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
              s->size += GOT_ENTRY_SIZE;
              if (*local_tls_type == GOT_TLS_GD)
                s->size += GOT_ENTRY_SIZE;
              s->size += GOT_ENTRY_SIZE;
              if (*local_tls_type == GOT_TLS_GD)
                s->size += GOT_ENTRY_SIZE;

-             if (info->shared)
+             if (bfd_link_pic (info))

                srela->size += sizeof (Elf32_External_Rela);
            }
          else
                srela->size += sizeof (Elf32_External_Rela);
            }
          else


@@ -2216,7 +2265,7 @@ elf_s390_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
 #define add_dynamic_entry(TAG, VAL) \
   _bfd_elf_add_dynamic_entry (info, TAG, VAL)
 
 #define add_dynamic_entry(TAG, VAL) \
   _bfd_elf_add_dynamic_entry (info, TAG, VAL)
 

-      if (info->executable)
+      if (bfd_link_executable (info))

        {
          if (!add_dynamic_entry (DT_DEBUG, 0))
            return FALSE;
        {
          if (!add_dynamic_entry (DT_DEBUG, 0))
            return FALSE;


@@ -2432,7 +2481,7 @@ elf_s390_relocate_section (bfd *output_bfd,
        RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
                                         rel, 1, relend, howto, 0, contents);
 
        RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
                                         rel, 1, relend, howto, 0, contents);
 

-      if (info->relocatable)
+      if (bfd_link_relocatable (info))

        continue;
 
       switch (r_type)
        continue;
 
       switch (r_type)


@@ -2515,8 +2564,10 @@ elf_s390_relocate_section (bfd *output_bfd,
                         finish_dynamic_symbol.  */
                    }
                }
                         finish_dynamic_symbol.  */
                    }
                }

-             else if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
-                      || (info->shared
+             else if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn,
+                                                         bfd_link_pic (info),
+                                                         h)
+                      || (bfd_link_pic (info)

                           && SYMBOL_REFERENCES_LOCAL (info, h))
                       || (ELF_ST_VISIBILITY (h->other)
                           && h->root.type == bfd_link_hash_undefweak))
                           && SYMBOL_REFERENCES_LOCAL (info, h))
                       || (ELF_ST_VISIBILITY (h->other)
                           && h->root.type == bfd_link_hash_undefweak))


@@ -2544,7 +2595,7 @@ elf_s390_relocate_section (bfd *output_bfd,
                    }
 
                  if ((h->def_regular
                    }
 
                  if ((h->def_regular

-                      && info->shared
+                      && bfd_link_pic (info)

                       && SYMBOL_REFERENCES_LOCAL (info, h))
                      /* lrl rx,sym@GOTENT -> larl rx, sym */
                      && ((r_type == R_390_GOTENT
                       && SYMBOL_REFERENCES_LOCAL (info, h))
                      /* lrl rx,sym@GOTENT -> larl rx, sym */
                      && ((r_type == R_390_GOTENT


@@ -2593,7 +2644,7 @@ elf_s390_relocate_section (bfd *output_bfd,
                  bfd_put_32 (output_bfd, relocation,
                              htab->elf.sgot->contents + off);
 
                  bfd_put_32 (output_bfd, relocation,
                              htab->elf.sgot->contents + off);
 

-                 if (info->shared)
+                 if (bfd_link_pic (info))

                    {
                      asection *srelgot;
                      Elf_Internal_Rela outrel;
                    {
                      asection *srelgot;
                      Elf_Internal_Rela outrel;


@@ -2637,6 +2688,18 @@ elf_s390_relocate_section (bfd *output_bfd,
          /* Relocation is relative to the start of the global offset
             table.  */
 
          /* Relocation is relative to the start of the global offset
             table.  */
 

+         if (h != NULL
+             && s390_is_ifunc_symbol_p (h)
+             && h->def_regular
+             && !bfd_link_executable (info))
+           {
+             relocation = (htab->elf.iplt->output_section->vma
+                           + htab->elf.iplt->output_offset
+                           + h->plt.offset
+                           - htab->elf.sgot->output_section->vma);
+             goto do_relocation;
+           }
+

          /* Note that sgot->output_offset is not involved in this
             calculation.  We always want the start of .got.  If we
             defined _GLOBAL_OFFSET_TABLE in a different way, as is
          /* Note that sgot->output_offset is not involved in this
             calculation.  We always want the start of .got.  If we
             defined _GLOBAL_OFFSET_TABLE in a different way, as is


@@ -2713,20 +2776,40 @@ elf_s390_relocate_section (bfd *output_bfd,
          unresolved_reloc = FALSE;
          break;
 
          unresolved_reloc = FALSE;
          break;
 

-       case R_390_8:
-       case R_390_16:
-       case R_390_32:

        case R_390_PC16:
        case R_390_PC12DBL:
        case R_390_PC16DBL:
        case R_390_PC24DBL:
        case R_390_PC32DBL:
        case R_390_PC32:
        case R_390_PC16:
        case R_390_PC12DBL:
        case R_390_PC16DBL:
        case R_390_PC24DBL:
        case R_390_PC32DBL:
        case R_390_PC32:

+         if (h != NULL
+             && s390_is_ifunc_symbol_p (h)
+             && h->def_regular
+             && !bfd_link_executable (info))
+           {
+             /* This will not work our if the function does not
+                happen to set up the GOT pointer for some other
+                reason.  31 bit PLT entries require r12 to hold the
+                GOT pointer.
+                FIXME: Implement an errorcheck.
+                NOTE: It will work when brasl is not available
+                (e.g. with -m31 -march=g5) since a local function
+                call then does use GOTOFF which implies r12 being set
+                up.  */
+             relocation = (htab->elf.iplt->output_section->vma
+                           + htab->elf.iplt->output_offset
+                           + h ->plt.offset);
+             goto do_relocation;
+           }
+
+       case R_390_8:
+       case R_390_16:
+       case R_390_32:

          if (h != NULL
              && s390_is_ifunc_symbol_p (h)
              && h->def_regular)
            {
          if (h != NULL
              && s390_is_ifunc_symbol_p (h)
              && h->def_regular)
            {

-             if (!info->shared || !h->non_got_ref)
+             if (!bfd_link_pic (info) || !h->non_got_ref)

                {
                  /* For a non-shared object STT_GNU_IFUNC symbol must
                     go through PLT.  */
                {
                  /* For a non-shared object STT_GNU_IFUNC symbol must
                     go through PLT.  */


@@ -2757,7 +2840,7 @@ elf_s390_relocate_section (bfd *output_bfd,
 
                  if (h->dynindx == -1
                      || h->forced_local
 
                  if (h->dynindx == -1
                      || h->forced_local

-                     || info->executable)
+                     || bfd_link_executable (info))

                    {
                      /* This symbol is resolved locally.  */
                      outrel.r_info = ELF32_R_INFO (0, R_390_IRELATIVE);
                    {
                      /* This symbol is resolved locally.  */
                      outrel.r_info = ELF32_R_INFO (0, R_390_IRELATIVE);


@@ -2786,7 +2869,7 @@ elf_s390_relocate_section (bfd *output_bfd,
          if ((input_section->flags & SEC_ALLOC) == 0)
            break;
 
          if ((input_section->flags & SEC_ALLOC) == 0)
            break;
 

-         if ((info->shared
+         if ((bfd_link_pic (info)

               && (h == NULL
                   || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
                   || h->root.type != bfd_link_hash_undefweak)
               && (h == NULL
                   || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
                   || h->root.type != bfd_link_hash_undefweak)


@@ -2798,7 +2881,7 @@ elf_s390_relocate_section (bfd *output_bfd,
                    && r_type != R_390_PC32)
                   || !SYMBOL_CALLS_LOCAL (info, h)))
              || (ELIMINATE_COPY_RELOCS
                    && r_type != R_390_PC32)
                   || !SYMBOL_CALLS_LOCAL (info, h)))
              || (ELIMINATE_COPY_RELOCS

-                 && !info->shared
+                 && !bfd_link_pic (info)

                  && h != NULL
                  && h->dynindx != -1
                  && !h->non_got_ref
                  && h != NULL
                  && h->dynindx != -1
                  && !h->non_got_ref


@@ -2839,7 +2922,7 @@ elf_s390_relocate_section (bfd *output_bfd,
                           || r_type == R_390_PC24DBL
                           || r_type == R_390_PC32DBL
                           || r_type == R_390_PC32
                           || r_type == R_390_PC24DBL
                           || r_type == R_390_PC32DBL
                           || r_type == R_390_PC32

-                          || !info->shared
+                          || !bfd_link_pic (info)

                           || !SYMBOLIC_BIND (info, h)
                           || !h->def_regular))
                {
                           || !SYMBOLIC_BIND (info, h)
                           || !h->def_regular))
                {


@@ -2909,7 +2992,7 @@ elf_s390_relocate_section (bfd *output_bfd,
 
          /* Relocations for tls literal pool entries.  */
        case R_390_TLS_IE32:
 
          /* Relocations for tls literal pool entries.  */
        case R_390_TLS_IE32:

-         if (info->shared)
+         if (bfd_link_pic (info))

            {
              Elf_Internal_Rela outrel;
              asection *sreloc;
            {
              Elf_Internal_Rela outrel;
              asection *sreloc;


@@ -2937,7 +3020,9 @@ elf_s390_relocate_section (bfd *output_bfd,
          else if (h != NULL)
            {
              tls_type = elf_s390_hash_entry(h)->tls_type;
          else if (h != NULL)
            {
              tls_type = elf_s390_hash_entry(h)->tls_type;

-             if (!info->shared && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
+             if (!bfd_link_pic (info)
+                 && h->dynindx == -1
+                 && tls_type >= GOT_TLS_IE)

                r_type = R_390_TLS_LE32;
            }
          if (r_type == R_390_TLS_GD32 && tls_type >= GOT_TLS_IE)
                r_type = R_390_TLS_LE32;
            }
          if (r_type == R_390_TLS_GD32 && tls_type >= GOT_TLS_IE)


@@ -3048,14 +3133,16 @@ elf_s390_relocate_section (bfd *output_bfd,
              if (local_got_offsets == NULL)
                abort();
              off = local_got_offsets[r_symndx];
              if (local_got_offsets == NULL)
                abort();
              off = local_got_offsets[r_symndx];

-             if (info->shared)
+             if (bfd_link_pic (info))

                goto emit_tls_relocs;
            }
          else
            {
              off = h->got.offset;
              tls_type = elf_s390_hash_entry(h)->tls_type;
                goto emit_tls_relocs;
            }
          else
            {
              off = h->got.offset;
              tls_type = elf_s390_hash_entry(h)->tls_type;

-             if (info->shared || h->dynindx != -1 || tls_type < GOT_TLS_IE)
+             if (bfd_link_pic (info)
+                 || h->dynindx != -1
+                 || tls_type < GOT_TLS_IE)

                goto emit_tls_relocs;
            }
 
                goto emit_tls_relocs;
            }
 


@@ -3072,7 +3159,7 @@ elf_s390_relocate_section (bfd *output_bfd,
          break;
 
        case R_390_TLS_LDM32:
          break;
 
        case R_390_TLS_LDM32:

-         if (! info->shared)
+         if (! bfd_link_pic (info))

            /* The literal pool entry this relocation refers to gets ignored
               by the optimized code of the local exec model. Do nothing
               and the value will turn out zero.  */
            /* The literal pool entry this relocation refers to gets ignored
               by the optimized code of the local exec model. Do nothing
               and the value will turn out zero.  */


@@ -3110,7 +3197,7 @@ elf_s390_relocate_section (bfd *output_bfd,
          break;
 
        case R_390_TLS_LE32:
          break;
 
        case R_390_TLS_LE32:

-         if (info->shared && !info->pie)
+         if (bfd_link_dll (info))

            {
              /* Linking a shared library with non-fpic code requires
                 a R_390_TLS_TPOFF relocation.  */
            {
              /* Linking a shared library with non-fpic code requires
                 a R_390_TLS_TPOFF relocation.  */


@@ -3147,7 +3234,7 @@ elf_s390_relocate_section (bfd *output_bfd,
          continue;
 
        case R_390_TLS_LDO32:
          continue;
 
        case R_390_TLS_LDO32:

-         if (info->shared || (input_section->flags & SEC_DEBUGGING))
+         if (bfd_link_pic (info) || (input_section->flags & SEC_DEBUGGING))

            relocation -= dtpoff_base (info);
          else
            /* When converting LDO to LE, we must negate.  */
            relocation -= dtpoff_base (info);
          else
            /* When converting LDO to LE, we must negate.  */


@@ -3169,7 +3256,7 @@ elf_s390_relocate_section (bfd *output_bfd,
 
          if (r_type == R_390_TLS_LOAD)
            {
 
          if (r_type == R_390_TLS_LOAD)
            {

-             if (!info->shared && (h == NULL || h->dynindx == -1))
+             if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))

                {
                  /* IE->LE transition. Four valid cases:
                     l %rx,0(0,%ry)    -> lr %rx,%ry + bcr 0,0
                {
                  /* IE->LE transition. Four valid cases:
                     l %rx,0(0,%ry)    -> lr %rx,%ry + bcr 0,0


@@ -3207,7 +3294,7 @@ elf_s390_relocate_section (bfd *output_bfd,
                  (insn & 0xffff0000) != 0xc0e50000 &&
                  (insn & 0xff000000) != 0x0d000000)
                invalid_tls_insn (input_bfd, input_section, rel);
                  (insn & 0xffff0000) != 0xc0e50000 &&
                  (insn & 0xff000000) != 0x0d000000)
                invalid_tls_insn (input_bfd, input_section, rel);

-             if (!info->shared && (h == NULL || h->dynindx == -1))
+             if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))

                {
                  if ((insn & 0xff000000) == 0x0d000000)
                    {
                {
                  if ((insn & 0xff000000) == 0x0d000000)
                    {


@@ -3257,7 +3344,7 @@ elf_s390_relocate_section (bfd *output_bfd,
            }
          else if (r_type == R_390_TLS_LDCALL)
            {
            }
          else if (r_type == R_390_TLS_LDCALL)
            {

-             if (!info->shared)
+             if (!bfd_link_pic (info))

                {
                  unsigned int insn;
 
                {
                  unsigned int insn;
 


@@ -3355,14 +3442,9 @@ elf_s390_relocate_section (bfd *output_bfd,
            }
 
          if (r == bfd_reloc_overflow)
            }
 
          if (r == bfd_reloc_overflow)

-           {
-
-             if (! ((*info->callbacks->reloc_overflow)
-                    (info, (h ? &h->root : NULL), name, howto->name,
-                     (bfd_vma) 0, input_bfd, input_section,
-                     rel->r_offset)))
-               return FALSE;
-           }
+           (*info->callbacks->reloc_overflow)
+             (info, (h ? &h->root : NULL), name, howto->name,
+              (bfd_vma) 0, input_bfd, input_section, rel->r_offset);

          else
            {
              (*_bfd_error_handler)
          else
            {
              (*_bfd_error_handler)


@@ -3422,7 +3504,7 @@ elf_s390_finish_ifunc_symbol (bfd *output_bfd,
       = -(unsigned) (((65536 / PLT_ENTRY_SIZE - 1) * PLT_ENTRY_SIZE) / 2);
 
   /* Fill in the entry in the procedure linkage table.  */
       = -(unsigned) (((65536 / PLT_ENTRY_SIZE - 1) * PLT_ENTRY_SIZE) / 2);
 
   /* Fill in the entry in the procedure linkage table.  */

-  if (!info->shared)
+  if (!bfd_link_pic (info))

     {
       memcpy (plt->contents + iplt_offset, elf_s390_plt_entry,
              PLT_ENTRY_SIZE);
     {
       memcpy (plt->contents + iplt_offset, elf_s390_plt_entry,
              PLT_ENTRY_SIZE);


@@ -3505,7 +3587,7 @@ elf_s390_finish_ifunc_symbol (bfd *output_bfd,
 
   if (!h
       || h->dynindx == -1
 
   if (!h
       || h->dynindx == -1

-      || ((info->executable
+      || ((bfd_link_executable (info)

           || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
          && h->def_regular))
     {
           || ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
          && h->def_regular))
     {


@@ -3547,16 +3629,15 @@ elf_s390_finish_dynamic_symbol (bfd *output_bfd,
 
       /* This symbol has an entry in the procedure linkage table.  Set
         it up.  */
 
       /* This symbol has an entry in the procedure linkage table.  Set
         it up.  */

-      if (s390_is_ifunc_symbol_p (h))
+      if (s390_is_ifunc_symbol_p (h) && h->def_regular)

        {
        {

-         /* If we can resolve the IFUNC symbol locally we generate an
-            IRELATIVE reloc.  */
-         elf_s390_finish_ifunc_symbol (output_bfd, info, h, htab, h->plt.offset,
-                                       eh->ifunc_resolver_address +
-                                       eh->ifunc_resolver_section->output_offset +
-                                       eh->ifunc_resolver_section->output_section->vma);
-         /* Fallthrough.  Handling of explicit GOT slots of IFUNC
-            symbols is below.  */
+         elf_s390_finish_ifunc_symbol (output_bfd, info, h,
+           htab, h->plt.offset,
+           eh->ifunc_resolver_address +
+           eh->ifunc_resolver_section->output_offset +
+           eh->ifunc_resolver_section->output_section->vma);
+         /* Do not return yet.  Handling of explicit GOT slots of
+            IFUNC symbols is below.  */

        }
       else
        {
        }
       else
        {


@@ -3584,7 +3665,7 @@ elf_s390_finish_dynamic_symbol (bfd *output_bfd,
              = -(unsigned) (((65536 / PLT_ENTRY_SIZE - 1) * PLT_ENTRY_SIZE) / 2);
 
          /* Fill in the entry in the procedure linkage table.  */
              = -(unsigned) (((65536 / PLT_ENTRY_SIZE - 1) * PLT_ENTRY_SIZE) / 2);
 
          /* Fill in the entry in the procedure linkage table.  */

-         if (!info->shared)
+         if (!bfd_link_pic (info))

            {
              memcpy (htab->elf.splt->contents + h->plt.offset, elf_s390_plt_entry,
                      PLT_ENTRY_SIZE);
            {
              memcpy (htab->elf.splt->contents + h->plt.offset, elf_s390_plt_entry,
                      PLT_ENTRY_SIZE);


@@ -3610,7 +3691,7 @@ elf_s390_finish_dynamic_symbol (bfd *output_bfd,
 
              /* Put in the GOT offset as displacement value.  The 0xc000
                 value comes from the first word of the plt entry.  Look
 
              /* Put in the GOT offset as displacement value.  The 0xc000
                 value comes from the first word of the plt entry.  Look

-                at the elf_s390_plt_pic16_entry content.  */
+                at the elf_s390_plt_pic12_entry content.  */

              bfd_put_16 (output_bfd, (bfd_vma)0xc000 | got_offset,
                          htab->elf.splt->contents + h->plt.offset + 2);
 
              bfd_put_16 (output_bfd, (bfd_vma)0xc000 | got_offset,
                          htab->elf.splt->contents + h->plt.offset + 2);
 


@@ -3708,7 +3789,7 @@ elf_s390_finish_dynamic_symbol (bfd *output_bfd,
         initialized in the relocate_section function.  */
       if (h->def_regular && s390_is_ifunc_symbol_p (h))
        {
         initialized in the relocate_section function.  */
       if (h->def_regular && s390_is_ifunc_symbol_p (h))
        {

-         if (info->shared)
+         if (bfd_link_pic (info))

            {
              /* An explicit GOT slot usage needs GLOB_DAT.  If the
                 symbol references local the implicit got.iplt slot
            {
              /* An explicit GOT slot usage needs GLOB_DAT.  If the
                 symbol references local the implicit got.iplt slot


@@ -3728,7 +3809,7 @@ elf_s390_finish_dynamic_symbol (bfd *output_bfd,
              return TRUE;
            }
        }
              return TRUE;
            }
        }

-      else if (info->shared
+      else if (bfd_link_pic (info)

          && SYMBOL_REFERENCES_LOCAL (info, h))
        {
          /* If this is a static link, or it is a -Bsymbolic link and
          && SYMBOL_REFERENCES_LOCAL (info, h))
        {
          /* If this is a static link, or it is a -Bsymbolic link and


@@ -3799,6 +3880,23 @@ elf_s390_reloc_type_class (const struct bfd_link_info *info ATTRIBUTE_UNUSED,
                           const asection *rel_sec ATTRIBUTE_UNUSED,
                           const Elf_Internal_Rela *rela)
 {
                           const asection *rel_sec ATTRIBUTE_UNUSED,
                           const Elf_Internal_Rela *rela)
 {

+  bfd *abfd = info->output_bfd;
+  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+  struct elf_s390_link_hash_table *htab = elf_s390_hash_table (info);
+  unsigned long r_symndx = ELF32_R_SYM (rela->r_info);
+  Elf_Internal_Sym sym;
+
+  if (htab->elf.dynsym == NULL
+      || !bed->s->swap_symbol_in (abfd,
+                                 (htab->elf.dynsym->contents
+                                  + r_symndx * bed->s->sizeof_sym),
+                                 0, &sym))
+    abort ();
+
+  /* Check relocation against STT_GNU_IFUNC symbol.  */
+  if (ELF_ST_TYPE (sym.st_info) == STT_GNU_IFUNC)
+    return reloc_class_ifunc;
+

   switch ((int) ELF32_R_TYPE (rela->r_info))
     {
     case R_390_RELATIVE:
   switch ((int) ELF32_R_TYPE (rela->r_info))
     {
     case R_390_RELATIVE:


@@ -3850,15 +3948,17 @@ elf_s390_finish_dynamic_sections (bfd *output_bfd,
              continue;
 
            case DT_PLTGOT:
              continue;
 
            case DT_PLTGOT:

-             dyn.d_un.d_ptr = htab->elf.sgot->output_section->vma;
+             s = htab->elf.sgotplt;
+             dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;

              break;
 
            case DT_JMPREL:
              break;
 
            case DT_JMPREL:

-             dyn.d_un.d_ptr = htab->elf.srelplt->output_section->vma;
+             s = htab->elf.srelplt;
+             dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;

              break;
 
            case DT_PLTRELSZ:
              break;
 
            case DT_PLTRELSZ:

-             s = htab->elf.srelplt->output_section;
+             s = htab->elf.srelplt;

              dyn.d_un.d_val = s->size;
              break;
            }
              dyn.d_un.d_val = s->size;
              break;
            }


@@ -3870,7 +3970,7 @@ elf_s390_finish_dynamic_sections (bfd *output_bfd,
       if (htab->elf.splt && htab->elf.splt->size > 0)
        {
          memset (htab->elf.splt->contents, 0, PLT_FIRST_ENTRY_SIZE);
       if (htab->elf.splt && htab->elf.splt->size > 0)
        {
          memset (htab->elf.splt->contents, 0, PLT_FIRST_ENTRY_SIZE);

-         if (info->shared)
+         if (bfd_link_pic (info))

            {
              memcpy (htab->elf.splt->contents, elf_s390_plt_pic_first_entry,
                      PLT_FIRST_ENTRY_SIZE);
            {
              memcpy (htab->elf.splt->contents, elf_s390_plt_pic_first_entry,
                      PLT_FIRST_ENTRY_SIZE);


@@ -3980,9 +4080,18 @@ elf_s390_plt_sym_val (bfd_vma i, const asection *plt,
   return plt->vma + PLT_FIRST_ENTRY_SIZE + i * PLT_ENTRY_SIZE;
 }
 
   return plt->vma + PLT_FIRST_ENTRY_SIZE + i * PLT_ENTRY_SIZE;
 }
 

+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+

 static bfd_boolean
 elf32_s390_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
 {
 static bfd_boolean
 elf32_s390_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
 {

+  if (!is_s390_elf (ibfd) || !is_s390_elf (obfd))
+    return TRUE;
+
+  if (!elf_s390_merge_obj_attributes (ibfd, obfd))
+    return FALSE;
+

   elf_elfheader (obfd)->e_flags |= elf_elfheader (ibfd)->e_flags;
   return TRUE;
 }
   elf_elfheader (obfd)->e_flags |= elf_elfheader (ibfd)->e_flags;
   return TRUE;
 }