Remove SIM_CHECK_MEMBER* in sim/common/.

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

diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
index db5237f2e7f9a15288ee3b484c7082f20efea404..eef92d031025ea3beae87c30a83591d8fcfdc68c 100644 (file)
--- a/bfd/elf64-s390.c
+++ b/bfd/elf64-s390.c
@@ -1,12 +1,13 @@
 /* IBM S/390-specific support for 64-bit ELF
 /* IBM S/390-specific support for 64-bit ELF

-   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+   Free Software Foundation, Inc.

    Contributed Martin Schwidefsky (schwidefsky@de.ibm.com).
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Contributed Martin Schwidefsky (schwidefsky@de.ibm.com).
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -16,11 +17,11 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software

-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */

 
 

-#include "bfd.h"

 #include "sysdep.h"
 #include "sysdep.h"

+#include "bfd.h"

 #include "bfdlink.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
 #include "bfdlink.h"
 #include "libbfd.h"
 #include "elf-bfd.h"


@@ -40,17 +41,14 @@ static bfd_boolean create_got_section
 static bfd_boolean elf_s390_create_dynamic_sections
   PARAMS((bfd *, struct bfd_link_info *));
 static void elf_s390_copy_indirect_symbol
 static bfd_boolean elf_s390_create_dynamic_sections
   PARAMS((bfd *, struct bfd_link_info *));
 static void elf_s390_copy_indirect_symbol

-  PARAMS ((struct elf_backend_data *, struct elf_link_hash_entry *,
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *,

           struct elf_link_hash_entry *));
 static bfd_boolean elf_s390_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
           const Elf_Internal_Rela *));
           struct elf_link_hash_entry *));
 static bfd_boolean elf_s390_check_relocs
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
           const Elf_Internal_Rela *));

-static asection *elf_s390_gc_mark_hook
-  PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,
-          struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static bfd_boolean elf_s390_gc_sweep_hook
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-          const Elf_Internal_Rela *));
+struct elf_s390_link_hash_entry;
+static void elf_s390_adjust_gotplt
+  PARAMS ((struct elf_s390_link_hash_entry *));

 static bfd_boolean elf_s390_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
 static bfd_boolean allocate_dynrelocs
 static bfd_boolean elf_s390_adjust_dynamic_symbol
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
 static bfd_boolean allocate_dynrelocs


@@ -69,7 +67,20 @@ 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 *));
   PARAMS ((const Elf_Internal_Rela *));
 static bfd_boolean elf_s390_finish_dynamic_sections
   PARAMS ((bfd *, struct bfd_link_info *));

-static bfd_boolean elf_s390_object_p PARAMS ((bfd *));
+static bfd_boolean elf_s390_object_p
+  PARAMS ((bfd *));
+static int elf_s390_tls_transition
+  PARAMS ((struct bfd_link_info *, int, int));
+static bfd_reloc_status_type s390_tls_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static bfd_vma dtpoff_base
+  PARAMS ((struct bfd_link_info *));
+static bfd_vma tpoff
+  PARAMS ((struct bfd_link_info *, bfd_vma));
+static void invalid_tls_insn
+  PARAMS ((bfd *, asection *, Elf_Internal_Rela *));
+static bfd_reloc_status_type s390_elf_ldisp_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));

 
 #include "elf/s390.h"
 
 
 #include "elf/s390.h"
 


@@ -94,32 +105,120 @@ static reloc_howto_type elf_howto_table[] =
         0,                     /* dst_mask */
         FALSE),                /* pcrel_offset */
 
         0,                     /* dst_mask */
         FALSE),                /* pcrel_offset */
 

