* config.sub, config.guess: Update from upstream sources.

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

diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c
index 1c527552bef882d59607f231344c8a406c6f6d5d..b887640640d01865d5f40955d22a1948adeddab4 100644 (file)
--- a/bfd/elf32-s390.c
+++ b/bfd/elf32-s390.c
@@ -73,8 +73,6 @@ static enum elf_reloc_type_class elf_s390_reloc_type_class
   PARAMS ((const Elf_Internal_Rela *));
 static bfd_boolean elf_s390_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static bfd_boolean elf_s390_mkobject
-  PARAMS ((bfd *));
 static bfd_boolean elf_s390_object_p
   PARAMS ((bfd *));
 static bfd_boolean elf_s390_grok_prstatus
@@ -678,14 +676,16 @@ struct elf_s390_obj_tdata
   (elf_s390_tdata (abfd)->local_got_tls_type)
 
 static bfd_boolean
-elf_s390_mkobject (abfd)
-     bfd *abfd;
+elf_s390_mkobject (bfd *abfd)
 {
-  bfd_size_type amt = sizeof (struct elf_s390_obj_tdata);
-  abfd->tdata.any = bfd_zalloc (abfd, amt);
   if (abfd->tdata.any == NULL)
-    return FALSE;
-  return TRUE;
+    {
+      bfd_size_type amt = sizeof (struct elf_s390_obj_tdata);
+      abfd->tdata.any = bfd_zalloc (abfd, amt);
+      if (abfd->tdata.any == NULL)
+       return FALSE;
+    }
+  return bfd_elf_mkobject (abfd);
 }
 
 static bfd_boolean
@@ -771,7 +771,8 @@ elf_s390_link_hash_table_create (abfd)
   if (ret == NULL)
     return NULL;
 
-  if (! _bfd_elf_link_hash_table_init (&ret->elf, abfd, link_hash_newfunc))
+  if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd, link_hash_newfunc,
+                                     sizeof (struct elf_s390_link_hash_entry)))
     {
       free (ret);
       return NULL;
@@ -1272,7 +1273,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
                  if (name == NULL)
                    return FALSE;
 
-                 if (strncmp (name, ".rela", 5) != 0
+                 if (! CONST_STRNEQ (name, ".rela")
                      || strcmp (bfd_get_section_name (abfd, sec),
                                 name + 5) != 0)
                    {
@@ -2125,7 +2126,7 @@ elf_s390_size_dynamic_sections (output_bfd, info)
          /* Strip this section if we don't need it; see the
             comment below.  */
        }
-      else if (strncmp (bfd_get_section_name (dynobj, s), ".rela", 5) == 0)
+      else if (CONST_STRNEQ (bfd_get_section_name (dynobj, s), ".rela"))
        {
          if (s->size != 0)
            relocs = TRUE;
@@ -2267,6 +2268,7 @@ invalid_tls_insn (input_bfd, input_section, rel)
      input_section,
      (long) rel->r_offset,
      howto->name);
+  bfd_set_error (bfd_error_bad_value);
 }
 
 /* Relocate a 390 ELF section.  */
@@ -2925,7 +2927,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
          continue;
 
        case R_390_TLS_LDO32:
-         if (info->shared || (input_section->flags & SEC_CODE) == 0)
+         if (info->shared)
            relocation -= dtpoff_base (info);
          else
            /* When converting LDO to LE, we must negate.  */
@@ -2981,16 +2983,44 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
              unsigned int insn;
 
              insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
-             if ((insn & 0xff000fff) != 0x4d000000)
+             if ((insn & 0xff000fff) != 0x4d000000 &&
+                 (insn & 0xffff0000) != 0xc0e50000)
                invalid_tls_insn (input_bfd, input_section, rel);
              if (!info->shared && (h == NULL || h->dynindx == -1))
-               /* GD->LE transition.
-                  bas %r14,0(%rx,%r13) -> bc 0,0  */
-               insn = 0x47000000;
+               {
+                 if ((insn & 0xff000000) == 0x4d000000)
+                   {
+                     /* GD->LE transition.
+                        bas %r14,0(%rx,%r13) -> bc 0,0  */
+                     insn = 0x47000000;
+                   }
+                 else
+                   {
+                     /* GD->LE transition.
+                        brasl %r14,_tls_get_addr@plt -> brcl 0,.  */
+                     insn = 0xc0040000;
+                     bfd_put_16 (output_bfd, 0x0000,
+                                 contents + rel->r_offset + 4);
+                   }
+               }
              else
-               /* GD->IE transition.
-                  bas %r14,0(%rx,%r13) -> l %r2,0(%r2,%r12)  */
-               insn = 0x5822c000;
+               {
+                 if ((insn & 0xff000000) == 0x4d000000)
+                   {
+                     /* GD->IE transition.
+                        bas %r14,0(%rx,%r13) -> l %r2,0(%r2,%r12)  */
+                     insn = 0x5822c000;
+                   }
+                 else
+                   {
+                     /* GD->IE transition.
+                        brasl %r14,__tls_get_addr@plt ->
+                               l %r2,0(%r2,%r12) ; bcr 0,0 */
+                     insn = 0x5822c000;
+                     bfd_put_16 (output_bfd, 0x0700,
+                                 contents + rel->r_offset + 4);
+                   }
+               }
              bfd_put_32 (output_bfd, insn, contents + rel->r_offset);
            }
          else if (r_type == R_390_TLS_LDCALL)
@@ -3000,11 +3030,23 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
                  unsigned int insn;
 
                  insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
-                 if ((insn & 0xff000fff) != 0x4d000000)
+                 if ((insn & 0xff000fff) != 0x4d000000 &&
+                     (insn & 0xffff0000) != 0xc0e50000)
                    invalid_tls_insn (input_bfd, input_section, rel);
-                 /* LD->LE transition.
-                    bas %r14,0(%rx,%r13) -> bc 0,0  */
-                 insn = 0x47000000;
+                 if ((insn & 0xff000000) == 0x4d000000)
+                   {
+                     /* LD->LE transition.
+                        bas %r14,0(%rx,%r13) -> bc 0,0  */
+                     insn = 0x47000000;
+                   }
+                 else
+                   {
+                     /* LD->LE transition.
+                        brasl %r14,__tls_get_addr@plt -> brcl 0,. */
+                     insn = 0xc0040000;
+                     bfd_put_16 (output_bfd, 0x0000,
+                                 contents + rel->r_offset + 4);
+                   }
                  bfd_put_32 (output_bfd, insn, contents + rel->r_offset);
                }
            }