-  HOWTO(R_390_8,         0, 0,  8, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_8",       FALSE, 0,0x000000ff, FALSE),
-  HOWTO(R_390_12,        0, 1, 12, FALSE, 0, complain_overflow_dont, bfd_elf_generic_reloc, "R_390_12",      FALSE, 0,0x00000fff, FALSE),
-  HOWTO(R_390_16,        0, 1, 16, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_16",      FALSE, 0,0x0000ffff, FALSE),
-  HOWTO(R_390_32,        0, 2, 32, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_32",      FALSE, 0,0xffffffff, FALSE),
-  HOWTO(R_390_PC32,     0, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC32",    FALSE, 0,0xffffffff,  TRUE),
-  HOWTO(R_390_GOT12,    0, 1, 12, FALSE, 0, complain_overflow_dont, bfd_elf_generic_reloc, "R_390_GOT12",   FALSE, 0,0x00000fff, FALSE),
-  HOWTO(R_390_GOT32,    0, 2, 32, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOT32",   FALSE, 0,0xffffffff, FALSE),
-  HOWTO(R_390_PLT32,    0, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PLT32",   FALSE, 0,0xffffffff,  TRUE),
-  HOWTO(R_390_COPY,      0, 4, 64, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_COPY",    FALSE, 0,MINUS_ONE, FALSE),
-  HOWTO(R_390_GLOB_DAT,  0, 4, 64, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GLOB_DAT",FALSE, 0,MINUS_ONE, FALSE),
-  HOWTO(R_390_JMP_SLOT,  0, 4, 64, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_JMP_SLOT",FALSE, 0,MINUS_ONE, FALSE),
-  HOWTO(R_390_RELATIVE,  0, 4, 64,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_RELATIVE",FALSE, 0,MINUS_ONE, FALSE),
-  HOWTO(R_390_GOTOFF,    0, 4, 64, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTOFF",  FALSE, 0,MINUS_ONE, FALSE),
-  HOWTO(R_390_GOTPC,     0, 4, 64,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTPC",   FALSE, 0,MINUS_ONE,  TRUE),
-  HOWTO(R_390_GOT16,     0, 1, 16, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOT16",   FALSE, 0,0x0000ffff, FALSE),
-  HOWTO(R_390_PC16,      0, 1, 16,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC16",    FALSE, 0,0x0000ffff,  TRUE),
-  HOWTO(R_390_PC16DBL,   1, 1, 16,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC16DBL", FALSE, 0,0x0000ffff,  TRUE),
-  HOWTO(R_390_PLT16DBL,  1, 1, 16,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PLT16DBL", FALSE, 0,0x0000ffff,  TRUE),
-  HOWTO(R_390_PC32DBL,  1, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC32DBL", FALSE, 0,0xffffffff,  TRUE),
-  HOWTO(R_390_PLT32DBL,         1, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PLT32DBL", FALSE, 0,0xffffffff,  TRUE),
-  HOWTO(R_390_GOTPCDBL,  1, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTPCDBL", FALSE, 0,MINUS_ONE,  TRUE),
-  HOWTO(R_390_64,        0, 4, 64, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_64",      FALSE, 0,MINUS_ONE, FALSE),
-  HOWTO(R_390_PC64,     0, 4, 64,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PC64",    FALSE, 0,MINUS_ONE,  TRUE),
-  HOWTO(R_390_GOT64,    0, 4, 64, FALSE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOT64",   FALSE, 0,MINUS_ONE, FALSE),
-  HOWTO(R_390_PLT64,    0, 4, 64,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_PLT64",   FALSE, 0,MINUS_ONE,  TRUE),
-  HOWTO(R_390_GOTENT,   1, 2, 32,  TRUE, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_390_GOTENT",   FALSE, 0,MINUS_ONE,  TRUE),
+  HOWTO(R_390_8,         0, 0,  8, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_8",        FALSE, 0,0x000000ff, FALSE),
+  HOWTO(R_390_12,        0, 1, 12, FALSE, 0, complain_overflow_dont,
+       bfd_elf_generic_reloc, "R_390_12",       FALSE, 0,0x00000fff, FALSE),
+  HOWTO(R_390_16,        0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_16",       FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(R_390_32,        0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_32",       FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_PC32,     0, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_PC32",     FALSE, 0,0xffffffff, TRUE),
+  HOWTO(R_390_GOT12,    0, 1, 12, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_GOT12",    FALSE, 0,0x00000fff, FALSE),
+  HOWTO(R_390_GOT32,    0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_GOT32",    FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_PLT32,    0, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_PLT32",    FALSE, 0,0xffffffff, TRUE),
+  HOWTO(R_390_COPY,      0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_COPY",     FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_GLOB_DAT,  0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_GLOB_DAT", FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_JMP_SLOT,  0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_JMP_SLOT", FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_RELATIVE,  0, 4, 64,  TRUE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_RELATIVE", FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_GOTOFF32,  0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_GOTOFF32", FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_GOTPC,     0, 4, 64,  TRUE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_GOTPC",    FALSE, 0,MINUS_ONE,  TRUE),
+  HOWTO(R_390_GOT16,     0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_GOT16",    FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(R_390_PC16,      0, 1, 16,  TRUE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_PC16",     FALSE, 0,0x0000ffff, TRUE),
+  HOWTO(R_390_PC16DBL,   1, 1, 16,  TRUE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_PC16DBL",  FALSE, 0,0x0000ffff, TRUE),
+  HOWTO(R_390_PLT16DBL,  1, 1, 16,  TRUE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_PLT16DBL", FALSE, 0,0x0000ffff, TRUE),
+  HOWTO(R_390_PC32DBL,  1, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_PC32DBL",  FALSE, 0,0xffffffff, TRUE),
+  HOWTO(R_390_PLT32DBL,         1, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_PLT32DBL", FALSE, 0,0xffffffff, TRUE),
+  HOWTO(R_390_GOTPCDBL,  1, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_GOTPCDBL", FALSE, 0,MINUS_ONE,  TRUE),
+  HOWTO(R_390_64,        0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_64",       FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_PC64,     0, 4, 64,  TRUE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_PC64",     FALSE, 0,MINUS_ONE,  TRUE),
+  HOWTO(R_390_GOT64,    0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_GOT64",    FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_PLT64,    0, 4, 64,  TRUE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_PLT64",    FALSE, 0,MINUS_ONE,  TRUE),
+  HOWTO(R_390_GOTENT,   1, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_GOTENT",   FALSE, 0,MINUS_ONE,  TRUE),
+  HOWTO(R_390_GOTOFF16,  0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_GOTOFF16", FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(R_390_GOTOFF64,  0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_GOTOFF64", FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_GOTPLT12,         0, 1, 12, FALSE, 0, complain_overflow_dont,
+       bfd_elf_generic_reloc, "R_390_GOTPLT12", FALSE, 0,0x00000fff, FALSE),
+  HOWTO(R_390_GOTPLT16,  0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_GOTPLT16", FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(R_390_GOTPLT32,         0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_GOTPLT32", FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_GOTPLT64,         0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_GOTPLT64", FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_GOTPLTENT, 1, 2, 32,  TRUE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_GOTPLTENT",FALSE, 0,MINUS_ONE,  TRUE),
+  HOWTO(R_390_PLTOFF16,  0, 1, 16, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_PLTOFF16", FALSE, 0,0x0000ffff, FALSE),
+  HOWTO(R_390_PLTOFF32,  0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_PLTOFF32", FALSE, 0,0xffffffff, FALSE),
+  HOWTO(R_390_PLTOFF64,  0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_PLTOFF64", FALSE, 0,MINUS_ONE,  FALSE),
+  HOWTO(R_390_TLS_LOAD, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+       s390_tls_reloc, "R_390_TLS_LOAD", FALSE, 0, 0, FALSE),
+  HOWTO(R_390_TLS_GDCALL, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+       s390_tls_reloc, "R_390_TLS_GDCALL", FALSE, 0, 0, FALSE),
+  HOWTO(R_390_TLS_LDCALL, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+       s390_tls_reloc, "R_390_TLS_LDCALL", FALSE, 0, 0, FALSE),
+  EMPTY_HOWTO (R_390_TLS_GD32),        /* Empty entry for R_390_TLS_GD32.  */
+  HOWTO(R_390_TLS_GD64,  0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_TLS_GD64", FALSE, 0, MINUS_ONE, FALSE),
+  HOWTO(R_390_TLS_GOTIE12, 0, 1, 12, FALSE, 0, complain_overflow_dont,
+       bfd_elf_generic_reloc, "R_390_TLS_GOTIE12", FALSE, 0, 0x00000fff, FALSE),
+  EMPTY_HOWTO (R_390_TLS_GOTIE32),     /* Empty entry for R_390_TLS_GOTIE32.  */
+  HOWTO(R_390_TLS_GOTIE64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_TLS_GOTIE64", FALSE, 0, MINUS_ONE, FALSE),
+  EMPTY_HOWTO (R_390_TLS_LDM32),       /* Empty entry for R_390_TLS_LDM32.  */
+  HOWTO(R_390_TLS_LDM64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_TLS_LDM64", FALSE, 0, MINUS_ONE, FALSE),
+  EMPTY_HOWTO (R_390_TLS_IE32),        /* Empty entry for R_390_TLS_IE32.  */
+  HOWTO(R_390_TLS_IE64,  0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_TLS_IE64", FALSE, 0, MINUS_ONE, FALSE),
+  HOWTO(R_390_TLS_IEENT, 1, 2, 32, TRUE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_TLS_IEENT", FALSE, 0, MINUS_ONE, TRUE),
+  EMPTY_HOWTO (R_390_TLS_LE32),        /* Empty entry for R_390_TLS_LE32.  */
+  HOWTO(R_390_TLS_LE64,  0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_TLS_LE64", FALSE, 0, MINUS_ONE, FALSE),
+  EMPTY_HOWTO (R_390_TLS_LDO32),       /* Empty entry for R_390_TLS_LDO32.  */
+  HOWTO(R_390_TLS_LDO64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_TLS_LDO64", FALSE, 0, MINUS_ONE, FALSE),
+  HOWTO(R_390_TLS_DTPMOD, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_TLS_DTPMOD", FALSE, 0, MINUS_ONE, FALSE),
+  HOWTO(R_390_TLS_DTPOFF, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_TLS_DTPOFF", FALSE, 0, MINUS_ONE, FALSE),
+  HOWTO(R_390_TLS_TPOFF, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_390_TLS_TPOFF", FALSE, 0, MINUS_ONE, FALSE),
+  HOWTO(R_390_20,        0, 2, 20, FALSE, 8, complain_overflow_dont,
+       s390_elf_ldisp_reloc, "R_390_20",      FALSE, 0,0x0fffff00, FALSE),
+  HOWTO(R_390_GOT20,    0, 2, 20, FALSE, 8, complain_overflow_dont,
+       s390_elf_ldisp_reloc, "R_390_GOT20",   FALSE, 0,0x0fffff00, FALSE),
+  HOWTO(R_390_GOTPLT20,  0, 2, 20, FALSE, 8, complain_overflow_dont,
+       s390_elf_ldisp_reloc, "R_390_GOTPLT20", FALSE, 0,0x0fffff00, FALSE),
+  HOWTO(R_390_TLS_GOTIE20, 0, 2, 20, FALSE, 8, complain_overflow_dont,
+       s390_elf_ldisp_reloc, "R_390_TLS_GOTIE20", FALSE, 0,0x0fffff00, FALSE),

 };
 
 /* GNU extension to record C++ vtable hierarchy.  */
 };
 
 /* GNU extension to record C++ vtable hierarchy.  */


@@ -164,7 +263,7 @@ elf_s390_reloc_type_lookup (abfd, code)
     case BFD_RELOC_390_RELATIVE:
       return &elf_howto_table[(int) R_390_RELATIVE];
     case BFD_RELOC_32_GOTOFF:
     case BFD_RELOC_390_RELATIVE:
       return &elf_howto_table[(int) R_390_RELATIVE];
     case BFD_RELOC_32_GOTOFF:

-      return &elf_howto_table[(int) R_390_GOTOFF];
+      return &elf_howto_table[(int) R_390_GOTOFF32];

     case BFD_RELOC_390_GOTPC:
       return &elf_howto_table[(int) R_390_GOTPC];
     case BFD_RELOC_390_GOT16:
     case BFD_RELOC_390_GOTPC:
       return &elf_howto_table[(int) R_390_GOTPC];
     case BFD_RELOC_390_GOT16:


@@ -175,10 +274,6 @@ elf_s390_reloc_type_lookup (abfd, code)
       return &elf_howto_table[(int) R_390_PC16DBL];
     case BFD_RELOC_390_PLT16DBL:
       return &elf_howto_table[(int) R_390_PLT16DBL];
       return &elf_howto_table[(int) R_390_PC16DBL];
     case BFD_RELOC_390_PLT16DBL:
       return &elf_howto_table[(int) R_390_PLT16DBL];

-    case BFD_RELOC_VTABLE_INHERIT:
-      return &elf64_s390_vtinherit_howto;
-    case BFD_RELOC_VTABLE_ENTRY:
-      return &elf64_s390_vtentry_howto;

     case BFD_RELOC_390_PC32DBL:
       return &elf_howto_table[(int) R_390_PC32DBL];
     case BFD_RELOC_390_PLT32DBL:
     case BFD_RELOC_390_PC32DBL:
       return &elf_howto_table[(int) R_390_PC32DBL];
     case BFD_RELOC_390_PLT32DBL:


@@ -195,12 +290,93 @@ elf_s390_reloc_type_lookup (abfd, code)
       return &elf_howto_table[(int) R_390_PLT64];
     case BFD_RELOC_390_GOTENT:
       return &elf_howto_table[(int) R_390_GOTENT];
       return &elf_howto_table[(int) R_390_PLT64];
     case BFD_RELOC_390_GOTENT:
       return &elf_howto_table[(int) R_390_GOTENT];

+    case BFD_RELOC_16_GOTOFF:
+      return &elf_howto_table[(int) R_390_GOTOFF16];
+    case BFD_RELOC_390_GOTOFF64:
+      return &elf_howto_table[(int) R_390_GOTOFF64];
+    case BFD_RELOC_390_GOTPLT12:
+      return &elf_howto_table[(int) R_390_GOTPLT12];
+    case BFD_RELOC_390_GOTPLT16:
+      return &elf_howto_table[(int) R_390_GOTPLT16];
+    case BFD_RELOC_390_GOTPLT32:
+      return &elf_howto_table[(int) R_390_GOTPLT32];
+    case BFD_RELOC_390_GOTPLT64:
+      return &elf_howto_table[(int) R_390_GOTPLT64];
+    case BFD_RELOC_390_GOTPLTENT:
+      return &elf_howto_table[(int) R_390_GOTPLTENT];
+    case BFD_RELOC_390_PLTOFF16:
+      return &elf_howto_table[(int) R_390_PLTOFF16];
+    case BFD_RELOC_390_PLTOFF32:
+      return &elf_howto_table[(int) R_390_PLTOFF32];
+    case BFD_RELOC_390_PLTOFF64:
+      return &elf_howto_table[(int) R_390_PLTOFF64];
+    case BFD_RELOC_390_TLS_LOAD:
+      return &elf_howto_table[(int) R_390_TLS_LOAD];
+    case BFD_RELOC_390_TLS_GDCALL:
+      return &elf_howto_table[(int) R_390_TLS_GDCALL];
+    case BFD_RELOC_390_TLS_LDCALL:
+      return &elf_howto_table[(int) R_390_TLS_LDCALL];
+    case BFD_RELOC_390_TLS_GD64:
+      return &elf_howto_table[(int) R_390_TLS_GD64];
+    case BFD_RELOC_390_TLS_GOTIE12:
+      return &elf_howto_table[(int) R_390_TLS_GOTIE12];
+    case BFD_RELOC_390_TLS_GOTIE64:
+      return &elf_howto_table[(int) R_390_TLS_GOTIE64];
+    case BFD_RELOC_390_TLS_LDM64:
+      return &elf_howto_table[(int) R_390_TLS_LDM64];
+    case BFD_RELOC_390_TLS_IE64:
+      return &elf_howto_table[(int) R_390_TLS_IE64];
+    case BFD_RELOC_390_TLS_IEENT:
+      return &elf_howto_table[(int) R_390_TLS_IEENT];
+    case BFD_RELOC_390_TLS_LE64:
+      return &elf_howto_table[(int) R_390_TLS_LE64];
+    case BFD_RELOC_390_TLS_LDO64:
+      return &elf_howto_table[(int) R_390_TLS_LDO64];
+    case BFD_RELOC_390_TLS_DTPMOD:
+      return &elf_howto_table[(int) R_390_TLS_DTPMOD];
+    case BFD_RELOC_390_TLS_DTPOFF:
+      return &elf_howto_table[(int) R_390_TLS_DTPOFF];
+    case BFD_RELOC_390_TLS_TPOFF:
+      return &elf_howto_table[(int) R_390_TLS_TPOFF];
+    case BFD_RELOC_390_20:
+      return &elf_howto_table[(int) R_390_20];
+    case BFD_RELOC_390_GOT20:
+      return &elf_howto_table[(int) R_390_GOT20];
+    case BFD_RELOC_390_GOTPLT20:
+      return &elf_howto_table[(int) R_390_GOTPLT20];
+    case BFD_RELOC_390_TLS_GOTIE20:
+      return &elf_howto_table[(int) R_390_TLS_GOTIE20];
+    case BFD_RELOC_VTABLE_INHERIT:
+      return &elf64_s390_vtinherit_howto;
+    case BFD_RELOC_VTABLE_ENTRY:
+      return &elf64_s390_vtentry_howto;

     default:
       break;
     }
   return 0;
 }
 
     default:
       break;
     }
   return 0;
 }
 

+static reloc_howto_type *
+elf_s390_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                           const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (elf_howto_table) / sizeof (elf_howto_table[0]);
+       i++)
+    if (elf_howto_table[i].name != NULL
+       && strcasecmp (elf_howto_table[i].name, r_name) == 0)
+      return &elf_howto_table[i];
+
+    if (strcasecmp (elf64_s390_vtinherit_howto.name, r_name) == 0)
+      return &elf64_s390_vtinherit_howto;
+    if (strcasecmp (elf64_s390_vtentry_howto.name, r_name) == 0)
+      return &elf64_s390_vtentry_howto;
+
+  return NULL;
+}
+

 /* We need to use ELF64_R_TYPE so we have our own copy of this function,
    and elf64-s390.c has its own copy.  */
 
 /* We need to use ELF64_R_TYPE so we have our own copy of this function,
    and elf64-s390.c has its own copy.  */
 


@@ -210,7 +386,8 @@ elf_s390_info_to_howto (abfd, cache_ptr, dst)
      arelent *cache_ptr;
      Elf_Internal_Rela *dst;
 {
      arelent *cache_ptr;
      Elf_Internal_Rela *dst;
 {

-  switch (ELF64_R_TYPE(dst->r_info))
+  unsigned int r_type = ELF64_R_TYPE(dst->r_info);
+  switch (r_type)

     {
     case R_390_GNU_VTINHERIT:
       cache_ptr->howto = &elf64_s390_vtinherit_howto;
     {
     case R_390_GNU_VTINHERIT:
       cache_ptr->howto = &elf64_s390_vtinherit_howto;


@@ -221,11 +398,85 @@ elf_s390_info_to_howto (abfd, cache_ptr, dst)
       break;
 
     default:
       break;
 
     default:

-      BFD_ASSERT (ELF64_R_TYPE(dst->r_info) < (unsigned int) R_390_max);
-      cache_ptr->howto = &elf_howto_table[ELF64_R_TYPE(dst->r_info)];
+      if (r_type >= sizeof (elf_howto_table) / sizeof (elf_howto_table[0]))
+       {
+         (*_bfd_error_handler) (_("%B: invalid relocation type %d"),
+                                abfd, (int) r_type);
+         r_type = R_390_NONE;
+       }
+      cache_ptr->howto = &elf_howto_table[r_type];

     }
 }
 
     }
 }
 

+/* A relocation function which doesn't do anything.  */
+static bfd_reloc_status_type
+s390_tls_reloc (abfd, reloc_entry, symbol, data, input_section,
+               output_bfd, error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry;
+     asymbol *symbol ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  if (output_bfd)
+    reloc_entry->address += input_section->output_offset;
+  return bfd_reloc_ok;
+}
+
+/* Handle the large displacement relocs.  */
+static bfd_reloc_status_type
+s390_elf_ldisp_reloc (abfd, reloc_entry, symbol, data, input_section,
+                      output_bfd, error_message)
+     bfd *abfd;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  reloc_howto_type *howto = reloc_entry->howto;
+  bfd_vma relocation;
+  bfd_vma insn;
+
+  if (output_bfd != (bfd *) NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (! howto->partial_inplace
+         || reloc_entry->addend == 0))
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+  if (output_bfd != NULL)
+    return bfd_reloc_continue;
+
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))
+    return bfd_reloc_outofrange;
+
+  relocation = (symbol->value
+               + symbol->section->output_section->vma
+               + symbol->section->output_offset);
+  relocation += reloc_entry->addend;
+  if (howto->pc_relative)
+    {
+      relocation -= (input_section->output_section->vma
+                    + input_section->output_offset);
+      relocation -= reloc_entry->address;
+    }
+
+  insn = bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address); 
+  insn |= (relocation & 0xfff) << 16 | (relocation & 0xff000) >> 4;
+  bfd_put_32 (abfd, insn, (bfd_byte *) data + reloc_entry->address);
+
+  if ((bfd_signed_vma) relocation < - 0x80000
+      || (bfd_signed_vma) relocation > 0x7ffff)
+    return bfd_reloc_overflow;
+  else
+    return bfd_reloc_ok;
+}
+

 static bfd_boolean
 elf_s390_is_local_label_name (abfd, name)
      bfd *abfd;
 static bfd_boolean
 elf_s390_is_local_label_name (abfd, name)
      bfd *abfd;


@@ -244,6 +495,12 @@ elf_s390_is_local_label_name (abfd, name)
 
 #define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so.1"
 
 
 #define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so.1"
 

+/* If ELIMINATE_COPY_RELOCS is non-zero, the linker will try to avoid
+   copying dynamic variables from a shared lib into an app's dynbss
+   section, and instead use a dynamic relocation to point into the
+   shared lib.  */
+#define ELIMINATE_COPY_RELOCS 1
+

 /* The size in bytes of the first entry in the procedure linkage table.  */
 #define PLT_FIRST_ENTRY_SIZE 32
 /* The size in bytes of an entry in the procedure linkage table.  */
 /* The size in bytes of the first entry in the procedure linkage table.  */
 #define PLT_FIRST_ENTRY_SIZE 32
 /* The size in bytes of an entry in the procedure linkage table.  */


@@ -357,8 +614,57 @@ struct elf_s390_link_hash_entry
 
   /* Track dynamic relocs copied for this symbol.  */
   struct elf_s390_dyn_relocs *dyn_relocs;
 
   /* Track dynamic relocs copied for this symbol.  */
   struct elf_s390_dyn_relocs *dyn_relocs;

+
+  /* Number of GOTPLT references for a function.  */
+  bfd_signed_vma gotplt_refcount;
+
+#define GOT_UNKNOWN    0
+#define GOT_NORMAL     1
+#define GOT_TLS_GD     2
+#define GOT_TLS_IE     3
+#define GOT_TLS_IE_NLT 3
+  unsigned char tls_type;
+};
+
+#define elf_s390_hash_entry(ent) \
+  ((struct elf_s390_link_hash_entry *)(ent))
+
+/* NOTE: Keep this structure in sync with
+   the one declared in elf32-s390.c.  */
+struct elf_s390_obj_tdata
+{
+  struct elf_obj_tdata root;
+
+  /* TLS type for each local got entry.  */
+  char *local_got_tls_type;

 };
 
 };
 

+#define elf_s390_tdata(abfd) \
+  ((struct elf_s390_obj_tdata *) (abfd)->tdata.any)
+
+#define elf_s390_local_got_tls_type(abfd) \
+  (elf_s390_tdata (abfd)->local_got_tls_type)
+
+#define is_s390_elf(bfd)                               \
+  (bfd_get_flavour (bfd) == bfd_target_elf_flavour     \
+   && elf_tdata (bfd) != NULL                          \
+   && elf_object_id (bfd) == S390_ELF_TDATA)
+
+static bfd_boolean
+elf_s390_mkobject (bfd *abfd)
+{
+  return bfd_elf_allocate_object (abfd, sizeof (struct elf_s390_obj_tdata),
+                                 S390_ELF_TDATA);
+}
+
+static bfd_boolean
+elf_s390_object_p (abfd)
+     bfd *abfd;
+{
+  /* Set the right machine number for an s390 elf32 file.  */
+  return bfd_default_set_arch_mach (abfd, bfd_arch_s390, bfd_mach_s390_64);
+}
+

 /* s390 ELF linker hash table.  */
 
 struct elf_s390_link_hash_table
 /* s390 ELF linker hash table.  */
 
 struct elf_s390_link_hash_table


@@ -374,8 +680,13 @@ struct elf_s390_link_hash_table
   asection *sdynbss;
   asection *srelbss;
 
   asection *sdynbss;
   asection *srelbss;
 

-  /* Small local sym to section mapping cache.  */
-  struct sym_sec_cache sym_sec;
+  union {
+    bfd_signed_vma refcount;
+    bfd_vma offset;
+  } tls_ldm_got;
+
+  /* Small local sym cache.  */
+  struct sym_cache sym_cache;

 };
 
 /* Get the s390 ELF linker hash table from a link_info structure.  */
 };
 
 /* Get the s390 ELF linker hash table from a link_info structure.  */


@@ -409,6 +720,8 @@ link_hash_newfunc (entry, table, string)
 
       eh = (struct elf_s390_link_hash_entry *) entry;
       eh->dyn_relocs = NULL;
 
       eh = (struct elf_s390_link_hash_entry *) entry;
       eh->dyn_relocs = NULL;

+      eh->gotplt_refcount = 0;
+      eh->tls_type = GOT_UNKNOWN;

     }
 
   return entry;
     }
 
   return entry;


@@ -427,7 +740,8 @@ elf_s390_link_hash_table_create (abfd)
   if (ret == NULL)
     return NULL;
 
   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;
     {
       free (ret);
       return NULL;


@@ -440,7 +754,8 @@ elf_s390_link_hash_table_create (abfd)
   ret->srelplt = NULL;
   ret->sdynbss = NULL;
   ret->srelbss = NULL;
   ret->srelplt = NULL;
   ret->sdynbss = NULL;
   ret->srelbss = NULL;

-  ret->sym_sec.abfd = NULL;
+  ret->tls_ldm_got.refcount = 0;
+  ret->sym_cache.abfd = NULL;

 
   return &ret->elf.root;
 }
 
   return &ret->elf.root;
 }


@@ -461,17 +776,9 @@ create_got_section (dynobj, info)
   htab = elf_s390_hash_table (info);
   htab->sgot = bfd_get_section_by_name (dynobj, ".got");
   htab->sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");
   htab = elf_s390_hash_table (info);
   htab->sgot = bfd_get_section_by_name (dynobj, ".got");
   htab->sgotplt = bfd_get_section_by_name (dynobj, ".got.plt");

-  if (!htab->sgot || !htab->sgotplt)
+  htab->srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+  if (!htab->sgot || !htab->sgotplt || !htab->srelgot)

     abort ();
     abort ();

-
-  htab->srelgot = bfd_make_section (dynobj, ".rela.got");
-  if (htab->srelgot == NULL
-      || ! bfd_set_section_flags (dynobj, htab->srelgot,
-                                 (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
-                                  | SEC_IN_MEMORY | SEC_LINKER_CREATED
-                                  | SEC_READONLY))
-      || ! bfd_set_section_alignment (dynobj, htab->srelgot, 3))
-    return FALSE;

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -509,8 +816,8 @@ elf_s390_create_dynamic_sections (dynobj, info)
 /* Copy the extra info we tack onto an elf_link_hash_entry.  */
 
 static void
 /* Copy the extra info we tack onto an elf_link_hash_entry.  */
 
 static void

-elf_s390_copy_indirect_symbol (bed, dir, ind)
-     struct elf_backend_data *bed;
+elf_s390_copy_indirect_symbol (info, dir, ind)
+     struct bfd_link_info *info;

      struct elf_link_hash_entry *dir, *ind;
 {
   struct elf_s390_link_hash_entry *edir, *eind;
      struct elf_link_hash_entry *dir, *ind;
 {
   struct elf_s390_link_hash_entry *edir, *eind;


@@ -525,10 +832,7 @@ elf_s390_copy_indirect_symbol (bed, dir, ind)
          struct elf_s390_dyn_relocs **pp;
          struct elf_s390_dyn_relocs *p;
 
          struct elf_s390_dyn_relocs **pp;
          struct elf_s390_dyn_relocs *p;
 

-         if (ind->root.type == bfd_link_hash_indirect)
-           abort ();
-
-         /* Add reloc counts against the weak sym to the strong sym
+         /* 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; )
            {
             list.  Merge any entries against the same section.  */
          for (pp = &eind->dyn_relocs; (p = *pp) != NULL; )
            {


@@ -552,7 +856,54 @@ elf_s390_copy_indirect_symbol (bed, dir, ind)
       eind->dyn_relocs = NULL;
     }
 
       eind->dyn_relocs = NULL;
     }
 

-  _bfd_elf_link_hash_copy_indirect (bed, dir, ind);
+  if (ind->root.type == bfd_link_hash_indirect
+      && dir->got.refcount <= 0)
+    {
+      edir->tls_type = eind->tls_type;
+      eind->tls_type = GOT_UNKNOWN;
+    }
+
+  if (ELIMINATE_COPY_RELOCS
+      && ind->root.type != bfd_link_hash_indirect
+      && dir->dynamic_adjusted)
+    {
+      /* If called to transfer flags for a weakdef during processing
+        of elf_adjust_dynamic_symbol, don't copy non_got_ref.
+        We clear it ourselves for ELIMINATE_COPY_RELOCS.  */
+      dir->ref_dynamic |= ind->ref_dynamic;
+      dir->ref_regular |= ind->ref_regular;
+      dir->ref_regular_nonweak |= ind->ref_regular_nonweak;
+      dir->needs_plt |= ind->needs_plt;
+    }
+  else
+    _bfd_elf_link_hash_copy_indirect (info, dir, ind);
+}
+
+static int
+elf_s390_tls_transition (info, r_type, is_local)
+     struct bfd_link_info *info;
+     int r_type;
+     int is_local;
+{
+  if (info->shared)
+    return r_type;
+
+  switch (r_type)
+    {
+    case R_390_TLS_GD64:
+    case R_390_TLS_IE64:
+      if (is_local)
+       return R_390_TLS_LE64;
+      return R_390_TLS_IE64;
+    case R_390_TLS_GOTIE64:
+      if (is_local)
+       return R_390_TLS_LE64;
+      return R_390_TLS_GOTIE64;
+    case R_390_TLS_LDM64:
+      return R_390_TLS_LE64;
+    }
+
+  return r_type;

 }
 
 /* Look through the relocs for a section during the first phase, and
 }
 
 /* Look through the relocs for a section during the first phase, and


@@ -572,19 +923,25 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
   const Elf_Internal_Rela *rel;
   const Elf_Internal_Rela *rel_end;
   asection *sreloc;
   const Elf_Internal_Rela *rel;
   const Elf_Internal_Rela *rel_end;
   asection *sreloc;

+  bfd_signed_vma *local_got_refcounts;
+  int tls_type, old_tls_type;

 
 

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

     return TRUE;
 
     return TRUE;
 

+  BFD_ASSERT (is_s390_elf (abfd));
+

   htab = elf_s390_hash_table (info);
   htab = elf_s390_hash_table (info);

-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  symtab_hdr = &elf_symtab_hdr (abfd);

   sym_hashes = elf_sym_hashes (abfd);
   sym_hashes = elf_sym_hashes (abfd);

+  local_got_refcounts = elf_local_got_refcounts (abfd);

 
   sreloc = NULL;
 
   rel_end = relocs + sec->reloc_count;
   for (rel = relocs; rel < rel_end; rel++)
     {
 
   sreloc = NULL;
 
   rel_end = relocs + sec->reloc_count;
   for (rel = relocs; rel < rel_end; rel++)
     {

+      unsigned int r_type;

       unsigned long r_symndx;
       struct elf_link_hash_entry *h;
 
       unsigned long r_symndx;
       struct elf_link_hash_entry *h;
 


@@ -592,8 +949,8 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 
       if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
        {
 
       if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
        {

-         (*_bfd_error_handler) (_("%s: bad symbol index: %d"),
-                                bfd_archive_filename (abfd),
+         (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
+                                abfd,

                                 r_symndx);
          return FALSE;
        }
                                 r_symndx);
          return FALSE;
        }


@@ -601,43 +958,58 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
       if (r_symndx < symtab_hdr->sh_info)
        h = NULL;
       else
       if (r_symndx < symtab_hdr->sh_info)
        h = NULL;
       else

-       h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+       {
+         h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+         while (h->root.type == bfd_link_hash_indirect
+                || h->root.type == bfd_link_hash_warning)
+           h = (struct elf_link_hash_entry *) h->root.u.i.link;
+       }

 
 

-      switch (ELF64_R_TYPE (rel->r_info))
+      /* Create got section and local_got_refcounts array if they
+        are needed.  */
+      r_type = elf_s390_tls_transition (info,
+                                       ELF64_R_TYPE (rel->r_info),
+                                       h == NULL);
+      switch (r_type)

        {
        case R_390_GOT12:
        case R_390_GOT16:
        {
        case R_390_GOT12:
        case R_390_GOT16:

+       case R_390_GOT20:

        case R_390_GOT32:
        case R_390_GOT64:
        case R_390_GOTENT:
        case R_390_GOT32:
        case R_390_GOT64:
        case R_390_GOTENT:

-         /* This symbol requires a global offset table entry.  */
-         if (h != NULL)
-           {
-             h->got.refcount += 1;
-           }
-         else
+       case R_390_GOTPLT12:
+       case R_390_GOTPLT16:
+       case R_390_GOTPLT20:
+       case R_390_GOTPLT32:
+       case R_390_GOTPLT64:
+       case R_390_GOTPLTENT:
+       case R_390_TLS_GD64:
+       case R_390_TLS_GOTIE12:
+       case R_390_TLS_GOTIE20:
+       case R_390_TLS_GOTIE64:
+       case R_390_TLS_IEENT:
+       case R_390_TLS_IE64:
+       case R_390_TLS_LDM64:
+         if (h == NULL
+             && local_got_refcounts == NULL)

            {
            {

-             bfd_signed_vma *local_got_refcounts;
+             bfd_size_type size;

 
 

-             /* This is a global offset table entry for a local symbol.  */
-             local_got_refcounts = elf_local_got_refcounts (abfd);
+             size = symtab_hdr->sh_info;
+             size *= (sizeof (bfd_signed_vma) + sizeof(char));
+             local_got_refcounts = ((bfd_signed_vma *)
+                                    bfd_zalloc (abfd, size));

              if (local_got_refcounts == NULL)
              if (local_got_refcounts == NULL)

-               {
-                 bfd_size_type size;
-
-                 size = symtab_hdr->sh_info;
-                 size *= sizeof (bfd_signed_vma);
-                 local_got_refcounts = ((bfd_signed_vma *)
-                                        bfd_zalloc (abfd, size));
-                 if (local_got_refcounts == NULL)
-                   return FALSE;
-                 elf_local_got_refcounts (abfd) = local_got_refcounts;
-               }
-             local_got_refcounts[r_symndx] += 1;
+               return FALSE;
+             elf_local_got_refcounts (abfd) = local_got_refcounts;
+             elf_s390_local_got_tls_type (abfd)
+               = (char *) (local_got_refcounts + symtab_hdr->sh_info);

            }
            }

-         /* Fall through */
-
-       case R_390_GOTOFF:
+         /* Fall through.  */
+       case R_390_GOTOFF16:
+       case R_390_GOTOFF32:
+       case R_390_GOTOFF64:

        case R_390_GOTPC:
        case R_390_GOTPCDBL:
          if (htab->sgot == NULL)
        case R_390_GOTPC:
        case R_390_GOTPCDBL:
          if (htab->sgot == NULL)


@@ -647,12 +1019,25 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
              if (!create_got_section (htab->elf.dynobj, info))
                return FALSE;
            }
              if (!create_got_section (htab->elf.dynobj, info))
                return FALSE;
            }

+       }
+
+      switch (r_type)
+       {
+       case R_390_GOTOFF16:
+       case R_390_GOTOFF32:
+       case R_390_GOTOFF64:
+       case R_390_GOTPC:
+       case R_390_GOTPCDBL:
+         /* Got is created, nothing to be done.  */

          break;
 
        case R_390_PLT16DBL:
        case R_390_PLT32:
        case R_390_PLT32DBL:
        case R_390_PLT64:
          break;
 
        case R_390_PLT16DBL:
        case R_390_PLT32:
        case R_390_PLT32DBL:
        case R_390_PLT64:

+       case R_390_PLTOFF16:
+       case R_390_PLTOFF32:
+       case R_390_PLTOFF64:

          /* This symbol requires a procedure linkage table entry.  We
             actually build the entry in adjust_dynamic_symbol,
             because this might be a case of linking PIC code which is
          /* This symbol requires a procedure linkage table entry.  We
             actually build the entry in adjust_dynamic_symbol,
             because this might be a case of linking PIC code which is


@@ -662,13 +1047,125 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
 
          /* If this is a local symbol, we resolve it directly without
             creating a procedure linkage table entry.  */
 
          /* If this is a local symbol, we resolve it directly without
             creating a procedure linkage table entry.  */

-         if (h == NULL)
-           continue;
+         if (h != NULL)
+           {
+             h->needs_plt = 1;
+             h->plt.refcount += 1;
+           }
+         break;
+
+       case R_390_GOTPLT12:
+       case R_390_GOTPLT16:
+       case R_390_GOTPLT20:
+       case R_390_GOTPLT32:
+       case R_390_GOTPLT64:
+       case R_390_GOTPLTENT:
+         /* This symbol requires either a procedure linkage table entry
+            or an entry in the local got. We actually build the entry
+            in adjust_dynamic_symbol because whether this is really a
+            global reference can change and with it the fact if we have
+            to create a plt entry or a local got entry. To be able to
+            make a once global symbol a local one we have to keep track
+            of the number of gotplt references that exist for this
+            symbol.  */
+         if (h != NULL)
+           {
+             ((struct elf_s390_link_hash_entry *) h)->gotplt_refcount++;
+             h->needs_plt = 1;
+             h->plt.refcount += 1;
+           }
+         else
+           local_got_refcounts[r_symndx] += 1;
+         break;

 
 

-         h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
-         h->plt.refcount += 1;
+       case R_390_TLS_LDM64:
+         htab->tls_ldm_got.refcount += 1;

          break;
 
          break;
 

+       case R_390_TLS_IE64:
+       case R_390_TLS_GOTIE12:
+       case R_390_TLS_GOTIE20:
+       case R_390_TLS_GOTIE64:
+       case R_390_TLS_IEENT:
+         if (info->shared)
+           info->flags |= DF_STATIC_TLS;
+         /* Fall through */
+
+       case R_390_GOT12:
+       case R_390_GOT16:
+       case R_390_GOT20:
+       case R_390_GOT32:
+       case R_390_GOT64:
+       case R_390_GOTENT:
+       case R_390_TLS_GD64:
+         /* This symbol requires a global offset table entry.  */
+         switch (r_type)
+           {
+           default:
+           case R_390_GOT12:
+           case R_390_GOT16:
+           case R_390_GOT20:
+           case R_390_GOT32:
+           case R_390_GOTENT:
+             tls_type = GOT_NORMAL;
+             break;
+           case R_390_TLS_GD64:
+             tls_type = GOT_TLS_GD;
+             break;
+           case R_390_TLS_IE64:
+           case R_390_TLS_GOTIE64:
+             tls_type = GOT_TLS_IE;
+             break;
+           case R_390_TLS_GOTIE12:
+           case R_390_TLS_GOTIE20:
+           case R_390_TLS_IEENT:
+             tls_type = GOT_TLS_IE_NLT;
+             break;
+           }
+
+         if (h != NULL)
+           {
+             h->got.refcount += 1;
+             old_tls_type = elf_s390_hash_entry(h)->tls_type;
+           }
+         else
+           {
+             local_got_refcounts[r_symndx] += 1;
+             old_tls_type = elf_s390_local_got_tls_type (abfd) [r_symndx];
+           }
+         /* If a TLS symbol is accessed using IE at least once,
+            there is no point to use dynamic model for it.  */
+         if (old_tls_type != tls_type && old_tls_type != GOT_UNKNOWN)
+           {
+             if (old_tls_type == GOT_NORMAL || tls_type == GOT_NORMAL)
+               {
+                 (*_bfd_error_handler)
+                   (_("%B: `%s' accessed both as normal and thread local symbol"),
+                    abfd, h->root.root.string);
+                 return FALSE;
+               }
+             if (old_tls_type > tls_type)
+               tls_type = old_tls_type;
+           }
+
+         if (old_tls_type != tls_type)
+           {
+             if (h != NULL)
+               elf_s390_hash_entry (h)->tls_type = tls_type;
+             else
+               elf_s390_local_got_tls_type (abfd) [r_symndx] = tls_type;
+           }
+
+         if (r_type != R_390_TLS_IE64)
+           break;
+         /* Fall through */
+
+       case R_390_TLS_LE64:
+         if (!info->shared)
+           break;
+         info->flags |= DF_STATIC_TLS;
+         /* Fall through */
+

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


@@ -686,7 +1183,7 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
                 sections have not yet been mapped to output sections.
                 Tentatively set the flag for now, and correct in
                 adjust_dynamic_symbol.  */
                 sections have not yet been mapped to output sections.
                 Tentatively set the flag for now, and correct in
                 adjust_dynamic_symbol.  */

-             h->elf_link_hash_flags |= ELF_LINK_NON_GOT_REF;
+             h->non_got_ref = 1;

 
              /* 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.  */


@@ -722,16 +1219,15 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
                    && ELF64_R_TYPE (rel->r_info) != R_390_PC32DBL
                    && ELF64_R_TYPE (rel->r_info) != R_390_PC64)
                   || (h != NULL
                    && ELF64_R_TYPE (rel->r_info) != R_390_PC32DBL
                    && ELF64_R_TYPE (rel->r_info) != R_390_PC64)
                   || (h != NULL

-                      && (! info->symbolic
+                      && (! SYMBOLIC_BIND (info, h)

                           || h->root.type == bfd_link_hash_defweak
                           || h->root.type == bfd_link_hash_defweak

-                          || (h->elf_link_hash_flags
-                              & ELF_LINK_HASH_DEF_REGULAR) == 0))))
-             || (!info->shared
+                          || !h->def_regular))))
+             || (ELIMINATE_COPY_RELOCS
+                 && !info->shared

                  && (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

-                     || (h->elf_link_hash_flags
-                         & ELF_LINK_HASH_DEF_REGULAR) == 0)))
+                     || !h->def_regular)))

            {
              struct elf_s390_dyn_relocs *p;
              struct elf_s390_dyn_relocs **head;
            {
              struct elf_s390_dyn_relocs *p;
              struct elf_s390_dyn_relocs **head;


@@ -741,45 +1237,14 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
                 this reloc.  */
              if (sreloc == NULL)
                {
                 this reloc.  */
              if (sreloc == NULL)
                {

-                 const char *name;
-                 bfd *dynobj;
-
-                 name = (bfd_elf_string_from_elf_section
-                         (abfd,
-                          elf_elfheader (abfd)->e_shstrndx,
-                          elf_section_data (sec)->rel_hdr.sh_name));
-                 if (name == NULL)
-                   return FALSE;
-
-                 if (strncmp (name, ".rela", 5) != 0
-                     || strcmp (bfd_get_section_name (abfd, sec),
-                                name + 5) != 0)
-                   {
-                     (*_bfd_error_handler)
-                       (_("%s: bad relocation section name `%s\'"),
-                        bfd_archive_filename (abfd), name);
-                   }
-

                  if (htab->elf.dynobj == NULL)
                    htab->elf.dynobj = abfd;
 
                  if (htab->elf.dynobj == NULL)
                    htab->elf.dynobj = abfd;
 

-                 dynobj = htab->elf.dynobj;
-                 sreloc = bfd_get_section_by_name (dynobj, name);
+                 sreloc = _bfd_elf_make_dynamic_reloc_section
+                   (sec, htab->elf.dynobj, 3, abfd, /*rela?*/ TRUE);
+

                  if (sreloc == NULL)
                  if (sreloc == NULL)

-                   {
-                     flagword flags;
-
-                     sreloc = bfd_make_section (dynobj, name);
-                     flags = (SEC_HAS_CONTENTS | SEC_READONLY
-                              | SEC_IN_MEMORY | SEC_LINKER_CREATED);
-                     if ((sec->flags & SEC_ALLOC) != 0)
-                       flags |= SEC_ALLOC | SEC_LOAD;
-                     if (sreloc == NULL
-                         || ! bfd_set_section_flags (dynobj, sreloc, flags)
-                         || ! bfd_set_section_alignment (dynobj, sreloc, 3))
-                       return FALSE;
-                   }
-                 elf_section_data (sec)->sreloc = sreloc;
+                   return FALSE;

                }
 
              /* If this is a global symbol, we count the number of
                }
 
              /* If this is a global symbol, we count the number of


@@ -793,15 +1258,21 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
                  /* Track dynamic relocs needed for local syms too.
                     We really need local syms available to do this
                     easily.  Oh well.  */
                  /* Track dynamic relocs needed for local syms too.
                     We really need local syms available to do this
                     easily.  Oh well.  */

-

                  asection *s;
                  asection *s;

-                 s = bfd_section_from_r_symndx (abfd, &htab->sym_sec,
-                                                sec, r_symndx);
-                 if (s == NULL)
+                 void *vpp;
+                 Elf_Internal_Sym *isym;
+
+                 isym = bfd_sym_from_r_symndx (&htab->sym_cache,
+                                               abfd, r_symndx);
+                 if (isym == NULL)

                    return FALSE;
 
                    return FALSE;
 

-                 head = ((struct elf_s390_dyn_relocs **)
-                         &elf_section_data (s)->local_dynrel);
+                 s = bfd_section_from_elf_index (abfd, isym->st_shndx);
+                 if (s == NULL)
+                   s = sec;
+
+                 vpp = &elf_section_data (s)->local_dynrel;
+                 head = (struct elf_s390_dyn_relocs **) vpp;

                }
 
              p = *head;
                }
 
              p = *head;


@@ -832,14 +1303,16 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
          /* This relocation describes the C++ object vtable hierarchy.
             Reconstruct it for later use during GC.  */
        case R_390_GNU_VTINHERIT:
          /* This relocation describes the C++ object vtable hierarchy.
             Reconstruct it for later use during GC.  */
        case R_390_GNU_VTINHERIT:

-         if (!_bfd_elf64_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+         if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))

            return FALSE;
          break;
 
          /* This relocation describes which C++ vtable entries are actually
             used.  Record for later use during GC.  */
        case R_390_GNU_VTENTRY:
            return FALSE;
          break;
 
          /* This relocation describes which C++ vtable entries are actually
             used.  Record for later use during GC.  */
        case R_390_GNU_VTENTRY:

-         if (!_bfd_elf64_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+         BFD_ASSERT (h != NULL);
+         if (h != NULL
+             && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))

            return FALSE;
          break;
 
            return FALSE;
          break;
 


@@ -855,149 +1328,193 @@ elf_s390_check_relocs (abfd, info, sec, relocs)
    relocation.  */
 
 static asection *
    relocation.  */
 
 static asection *

-elf_s390_gc_mark_hook (sec, info, rel, h, sym)
-     asection *sec;
-     struct bfd_link_info *info ATTRIBUTE_UNUSED;
-     Elf_Internal_Rela *rel;
-     struct elf_link_hash_entry *h;
-     Elf_Internal_Sym *sym;
+elf_s390_gc_mark_hook (asection *sec,
+                      struct bfd_link_info *info,
+                      Elf_Internal_Rela *rel,
+                      struct elf_link_hash_entry *h,
+                      Elf_Internal_Sym *sym)

 {
   if (h != NULL)
 {
   if (h != NULL)

-    {
-      switch (ELF64_R_TYPE (rel->r_info))
-       {
-       case R_390_GNU_VTINHERIT:
-       case R_390_GNU_VTENTRY:
-         break;
-
-       default:
-         switch (h->root.type)
-           {
-           case bfd_link_hash_defined:
-           case bfd_link_hash_defweak:
-             return h->root.u.def.section;
-
-           case bfd_link_hash_common:
-             return h->root.u.c.p->section;
-
-           default:
-             break;
-           }
-       }
-    }
-  else
-    return bfd_section_from_elf_index (sec->owner, sym->st_shndx);
+    switch (ELF64_R_TYPE (rel->r_info))
+      {
+      case R_390_GNU_VTINHERIT:
+      case R_390_GNU_VTENTRY:
+       return NULL;
+      }

 
 

-  return NULL;
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);

 }
 
 /* Update the got entry reference counts for the section being removed.  */
 
 static bfd_boolean
 }
 
 /* Update the got entry reference counts for the section being removed.  */
 
 static bfd_boolean

-elf_s390_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
+elf_s390_gc_sweep_hook (bfd *abfd,
+                       struct bfd_link_info *info,
+                       asection *sec,
+                       const Elf_Internal_Rela *relocs)

 {
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
   bfd_signed_vma *local_got_refcounts;
   const Elf_Internal_Rela *rel, *relend;
 {
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
   bfd_signed_vma *local_got_refcounts;
   const Elf_Internal_Rela *rel, *relend;

-  unsigned long r_symndx;
-  struct elf_link_hash_entry *h;
+
+  if (info->relocatable)
+    return TRUE;

 
   elf_section_data (sec)->local_dynrel = NULL;
 
 
   elf_section_data (sec)->local_dynrel = NULL;
 

-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  symtab_hdr = &elf_symtab_hdr (abfd);

   sym_hashes = elf_sym_hashes (abfd);
   local_got_refcounts = elf_local_got_refcounts (abfd);
 
   relend = relocs + sec->reloc_count;
   for (rel = relocs; rel < relend; rel++)
   sym_hashes = elf_sym_hashes (abfd);
   local_got_refcounts = elf_local_got_refcounts (abfd);
 
   relend = relocs + sec->reloc_count;
   for (rel = relocs; rel < relend; rel++)

-    switch (ELF64_R_TYPE (rel->r_info))
-      {
-      case R_390_GOT12:
-      case R_390_GOT16:
-      case R_390_GOT32:
-      case R_390_GOT64:
-      case R_390_GOTOFF:
-      case R_390_GOTPC:
-      case R_390_GOTPCDBL:
-      case R_390_GOTENT:
-       r_symndx = ELF64_R_SYM (rel->r_info);
-       if (r_symndx >= symtab_hdr->sh_info)
-         {
-           h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-           if (h->got.refcount > 0)
-             h->got.refcount -= 1;
-         }
-       else if (local_got_refcounts != NULL)
-         {
-           if (local_got_refcounts[r_symndx] > 0)
-             local_got_refcounts[r_symndx] -= 1;
-         }
-       break;
-
-      case R_390_8:
-      case R_390_12:
-      case R_390_16:
-      case R_390_32:
-      case R_390_64:
-      case R_390_PC16:
-      case R_390_PC16DBL:
-      case R_390_PC32:
-      case R_390_PC32DBL:
-      case R_390_PC64:
-       r_symndx = ELF64_R_SYM (rel->r_info);
-       if (r_symndx >= symtab_hdr->sh_info)
-         {
-           struct elf_s390_link_hash_entry *eh;
-           struct elf_s390_dyn_relocs **pp;
-           struct elf_s390_dyn_relocs *p;
-
-           h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-
-           if (!info->shared && h->plt.refcount > 0)
-             h->plt.refcount -= 1;
-
-           eh = (struct elf_s390_link_hash_entry *) h;
-
-           for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
-             if (p->sec == sec)
+    {
+      unsigned long r_symndx;
+      unsigned int r_type;
+      struct elf_link_hash_entry *h = NULL;
+
+      r_symndx = ELF64_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)
+       {
+         struct elf_s390_link_hash_entry *eh;
+         struct elf_s390_dyn_relocs **pp;
+         struct elf_s390_dyn_relocs *p;
+
+         h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+         while (h->root.type == bfd_link_hash_indirect
+                || h->root.type == bfd_link_hash_warning)
+           h = (struct elf_link_hash_entry *) h->root.u.i.link;
+         eh = (struct elf_s390_link_hash_entry *) h;
+
+         for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
+           if (p->sec == sec)
+             {
+               /* Everything must go for SEC.  */
+               *pp = p->next;
+               break;
+             }
+       }
+
+      r_type = ELF64_R_TYPE (rel->r_info);
+      r_type = elf_s390_tls_transition (info, r_type, h != NULL);
+      switch (r_type)
+       {
+       case R_390_TLS_LDM64:
+         if (elf_s390_hash_table (info)->tls_ldm_got.refcount > 0)
+           elf_s390_hash_table (info)->tls_ldm_got.refcount -= 1;
+         break;
+
+       case R_390_TLS_GD64:
+       case R_390_TLS_IE64:
+       case R_390_TLS_GOTIE12:
+       case R_390_TLS_GOTIE20:
+       case R_390_TLS_GOTIE64:
+       case R_390_TLS_IEENT:
+       case R_390_GOT12:
+       case R_390_GOT16:
+       case R_390_GOT20:
+       case R_390_GOT32:
+       case R_390_GOT64:
+       case R_390_GOTOFF16:
+       case R_390_GOTOFF32:
+       case R_390_GOTOFF64:
+       case R_390_GOTPC:
+       case R_390_GOTPCDBL:
+       case R_390_GOTENT:
+         if (h != NULL)
+           {
+             if (h->got.refcount > 0)
+               h->got.refcount -= 1;
+           }
+         else if (local_got_refcounts != NULL)
+           {
+             if (local_got_refcounts[r_symndx] > 0)
+               local_got_refcounts[r_symndx] -= 1;
+           }
+         break;
+
+       case R_390_8:
+       case R_390_12:
+       case R_390_16:
+       case R_390_20:
+       case R_390_32:
+       case R_390_64:
+       case R_390_PC16:
+       case R_390_PC16DBL:
+       case R_390_PC32:
+       case R_390_PC32DBL:
+       case R_390_PC64:
+         if (info->shared)
+           break;
+         /* Fall through */
+
+       case R_390_PLT16DBL:
+       case R_390_PLT32:
+       case R_390_PLT32DBL:
+       case R_390_PLT64:
+       case R_390_PLTOFF16:
+       case R_390_PLTOFF32:
+       case R_390_PLTOFF64:
+         if (h != NULL)
+           {
+             if (h->plt.refcount > 0)
+               h->plt.refcount -= 1;
+           }
+         break;
+
+       case R_390_GOTPLT12:
+       case R_390_GOTPLT16:
+       case R_390_GOTPLT20:
+       case R_390_GOTPLT32:
+       case R_390_GOTPLT64:
+       case R_390_GOTPLTENT:
+         if (h != NULL)
+           {
+             if (h->plt.refcount > 0)

                {
                {

-                 if (ELF64_R_TYPE (rel->r_info) == R_390_PC16
-                     || ELF64_R_TYPE (rel->r_info) == R_390_PC16DBL
-                     || ELF64_R_TYPE (rel->r_info) == R_390_PC32)
-                   p->pc_count -= 1;
-                 p->count -= 1;
-                 if (p->count == 0)
-                   *pp = p->next;
-                 break;
+                 ((struct elf_s390_link_hash_entry *) h)->gotplt_refcount--;
+                 h->plt.refcount -= 1;

                }
                }

-         }
-       break;
-
-      case R_390_PLT16DBL:
-      case R_390_PLT32:
-      case R_390_PLT32DBL:
-      case R_390_PLT64:
-       r_symndx = ELF64_R_SYM (rel->r_info);
-       if (r_symndx >= symtab_hdr->sh_info)
-         {
-           h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-           if (h->plt.refcount > 0)
-             h->plt.refcount -= 1;
-         }
-       break;
-
-      default:
-       break;
-      }
+           }
+         else if (local_got_refcounts != NULL)
+           {
+             if (local_got_refcounts[r_symndx] > 0)
+               local_got_refcounts[r_symndx] -= 1;
+           }
+         break;
+
+       default:
+         break;
+       }
+    }

 
   return TRUE;
 }
 
 
   return TRUE;
 }
 

+/* Make sure we emit a GOT entry if the symbol was supposed to have a PLT
+   entry but we found we will not create any.  Called when we find we will
+   not have any PLT for this symbol, by for example
+   elf_s390_adjust_dynamic_symbol when we're doing a proper dynamic link,
+   or elf_s390_size_dynamic_sections if no dynamic sections will be
+   created (we're only linking static objects).  */
+
+static void
+elf_s390_adjust_gotplt (h)
+     struct elf_s390_link_hash_entry *h;
+{
+  if (h->elf.root.type == bfd_link_hash_warning)
+    h = (struct elf_s390_link_hash_entry *) h->elf.root.u.i.link;
+
+  if (h->gotplt_refcount <= 0)
+    return;
+
+  /* We simply add the number of gotplt references to the number
+   * of got references for this symbol.  */
+  h->elf.got.refcount += h->gotplt_refcount;
+  h->gotplt_refcount = -1;
+}
+

 /* Adjust a symbol defined by a dynamic object and referenced by a
    regular object.  The current definition is in some section of the
    dynamic object, but we're not including those sections.  We have to
 /* Adjust a symbol defined by a dynamic object and referenced by a
    regular object.  The current definition is in some section of the
    dynamic object, but we're not including those sections.  We have to


@@ -1010,23 +1527,18 @@ elf_s390_adjust_dynamic_symbol (info, h)
      struct elf_link_hash_entry *h;
 {
   struct elf_s390_link_hash_table *htab;
      struct elf_link_hash_entry *h;
 {
   struct elf_s390_link_hash_table *htab;

-  struct elf_s390_link_hash_entry * eh;
-  struct elf_s390_dyn_relocs *p;

   asection *s;
   asection *s;

-  unsigned int power_of_two;

 
   /* If this is a function, put it in the procedure linkage table.  We
      will fill in the contents of the procedure linkage table later
      (although we could actually do it here).  */
   if (h->type == STT_FUNC
 
   /* If this is a function, put it in the procedure linkage table.  We
      will fill in the contents of the procedure linkage table later
      (although we could actually do it here).  */
   if (h->type == STT_FUNC

-      || (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0)
+      || h->needs_plt)

     {
       if (h->plt.refcount <= 0
     {
       if (h->plt.refcount <= 0

-         || (! info->shared
-             && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0
-             && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) == 0
-             && h->root.type != bfd_link_hash_undefweak
-             && h->root.type != bfd_link_hash_undefined))
+         || SYMBOL_CALLS_LOCAL (info, h)
+         || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT
+             && h->root.type == bfd_link_hash_undefweak))

        {
          /* This case can occur if we saw a PLT32 reloc in an input
             file, but the symbol was never referred to by a dynamic
        {
          /* This case can occur if we saw a PLT32 reloc in an input
             file, but the symbol was never referred to by a dynamic


@@ -1034,7 +1546,8 @@ elf_s390_adjust_dynamic_symbol (info, h)
             such a case, we don't actually need to build a procedure
             linkage table, and we can just do a PC32 reloc instead.  */
          h->plt.offset = (bfd_vma) -1;
             such a case, we don't actually need to build a procedure
             linkage table, and we can just do a PC32 reloc instead.  */
          h->plt.offset = (bfd_vma) -1;

-         h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
+         h->needs_plt = 0;
+         elf_s390_adjust_gotplt((struct elf_s390_link_hash_entry *) h);

        }
 
       return TRUE;
        }
 
       return TRUE;


@@ -1050,12 +1563,14 @@ elf_s390_adjust_dynamic_symbol (info, h)
   /* If this is a weak symbol, and there is a real definition, the
      processor independent code will have arranged for us to see the
      real definition first, and we can just use the same value.  */
   /* If this is a weak symbol, and there is a real definition, the
      processor independent code will have arranged for us to see the
      real definition first, and we can just use the same value.  */

-  if (h->weakdef != NULL)
+  if (h->u.weakdef != NULL)

     {
     {

-      BFD_ASSERT (h->weakdef->root.type == bfd_link_hash_defined
-                 || h->weakdef->root.type == bfd_link_hash_defweak);
-      h->root.u.def.section = h->weakdef->root.u.def.section;
-      h->root.u.def.value = h->weakdef->root.u.def.value;
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+                 || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      if (ELIMINATE_COPY_RELOCS || info->nocopyreloc)
+       h->non_got_ref = h->u.weakdef->non_got_ref;

       return TRUE;
     }
 
       return TRUE;
     }
 


@@ -1071,29 +1586,42 @@ elf_s390_adjust_dynamic_symbol (info, h)
 
   /* If there are no references to this symbol that do not use the
      GOT, we don't need to generate a copy reloc.  */
 
   /* If there are no references to this symbol that do not use the
      GOT, we don't need to generate a copy reloc.  */

-  if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0)
+  if (!h->non_got_ref)

     return TRUE;
 
   /* If -z nocopyreloc was given, we won't generate them either.  */
   if (info->nocopyreloc)
     {
     return TRUE;
 
   /* If -z nocopyreloc was given, we won't generate them either.  */
   if (info->nocopyreloc)
     {

-      h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
+      h->non_got_ref = 0;

       return TRUE;
     }
 
       return TRUE;
     }
 

-  eh = (struct elf_s390_link_hash_entry *) h;
-  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+  if (ELIMINATE_COPY_RELOCS)

     {
     {

-      s = p->sec->output_section;
-      if (s != NULL && (s->flags & SEC_READONLY) != 0)
-       break;
+      struct elf_s390_link_hash_entry * eh;
+      struct elf_s390_dyn_relocs *p;
+
+      eh = (struct elf_s390_link_hash_entry *) h;
+      for (p = eh->dyn_relocs; p != NULL; p = p->next)
+       {
+         s = p->sec->output_section;
+         if (s != NULL && (s->flags & SEC_READONLY) != 0)
+           break;
+       }
+
+      /* If we didn't find any dynamic relocs in read-only sections, then
+        we'll be keeping the dynamic relocs and avoiding the copy reloc.  */
+      if (p == NULL)
+       {
+         h->non_got_ref = 0;
+         return TRUE;
+       }

     }
 
     }
 

-  /* If we didn't find any dynamic relocs in read-only sections, then
-     we'll be keeping the dynamic relocs and avoiding the copy reloc.  */
-  if (p == NULL)
+  if (h->size == 0)

     {
     {

-      h->elf_link_hash_flags &= ~ELF_LINK_NON_GOT_REF;
+      (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
+                            h->root.root.string);

       return TRUE;
     }
 
       return TRUE;
     }
 


@@ -1111,49 +1639,18 @@ elf_s390_adjust_dynamic_symbol (info, h)
 
   /* We must generate a R_390_COPY reloc to tell the dynamic linker to
      copy the initial value out of the dynamic object and into the
 
   /* We must generate a R_390_COPY reloc to tell the dynamic linker to
      copy the initial value out of the dynamic object and into the

-     runtime process image.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
-    {
-      htab->srelbss->_raw_size += sizeof (Elf64_External_Rela);
-      h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_COPY;
-    }
-
-  /* We need to figure out the alignment required for this symbol.  I
-     have no idea how ELF linkers handle this.  */
-  power_of_two = bfd_log2 (h->size);
-  if (power_of_two > 3)
-    power_of_two = 3;
-
-  /* Apply the required alignment.  */
-  s = htab->sdynbss;
-  s->_raw_size = BFD_ALIGN (s->_raw_size, (bfd_size_type) (1 << power_of_two));
-  if (power_of_two > bfd_get_section_alignment (htab->elf.dynobj, s))
+     runtime process image.  */
+  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)

     {
     {

-      if (! bfd_set_section_alignment (htab->elf.dynobj, s, power_of_two))
-       return FALSE;
+      htab->srelbss->size += sizeof (Elf64_External_Rela);
+      h->needs_copy = 1;

     }
 
     }
 

-  /* Define the symbol as being at this point in the section.  */
-  h->root.u.def.section = s;
-  h->root.u.def.value = s->_raw_size;
-
-  /* Increment the section size to make room for the symbol.  */
-  s->_raw_size += h->size;
+  s = htab->sdynbss;

 
 

-  return TRUE;
+  return _bfd_elf_adjust_dynamic_copy (h, s);

 }
 
 }
 

-/* This is the condition under which elf_s390_finish_dynamic_symbol
-   will be called from elflink.h.  If elflink.h doesn't call our
-   finish_dynamic_symbol routine, we'll need to do something about
-   initializing any .plt and .got entries in elf_s390_relocate_section.  */
-#define WILL_CALL_FINISH_DYNAMIC_SYMBOL(DYN, INFO, H) \
-  ((DYN)                                                               \
-   && ((INFO)->shared                                                  \
-       || ((H)->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)     \
-   && ((H)->dynindx != -1                                              \
-       || ((H)->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0))
-

 /* Allocate space in .plt, .got and associated reloc sections for
    dynamic relocs.  */
 
 /* Allocate space in .plt, .got and associated reloc sections for
    dynamic relocs.  */
 


@@ -1171,6 +1668,9 @@ allocate_dynrelocs (h, inf)
     return TRUE;
 
   if (h->root.type == bfd_link_hash_warning)
     return TRUE;
 
   if (h->root.type == bfd_link_hash_warning)

+    /* When warning symbols are created, they **replace** the "real"
+       entry in the hash table, thus we never get to see the real
+       symbol in a hash traversal.  So look at it now.  */

     h = (struct elf_link_hash_entry *) h->root.u.i.link;
 
   info = (struct bfd_link_info *) inf;
     h = (struct elf_link_hash_entry *) h->root.u.i.link;
 
   info = (struct bfd_link_info *) inf;


@@ -1182,22 +1682,23 @@ allocate_dynrelocs (h, inf)
       /* Make sure this symbol is output as a dynamic symbol.
         Undefined weak syms won't yet be marked as dynamic.  */
       if (h->dynindx == -1
       /* Make sure this symbol is output as a dynamic symbol.
         Undefined weak syms won't yet be marked as dynamic.  */
       if (h->dynindx == -1

-         && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
+         && !h->forced_local)

        {
        {

-         if (! bfd_elf64_link_record_dynamic_symbol (info, h))
+         if (! bfd_elf_link_record_dynamic_symbol (info, h))

            return FALSE;
        }
 
            return FALSE;
        }
 

-      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info, h))
+      if (info->shared
+         || WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, 0, h))

        {
          asection *s = htab->splt;
 
          /* If this is the first .plt entry, make room for the special
             first entry.  */
        {
          asection *s = htab->splt;
 
          /* If this is the first .plt entry, make room for the special
             first entry.  */

-         if (s->_raw_size == 0)
-           s->_raw_size += PLT_FIRST_ENTRY_SIZE;
+         if (s->size == 0)
+           s->size += PLT_FIRST_ENTRY_SIZE;

 
 

-         h->plt.offset = s->_raw_size;
+         h->plt.offset = s->size;

 
          /* If this symbol is not defined in a regular file, and we are
             not generating a shared library, then set the symbol to this
 
          /* If this symbol is not defined in a regular file, and we are
             not generating a shared library, then set the symbol to this


@@ -1205,54 +1706,90 @@ allocate_dynrelocs (h, inf)
             pointers compare as equal between the normal executable and
             the shared library.  */
          if (! info->shared
             pointers compare as equal between the normal executable and
             the shared library.  */
          if (! info->shared

-             && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
+             && !h->def_regular)

            {
              h->root.u.def.section = s;
              h->root.u.def.value = h->plt.offset;
            }
 
          /* Make room for this entry.  */
            {
              h->root.u.def.section = s;
              h->root.u.def.value = h->plt.offset;
            }
 
          /* Make room for this entry.  */

-         s->_raw_size += PLT_ENTRY_SIZE;
+         s->size += PLT_ENTRY_SIZE;

 
          /* We also need to make an entry in the .got.plt section, which
             will be placed in the .got section by the linker script.  */
 
          /* We also need to make an entry in the .got.plt section, which
             will be placed in the .got section by the linker script.  */

-         htab->sgotplt->_raw_size += GOT_ENTRY_SIZE;
+         htab->sgotplt->size += GOT_ENTRY_SIZE;

 
          /* We also need to make an entry in the .rela.plt section.  */
 
          /* We also need to make an entry in the .rela.plt section.  */

-         htab->srelplt->_raw_size += sizeof (Elf64_External_Rela);
+         htab->srelplt->size += sizeof (Elf64_External_Rela);

        }
       else
        {
          h->plt.offset = (bfd_vma) -1;
        }
       else
        {
          h->plt.offset = (bfd_vma) -1;

-         h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
+         h->needs_plt = 0;
+         elf_s390_adjust_gotplt((struct elf_s390_link_hash_entry *) h);

        }
     }
   else
     {
       h->plt.offset = (bfd_vma) -1;
        }
     }
   else
     {
       h->plt.offset = (bfd_vma) -1;

-      h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
+      h->needs_plt = 0;
+      elf_s390_adjust_gotplt((struct elf_s390_link_hash_entry *) h);

     }
 
     }
 

-  if (h->got.refcount > 0)
+  /* If R_390_TLS_{IE64,GOTIE64,GOTIE12,IEENT} symbol is now local to
+     the binary, we can optimize a bit. IE64 and GOTIE64 get converted
+     to R_390_TLS_LE64 requiring no TLS entry. For GOTIE12 and IEENT
+     we can save the dynamic TLS relocation.  */
+  if (h->got.refcount > 0
+      && !info->shared
+      && h->dynindx == -1
+      && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
+    {
+      if (elf_s390_hash_entry(h)->tls_type == GOT_TLS_IE_NLT)
+       /* For the GOTIE access without a literal pool entry the offset has
+          to be stored somewhere. The immediate value in the instruction
+          is not bit enough so the value is stored in the got.  */
+       {
+         h->got.offset = htab->sgot->size;
+         htab->sgot->size += GOT_ENTRY_SIZE;
+       }
+      else
+       h->got.offset = (bfd_vma) -1;
+    }
+  else if (h->got.refcount > 0)

     {
       asection *s;
       bfd_boolean dyn;
     {
       asection *s;
       bfd_boolean dyn;

+      int tls_type = elf_s390_hash_entry(h)->tls_type;

 
       /* Make sure this symbol is output as a dynamic symbol.
         Undefined weak syms won't yet be marked as dynamic.  */
       if (h->dynindx == -1
 
       /* Make sure this symbol is output as a dynamic symbol.
         Undefined weak syms won't yet be marked as dynamic.  */
       if (h->dynindx == -1

-         && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
+         && !h->forced_local)

        {
        {

-         if (! bfd_elf64_link_record_dynamic_symbol (info, h))
+         if (! bfd_elf_link_record_dynamic_symbol (info, h))

            return FALSE;
        }
 
       s = htab->sgot;
            return FALSE;
        }
 
       s = htab->sgot;

-      h->got.offset = s->_raw_size;
-      s->_raw_size += GOT_ENTRY_SIZE;
+      h->got.offset = s->size;
+      s->size += GOT_ENTRY_SIZE;
+      /* R_390_TLS_GD64 needs 2 consecutive GOT slots.  */
+      if (tls_type == GOT_TLS_GD)
+       s->size += GOT_ENTRY_SIZE;

       dyn = htab->elf.dynamic_sections_created;
       dyn = htab->elf.dynamic_sections_created;

-      if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info, h))
-       htab->srelgot->_raw_size += sizeof (Elf64_External_Rela);
+      /* R_390_TLS_IE64 needs one dynamic relocation,
+        R_390_TLS_GD64 needs one if local symbol and two if global.  */
+      if ((tls_type == GOT_TLS_GD && h->dynindx == -1)
+         || tls_type >= GOT_TLS_IE)
+       htab->srelgot->size += sizeof (Elf64_External_Rela);
+      else if (tls_type == GOT_TLS_GD)
+       htab->srelgot->size += 2 * sizeof (Elf64_External_Rela);
+      else if ((ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
+               || h->root.type != bfd_link_hash_undefweak)
+              && (info->shared
+                  || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h)))
+       htab->srelgot->size += sizeof (Elf64_External_Rela);

     }
   else
     h->got.offset = (bfd_vma) -1;
     }
   else
     h->got.offset = (bfd_vma) -1;


@@ -1269,9 +1806,7 @@ allocate_dynrelocs (h, inf)
 
   if (info->shared)
     {
 
   if (info->shared)
     {

-      if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0
-         && ((h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0
-             || info->symbolic))
+      if (SYMBOL_CALLS_LOCAL (info, h))

        {
          struct elf_s390_dyn_relocs **pp;
 
        {
          struct elf_s390_dyn_relocs **pp;
 


@@ -1285,16 +1820,34 @@ allocate_dynrelocs (h, inf)
                pp = &p->next;
            }
        }
                pp = &p->next;
            }
        }

+
+      /* Also discard relocs on undefined weak syms with non-default
+        visibility.  */
+      if (eh->dyn_relocs != NULL
+         && h->root.type == bfd_link_hash_undefweak)
+       {
+         if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+           eh->dyn_relocs = NULL;
+
+         /* Make sure undefined weak symbols are output as a dynamic
+            symbol in PIEs.  */
+         else if (h->dynindx == -1
+                  && !h->forced_local)
+           {
+             if (! bfd_elf_link_record_dynamic_symbol (info, h))
+               return FALSE;
+           }
+       }

     }
     }

-  else
+  else if (ELIMINATE_COPY_RELOCS)

     {
       /* For the non-shared case, discard space for relocs against
         symbols which turn out to need copy relocs or are not
         dynamic.  */
 
     {
       /* For the non-shared case, discard space for relocs against
         symbols which turn out to need copy relocs or are not
         dynamic.  */
 

-      if ((h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0
-         && (((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-              && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
+      if (!h->non_got_ref
+         && ((h->def_dynamic
+              && !h->def_regular)

              || (htab->elf.dynamic_sections_created
                  && (h->root.type == bfd_link_hash_undefweak
                      || h->root.type == bfd_link_hash_undefined))))
              || (htab->elf.dynamic_sections_created
                  && (h->root.type == bfd_link_hash_undefweak
                      || h->root.type == bfd_link_hash_undefined))))


@@ -1302,9 +1855,9 @@ allocate_dynrelocs (h, inf)
          /* Make sure this symbol is output as a dynamic symbol.
             Undefined weak syms won't yet be marked as dynamic.  */
          if (h->dynindx == -1
          /* Make sure this symbol is output as a dynamic symbol.
             Undefined weak syms won't yet be marked as dynamic.  */
          if (h->dynindx == -1

-             && (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
+             && !h->forced_local)

            {
            {

-             if (! bfd_elf64_link_record_dynamic_symbol (info, h))
+             if (! bfd_elf_link_record_dynamic_symbol (info, h))

                return FALSE;
            }
 
                return FALSE;
            }
 


@@ -1323,7 +1876,7 @@ allocate_dynrelocs (h, inf)
   for (p = eh->dyn_relocs; p != NULL; p = p->next)
     {
       asection *sreloc = elf_section_data (p->sec)->sreloc;
   for (p = eh->dyn_relocs; p != NULL; p = p->next)
     {
       asection *sreloc = elf_section_data (p->sec)->sreloc;

-      sreloc->_raw_size += p->count * sizeof (Elf64_External_Rela);
+      sreloc->size += p->count * sizeof (Elf64_External_Rela);

     }
 
   return TRUE;
     }
 
   return TRUE;


@@ -1381,12 +1934,12 @@ elf_s390_size_dynamic_sections (output_bfd, info)
   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->shared)
+      if (info->executable)

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

-         s->_raw_size = sizeof ELF_DYNAMIC_INTERPRETER;
+         s->size = sizeof ELF_DYNAMIC_INTERPRETER;

          s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
        }
     }
          s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
        }
     }


@@ -1397,21 +1950,19 @@ elf_s390_size_dynamic_sections (output_bfd, info)
     {
       bfd_signed_vma *local_got;
       bfd_signed_vma *end_local_got;
     {
       bfd_signed_vma *local_got;
       bfd_signed_vma *end_local_got;

+      char *local_tls_type;

       bfd_size_type locsymcount;
       Elf_Internal_Shdr *symtab_hdr;
       asection *srela;
 
       bfd_size_type locsymcount;
       Elf_Internal_Shdr *symtab_hdr;
       asection *srela;
 

-      if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour)
+      if (! is_s390_elf (ibfd))

        continue;
 
       for (s = ibfd->sections; s != NULL; s = s->next)
        {
          struct elf_s390_dyn_relocs *p;
 
        continue;
 
       for (s = ibfd->sections; s != NULL; s = s->next)
        {
          struct elf_s390_dyn_relocs *p;
 

-         for (p = *((struct elf_s390_dyn_relocs **)
-                    &elf_section_data (s)->local_dynrel);
-              p != NULL;
-              p = p->next)
+         for (p = elf_section_data (s)->local_dynrel; p != NULL; p = p->next)

            {
              if (!bfd_is_abs_section (p->sec)
                  && bfd_is_abs_section (p->sec->output_section))
            {
              if (!bfd_is_abs_section (p->sec)
                  && bfd_is_abs_section (p->sec->output_section))


@@ -1424,7 +1975,7 @@ elf_s390_size_dynamic_sections (output_bfd, info)
              else if (p->count != 0)
                {
                  srela = elf_section_data (p->sec)->sreloc;
              else if (p->count != 0)
                {
                  srela = elf_section_data (p->sec)->sreloc;

-                 srela->_raw_size += p->count * sizeof (Elf64_External_Rela);
+                 srela->size += p->count * sizeof (Elf64_External_Rela);

                  if ((p->sec->output_section->flags & SEC_READONLY) != 0)
                    info->flags |= DF_TEXTREL;
                }
                  if ((p->sec->output_section->flags & SEC_READONLY) != 0)
                    info->flags |= DF_TEXTREL;
                }


@@ -1435,25 +1986,39 @@ elf_s390_size_dynamic_sections (output_bfd, info)
       if (!local_got)
        continue;
 
       if (!local_got)
        continue;
 

-      symtab_hdr = &elf_tdata (ibfd)->symtab_hdr;
+      symtab_hdr = &elf_symtab_hdr (ibfd);

       locsymcount = symtab_hdr->sh_info;
       end_local_got = local_got + locsymcount;
       locsymcount = symtab_hdr->sh_info;
       end_local_got = local_got + locsymcount;

+      local_tls_type = elf_s390_local_got_tls_type (ibfd);

       s = htab->sgot;
       srela = htab->srelgot;
       s = htab->sgot;
       srela = htab->srelgot;

-      for (; local_got < end_local_got; ++local_got)
+      for (; local_got < end_local_got; ++local_got, ++local_tls_type)

        {
          if (*local_got > 0)
            {
        {
          if (*local_got > 0)
            {

-             *local_got = s->_raw_size;
-             s->_raw_size += GOT_ENTRY_SIZE;
+             *local_got = s->size;
+             s->size += GOT_ENTRY_SIZE;
+             if (*local_tls_type == GOT_TLS_GD)
+               s->size += GOT_ENTRY_SIZE;

              if (info->shared)
              if (info->shared)

-               srela->_raw_size += sizeof (Elf64_External_Rela);
+               srela->size += sizeof (Elf64_External_Rela);

            }
          else
            *local_got = (bfd_vma) -1;
        }
     }
 
            }
          else
            *local_got = (bfd_vma) -1;
        }
     }
 

+  if (htab->tls_ldm_got.refcount > 0)
+    {
+      /* Allocate 2 got entries and 1 dynamic reloc for R_390_TLS_LDM64
+        relocs.  */
+      htab->tls_ldm_got.offset = htab->sgot->size;
+      htab->sgot->size += 2 * GOT_ENTRY_SIZE;
+      htab->srelgot->size += sizeof (Elf64_External_Rela);
+    }
+  else
+    htab->tls_ldm_got.offset = -1;
+

   /* Allocate global sym .plt and .got entries, and space for global
      sym dynamic relocs.  */
   elf_link_hash_traverse (&htab->elf, allocate_dynrelocs, (PTR) info);
   /* Allocate global sym .plt and .got entries, and space for global
      sym dynamic relocs.  */
   elf_link_hash_traverse (&htab->elf, allocate_dynrelocs, (PTR) info);


@@ -1468,14 +2033,15 @@ elf_s390_size_dynamic_sections (output_bfd, info)
 
       if (s == htab->splt
          || s == htab->sgot
 
       if (s == htab->splt
          || s == htab->sgot

-         || s == htab->sgotplt)
+         || s == htab->sgotplt
+         || s == htab->sdynbss)

        {
          /* Strip this section if we don't need it; see the
             comment below.  */
        }
        {
          /* 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->_raw_size != 0 && s != htab->srelplt)
+         if (s->size != 0 && s != htab->srelplt)

            relocs = TRUE;
 
          /* We use the reloc_count field as a counter if we need
            relocs = TRUE;
 
          /* We use the reloc_count field as a counter if we need


@@ -1488,7 +2054,7 @@ elf_s390_size_dynamic_sections (output_bfd, info)
          continue;
        }
 
          continue;
        }
 

-      if (s->_raw_size == 0)
+      if (s->size == 0)

        {
          /* If we don't need this section, strip it from the
             output file.  This is to handle .rela.bss and
        {
          /* If we don't need this section, strip it from the
             output file.  This is to handle .rela.bss and


@@ -1500,16 +2066,19 @@ elf_s390_size_dynamic_sections (output_bfd, info)
             function which decides whether anything needs to go
             into these sections.  */
 
             function which decides whether anything needs to go
             into these sections.  */
 

-         _bfd_strip_section_from_output (info, s);
+         s->flags |= SEC_EXCLUDE;

          continue;
        }
 
          continue;
        }
 

+      if ((s->flags & SEC_HAS_CONTENTS) == 0)
+       continue;
+

       /* Allocate memory for the section contents.  We use bfd_zalloc
         here in case unused entries are not reclaimed before the
         section's contents are written out.  This should not happen,
         but this way if it does, we get a R_390_NONE reloc instead
         of garbage.  */
       /* Allocate memory for the section contents.  We use bfd_zalloc
         here in case unused entries are not reclaimed before the
         section's contents are written out.  This should not happen,
         but this way if it does, we get a R_390_NONE reloc instead
         of garbage.  */

-      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
+      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);

       if (s->contents == NULL)
        return FALSE;
     }
       if (s->contents == NULL)
        return FALSE;
     }


@@ -1522,15 +2091,15 @@ elf_s390_size_dynamic_sections (output_bfd, info)
         the .dynamic section.  The DT_DEBUG entry is filled in by the
         dynamic linker and used by the debugger.  */
 #define add_dynamic_entry(TAG, VAL) \
         the .dynamic section.  The DT_DEBUG entry is filled in by the
         dynamic linker and used by the debugger.  */
 #define add_dynamic_entry(TAG, VAL) \

-  bfd_elf64_add_dynamic_entry (info, (bfd_vma) (TAG), (bfd_vma) (VAL))
+  _bfd_elf_add_dynamic_entry (info, TAG, VAL)

 
 

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

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

-      if (htab->splt->_raw_size != 0)
+      if (htab->splt->size != 0)

        {
          if (!add_dynamic_entry (DT_PLTGOT, 0)
              || !add_dynamic_entry (DT_PLTRELSZ, 0)
        {
          if (!add_dynamic_entry (DT_PLTGOT, 0)
              || !add_dynamic_entry (DT_PLTRELSZ, 0)


@@ -1564,6 +2133,57 @@ elf_s390_size_dynamic_sections (output_bfd, info)
   return TRUE;
 }
 
   return TRUE;
 }
 

+/* Return the base VMA address which should be subtracted from real addresses
+   when resolving @dtpoff relocation.
+   This is PT_TLS segment p_vaddr.  */
+
+static bfd_vma
+dtpoff_base (info)
+     struct bfd_link_info *info;
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return 0;
+  return elf_hash_table (info)->tls_sec->vma;
+}
+
+/* Return the relocation value for @tpoff relocation
+   if STT_TLS virtual address is ADDRESS.  */
+
+static bfd_vma
+tpoff (info, address)
+     struct bfd_link_info *info;
+     bfd_vma address;
+{
+  struct elf_link_hash_table *htab = elf_hash_table (info);
+
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (htab->tls_sec == NULL)
+    return 0;
+  return htab->tls_size + htab->tls_sec->vma - address;
+}
+
+/* Complain if TLS instruction relocation is against an invalid
+   instruction.  */
+
+static void
+invalid_tls_insn (input_bfd, input_section, rel)
+     bfd *input_bfd;
+     asection *input_section;
+     Elf_Internal_Rela *rel;
+{
+  reloc_howto_type *howto;
+
+  howto = elf_howto_table + ELF64_R_TYPE (rel->r_info);
+  (*_bfd_error_handler)
+    (_("%B(%A+0x%lx): invalid instruction for TLS relocation %s"),
+     input_bfd,
+     input_section,
+     (long) rel->r_offset,
+     howto->name);
+  bfd_set_error (bfd_error_bad_value);
+}
+

 /* Relocate a 390 ELF section.  */
 
 static bfd_boolean
 /* Relocate a 390 ELF section.  */
 
 static bfd_boolean


@@ -1585,11 +2205,10 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *rel;
   Elf_Internal_Rela *relend;
 
   Elf_Internal_Rela *rel;
   Elf_Internal_Rela *relend;
 

-  if (info->relocateable)
-    return TRUE;
+  BFD_ASSERT (is_s390_elf (input_bfd));

 
   htab = elf_s390_hash_table (info);
 
   htab = elf_s390_hash_table (info);

-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+  symtab_hdr = &elf_symtab_hdr (input_bfd);

   sym_hashes = elf_sym_hashes (input_bfd);
   local_got_offsets = elf_local_got_offsets (input_bfd);
 
   sym_hashes = elf_sym_hashes (input_bfd);
   local_got_offsets = elf_local_got_offsets (input_bfd);
 


@@ -1597,7 +2216,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
   relend = relocs + input_section->reloc_count;
   for (; rel < relend; rel++)
     {
   relend = relocs + input_section->reloc_count;
   for (; rel < relend; rel++)
     {

-      int r_type;
+      unsigned int r_type;

       reloc_howto_type *howto;
       unsigned long r_symndx;
       struct elf_link_hash_entry *h;
       reloc_howto_type *howto;
       unsigned long r_symndx;
       struct elf_link_hash_entry *h;


@@ -1607,12 +2226,13 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
       bfd_vma relocation;
       bfd_boolean unresolved_reloc;
       bfd_reloc_status_type r;
       bfd_vma relocation;
       bfd_boolean unresolved_reloc;
       bfd_reloc_status_type r;

+      int tls_type;

 
       r_type = ELF64_R_TYPE (rel->r_info);
       if (r_type == (int) R_390_GNU_VTINHERIT
          || r_type == (int) R_390_GNU_VTENTRY)
        continue;
 
       r_type = ELF64_R_TYPE (rel->r_info);
       if (r_type == (int) R_390_GNU_VTINHERIT
          || r_type == (int) R_390_GNU_VTENTRY)
        continue;

-      if (r_type < 0 || r_type >= (int) R_390_max)
+      if (r_type >= (int) R_390_max)

        {
          bfd_set_error (bfd_error_bad_value);
          return FALSE;
        {
          bfd_set_error (bfd_error_bad_value);
          return FALSE;


@@ -1620,6 +2240,7 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 
       howto = elf_howto_table + r_type;
       r_symndx = ELF64_R_SYM (rel->r_info);
 
       howto = elf_howto_table + r_type;
       r_symndx = ELF64_R_SYM (rel->r_info);

+

       h = NULL;
       sym = NULL;
       sec = NULL;
       h = NULL;
       sym = NULL;
       sec = NULL;


@@ -1628,56 +2249,72 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
        {
          sym = local_syms + r_symndx;
          sec = local_sections[r_symndx];
        {
          sym = local_syms + r_symndx;
          sec = local_sections[r_symndx];

-         relocation = _bfd_elf_rela_local_sym (output_bfd, sym, sec, rel);
+         relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);

        }
       else
        {
        }
       else
        {

-         h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-         while (h->root.type == bfd_link_hash_indirect
-                || h->root.type == bfd_link_hash_warning)
-           h = (struct elf_link_hash_entry *) h->root.u.i.link;
+         bfd_boolean warned ATTRIBUTE_UNUSED;

 
 

-         if (h->root.type == bfd_link_hash_defined
-             || h->root.type == bfd_link_hash_defweak)
-           {
-             sec = h->root.u.def.section;
-             if (sec->output_section == NULL)
-               {
-                 /* Set a flag that will be cleared later if we find a
-                    relocation value for this symbol.  output_section
-                    is typically NULL for symbols satisfied by a shared
-                    library.  */
-                 unresolved_reloc = TRUE;
-                 relocation = 0;
-               }
-             else
-               relocation = (h->root.u.def.value
-                             + sec->output_section->vma
-                             + sec->output_offset);
-           }
-         else if (h->root.type == bfd_link_hash_undefweak)
-           relocation = 0;
-         else if (info->shared
-                  && (!info->symbolic || info->allow_shlib_undefined)
-                  && !info->no_undefined
-                  && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)
-           relocation = 0;
-         else
-           {
-             if (! ((*info->callbacks->undefined_symbol)
-                    (info, h->root.root.string, input_bfd,
-                     input_section, rel->r_offset,
-                     (!info->shared || info->no_undefined
-                      || ELF_ST_VISIBILITY (h->other)))))
-               return FALSE;
-             relocation = 0;
-           }
+         RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+                                  r_symndx, symtab_hdr, sym_hashes,
+                                  h, sec, relocation,
+                                  unresolved_reloc, warned);
+       }
+
+      if (sec != NULL && elf_discarded_section (sec))
+       {
+         /* For relocs against symbols from removed linkonce sections,
+            or sections discarded by a linker script, we just want the
+            section contents zeroed.  Avoid any special processing.  */
+         _bfd_clear_contents (howto, input_bfd, contents + rel->r_offset);
+         rel->r_info = 0;
+         rel->r_addend = 0;
+         continue;

        }
 
        }
 

+      if (info->relocatable)
+       continue;
+

       switch (r_type)
        {
       switch (r_type)
        {

+       case R_390_GOTPLT12:
+       case R_390_GOTPLT16:
+       case R_390_GOTPLT20:
+       case R_390_GOTPLT32:
+       case R_390_GOTPLT64:
+       case R_390_GOTPLTENT:
+         /* There are three cases for a GOTPLT relocation. 1) The
+            relocation is against the jump slot entry of a plt that
+            will get emitted to the output file. 2) The relocation
+            is against the jump slot of a plt entry that has been
+            removed. elf_s390_adjust_gotplt has created a GOT entry
+            as replacement. 3) The relocation is against a local symbol.
+            Cases 2) and 3) are the same as the GOT relocation code
+            so we just have to test for case 1 and fall through for
+            the other two.  */
+         if (h != NULL && h->plt.offset != (bfd_vma) -1)
+           {
+             bfd_vma plt_index;
+
+             /* Calc. index no.
+                Current offset - size first entry / entry size.  */
+             plt_index = (h->plt.offset - PLT_FIRST_ENTRY_SIZE) /
+               PLT_ENTRY_SIZE;
+
+             /* Offset in GOT is PLT index plus GOT headers(3) times 4,
+                addr & GOT addr.  */
+             relocation = (plt_index + 3) * GOT_ENTRY_SIZE;
+             unresolved_reloc = FALSE;
+
+             if (r_type == R_390_GOTPLTENT)
+               relocation += htab->sgot->output_section->vma;
+             break;
+           }
+         /* Fall through.  */
+

        case R_390_GOT12:
        case R_390_GOT16:
        case R_390_GOT12:
        case R_390_GOT16:

+       case R_390_GOT20:

        case R_390_GOT32:
        case R_390_GOT64:
        case R_390_GOTENT:
        case R_390_GOT32:
        case R_390_GOT64:
        case R_390_GOTENT:


@@ -1692,12 +2329,11 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 
              off = h->got.offset;
              dyn = htab->elf.dynamic_sections_created;
 
              off = h->got.offset;
              dyn = htab->elf.dynamic_sections_created;

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

                  || (info->shared
                  || (info->shared

-                     && (info->symbolic
-                         || h->dynindx == -1
-                         || (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL))
-                     && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)))
+                     && SYMBOL_REFERENCES_LOCAL (info, h))
+                 || (ELF_ST_VISIBILITY (h->other)
+                     && h->root.type == bfd_link_hash_undefweak))

                {
                  /* This is actually a static link, or it is a
                     -Bsymbolic link and the symbol is defined
                {
                  /* This is actually a static link, or it is a
                     -Bsymbolic link and the symbol is defined


@@ -1769,18 +2405,19 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 
          relocation = htab->sgot->output_offset + off;
 
 
          relocation = htab->sgot->output_offset + off;
 

-         /*
-          * For @GOTENT the relocation is against the offset between
-          * the instruction and the symbols entry in the GOT and not
-          * between the start of the GOT and the symbols entry. We
-          * add the vma of the GOT to get the correct value.
-          */
-         if (r_type == R_390_GOTENT)
+         /* For @GOTENT the relocation is against the offset between
+            the instruction and the symbols entry in the GOT and not
+            between the start of the GOT and the symbols entry. We
+            add the vma of the GOT to get the correct value.  */
+         if (   r_type == R_390_GOTENT
+             || r_type == R_390_GOTPLTENT)

            relocation += htab->sgot->output_section->vma;
 
          break;
 
            relocation += htab->sgot->output_section->vma;
 
          break;
 

-       case R_390_GOTOFF:
+       case R_390_GOTOFF16:
+       case R_390_GOTOFF32:
+       case R_390_GOTOFF64:

          /* Relocation is relative to the start of the global offset
             table.  */
 
          /* Relocation is relative to the start of the global offset
             table.  */
 


@@ -1790,7 +2427,6 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
             permitted by the ABI, we might have to change this
             calculation.  */
          relocation -= htab->sgot->output_section->vma;
             permitted by the ABI, we might have to change this
             calculation.  */
          relocation -= htab->sgot->output_section->vma;

-

          break;
 
        case R_390_GOTPC:
          break;
 
        case R_390_GOTPC:


@@ -1827,6 +2463,29 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
          unresolved_reloc = FALSE;
          break;
 
          unresolved_reloc = FALSE;
          break;
 

+       case R_390_PLTOFF16:
+       case R_390_PLTOFF32:
+       case R_390_PLTOFF64:
+         /* Relocation is to the entry for this symbol in the
+            procedure linkage table relative to the start of the GOT.  */
+
+         /* For local symbols or if we didn't make a PLT entry for
+            this symbol resolve the symbol directly.  */
+         if (   h == NULL
+             || h->plt.offset == (bfd_vma) -1
+             || htab->splt == NULL)
+           {
+             relocation -= htab->sgot->output_section->vma;
+             break;
+           }
+
+         relocation = (htab->splt->output_section->vma
+                       + htab->splt->output_offset
+                       + h->plt.offset
+                       - htab->sgot->output_section->vma);
+         unresolved_reloc = FALSE;
+         break;
+

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


@@ -1836,32 +2495,26 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
        case R_390_PC32:
        case R_390_PC32DBL:
        case R_390_PC64:
        case R_390_PC32:
        case R_390_PC32DBL:
        case R_390_PC64:

-         /* r_symndx will be zero only for relocs against symbols
-            from removed linkonce sections, or sections discarded by
-            a linker script.  */
-         if (r_symndx == 0
-             || (input_section->flags & SEC_ALLOC) == 0)
+         if ((input_section->flags & SEC_ALLOC) == 0)

            break;
 
          if ((info->shared
            break;
 
          if ((info->shared

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

               && ((r_type != R_390_PC16
                    && r_type != R_390_PC16DBL
                    && r_type != R_390_PC32
                    && r_type != R_390_PC32DBL
                    && r_type != R_390_PC64)
               && ((r_type != R_390_PC16
                    && r_type != R_390_PC16DBL
                    && r_type != R_390_PC32
                    && r_type != R_390_PC32DBL
                    && r_type != R_390_PC64)

-                  || (h != NULL
-                      && h->dynindx != -1
-                      && (! info->symbolic
-                          || (h->elf_link_hash_flags
-                              & ELF_LINK_HASH_DEF_REGULAR) == 0))))
-             || (!info->shared
+                  || !SYMBOL_CALLS_LOCAL (info, h)))
+             || (ELIMINATE_COPY_RELOCS
+                 && !info->shared

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

-                 && (h->elf_link_hash_flags & ELF_LINK_NON_GOT_REF) == 0
-                 && (((h->elf_link_hash_flags
-                       & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-                      && (h->elf_link_hash_flags
-                          & ELF_LINK_HASH_DEF_REGULAR) == 0)
+                 && !h->non_got_ref
+                 && ((h->def_dynamic
+                      && !h->def_regular)

                      || h->root.type == bfd_link_hash_undefweak
                      || h->root.type == bfd_link_hash_undefined)))
            {
                      || h->root.type == bfd_link_hash_undefweak
                      || h->root.type == bfd_link_hash_undefined)))
            {


@@ -1873,7 +2526,6 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
              /* When generating a shared object, these relocations
                 are copied into the output file to be resolved at run
                 time.  */
              /* When generating a shared object, these relocations
                 are copied into the output file to be resolved at run
                 time.  */

-

              skip = FALSE;
              relocate = FALSE;
 
              skip = FALSE;
              relocate = FALSE;
 


@@ -1898,9 +2550,8 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
                           || r_type == R_390_PC32DBL
                           || r_type == R_390_PC64
                           || !info->shared
                           || r_type == R_390_PC32DBL
                           || r_type == R_390_PC64
                           || !info->shared

-                          || !info->symbolic
-                          || (h->elf_link_hash_flags
-                              & ELF_LINK_HASH_DEF_REGULAR) == 0))
+                          || !SYMBOLIC_BIND (info, h)
+                          || !h->def_regular))

                {
                  outrel.r_info = ELF64_R_INFO (h->dynindx, r_type);
                  outrel.r_addend = rel->r_addend;
                {
                  outrel.r_info = ELF64_R_INFO (h->dynindx, r_type);
                  outrel.r_addend = rel->r_addend;


@@ -1908,9 +2559,46 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
              else
                {
                  /* This symbol is local, or marked to become local.  */
              else
                {
                  /* This symbol is local, or marked to become local.  */

-                 relocate = TRUE;
-                 outrel.r_info = ELF64_R_INFO (0, R_390_RELATIVE);

                  outrel.r_addend = relocation + rel->r_addend;
                  outrel.r_addend = relocation + rel->r_addend;

+                 if (r_type == R_390_64)
+                   {
+                     relocate = TRUE;
+                     outrel.r_info = ELF64_R_INFO (0, R_390_RELATIVE);
+                   }
+                 else
+                   {
+                     long sindx;
+
+                     if (bfd_is_abs_section (sec))
+                       sindx = 0;
+                     else if (sec == NULL || sec->owner == NULL)
+                       {
+                         bfd_set_error(bfd_error_bad_value);
+                         return FALSE;
+                       }
+                     else
+                       {
+                         asection *osec;
+
+                         osec = sec->output_section;
+                         sindx = elf_section_data (osec)->dynindx;
+
+                         if (sindx == 0)
+                           {
+                             osec = htab->elf.text_index_section;
+                             sindx = elf_section_data (osec)->dynindx;
+                           }
+                         BFD_ASSERT (sindx != 0);
+
+                         /* We are turning this relocation into one
+                            against a section symbol, so subtract out
+                            the output section's address but not the
+                            offset of the input section in the output
+                            section.  */
+                         outrel.r_addend -= osec->vma;
+                       }
+                     outrel.r_info = ELF64_R_INFO (sindx, r_type);
+                   }

                }
 
              sreloc = elf_section_data (input_section)->sreloc;
                }
 
              sreloc = elf_section_data (input_section)->sreloc;


@@ -1931,6 +2619,347 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
 
          break;
 
 
          break;
 

+         /* Relocations for tls literal pool entries.  */
+       case R_390_TLS_IE64:
+         if (info->shared)
+           {
+             Elf_Internal_Rela outrel;
+             asection *sreloc;
+             bfd_byte *loc;
+
+             outrel.r_offset = rel->r_offset
+                               + input_section->output_section->vma
+                               + input_section->output_offset;
+             outrel.r_info = ELF64_R_INFO (0, R_390_RELATIVE);
+             sreloc = elf_section_data (input_section)->sreloc;
+             if (sreloc == NULL)
+               abort ();
+             loc = sreloc->contents;
+             loc += sreloc->reloc_count++ * sizeof (Elf64_External_Rela);
+             bfd_elf64_swap_reloc_out (output_bfd, &outrel, loc);
+           }
+         /* Fall through.  */
+
+       case R_390_TLS_GD64:
+       case R_390_TLS_GOTIE64:
+         r_type = elf_s390_tls_transition (info, r_type, h == NULL);
+         tls_type = GOT_UNKNOWN;
+         if (h == NULL && local_got_offsets)
+           tls_type = elf_s390_local_got_tls_type (input_bfd) [r_symndx];
+         else if (h != NULL)
+           {
+             tls_type = elf_s390_hash_entry(h)->tls_type;
+             if (!info->shared && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
+               r_type = R_390_TLS_LE64;
+           }
+         if (r_type == R_390_TLS_GD64 && tls_type >= GOT_TLS_IE)
+           r_type = R_390_TLS_IE64;
+
+         if (r_type == R_390_TLS_LE64)
+           {
+             /* This relocation gets optimized away by the local exec
+                access optimization.  */
+             BFD_ASSERT (! unresolved_reloc);
+             bfd_put_64 (output_bfd, -tpoff (info, relocation),
+                         contents + rel->r_offset);
+             continue;
+           }
+
+         if (htab->sgot == NULL)
+           abort ();
+
+         if (h != NULL)
+           off = h->got.offset;
+         else
+           {
+             if (local_got_offsets == NULL)
+               abort ();
+
+             off = local_got_offsets[r_symndx];
+           }
+
+       emit_tls_relocs:
+
+         if ((off & 1) != 0)
+           off &= ~1;
+         else
+           {
+             Elf_Internal_Rela outrel;
+             bfd_byte *loc;
+             int dr_type, indx;
+
+             if (htab->srelgot == NULL)
+               abort ();
+
+             outrel.r_offset = (htab->sgot->output_section->vma
+                                + htab->sgot->output_offset + off);
+
+             indx = h && h->dynindx != -1 ? h->dynindx : 0;
+             if (r_type == R_390_TLS_GD64)
+               dr_type = R_390_TLS_DTPMOD;
+             else
+               dr_type = R_390_TLS_TPOFF;
+             if (dr_type == R_390_TLS_TPOFF && indx == 0)
+               outrel.r_addend = relocation - dtpoff_base (info);
+             else
+               outrel.r_addend = 0;
+             outrel.r_info = ELF64_R_INFO (indx, dr_type);
+             loc = htab->srelgot->contents;
+             loc += htab->srelgot->reloc_count++
+               * sizeof (Elf64_External_Rela);
+             bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
+
+             if (r_type == R_390_TLS_GD64)
+               {
+                 if (indx == 0)
+                   {
+                     BFD_ASSERT (! unresolved_reloc);
+                     bfd_put_64 (output_bfd,
+                                 relocation - dtpoff_base (info),
+                                 htab->sgot->contents + off + GOT_ENTRY_SIZE);
+                   }
+                 else
+                   {
+                     outrel.r_info = ELF64_R_INFO (indx, R_390_TLS_DTPOFF);
+                     outrel.r_offset += GOT_ENTRY_SIZE;
+                     outrel.r_addend = 0;
+                     htab->srelgot->reloc_count++;
+                     loc += sizeof (Elf64_External_Rela);
+                     bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
+                   }
+               }
+
+             if (h != NULL)
+               h->got.offset |= 1;
+             else
+               local_got_offsets[r_symndx] |= 1;
+           }
+
+         if (off >= (bfd_vma) -2)
+           abort ();
+         if (r_type == ELF64_R_TYPE (rel->r_info))
+           {
+             relocation = htab->sgot->output_offset + off;
+             if (r_type == R_390_TLS_IE64 || r_type == R_390_TLS_IEENT)
+               relocation += htab->sgot->output_section->vma;
+             unresolved_reloc = FALSE;
+           }
+         else
+           {
+             bfd_put_64 (output_bfd, htab->sgot->output_offset + off,
+                         contents + rel->r_offset);
+             continue;
+           }
+         break;
+
+       case R_390_TLS_GOTIE12:
+       case R_390_TLS_GOTIE20:
+       case R_390_TLS_IEENT:
+         if (h == NULL)
+           {
+             if (local_got_offsets == NULL)
+               abort();
+             off = local_got_offsets[r_symndx];
+             if (info->shared)
+               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)
+               goto emit_tls_relocs;
+           }
+
+         if (htab->sgot == NULL)
+           abort ();
+
+         BFD_ASSERT (! unresolved_reloc);
+         bfd_put_64 (output_bfd, -tpoff (info, relocation),
+                     htab->sgot->contents + off);
+         relocation = htab->sgot->output_offset + off;
+         if (r_type == R_390_TLS_IEENT)
+           relocation += htab->sgot->output_section->vma;
+         unresolved_reloc = FALSE;
+         break;
+
+       case R_390_TLS_LDM64:
+         if (! info->shared)
+           /* 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.  */
+           continue;
+
+         if (htab->sgot == NULL)
+           abort ();
+
+         off = htab->tls_ldm_got.offset;
+         if (off & 1)
+           off &= ~1;
+         else
+           {
+             Elf_Internal_Rela outrel;
+             bfd_byte *loc;
+
+             if (htab->srelgot == NULL)
+               abort ();
+
+             outrel.r_offset = (htab->sgot->output_section->vma
+                                + htab->sgot->output_offset + off);
+
+             bfd_put_64 (output_bfd, 0,
+                         htab->sgot->contents + off + GOT_ENTRY_SIZE);
+             outrel.r_info = ELF64_R_INFO (0, R_390_TLS_DTPMOD);
+             outrel.r_addend = 0;
+             loc = htab->srelgot->contents;
+             loc += htab->srelgot->reloc_count++
+               * sizeof (Elf64_External_Rela);
+             bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
+             htab->tls_ldm_got.offset |= 1;
+           }
+         relocation = htab->sgot->output_offset + off;
+         unresolved_reloc = FALSE;
+         break;
+
+       case R_390_TLS_LE64:
+         if (info->shared)
+           {
+             /* Linking a shared library with non-fpic code requires
+                a R_390_TLS_TPOFF relocation.  */
+             Elf_Internal_Rela outrel;
+             asection *sreloc;
+             bfd_byte *loc;
+             int indx;
+
+             outrel.r_offset = rel->r_offset
+                               + input_section->output_section->vma
+                               + input_section->output_offset;
+             if (h != NULL && h->dynindx != -1)
+               indx = h->dynindx;
+             else
+               indx = 0;
+             outrel.r_info = ELF64_R_INFO (indx, R_390_TLS_TPOFF);
+             if (indx == 0)
+               outrel.r_addend = relocation - dtpoff_base (info);
+             else
+               outrel.r_addend = 0;
+             sreloc = elf_section_data (input_section)->sreloc;
+             if (sreloc == NULL)
+               abort ();
+             loc = sreloc->contents;
+             loc += sreloc->reloc_count++ * sizeof (Elf64_External_Rela);
+             bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
+           }
+         else
+           {
+             BFD_ASSERT (! unresolved_reloc);
+             bfd_put_64 (output_bfd, -tpoff (info, relocation),
+                         contents + rel->r_offset);
+           }
+         continue;
+
+       case R_390_TLS_LDO64:
+         if (info->shared)
+           relocation -= dtpoff_base (info);
+         else
+           /* When converting LDO to LE, we must negate.  */
+           relocation = -tpoff (info, relocation);
+         break;
+
+         /* Relocations for tls instructions.  */
+       case R_390_TLS_LOAD:
+       case R_390_TLS_GDCALL:
+       case R_390_TLS_LDCALL:
+         tls_type = GOT_UNKNOWN;
+         if (h == NULL && local_got_offsets)
+           tls_type = elf_s390_local_got_tls_type (input_bfd) [r_symndx];
+         else if (h != NULL)
+           tls_type = elf_s390_hash_entry(h)->tls_type;
+
+         if (tls_type == GOT_TLS_GD)
+           continue;
+
+         if (r_type == R_390_TLS_LOAD)
+           {
+             if (!info->shared && (h == NULL || h->dynindx == -1))
+               {
+                 /* IE->LE transition. Four valid cases:
+                    lg %rx,(0,%ry)    -> sllg %rx,%ry,0
+                    lg %rx,(%ry,0)    -> sllg %rx,%ry,0
+                    lg %rx,(%ry,%r12) -> sllg %rx,%ry,0
+                    lg %rx,(%r12,%ry) -> sllg %rx,%ry,0  */
+                 unsigned int insn0, insn1, ry;
+
+                 insn0 = bfd_get_32 (input_bfd, contents + rel->r_offset);
+                 insn1 = bfd_get_16 (input_bfd, contents + rel->r_offset + 4);
+                 if (insn1 != 0x0004)
+                   invalid_tls_insn (input_bfd, input_section, rel);
+                 ry = 0;
+                 if ((insn0 & 0xff00f000) == 0xe3000000)
+                   /* lg %rx,0(%ry,0) -> sllg %rx,%ry,0  */
+                   ry = (insn0 & 0x000f0000);
+                 else if ((insn0 & 0xff0f0000) == 0xe3000000)
+                   /* lg %rx,0(0,%ry) -> sllg %rx,%ry,0  */
+                   ry = (insn0 & 0x0000f000) << 4;
+                 else if ((insn0 & 0xff00f000) == 0xe300c000)
+                   /* lg %rx,0(%ry,%r12) -> sllg %rx,%ry,0  */
+                   ry = (insn0 & 0x000f0000);
+                 else if ((insn0 & 0xff0f0000) == 0xe30c0000)
+                   /* lg %rx,0(%r12,%ry) -> sllg %rx,%ry,0  */
+                   ry = (insn0 & 0x0000f000) << 4;
+                 else
+                   invalid_tls_insn (input_bfd, input_section, rel);
+                 insn0 = 0xeb000000 | (insn0 & 0x00f00000) | ry;
+                 insn1 = 0x000d;
+                 bfd_put_32 (output_bfd, insn0, contents + rel->r_offset);
+                 bfd_put_16 (output_bfd, insn1, contents + rel->r_offset + 4);
+               }
+           }
+         else if (r_type == R_390_TLS_GDCALL)
+           {
+             unsigned int insn0, insn1;
+
+             insn0 = bfd_get_32 (input_bfd, contents + rel->r_offset);
+             insn1 = bfd_get_16 (input_bfd, contents + rel->r_offset + 4);
+             if ((insn0 & 0xffff0000) != 0xc0e50000)
+               invalid_tls_insn (input_bfd, input_section, rel);
+             if (!info->shared && (h == NULL || h->dynindx == -1))
+               {
+                 /* GD->LE transition.
+                    brasl %r14,__tls_get_addr@plt -> brcl 0,. */
+                 insn0 = 0xc0040000;
+                 insn1 = 0x0000;
+               }
+             else
+               {
+                 /* GD->IE transition.
+                    brasl %r14,__tls_get_addr@plt -> lg %r2,0(%r2,%r12)  */
+                 insn0 = 0xe322c000;
+                 insn1 = 0x0004;
+               }
+             bfd_put_32 (output_bfd, insn0, contents + rel->r_offset);
+             bfd_put_16 (output_bfd, insn1, contents + rel->r_offset + 4);
+           }
+         else if (r_type == R_390_TLS_LDCALL)
+           {
+             if (!info->shared)
+               {
+                 unsigned int insn0, insn1;
+
+                 insn0 = bfd_get_32 (input_bfd, contents + rel->r_offset);
+                 insn1 = bfd_get_16 (input_bfd, contents + rel->r_offset + 4);
+                 if ((insn0 & 0xffff0000) != 0xc0e50000)
+                   invalid_tls_insn (input_bfd, input_section, rel);
+                 /* LD->LE transition.
+                    brasl %r14,__tls_get_addr@plt -> brcl 0,. */
+                 insn0 = 0xc0040000;
+                 insn1 = 0x0000;
+                 bfd_put_32 (output_bfd, insn0, contents + rel->r_offset);
+                 bfd_put_16 (output_bfd, insn1, contents + rel->r_offset + 4);
+               }
+           }
+         continue;
+

        default:
          break;
        }
        default:
          break;
        }


@@ -1940,15 +2969,28 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
         not process them.  */
       if (unresolved_reloc
          && !((input_section->flags & SEC_DEBUGGING) != 0
         not process them.  */
       if (unresolved_reloc
          && !((input_section->flags & SEC_DEBUGGING) != 0

-              && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0))
+              && h->def_dynamic))

        (*_bfd_error_handler)
        (*_bfd_error_handler)

-         (_("%s(%s+0x%lx): unresolvable relocation against symbol `%s'"),
-          bfd_archive_filename (input_bfd),
-          bfd_get_section_name (input_bfd, input_section),
+         (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+          input_bfd,
+          input_section,

           (long) rel->r_offset,
           (long) rel->r_offset,

+          howto->name,

           h->root.root.string);
 
           h->root.root.string);
 

-      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+      if (r_type == R_390_20
+         || r_type == R_390_GOT20
+         || r_type == R_390_GOTPLT20
+         || r_type == R_390_TLS_GOTIE20)
+       {
+         relocation += rel->r_addend;
+         relocation = (relocation&0xfff) << 8 | (relocation&0xff000) >> 12;
+         r = _bfd_final_link_relocate (howto, input_bfd, input_section,
+                                       contents, rel->r_offset,
+                                       relocation, 0);
+       }
+      else
+       r = _bfd_final_link_relocate (howto, input_bfd, input_section,

                                      contents, rel->r_offset,
                                      relocation, rel->r_addend);
 
                                      contents, rel->r_offset,
                                      relocation, rel->r_addend);
 


@@ -1973,16 +3015,16 @@ elf_s390_relocate_section (output_bfd, info, input_bfd, input_section,
            {
 
              if (! ((*info->callbacks->reloc_overflow)
            {
 
              if (! ((*info->callbacks->reloc_overflow)

-                    (info, name, howto->name, (bfd_vma) 0,
-                     input_bfd, input_section, rel->r_offset)))
+                    (info, (h ? &h->root : NULL), name, howto->name,
+                     (bfd_vma) 0, input_bfd, input_section,
+                     rel->r_offset)))

                return FALSE;
            }
          else
            {
              (*_bfd_error_handler)
                return FALSE;
            }
          else
            {
              (*_bfd_error_handler)

-               (_("%s(%s+0x%lx): reloc against `%s': error %d"),
-                bfd_archive_filename (input_bfd),
-                bfd_get_section_name (input_bfd, input_section),
+               (_("%B(%A+0x%lx): reloc against `%s': error %d"),
+                input_bfd, input_section,

                 (long) rel->r_offset, name, (int) r);
              return FALSE;
            }
                 (long) rel->r_offset, name, (int) r);
              return FALSE;
            }


@@ -2079,7 +3121,7 @@ elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
       loc = htab->srelplt->contents + plt_index * sizeof (Elf64_External_Rela);
       bfd_elf64_swap_reloca_out (output_bfd, &rela, loc);
 
       loc = htab->srelplt->contents + plt_index * sizeof (Elf64_External_Rela);
       bfd_elf64_swap_reloca_out (output_bfd, &rela, loc);
 

-      if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
+      if (!h->def_regular)

        {
          /* Mark the symbol as undefined, rather than as defined in
             the .plt section.  Leave the value alone.  This is a clue
        {
          /* Mark the symbol as undefined, rather than as defined in
             the .plt section.  Leave the value alone.  This is a clue


@@ -2090,14 +3132,16 @@ elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
        }
     }
 
        }
     }
 

-  if (h->got.offset != (bfd_vma) -1)
+  if (h->got.offset != (bfd_vma) -1
+      && elf_s390_hash_entry(h)->tls_type != GOT_TLS_GD
+      && elf_s390_hash_entry(h)->tls_type != GOT_TLS_IE
+      && elf_s390_hash_entry(h)->tls_type != GOT_TLS_IE_NLT)

     {
       Elf_Internal_Rela rela;
       bfd_byte *loc;
 
       /* This symbol has an entry in the global offset table.  Set it
         up.  */
     {
       Elf_Internal_Rela rela;
       bfd_byte *loc;
 
       /* This symbol has an entry in the global offset table.  Set it
         up.  */

-

       if (htab->sgot == NULL || htab->srelgot == NULL)
        abort ();
 
       if (htab->sgot == NULL || htab->srelgot == NULL)
        abort ();
 


@@ -2111,11 +3155,10 @@ elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
         The entry in the global offset table will already have been
         initialized in the relocate_section function.  */
       if (info->shared
         The entry in the global offset table will already have been
         initialized in the relocate_section function.  */
       if (info->shared

-         && (info->symbolic
-             || h->dynindx == -1
-             || (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL))
-         && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR))
+         && SYMBOL_REFERENCES_LOCAL (info, h))

        {
        {

+         if (!h->def_regular)
+           return FALSE;

          BFD_ASSERT((h->got.offset & 1) != 0);
          rela.r_info = ELF64_R_INFO (0, R_390_RELATIVE);
          rela.r_addend = (h->root.u.def.value
          BFD_ASSERT((h->got.offset & 1) != 0);
          rela.r_info = ELF64_R_INFO (0, R_390_RELATIVE);
          rela.r_addend = (h->root.u.def.value


@@ -2135,7 +3178,7 @@ elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
       bfd_elf64_swap_reloca_out (output_bfd, &rela, loc);
     }
 
       bfd_elf64_swap_reloca_out (output_bfd, &rela, loc);
     }
 

-  if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_COPY) != 0)
+  if (h->needs_copy)

     {
       Elf_Internal_Rela rela;
       bfd_byte *loc;
     {
       Elf_Internal_Rela rela;
       bfd_byte *loc;


@@ -2160,8 +3203,8 @@ elf_s390_finish_dynamic_symbol (output_bfd, info, h, sym)
 
   /* Mark some specially defined symbols as absolute.  */
   if (strcmp (h->root.root.string, "_DYNAMIC") == 0
 
   /* Mark some specially defined symbols as absolute.  */
   if (strcmp (h->root.root.string, "_DYNAMIC") == 0

-      || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0
-      || strcmp (h->root.root.string, "_PROCEDURE_LINKAGE_TABLE_") == 0)
+      || h == htab->elf.hgot
+      || h == htab->elf.hplt)

     sym->st_shndx = SHN_ABS;
 
   return TRUE;
     sym->st_shndx = SHN_ABS;
 
   return TRUE;


@@ -2210,7 +3253,7 @@ elf_s390_finish_dynamic_sections (output_bfd, info)
        abort ();
 
       dyncon = (Elf64_External_Dyn *) sdyn->contents;
        abort ();
 
       dyncon = (Elf64_External_Dyn *) sdyn->contents;

-      dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->_raw_size);
+      dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->size);

       for (; dyncon < dynconend; dyncon++)
        {
          Elf_Internal_Dyn dyn;
       for (; dyncon < dynconend; dyncon++)
        {
          Elf_Internal_Dyn dyn;


@@ -2233,10 +3276,7 @@ elf_s390_finish_dynamic_sections (output_bfd, info)
 
            case DT_PLTRELSZ:
              s = htab->srelplt->output_section;
 
            case DT_PLTRELSZ:
              s = htab->srelplt->output_section;

-             if (s->_cooked_size != 0)
-               dyn.d_un.d_val = s->_cooked_size;
-             else
-               dyn.d_un.d_val = s->_raw_size;
+             dyn.d_un.d_val = s->size;

              break;
 
            case DT_RELASZ:
              break;
 
            case DT_RELASZ:


@@ -2248,10 +3288,7 @@ elf_s390_finish_dynamic_sections (output_bfd, info)
                 other relocation sections, we don't have to worry
                 about changing the DT_RELA entry.  */
              s = htab->srelplt->output_section;
                 other relocation sections, we don't have to worry
                 about changing the DT_RELA entry.  */
              s = htab->srelplt->output_section;

-             if (s->_cooked_size != 0)
-               dyn.d_un.d_val -= s->_cooked_size;
-             else
-               dyn.d_un.d_val -= s->_raw_size;
+             dyn.d_un.d_val -= s->size;

              break;
            }
 
              break;
            }
 


@@ -2259,7 +3296,7 @@ elf_s390_finish_dynamic_sections (output_bfd, info)
        }
 
       /* Fill in the special first entry in the procedure linkage table.  */
        }
 
       /* Fill in the special first entry in the procedure linkage table.  */

-      if (htab->splt && htab->splt->_raw_size > 0)
+      if (htab->splt && htab->splt->size > 0)

        {
          /* fill in blueprint for plt 0 entry */
          bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD0,
        {
          /* fill in blueprint for plt 0 entry */
          bfd_put_32 (output_bfd, (bfd_vma) PLT_FIRST_ENTRY_WORD0,


@@ -2290,7 +3327,7 @@ elf_s390_finish_dynamic_sections (output_bfd, info)
   if (htab->sgotplt)
     {
       /* Fill in the first three entries in the global offset table.  */
   if (htab->sgotplt)
     {
       /* Fill in the first three entries in the global offset table.  */

-      if (htab->sgotplt->_raw_size > 0)
+      if (htab->sgotplt->size > 0)

        {
          bfd_put_64 (output_bfd,
                      (sdyn == NULL ? (bfd_vma) 0
        {
          bfd_put_64 (output_bfd,
                      (sdyn == NULL ? (bfd_vma) 0


@@ -2308,18 +3345,20 @@ elf_s390_finish_dynamic_sections (output_bfd, info)
   return TRUE;
 }
 
   return TRUE;
 }
 

-static bfd_boolean
-elf_s390_object_p (abfd)
-     bfd *abfd;
+/* Return address for Ith PLT stub in section PLT, for relocation REL
+   or (bfd_vma) -1 if it should not be included.  */
+
+static bfd_vma
+elf_s390_plt_sym_val (bfd_vma i, const asection *plt,
+                     const arelent *rel ATTRIBUTE_UNUSED)

 {
 {

-  return bfd_default_set_arch_mach (abfd, bfd_arch_s390, bfd_mach_s390_64);
+  return plt->vma + PLT_FIRST_ENTRY_SIZE + i * PLT_ENTRY_SIZE;

 }
 
 }
 

-/*
- * Why was the hash table entry size definition changed from
- * ARCH_SIZE/8 to 4? This breaks the 64 bit dynamic linker and
- * this is the only reason for the s390_elf64_size_info structure.
- */
+
+/* Why was the hash table entry size definition changed from
+   ARCH_SIZE/8 to 4? This breaks the 64 bit dynamic linker and
+   this is the only reason for the s390_elf64_size_info structure.  */

 
 const struct elf_size_info s390_elf64_size_info =
 {
 
 const struct elf_size_info s390_elf64_size_info =
 {


@@ -2331,13 +3370,14 @@ const struct elf_size_info s390_elf64_size_info =
   sizeof (Elf64_External_Sym),
   sizeof (Elf64_External_Dyn),
   sizeof (Elf_External_Note),
   sizeof (Elf64_External_Sym),
   sizeof (Elf64_External_Dyn),
   sizeof (Elf_External_Note),

-  8,           /* hash-table entry size */
-  1,           /* internal relocations per external relocations */
-  64,          /* arch_size */
-  8,           /* file_align */
+  8,           /* hash-table entry size.  */
+  1,           /* internal relocations per external relocations.  */
+  64,          /* arch_size.  */
+  3,           /* log_file_align.  */

   ELFCLASS64, EV_CURRENT,
   bfd_elf64_write_out_phdrs,
   bfd_elf64_write_shdrs_and_ehdr,
   ELFCLASS64, EV_CURRENT,
   bfd_elf64_write_out_phdrs,
   bfd_elf64_write_shdrs_and_ehdr,

+  bfd_elf64_checksum_contents,

   bfd_elf64_write_relocs,
   bfd_elf64_swap_symbol_in,
   bfd_elf64_swap_symbol_out,
   bfd_elf64_write_relocs,
   bfd_elf64_swap_symbol_in,
   bfd_elf64_swap_symbol_out,


@@ -2366,7 +3406,6 @@ const struct elf_size_info s390_elf64_size_info =
 #define elf_backend_plt_readonly       1
 #define elf_backend_want_plt_sym       0
 #define elf_backend_got_header_size    24
 #define elf_backend_plt_readonly       1
 #define elf_backend_want_plt_sym       0
 #define elf_backend_got_header_size    24

-#define elf_backend_plt_header_size    PLT_ENTRY_SIZE

 #define elf_backend_rela_normal                1
 
 #define elf_info_to_howto              elf_s390_info_to_howto
 #define elf_backend_rela_normal                1
 
 #define elf_info_to_howto              elf_s390_info_to_howto


@@ -2374,6 +3413,7 @@ const struct elf_size_info s390_elf64_size_info =
 #define bfd_elf64_bfd_is_local_label_name     elf_s390_is_local_label_name
 #define bfd_elf64_bfd_link_hash_table_create  elf_s390_link_hash_table_create
 #define bfd_elf64_bfd_reloc_type_lookup              elf_s390_reloc_type_lookup
 #define bfd_elf64_bfd_is_local_label_name     elf_s390_is_local_label_name
 #define bfd_elf64_bfd_link_hash_table_create  elf_s390_link_hash_table_create
 #define bfd_elf64_bfd_reloc_type_lookup              elf_s390_reloc_type_lookup

+#define bfd_elf64_bfd_reloc_name_lookup elf_s390_reloc_name_lookup

 
 #define elf_backend_adjust_dynamic_symbol     elf_s390_adjust_dynamic_symbol
 #define elf_backend_check_relocs             elf_s390_check_relocs
 
 #define elf_backend_adjust_dynamic_symbol     elf_s390_adjust_dynamic_symbol
 #define elf_backend_check_relocs             elf_s390_check_relocs


@@ -2386,8 +3426,11 @@ const struct elf_size_info s390_elf64_size_info =
 #define elf_backend_reloc_type_class         elf_s390_reloc_type_class
 #define elf_backend_relocate_section         elf_s390_relocate_section
 #define elf_backend_size_dynamic_sections     elf_s390_size_dynamic_sections
 #define elf_backend_reloc_type_class         elf_s390_reloc_type_class
 #define elf_backend_relocate_section         elf_s390_relocate_section
 #define elf_backend_size_dynamic_sections     elf_s390_size_dynamic_sections

+#define elf_backend_init_index_section       _bfd_elf_init_1_index_section

 #define elf_backend_reloc_type_class         elf_s390_reloc_type_class
 #define elf_backend_reloc_type_class         elf_s390_reloc_type_class

+#define elf_backend_plt_sym_val                      elf_s390_plt_sym_val

 
 

-#define elf_backend_object_p                 elf_s390_object_p
+#define bfd_elf64_mkobject             elf_s390_mkobject
+#define elf_backend_object_p           elf_s390_object_p

 
 #include "elf64-target.h"
 
 #include "elf64-target.h"