include/elf
[deliverable/binutils-gdb.git] / bfd / elf64-x86-64.c
index 6ca622a0d23d26df5c30b92ade0c28639a0277b8..b82bcd11b768993134da4b75507fafd3254d3573 100644 (file)
@@ -1,5 +1,5 @@
 /* X86-64 specific support for 64-bit ELF
 /* X86-64 specific support for 64-bit ELF
-   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
    Free Software Foundation, Inc.
    Contributed by Jan Hubicka <jh@suse.cz>.
 
    Free Software Foundation, Inc.
    Contributed by Jan Hubicka <jh@suse.cz>.
 
@@ -7,7 +7,7 @@
 
    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
 
    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,
 
    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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, 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"
+#include "bfd_stdint.h"
 
 #include "elf/x86-64.h"
 
 
 #include "elf/x86-64.h"
 
@@ -159,6 +161,12 @@ static reloc_howto_type x86_64_elf_howto_table[] =
         FALSE)
 };
 
         FALSE)
 };
 
+#define IS_X86_64_PCREL_TYPE(TYPE)     \
+  (   ((TYPE) == R_X86_64_PC8)         \
+   || ((TYPE) == R_X86_64_PC16)                \
+   || ((TYPE) == R_X86_64_PC32)                \
+   || ((TYPE) == R_X86_64_PC64))
+
 /* Map BFD relocs to the x86_64 elf relocs.  */
 struct elf_reloc_map
 {
 /* Map BFD relocs to the x86_64 elf relocs.  */
 struct elf_reloc_map
 {
@@ -246,6 +254,23 @@ elf64_x86_64_reloc_type_lookup (bfd *abfd,
   return 0;
 }
 
   return 0;
 }
 
+static reloc_howto_type *
+elf64_x86_64_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                               const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < (sizeof (x86_64_elf_howto_table)
+           / sizeof (x86_64_elf_howto_table[0]));
+       i++)
+    if (x86_64_elf_howto_table[i].name != NULL
+       && strcasecmp (x86_64_elf_howto_table[i].name, r_name) == 0)
+      return &x86_64_elf_howto_table[i];
+
+  return NULL;
+}
+
 /* Given an x86_64 ELF reloc type, fill in an arelent structure.  */
 
 static void
 /* Given an x86_64 ELF reloc type, fill in an arelent structure.  */
 
 static void
@@ -438,6 +463,18 @@ struct elf64_x86_64_obj_tdata
 #define elf64_x86_64_local_tlsdesc_gotent(abfd) \
   (elf64_x86_64_tdata (abfd)->local_tlsdesc_gotent)
 
 #define elf64_x86_64_local_tlsdesc_gotent(abfd) \
   (elf64_x86_64_tdata (abfd)->local_tlsdesc_gotent)
 
+#define is_x86_64_elf(bfd)                             \
+  (bfd_get_flavour (bfd) == bfd_target_elf_flavour     \
+   && elf_tdata (bfd) != NULL                          \
+   && elf_object_id (bfd) == X86_64_ELF_TDATA)
+
+static bfd_boolean
+elf64_x86_64_mkobject (bfd *abfd)
+{
+  return bfd_elf_allocate_object (abfd, sizeof (struct elf64_x86_64_obj_tdata),
+                                 X86_64_ELF_TDATA);
+}
+
 /* x86-64 ELF linker hash table.  */
 
 struct elf64_x86_64_link_hash_table
 /* x86-64 ELF linker hash table.  */
 
 struct elf64_x86_64_link_hash_table
@@ -472,6 +509,9 @@ struct elf64_x86_64_link_hash_table
 
   /* Small local sym to section mapping cache.  */
   struct sym_sec_cache sym_sec;
 
   /* Small local sym to section mapping cache.  */
   struct sym_sec_cache sym_sec;
+
+  /* _TLS_MODULE_BASE_ symbol.  */
+  struct bfd_link_hash_entry *tls_module_base;
 };
 
 /* Get the x86-64 ELF linker hash table from a link_info structure.  */
 };
 
 /* Get the x86-64 ELF linker hash table from a link_info structure.  */
@@ -544,6 +584,7 @@ elf64_x86_64_link_hash_table_create (bfd *abfd)
   ret->tlsdesc_got = 0;
   ret->tls_ld_got.refcount = 0;
   ret->sgotplt_jump_table_size = 0;
   ret->tlsdesc_got = 0;
   ret->tls_ld_got.refcount = 0;
   ret->sgotplt_jump_table_size = 0;
+  ret->tls_module_base = NULL;
 
   return &ret->elf.root;
 }
 
   return &ret->elf.root;
 }
@@ -673,19 +714,6 @@ elf64_x86_64_copy_indirect_symbol (struct bfd_link_info *info,
     _bfd_elf_link_hash_copy_indirect (info, dir, ind);
 }
 
     _bfd_elf_link_hash_copy_indirect (info, dir, ind);
 }
 
-static bfd_boolean
-elf64_x86_64_mkobject (bfd *abfd)
-{
-  if (abfd->tdata.any == NULL)
-    {
-      bfd_size_type amt = sizeof (struct elf64_x86_64_obj_tdata);
-      abfd->tdata.any = bfd_zalloc (abfd, amt);
-      if (abfd->tdata.any == NULL)
-       return FALSE;
-    }
-  return bfd_elf_mkobject (abfd);
-}
-
 static bfd_boolean
 elf64_x86_64_elf_object_p (bfd *abfd)
 {
 static bfd_boolean
 elf64_x86_64_elf_object_p (bfd *abfd)
 {
@@ -694,26 +722,284 @@ elf64_x86_64_elf_object_p (bfd *abfd)
   return TRUE;
 }
 
   return TRUE;
 }
 
-static int
-elf64_x86_64_tls_transition (struct bfd_link_info *info, int r_type, int is_local)
+typedef union
+  {
+    unsigned char c[2];
+    uint16_t i;
+  }
+x86_64_opcode16;
+
+typedef union
+  {
+    unsigned char c[4];
+    uint32_t i;
+  }
+x86_64_opcode32;
+
+/* Return TRUE if the TLS access code sequence support transition
+   from R_TYPE.  */
+
+static bfd_boolean
+elf64_x86_64_check_tls_transition (bfd *abfd, asection *sec,
+                                  bfd_byte *contents,
+                                  Elf_Internal_Shdr *symtab_hdr,
+                                  struct elf_link_hash_entry **sym_hashes,
+                                  unsigned int r_type,
+                                  const Elf_Internal_Rela *rel,
+                                  const Elf_Internal_Rela *relend)
 {
 {
-  if (info->shared)
-    return r_type;
+  unsigned int val;
+  unsigned long r_symndx;
+  struct elf_link_hash_entry *h;
+  bfd_vma offset;
+
+  /* Get the section contents.  */
+  if (contents == NULL)
+    {
+      if (elf_section_data (sec)->this_hdr.contents != NULL)
+       contents = elf_section_data (sec)->this_hdr.contents;
+      else
+       {
+         /* FIXME: How to better handle error condition?  */
+         if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+           return FALSE;
 
 
+         /* Cache the section contents for elf_link_input_bfd.  */
+         elf_section_data (sec)->this_hdr.contents = contents;
+       }
+    }
+
+  offset = rel->r_offset;
   switch (r_type)
   switch (r_type)
+    {
+    case R_X86_64_TLSGD:
+    case R_X86_64_TLSLD:
+      if ((rel + 1) >= relend)
+       return FALSE;
+
+      if (r_type == R_X86_64_TLSGD)
+       {
+         /* Check transition from GD access model.  Only
+               .byte 0x66; leaq foo@tlsgd(%rip), %rdi
+               .word 0x6666; rex64; call __tls_get_addr
+            can transit to different access model.  */
+
+         static x86_64_opcode32 leaq = { { 0x66, 0x48, 0x8d, 0x3d } },
+                                call = { { 0x66, 0x66, 0x48, 0xe8 } };
+         if (offset < 4
+             || (offset + 12) > sec->size
+             || bfd_get_32 (abfd, contents + offset - 4) != leaq.i
+             || bfd_get_32 (abfd, contents + offset + 4) != call.i)
+           return FALSE;
+       }
+      else
+       {
+         /* Check transition from LD access model.  Only
+               leaq foo@tlsld(%rip), %rdi;
+               call __tls_get_addr
+            can transit to different access model.  */
+
+         static x86_64_opcode32 ld = { { 0x48, 0x8d, 0x3d, 0xe8 } };
+         x86_64_opcode32 op;
+
+         if (offset < 3 || (offset + 9) > sec->size)
+           return FALSE;
+
+         op.i = bfd_get_32 (abfd, contents + offset - 3);
+         op.c[3] = bfd_get_8 (abfd, contents + offset + 4);
+         if (op.i != ld.i)
+           return FALSE;
+       }
+
+      r_symndx = ELF64_R_SYM (rel[1].r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+       return FALSE;
+
+      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+      /* Use strncmp to check __tls_get_addr since __tls_get_addr
+        may be versioned.  */ 
+      return (h != NULL
+             && h->root.root.string != NULL
+             && (ELF64_R_TYPE (rel[1].r_info) == R_X86_64_PC32
+                 || ELF64_R_TYPE (rel[1].r_info) == R_X86_64_PLT32)
+             && (strncmp (h->root.root.string,
+                          "__tls_get_addr", 14) == 0));
+
+    case R_X86_64_GOTTPOFF:
+      /* Check transition from IE access model:
+               movq foo@gottpoff(%rip), %reg
+               addq foo@gottpoff(%rip), %reg
+       */
+
+      if (offset < 3 || (offset + 4) > sec->size)
+       return FALSE;
+
+      val = bfd_get_8 (abfd, contents + offset - 3);
+      if (val != 0x48 && val != 0x4c)
+       return FALSE;
+
+      val = bfd_get_8 (abfd, contents + offset - 2);
+      if (val != 0x8b && val != 0x03)
+       return FALSE;
+
+      val = bfd_get_8 (abfd, contents + offset - 1);
+      return (val & 0xc7) == 5;
+
+    case R_X86_64_GOTPC32_TLSDESC:
+      /* Check transition from GDesc access model:
+               leaq x@tlsdesc(%rip), %rax
+
+        Make sure it's a leaq adding rip to a 32-bit offset
+        into any register, although it's probably almost always
+        going to be rax.  */
+
+      if (offset < 3 || (offset + 4) > sec->size)
+       return FALSE;
+
+      val = bfd_get_8 (abfd, contents + offset - 3);
+      if ((val & 0xfb) != 0x48)
+       return FALSE;
+
+      if (bfd_get_8 (abfd, contents + offset - 2) != 0x8d)
+       return FALSE;
+
+      val = bfd_get_8 (abfd, contents + offset - 1);
+      return (val & 0xc7) == 0x05;
+
+    case R_X86_64_TLSDESC_CALL:
+      /* Check transition from GDesc access model:
+               call *x@tlsdesc(%rax)
+       */
+      if (offset + 2 <= sec->size)
+       {
+         /* Make sure that it's a call *x@tlsdesc(%rax).  */
+         static x86_64_opcode16 call = { { 0xff, 0x10 } };
+         return bfd_get_16 (abfd, contents + offset) == call.i;
+       }
+
+      return FALSE;
+
+    default:
+      abort ();
+    }
+}
+
+/* Return TRUE if the TLS access transition is OK or no transition
+   will be performed.  Update R_TYPE if there is a transition.  */
+
+static bfd_boolean
+elf64_x86_64_tls_transition (struct bfd_link_info *info, bfd *abfd,
+                            asection *sec, bfd_byte *contents,
+                            Elf_Internal_Shdr *symtab_hdr,
+                            struct elf_link_hash_entry **sym_hashes,
+                            unsigned int *r_type, int tls_type,
+                            const Elf_Internal_Rela *rel,
+                            const Elf_Internal_Rela *relend,
+                            struct elf_link_hash_entry *h)
+{
+  unsigned int from_type = *r_type;
+  unsigned int to_type = from_type;
+  bfd_boolean check = TRUE;
+
+  switch (from_type)
     {
     case R_X86_64_TLSGD:
     case R_X86_64_GOTPC32_TLSDESC:
     case R_X86_64_TLSDESC_CALL:
     case R_X86_64_GOTTPOFF:
     {
     case R_X86_64_TLSGD:
     case R_X86_64_GOTPC32_TLSDESC:
     case R_X86_64_TLSDESC_CALL:
     case R_X86_64_GOTTPOFF:
-      if (is_local)
-       return R_X86_64_TPOFF32;
-      return R_X86_64_GOTTPOFF;
+      if (!info->shared)
+       {
+         if (h == NULL)
+           to_type = R_X86_64_TPOFF32;
+         else
+           to_type = R_X86_64_GOTTPOFF;
+       }
+
+      /* When we are called from elf64_x86_64_relocate_section,
+        CONTENTS isn't NULL and there may be additional transitions
+        based on TLS_TYPE.  */
+      if (contents != NULL)
+       {
+         unsigned int new_to_type = to_type;
+
+         if (!info->shared
+             && h != NULL
+             && h->dynindx == -1
+             && tls_type == GOT_TLS_IE)
+           new_to_type = R_X86_64_TPOFF32;
+
+         if (to_type == R_X86_64_TLSGD
+             || to_type == R_X86_64_GOTPC32_TLSDESC
+             || to_type == R_X86_64_TLSDESC_CALL)
+           {
+             if (tls_type == GOT_TLS_IE)
+               new_to_type = R_X86_64_GOTTPOFF;
+           }
+
+         /* We checked the transition before when we were called from
+            elf64_x86_64_check_relocs.  We only want to check the new
+            transition which hasn't been checked before.  */
+         check = new_to_type != to_type && from_type == to_type;
+         to_type = new_to_type;
+       }
+
+      break;
+
     case R_X86_64_TLSLD:
     case R_X86_64_TLSLD:
-      return R_X86_64_TPOFF32;
+      if (!info->shared)
+       to_type = R_X86_64_TPOFF32;
+      break;
+
+    default:
+      return TRUE;
+    }
+
+  /* Return TRUE if there is no transition.  */
+  if (from_type == to_type)
+    return TRUE;
+
+  /* Check if the transition can be performed.  */
+  if (check
+      && ! elf64_x86_64_check_tls_transition (abfd, sec, contents,
+                                             symtab_hdr, sym_hashes,
+                                             from_type, rel, relend))
+    {
+      reloc_howto_type *from, *to;
+
+      from = elf64_x86_64_rtype_to_howto (abfd, from_type);
+      to = elf64_x86_64_rtype_to_howto (abfd, to_type);
+
+      (*_bfd_error_handler)
+       (_("%B: TLS transition from %s to %s against `%s' at 0x%lx "
+          "in section `%A' failed"),
+        abfd, sec, from->name, to->name,
+        h ? h->root.root.string : "a local symbol",
+        (unsigned long) rel->r_offset);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
     }
 
     }
 
-   return r_type;
+  *r_type = to_type;
+  return TRUE;
+}
+
+/* Returns true if the hash entry refers to a symbol
+   marked for indirect handling during reloc processing.  */
+
+static bfd_boolean
+is_indirect_symbol (bfd * abfd, struct elf_link_hash_entry * h)
+{
+  const struct elf_backend_data * bed;
+
+  if (abfd == NULL || h == NULL)
+    return FALSE;
+
+  bed = get_elf_backend_data (abfd);
+
+  return h->type == STT_GNU_IFUNC
+    && (bed->elf_osabi == ELFOSABI_LINUX
+       /* GNU/Linux is still using the default value 0.  */
+       || bed->elf_osabi == ELFOSABI_NONE);
 }
 
 /* Look through the relocs for a section during the first phase, and
 }
 
 /* Look through the relocs for a section during the first phase, and
@@ -721,7 +1007,8 @@ elf64_x86_64_tls_transition (struct bfd_link_info *info, int r_type, int is_loca
    linkage table, and dynamic reloc sections.  */
 
 static bfd_boolean
    linkage table, and dynamic reloc sections.  */
 
 static bfd_boolean
-elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
+elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info,
+                          asection *sec,
                           const Elf_Internal_Rela *relocs)
 {
   struct elf64_x86_64_link_hash_table *htab;
                           const Elf_Internal_Rela *relocs)
 {
   struct elf64_x86_64_link_hash_table *htab;
@@ -734,12 +1021,14 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
   if (info->relocatable)
     return TRUE;
 
   if (info->relocatable)
     return TRUE;
 
+  BFD_ASSERT (is_x86_64_elf (abfd));
+
   htab = elf64_x86_64_hash_table (info);
   htab = elf64_x86_64_hash_table (info);
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  symtab_hdr = &elf_symtab_hdr (abfd);
   sym_hashes = elf_sym_hashes (abfd);
 
   sreloc = NULL;
   sym_hashes = elf_sym_hashes (abfd);
 
   sreloc = NULL;
-
+  
   rel_end = relocs + sec->reloc_count;
   for (rel = relocs; rel < rel_end; rel++)
     {
   rel_end = relocs + sec->reloc_count;
   for (rel = relocs; rel < rel_end; rel++)
     {
@@ -767,7 +1056,12 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
            h = (struct elf_link_hash_entry *) h->root.u.i.link;
        }
 
            h = (struct elf_link_hash_entry *) h->root.u.i.link;
        }
 
-      r_type = elf64_x86_64_tls_transition (info, r_type, h == NULL);
+      if (! elf64_x86_64_tls_transition (info, abfd, sec, NULL,
+                                        symtab_hdr, sym_hashes,
+                                        &r_type, GOT_UNKNOWN,
+                                        rel, rel_end, h))
+       return FALSE;
+
       switch (r_type)
        {
        case R_X86_64_TLSLD:
       switch (r_type)
        {
        case R_X86_64_TLSLD:
@@ -869,7 +1163,7 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
                else
                  {
                    (*_bfd_error_handler)
                else
                  {
                    (*_bfd_error_handler)
-                     (_("%B: %s' accessed both as normal and thread local symbol"),
+                     (_("%B: '%s' accessed both as normal and thread local symbol"),
                       abfd, h ? h->root.root.string : "<local>");
                    return FALSE;
                  }
                       abfd, h ? h->root.root.string : "<local>");
                    return FALSE;
                  }
@@ -992,12 +1286,9 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
             symbol.  */
          if ((info->shared
               && (sec->flags & SEC_ALLOC) != 0
             symbol.  */
          if ((info->shared
               && (sec->flags & SEC_ALLOC) != 0
-              && (((r_type != R_X86_64_PC8)
-                   && (r_type != R_X86_64_PC16)
-                   && (r_type != R_X86_64_PC32)
-                   && (r_type != R_X86_64_PC64))
+              && (! IS_X86_64_PCREL_TYPE (r_type)
                   || (h != NULL
                   || (h != NULL
-                      && (! info->symbolic
+                      && (! SYMBOLIC_BIND (info, h)
                           || h->root.type == bfd_link_hash_defweak
                           || !h->def_regular))))
              || (ELIMINATE_COPY_RELOCS
                           || h->root.type == bfd_link_hash_defweak
                           || !h->def_regular))))
              || (ELIMINATE_COPY_RELOCS
@@ -1015,47 +1306,20 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
                 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)
-                       (_("%B: bad relocation section name `%s\'"),
-                        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_elf_make_dynamic_reloc_section
+                   (sec, htab->elf.dynobj, 3, abfd, /*rela?*/ TRUE);
 
 
-                 sreloc = bfd_get_section_by_name (dynobj, name);
                  if (sreloc == NULL)
                  if (sreloc == NULL)
-                   {
-                     flagword flags;
-
-                     flags = (SEC_HAS_CONTENTS | SEC_READONLY
-                              | SEC_IN_MEMORY | SEC_LINKER_CREATED);
-                     if ((sec->flags & SEC_ALLOC) != 0)
-                       flags |= SEC_ALLOC | SEC_LOAD;
-                     sreloc = bfd_make_section_with_flags (dynobj,
-                                                           name,
-                                                           flags);
-                     if (sreloc == NULL
-                         || ! bfd_set_section_alignment (dynobj, sreloc, 3))
-                       return FALSE;
-                   }
-                 elf_section_data (sec)->sreloc = sreloc;
+                   return FALSE;
+
+                 /* Create the ifunc section, even if we will not encounter an
+                    indirect function symbol.  We may not even see one in the input
+                    object file, but we can still encounter them in libraries.  */
+                 (void) _bfd_elf_make_ifunc_reloc_section
+                   (abfd, sec, htab->elf.dynobj, 2);
                }
 
              /* If this is a global symbol, we count the number of
                }
 
              /* If this is a global symbol, we count the number of
@@ -1087,6 +1351,7 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
              if (p == NULL || p->sec != sec)
                {
                  bfd_size_type amt = sizeof *p;
              if (p == NULL || p->sec != sec)
                {
                  bfd_size_type amt = sizeof *p;
+
                  p = ((struct elf64_x86_64_dyn_relocs *)
                       bfd_alloc (htab->elf.dynobj, amt));
                  if (p == NULL)
                  p = ((struct elf64_x86_64_dyn_relocs *)
                       bfd_alloc (htab->elf.dynobj, amt));
                  if (p == NULL)
@@ -1099,10 +1364,7 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
                }
 
              p->count += 1;
                }
 
              p->count += 1;
-             if (r_type == R_X86_64_PC8
-                 || r_type == R_X86_64_PC16
-                 || r_type == R_X86_64_PC32
-                 || r_type == R_X86_64_PC64)
+             if (IS_X86_64_PCREL_TYPE (r_type))
                p->pc_count += 1;
            }
          break;
                p->pc_count += 1;
            }
          break;
@@ -1117,7 +1379,9 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
          /* This relocation describes which C++ vtable entries are actually
             used.  Record for later use during GC.  */
        case R_X86_64_GNU_VTENTRY:
          /* This relocation describes which C++ vtable entries are actually
             used.  Record for later use during GC.  */
        case R_X86_64_GNU_VTENTRY:
-         if (!bfd_elf_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;
 
@@ -1134,54 +1398,40 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
 
 static asection *
 elf64_x86_64_gc_mark_hook (asection *sec,
 
 static asection *
 elf64_x86_64_gc_mark_hook (asection *sec,
-                          struct bfd_link_info *info ATTRIBUTE_UNUSED,
+                          struct bfd_link_info *info,
                           Elf_Internal_Rela *rel,
                           struct elf_link_hash_entry *h,
                           Elf_Internal_Sym *sym)
 {
   if (h != NULL)
                           Elf_Internal_Rela *rel,
                           struct elf_link_hash_entry *h,
                           Elf_Internal_Sym *sym)
 {
   if (h != NULL)
-    {
-      switch (ELF64_R_TYPE (rel->r_info))
-       {
-       case R_X86_64_GNU_VTINHERIT:
-       case R_X86_64_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);
-
-  return NULL;
+    switch (ELF64_R_TYPE (rel->r_info))
+      {
+      case R_X86_64_GNU_VTINHERIT:
+      case R_X86_64_GNU_VTENTRY:
+       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
 elf64_x86_64_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info,
 }
 
 /* Update the got entry reference counts for the section being removed.         */
 
 static bfd_boolean
 elf64_x86_64_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info,
-                           asection *sec, const Elf_Internal_Rela *relocs)
+                           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;
 
+  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);
 
   sym_hashes = elf_sym_hashes (abfd);
   local_got_refcounts = elf_local_got_refcounts (abfd);
 
@@ -1215,7 +1465,12 @@ elf64_x86_64_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info,
        }
 
       r_type = ELF64_R_TYPE (rel->r_info);
        }
 
       r_type = ELF64_R_TYPE (rel->r_info);
-      r_type = elf64_x86_64_tls_transition (info, r_type, h != NULL);
+      if (! elf64_x86_64_tls_transition (info, abfd, sec, NULL,
+                                        symtab_hdr, sym_hashes,
+                                        &r_type, GOT_UNKNOWN,
+                                        rel, relend, h))
+       return FALSE;
+
       switch (r_type)
        {
        case R_X86_64_TLSLD:
       switch (r_type)
        {
        case R_X86_64_TLSLD:
@@ -1288,7 +1543,6 @@ elf64_x86_64_adjust_dynamic_symbol (struct bfd_link_info *info,
 {
   struct elf64_x86_64_link_hash_table *htab;
   asection *s;
 {
   struct elf64_x86_64_link_hash_table *htab;
   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,
 
   /* If this is a function, put it in the procedure linkage table.  We
      will fill in the contents of the procedure linkage table later,
@@ -1406,32 +1660,9 @@ elf64_x86_64_adjust_dynamic_symbol (struct bfd_link_info *info,
       h->needs_copy = 1;
     }
 
       h->needs_copy = 1;
     }
 
-  /* We need to figure out the alignment required for this symbol.  I
-     have no idea how ELF linkers handle this. 16-bytes is the size
-     of the largest type that requires hard alignment -- long double.  */
-  /* FIXME: This is VERY ugly. Should be fixed for all architectures using
-     this construct.  */
-  power_of_two = bfd_log2 (h->size);
-  if (power_of_two > 4)
-    power_of_two = 4;
-
-  /* Apply the required alignment.  */
   s = htab->sdynbss;
   s = htab->sdynbss;
-  s->size = BFD_ALIGN (s->size, (bfd_size_type) (1 << power_of_two));
-  if (power_of_two > bfd_get_section_alignment (htab->elf.dynobj, s))
-    {
-      if (! bfd_set_section_alignment (htab->elf.dynobj, s, power_of_two))
-       return FALSE;
-    }
 
 
-  /* Define the symbol as being at this point in the section.  */
-  h->root.u.def.section = s;
-  h->root.u.def.value = s->size;
-
-  /* Increment the section size to make room for the symbol.  */
-  s->size += h->size;
-
-  return TRUE;
+  return _bfd_elf_adjust_dynamic_copy (h, s);
 }
 
 /* Allocate space in .plt, .got and associated reloc sections for
 }
 
 /* Allocate space in .plt, .got and associated reloc sections for
@@ -1444,6 +1675,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
   struct elf64_x86_64_link_hash_table *htab;
   struct elf64_x86_64_link_hash_entry *eh;
   struct elf64_x86_64_dyn_relocs *p;
   struct elf64_x86_64_link_hash_table *htab;
   struct elf64_x86_64_link_hash_entry *eh;
   struct elf64_x86_64_dyn_relocs *p;
+  bfd_boolean use_indirect_section = FALSE;
 
   if (h->root.type == bfd_link_hash_indirect)
     return TRUE;
 
   if (h->root.type == bfd_link_hash_indirect)
     return TRUE;
@@ -1522,7 +1754,9 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
       && !info->shared
       && h->dynindx == -1
       && elf64_x86_64_hash_entry (h)->tls_type == GOT_TLS_IE)
       && !info->shared
       && h->dynindx == -1
       && elf64_x86_64_hash_entry (h)->tls_type == GOT_TLS_IE)
-    h->got.offset = (bfd_vma) -1;
+    {
+      h->got.offset = (bfd_vma) -1;
+    }
   else if (h->got.refcount > 0)
     {
       asection *s;
   else if (h->got.refcount > 0)
     {
       asection *s;
@@ -1621,13 +1855,21 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
          /* Make sure undefined weak symbols are output as a dynamic
             symbol in PIEs.  */
          else if (h->dynindx == -1
          /* 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;
-           }
+                  && ! h->forced_local
+                  && ! bfd_elf_link_record_dynamic_symbol (info, h))
+           return FALSE;
        }
     }
        }
     }
+  else if (is_indirect_symbol (info->output_bfd, h)
+          && h->dynindx == -1
+          && ! h->forced_local)
+    {
+      if (bfd_elf_link_record_dynamic_symbol (info, h)
+         && h->dynindx != -1)
+       use_indirect_section = TRUE;
+      else
+       return FALSE;
+    }
   else if (ELIMINATE_COPY_RELOCS)
     {
       /* For the non-shared case, discard space for relocs against
   else if (ELIMINATE_COPY_RELOCS)
     {
       /* For the non-shared case, discard space for relocs against
@@ -1644,11 +1886,9 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * 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->forced_local)
-           {
-             if (! bfd_elf_link_record_dynamic_symbol (info, h))
-               return FALSE;
-           }
+             && ! h->forced_local
+             && ! bfd_elf_link_record_dynamic_symbol (info, h))
+           return FALSE;
 
          /* If that succeeded, we know we'll be keeping all the
             relocs.  */
 
          /* If that succeeded, we know we'll be keeping all the
             relocs.  */
@@ -1664,7 +1904,15 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
   /* Finally, allocate space.  */
   for (p = eh->dyn_relocs; p != NULL; p = p->next)
     {
   /* Finally, allocate space.  */
   for (p = eh->dyn_relocs; p != NULL; p = p->next)
     {
-      asection *sreloc = elf_section_data (p->sec)->sreloc;
+      asection * sreloc;
+
+      if (use_indirect_section)
+       sreloc = elf_section_data (p->sec)->indirect_relocs;
+      else
+       sreloc = elf_section_data (p->sec)->sreloc;
+
+      BFD_ASSERT (sreloc != NULL);
+
       sreloc->size += p->count * sizeof (Elf64_External_Rela);
     }
 
       sreloc->size += p->count * sizeof (Elf64_External_Rela);
     }
 
@@ -1742,7 +1990,7 @@ elf64_x86_64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
       Elf_Internal_Shdr *symtab_hdr;
       asection *srel;
 
       Elf_Internal_Shdr *symtab_hdr;
       asection *srel;
 
-      if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour)
+      if (! is_x86_64_elf (ibfd))
        continue;
 
       for (s = ibfd->sections; s != NULL; s = s->next)
        continue;
 
       for (s = ibfd->sections; s != NULL; s = s->next)
@@ -1768,7 +2016,6 @@ elf64_x86_64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
                  srel->size += p->count * sizeof (Elf64_External_Rela);
                  if ((p->sec->output_section->flags & SEC_READONLY) != 0)
                    info->flags |= DF_TEXTREL;
                  srel->size += p->count * sizeof (Elf64_External_Rela);
                  if ((p->sec->output_section->flags & SEC_READONLY) != 0)
                    info->flags |= DF_TEXTREL;
-
                }
            }
        }
                }
            }
        }
@@ -1777,7 +2024,7 @@ elf64_x86_64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
       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;
       local_tls_type = elf64_x86_64_local_got_tls_type (ibfd);
       locsymcount = symtab_hdr->sh_info;
       end_local_got = local_got + locsymcount;
       local_tls_type = elf64_x86_64_local_got_tls_type (ibfd);
@@ -1837,7 +2084,7 @@ elf64_x86_64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
 
   /* Allocate global sym .plt and .got entries, and space for global
      sym dynamic relocs.  */
 
   /* Allocate global sym .plt and .got entries, and space for global
      sym dynamic relocs.  */
-  elf_link_hash_traverse (&htab->elf, allocate_dynrelocs, (PTR) info);
+  elf_link_hash_traverse (&htab->elf, allocate_dynrelocs, info);
 
   /* For every jump slot reserved in the sgotplt, reloc_count is
      incremented.  However, when we reserve space for TLS descriptors,
 
   /* For every jump slot reserved in the sgotplt, reloc_count is
      incremented.  However, when we reserve space for TLS descriptors,
@@ -1883,7 +2130,7 @@ elf64_x86_64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
          /* 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->size != 0 && s != htab->srelplt)
            relocs = TRUE;
        {
          if (s->size != 0 && s != htab->srelplt)
            relocs = TRUE;
@@ -1968,8 +2215,7 @@ elf64_x86_64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
          /* If any dynamic relocs apply to a read-only section,
             then we need a DT_TEXTREL entry.  */
          if ((info->flags & DF_TEXTREL) == 0)
          /* If any dynamic relocs apply to a read-only section,
             then we need a DT_TEXTREL entry.  */
          if ((info->flags & DF_TEXTREL) == 0)
-           elf_link_hash_traverse (&htab->elf, readonly_dynrelocs,
-                                   (PTR) info);
+           elf_link_hash_traverse (&htab->elf, readonly_dynrelocs, info);
 
          if ((info->flags & DF_TEXTREL) != 0)
            {
 
          if ((info->flags & DF_TEXTREL) != 0)
            {
@@ -2008,6 +2254,9 @@ elf64_x86_64_always_size_sections (bfd *output_bfd,
                 tls_sec, 0, NULL, FALSE,
                 bed->collect, &bh)))
            return FALSE;
                 tls_sec, 0, NULL, FALSE,
                 bed->collect, &bh)))
            return FALSE;
+
+         elf64_x86_64_hash_table (info)->tls_module_base = bh;
+
          tlsbase = (struct elf_link_hash_entry *)bh;
          tlsbase->def_regular = 1;
          tlsbase->other = STV_HIDDEN;
          tlsbase = (struct elf_link_hash_entry *)bh;
          tlsbase->def_regular = 1;
          tlsbase->other = STV_HIDDEN;
@@ -2018,6 +2267,27 @@ elf64_x86_64_always_size_sections (bfd *output_bfd,
   return TRUE;
 }
 
   return TRUE;
 }
 
+/* _TLS_MODULE_BASE_ needs to be treated especially when linking
+   executables.  Rather than setting it to the beginning of the TLS
+   section, we have to set it to the end.  This function may be called
+   multiple times, it is idempotent.  */
+
+static void
+set_tls_module_base (struct bfd_link_info *info)
+{
+  struct bfd_link_hash_entry *base;
+
+  if (!info->executable)
+    return;
+
+  base = elf64_x86_64_hash_table (info)->tls_module_base;
+
+  if (!base)
+    return;
+
+  base->u.def.value = elf_hash_table (info)->tls_size;
+}
+
 /* Return the base VMA address which should be subtracted from real addresses
    when resolving @dtpoff relocation.
    This is PT_TLS segment p_vaddr.  */
 /* Return the base VMA address which should be subtracted from real addresses
    when resolving @dtpoff relocation.
    This is PT_TLS segment p_vaddr.  */
@@ -2080,15 +2350,16 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
   Elf_Internal_Rela *rel;
   Elf_Internal_Rela *relend;
 
   Elf_Internal_Rela *rel;
   Elf_Internal_Rela *relend;
 
-  if (info->relocatable)
-    return TRUE;
+  BFD_ASSERT (is_x86_64_elf (input_bfd));
 
   htab = elf64_x86_64_hash_table (info);
 
   htab = elf64_x86_64_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);
   local_tlsdesc_gotents = elf64_x86_64_local_tlsdesc_gotent (input_bfd);
 
   sym_hashes = elf_sym_hashes (input_bfd);
   local_got_offsets = elf_local_got_offsets (input_bfd);
   local_tlsdesc_gotents = elf64_x86_64_local_tlsdesc_gotent (input_bfd);
 
+  set_tls_module_base (info);
+
   rel = relocs;
   relend = relocs + input_section->reloc_count;
   for (; rel < relend; rel++)
   rel = relocs;
   relend = relocs + input_section->reloc_count;
   for (; rel < relend; rel++)
@@ -2138,6 +2409,21 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                                   h, sec, relocation,
                                   unresolved_reloc, warned);
        }
                                   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;
+
       /* When generating a shared object, the relocations handled here are
         copied into the output file to be resolved at run time.  */
       switch (r_type)
       /* When generating a shared object, the relocations handled here are
         copied into the output file to be resolved at run time.  */
       switch (r_type)
@@ -2350,30 +2636,63 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
        case R_X86_64_PC16:
        case R_X86_64_PC32:
          if (info->shared
        case R_X86_64_PC16:
        case R_X86_64_PC32:
          if (info->shared
-             && !SYMBOL_REFERENCES_LOCAL (info, h)
              && (input_section->flags & SEC_ALLOC) != 0
              && (input_section->flags & SEC_READONLY) != 0
              && (input_section->flags & SEC_ALLOC) != 0
              && (input_section->flags & SEC_READONLY) != 0
-             && (!h->def_regular
-                 || r_type != R_X86_64_PC32
-                 || h->type != STT_FUNC
-                 || ELF_ST_VISIBILITY (h->other) != STV_PROTECTED
-                 || !is_32bit_relative_branch (contents,
-                                               rel->r_offset)))
+             && h != NULL)
            {
            {
-             if (h->def_regular
-                 && r_type == R_X86_64_PC32
-                 && h->type == STT_FUNC
-                 && ELF_ST_VISIBILITY (h->other) == STV_PROTECTED)
-               (*_bfd_error_handler)
-                  (_("%B: relocation R_X86_64_PC32 against protected function `%s' can not be used when making a shared object"),
-                   input_bfd, h->root.root.string);
+             bfd_boolean fail = FALSE;
+             bfd_boolean branch
+               = (r_type == R_X86_64_PC32
+                  && is_32bit_relative_branch (contents, rel->r_offset));
+
+             if (SYMBOL_REFERENCES_LOCAL (info, h))
+               {
+                 /* Symbol is referenced locally.  Make sure it is
+                    defined locally or for a branch.  */
+                 fail = !h->def_regular && !branch;
+               }
              else
              else
-               (*_bfd_error_handler)
-                 (_("%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"),
-                  input_bfd, x86_64_elf_howto_table[r_type].name,
-                  h->root.root.string);
-             bfd_set_error (bfd_error_bad_value);
-             return FALSE;
+               {
+                 /* Symbol isn't referenced locally.  We only allow
+                    branch to symbol with non-default visibility. */
+                 fail = (!branch
+                         || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT);
+               }
+
+             if (fail)
+               {
+                 const char *fmt;
+                 const char *v;
+                 const char *pic = "";
+
+                 switch (ELF_ST_VISIBILITY (h->other))
+                   {
+                   case STV_HIDDEN:
+                     v = _("hidden symbol");
+                     break;
+                   case STV_INTERNAL:
+                     v = _("internal symbol");
+                     break;
+                   case STV_PROTECTED:
+                     v = _("protected symbol");
+                     break;
+                   default:
+                     v = _("symbol");
+                     pic = _("; recompile with -fPIC");
+                     break;
+                   }
+
+                 if (h->def_regular)
+                   fmt = _("%B: relocation %s against %s `%s' can not be used when making a shared object%s");
+                 else
+                   fmt = _("%B: relocation %s against undefined %s `%s' can not be used when making a shared object%s");
+
+                 (*_bfd_error_handler) (fmt, input_bfd,
+                                        x86_64_elf_howto_table[r_type].name,
+                                        v,  h->root.root.string, pic);
+                 bfd_set_error (bfd_error_bad_value);
+                 return FALSE;
+               }
            }
          /* Fall through.  */
 
            }
          /* Fall through.  */
 
@@ -2385,22 +2704,21 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
          /* FIXME: The ABI says the linker should make sure the value is
             the same when it's zeroextended to 64 bit.  */
 
          /* FIXME: The ABI says the linker should make sure the value is
             the same when it's zeroextended to 64 bit.  */
 
-         /* 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
               && (h == NULL
                   || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
                   || h->root.type != bfd_link_hash_undefweak)
            break;
 
          if ((info->shared
               && (h == NULL
                   || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
                   || h->root.type != bfd_link_hash_undefweak)
-              && ((r_type != R_X86_64_PC8
-                   && r_type != R_X86_64_PC16
-                   && r_type != R_X86_64_PC32
-                   && r_type != R_X86_64_PC64)
-                  || !SYMBOL_CALLS_LOCAL (info, h)))
+              && (! IS_X86_64_PCREL_TYPE (r_type)
+                  || ! SYMBOL_CALLS_LOCAL (info, h)))
+             || (! info->shared
+                 && h != NULL
+                 && h->dynindx != -1
+                 && ! h->forced_local
+                 && ((struct elf64_x86_64_link_hash_entry *) h)->dyn_relocs != NULL
+                 && is_indirect_symbol (output_bfd, h))
              || (ELIMINATE_COPY_RELOCS
                  && !info->shared
                  && h != NULL
              || (ELIMINATE_COPY_RELOCS
                  && !info->shared
                  && h != NULL
@@ -2440,13 +2758,10 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                 become local.  */
              else if (h != NULL
                       && h->dynindx != -1
                 become local.  */
              else if (h != NULL
                       && h->dynindx != -1
-                      && (r_type == R_X86_64_PC8
-                          || r_type == R_X86_64_PC16
-                          || r_type == R_X86_64_PC32
-                          || r_type == R_X86_64_PC64
-                          || !info->shared
-                          || !info->symbolic
-                          || !h->def_regular))
+                      && (IS_X86_64_PCREL_TYPE (r_type)
+                          || ! info->shared
+                          || ! 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;
@@ -2475,9 +2790,19 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                        {
                          asection *osec;
 
                        {
                          asection *osec;
 
+                         /* We are turning this relocation into one
+                            against a section symbol.  It would be
+                            proper to subtract the symbol's value,
+                            osec->vma, from the emitted reloc addend,
+                            but ld.so expects buggy relocs.  */
                          osec = sec->output_section;
                          sindx = elf_section_data (osec)->dynindx;
                          osec = sec->output_section;
                          sindx = elf_section_data (osec)->dynindx;
-                         BFD_ASSERT (sindx > 0);
+                         if (sindx == 0)
+                           {
+                             asection *oi = htab->elf.text_index_section;
+                             sindx = elf_section_data (oi)->dynindx;
+                           }
+                         BFD_ASSERT (sindx != 0);
                        }
 
                      outrel.r_info = ELF64_R_INFO (sindx, r_type);
                        }
 
                      outrel.r_info = ELF64_R_INFO (sindx, r_type);
@@ -2485,9 +2810,18 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                    }
                }
 
                    }
                }
 
-             sreloc = elf_section_data (input_section)->sreloc;
-             if (sreloc == NULL)
-               abort ();
+             if (! info->shared
+                 && h != NULL
+                 && h->dynindx != -1
+                 && ! h->forced_local
+                 && is_indirect_symbol (output_bfd, h)
+                 && elf_section_data (input_section)->indirect_relocs != NULL
+                 && elf_section_data (input_section)->indirect_relocs->contents != NULL)
+               sreloc = elf_section_data (input_section)->indirect_relocs;
+             else
+               sreloc = elf_section_data (input_section)->sreloc;
+
+             BFD_ASSERT (sreloc != NULL && sreloc->contents != NULL);
 
              loc = sreloc->contents;
              loc += sreloc->reloc_count++ * sizeof (Elf64_External_Rela);
 
              loc = sreloc->contents;
              loc += sreloc->reloc_count++ * sizeof (Elf64_External_Rela);
@@ -2507,57 +2841,39 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
        case R_X86_64_GOTPC32_TLSDESC:
        case R_X86_64_TLSDESC_CALL:
        case R_X86_64_GOTTPOFF:
        case R_X86_64_GOTPC32_TLSDESC:
        case R_X86_64_TLSDESC_CALL:
        case R_X86_64_GOTTPOFF:
-         r_type = elf64_x86_64_tls_transition (info, r_type, h == NULL);
          tls_type = GOT_UNKNOWN;
          if (h == NULL && local_got_offsets)
            tls_type = elf64_x86_64_local_got_tls_type (input_bfd) [r_symndx];
          else if (h != NULL)
          tls_type = GOT_UNKNOWN;
          if (h == NULL && local_got_offsets)
            tls_type = elf64_x86_64_local_got_tls_type (input_bfd) [r_symndx];
          else if (h != NULL)
-           {
-             tls_type = elf64_x86_64_hash_entry (h)->tls_type;
-             if (!info->shared && h->dynindx == -1 && tls_type == GOT_TLS_IE)
-               r_type = R_X86_64_TPOFF32;
-           }
-         if (r_type == R_X86_64_TLSGD
-             || r_type == R_X86_64_GOTPC32_TLSDESC
-             || r_type == R_X86_64_TLSDESC_CALL)
-           {
-             if (tls_type == GOT_TLS_IE)
-               r_type = R_X86_64_GOTTPOFF;
-           }
+           tls_type = elf64_x86_64_hash_entry (h)->tls_type;
+
+         if (! elf64_x86_64_tls_transition (info, input_bfd,
+                                            input_section, contents,
+                                            symtab_hdr, sym_hashes,
+                                            &r_type, tls_type, rel,
+                                            relend, h))
+           return FALSE;
 
          if (r_type == R_X86_64_TPOFF32)
            {
 
          if (r_type == R_X86_64_TPOFF32)
            {
+             bfd_vma roff = rel->r_offset;
+
              BFD_ASSERT (! unresolved_reloc);
              BFD_ASSERT (! unresolved_reloc);
+
              if (ELF64_R_TYPE (rel->r_info) == R_X86_64_TLSGD)
                {
              if (ELF64_R_TYPE (rel->r_info) == R_X86_64_TLSGD)
                {
-                 unsigned int i;
-                 static unsigned char tlsgd[8]
-                   = { 0x66, 0x48, 0x8d, 0x3d, 0x66, 0x66, 0x48, 0xe8 };
-
                  /* GD->LE transition.
                     .byte 0x66; leaq foo@tlsgd(%rip), %rdi
                  /* GD->LE transition.
                     .byte 0x66; leaq foo@tlsgd(%rip), %rdi
-                    .word 0x6666; rex64; call __tls_get_addr@plt
+                    .word 0x6666; rex64; call __tls_get_addr
                     Change it into:
                     movq %fs:0, %rax
                     leaq foo@tpoff(%rax), %rax */
                     Change it into:
                     movq %fs:0, %rax
                     leaq foo@tpoff(%rax), %rax */
-                 BFD_ASSERT (rel->r_offset >= 4);
-                 for (i = 0; i < 4; i++)
-                   BFD_ASSERT (bfd_get_8 (input_bfd,
-                                          contents + rel->r_offset - 4 + i)
-                               == tlsgd[i]);
-                 BFD_ASSERT (rel->r_offset + 12 <= input_section->size);
-                 for (i = 0; i < 4; i++)
-                   BFD_ASSERT (bfd_get_8 (input_bfd,
-                                          contents + rel->r_offset + 4 + i)
-                               == tlsgd[i+4]);
-                 BFD_ASSERT (rel + 1 < relend);
-                 BFD_ASSERT (ELF64_R_TYPE (rel[1].r_info) == R_X86_64_PLT32);
-                 memcpy (contents + rel->r_offset - 4,
+                 memcpy (contents + roff - 4,
                          "\x64\x48\x8b\x04\x25\0\0\0\0\x48\x8d\x80\0\0\0",
                          16);
                  bfd_put_32 (output_bfd, tpoff (info, relocation),
                          "\x64\x48\x8b\x04\x25\0\0\0\0\x48\x8d\x80\0\0\0",
                          16);
                  bfd_put_32 (output_bfd, tpoff (info, relocation),
-                             contents + rel->r_offset + 8);
-                 /* Skip R_X86_64_PLT32.  */
+                             contents + roff + 8);
+                 /* Skip R_X86_64_PC32/R_X86_64_PLT32.  */
                  rel++;
                  continue;
                }
                  rel++;
                  continue;
                }
@@ -2569,26 +2885,13 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 
                     Change it to:
                     movl $x@tpoff, %rax
 
                     Change it to:
                     movl $x@tpoff, %rax
-
-                    Registers other than %rax may be set up here.  */
+                  */
 
                  unsigned int val, type, type2;
 
                  unsigned int val, type, type2;
-                 bfd_vma roff;
 
 
-                 /* First, make sure it's a leaq adding rip to a
-                    32-bit offset into any register, although it's
-                    probably almost always going to be rax.  */
-                 roff = rel->r_offset;
-                 BFD_ASSERT (roff >= 3);
                  type = bfd_get_8 (input_bfd, contents + roff - 3);
                  type = bfd_get_8 (input_bfd, contents + roff - 3);
-                 BFD_ASSERT ((type & 0xfb) == 0x48);
                  type2 = bfd_get_8 (input_bfd, contents + roff - 2);
                  type2 = bfd_get_8 (input_bfd, contents + roff - 2);
-                 BFD_ASSERT (type2 == 0x8d);
                  val = bfd_get_8 (input_bfd, contents + roff - 1);
                  val = bfd_get_8 (input_bfd, contents + roff - 1);
-                 BFD_ASSERT ((val & 0xc7) == 0x05);
-                 BFD_ASSERT (roff + 4 <= input_section->size);
-
-                 /* Now modify the instruction as appropriate.  */
                  bfd_put_8 (output_bfd, 0x48 | ((type >> 2) & 1),
                             contents + roff - 3);
                  bfd_put_8 (output_bfd, 0xc7, contents + roff - 2);
                  bfd_put_8 (output_bfd, 0x48 | ((type >> 2) & 1),
                             contents + roff - 3);
                  bfd_put_8 (output_bfd, 0xc7, contents + roff - 2);
@@ -2604,29 +2907,13 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                     It's originally:
                     call *(%rax)
                     Turn it into:
                     It's originally:
                     call *(%rax)
                     Turn it into:
-                    nop; nop.  */
-
-                 unsigned int val, type;
-                 bfd_vma roff;
-
-                 /* First, make sure it's a call *(%rax).  */
-                 roff = rel->r_offset;
-                 BFD_ASSERT (roff + 2 <= input_section->size);
-                 type = bfd_get_8 (input_bfd, contents + roff);
-                 BFD_ASSERT (type == 0xff);
-                 val = bfd_get_8 (input_bfd, contents + roff + 1);
-                 BFD_ASSERT (val == 0x10);
-
-                 /* Now modify the instruction as appropriate.  Use
-                    xchg %ax,%ax instead of 2 nops.  */
+                    xchg %ax,%ax.  */
                  bfd_put_8 (output_bfd, 0x66, contents + roff);
                  bfd_put_8 (output_bfd, 0x90, contents + roff + 1);
                  continue;
                }
                  bfd_put_8 (output_bfd, 0x66, contents + roff);
                  bfd_put_8 (output_bfd, 0x90, contents + roff + 1);
                  continue;
                }
-             else
+             else if (ELF64_R_TYPE (rel->r_info) == R_X86_64_GOTTPOFF)
                {
                {
-                 unsigned int val, type, reg;
-
                  /* IE->LE transition:
                     Originally it can be one of:
                     movq foo@gottpoff(%rip), %reg
                  /* IE->LE transition:
                     Originally it can be one of:
                     movq foo@gottpoff(%rip), %reg
@@ -2635,25 +2922,23 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                     movq $foo, %reg
                     leaq foo(%reg), %reg
                     addq $foo, %reg.  */
                     movq $foo, %reg
                     leaq foo(%reg), %reg
                     addq $foo, %reg.  */
-                 BFD_ASSERT (rel->r_offset >= 3);
-                 val = bfd_get_8 (input_bfd, contents + rel->r_offset - 3);
-                 BFD_ASSERT (val == 0x48 || val == 0x4c);
-                 type = bfd_get_8 (input_bfd, contents + rel->r_offset - 2);
-                 BFD_ASSERT (type == 0x8b || type == 0x03);
-                 reg = bfd_get_8 (input_bfd, contents + rel->r_offset - 1);
-                 BFD_ASSERT ((reg & 0xc7) == 5);
+
+                 unsigned int val, type, reg;
+
+                 val = bfd_get_8 (input_bfd, contents + roff - 3);
+                 type = bfd_get_8 (input_bfd, contents + roff - 2);
+                 reg = bfd_get_8 (input_bfd, contents + roff - 1);
                  reg >>= 3;
                  reg >>= 3;
-                 BFD_ASSERT (rel->r_offset + 4 <= input_section->size);
                  if (type == 0x8b)
                    {
                      /* movq */
                      if (val == 0x4c)
                        bfd_put_8 (output_bfd, 0x49,
                  if (type == 0x8b)
                    {
                      /* movq */
                      if (val == 0x4c)
                        bfd_put_8 (output_bfd, 0x49,
-                                  contents + rel->r_offset - 3);
+                                  contents + roff - 3);
                      bfd_put_8 (output_bfd, 0xc7,
                      bfd_put_8 (output_bfd, 0xc7,
-                                contents + rel->r_offset - 2);
+                                contents + roff - 2);
                      bfd_put_8 (output_bfd, 0xc0 | reg,
                      bfd_put_8 (output_bfd, 0xc0 | reg,
-                                contents + rel->r_offset - 1);
+                                contents + roff - 1);
                    }
                  else if (reg == 4)
                    {
                    }
                  else if (reg == 4)
                    {
@@ -2661,27 +2946,29 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                         special  */
                      if (val == 0x4c)
                        bfd_put_8 (output_bfd, 0x49,
                         special  */
                      if (val == 0x4c)
                        bfd_put_8 (output_bfd, 0x49,
-                                  contents + rel->r_offset - 3);
+                                  contents + roff - 3);
                      bfd_put_8 (output_bfd, 0x81,
                      bfd_put_8 (output_bfd, 0x81,
-                                contents + rel->r_offset - 2);
+                                contents + roff - 2);
                      bfd_put_8 (output_bfd, 0xc0 | reg,
                      bfd_put_8 (output_bfd, 0xc0 | reg,
-                                contents + rel->r_offset - 1);
+                                contents + roff - 1);
                    }
                  else
                    {
                      /* addq -> leaq */
                      if (val == 0x4c)
                        bfd_put_8 (output_bfd, 0x4d,
                    }
                  else
                    {
                      /* addq -> leaq */
                      if (val == 0x4c)
                        bfd_put_8 (output_bfd, 0x4d,
-                                  contents + rel->r_offset - 3);
+                                  contents + roff - 3);
                      bfd_put_8 (output_bfd, 0x8d,
                      bfd_put_8 (output_bfd, 0x8d,
-                                contents + rel->r_offset - 2);
+                                contents + roff - 2);
                      bfd_put_8 (output_bfd, 0x80 | reg | (reg << 3),
                      bfd_put_8 (output_bfd, 0x80 | reg | (reg << 3),
-                                contents + rel->r_offset - 1);
+                                contents + roff - 1);
                    }
                  bfd_put_32 (output_bfd, tpoff (info, relocation),
                    }
                  bfd_put_32 (output_bfd, tpoff (info, relocation),
-                             contents + rel->r_offset);
+                             contents + roff);
                  continue;
                }
                  continue;
                }
+             else
+               BFD_ASSERT (FALSE);
            }
 
          if (htab->sgot == NULL)
            }
 
          if (htab->sgot == NULL)
@@ -2808,143 +3095,107 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                  + htab->sgot->output_offset + off;
              unresolved_reloc = FALSE;
            }
                  + htab->sgot->output_offset + off;
              unresolved_reloc = FALSE;
            }
-         else if (ELF64_R_TYPE (rel->r_info) == R_X86_64_TLSGD)
-           {
-             unsigned int i;
-             static unsigned char tlsgd[8]
-               = { 0x66, 0x48, 0x8d, 0x3d, 0x66, 0x66, 0x48, 0xe8 };
-
-             /* GD->IE transition.
-                .byte 0x66; leaq foo@tlsgd(%rip), %rdi
-                .word 0x6666; rex64; call __tls_get_addr@plt
-                Change it into:
-                movq %fs:0, %rax
-                addq foo@gottpoff(%rip), %rax */
-             BFD_ASSERT (rel->r_offset >= 4);
-             for (i = 0; i < 4; i++)
-               BFD_ASSERT (bfd_get_8 (input_bfd,
-                                      contents + rel->r_offset - 4 + i)
-                           == tlsgd[i]);
-             BFD_ASSERT (rel->r_offset + 12 <= input_section->size);
-             for (i = 0; i < 4; i++)
-               BFD_ASSERT (bfd_get_8 (input_bfd,
-                                      contents + rel->r_offset + 4 + i)
-                           == tlsgd[i+4]);
-             BFD_ASSERT (rel + 1 < relend);
-             BFD_ASSERT (ELF64_R_TYPE (rel[1].r_info) == R_X86_64_PLT32);
-             memcpy (contents + rel->r_offset - 4,
-                     "\x64\x48\x8b\x04\x25\0\0\0\0\x48\x03\x05\0\0\0",
-                     16);
-
-             relocation = (htab->sgot->output_section->vma
-                           + htab->sgot->output_offset + off
-                           - rel->r_offset
-                           - input_section->output_section->vma
-                           - input_section->output_offset
-                           - 12);
-             bfd_put_32 (output_bfd, relocation,
-                         contents + rel->r_offset + 8);
-             /* Skip R_X86_64_PLT32.  */
-             rel++;
-             continue;
-           }
-         else if (ELF64_R_TYPE (rel->r_info) == R_X86_64_GOTPC32_TLSDESC)
+         else
            {
            {
-             /* GDesc -> IE transition.
-                It's originally something like:
-                leaq x@tlsdesc(%rip), %rax
-
-                Change it to:
-                movq x@gottpoff(%rip), %rax # before nop; nop
-
-                Registers other than %rax may be set up here.  */
-
-             unsigned int val, type, type2;
-             bfd_vma roff;
-
-             /* First, make sure it's a leaq adding rip to a 32-bit
-                offset into any register, although it's probably
-                almost always going to be rax.  */
-             roff = rel->r_offset;
-             BFD_ASSERT (roff >= 3);
-             type = bfd_get_8 (input_bfd, contents + roff - 3);
-             BFD_ASSERT ((type & 0xfb) == 0x48);
-             type2 = bfd_get_8 (input_bfd, contents + roff - 2);
-             BFD_ASSERT (type2 == 0x8d);
-             val = bfd_get_8 (input_bfd, contents + roff - 1);
-             BFD_ASSERT ((val & 0xc7) == 0x05);
-             BFD_ASSERT (roff + 4 <= input_section->size);
-
-             /* Now modify the instruction as appropriate.  */
-             /* To turn a leaq into a movq in the form we use it, it
-                suffices to change the second byte from 0x8d to
-                0x8b.  */
-             bfd_put_8 (output_bfd, 0x8b, contents + roff - 2);
+             bfd_vma roff = rel->r_offset;
 
 
-             bfd_put_32 (output_bfd,
-                         htab->sgot->output_section->vma
-                         + htab->sgot->output_offset + off
-                         - rel->r_offset
-                         - input_section->output_section->vma
-                         - input_section->output_offset
-                         - 4,
-                         contents + roff);
-             continue;
-           }
-         else if (ELF64_R_TYPE (rel->r_info) == R_X86_64_TLSDESC_CALL)
-           {
-             /* GDesc -> IE transition.
-                It's originally:
-                call *(%rax)
+             if (ELF64_R_TYPE (rel->r_info) == R_X86_64_TLSGD)
+               {
+                 /* GD->IE transition.
+                    .byte 0x66; leaq foo@tlsgd(%rip), %rdi
+                    .word 0x6666; rex64; call __tls_get_addr@plt
+                    Change it into:
+                    movq %fs:0, %rax
+                    addq foo@gottpoff(%rip), %rax */
+                 memcpy (contents + roff - 4,
+                         "\x64\x48\x8b\x04\x25\0\0\0\0\x48\x03\x05\0\0\0",
+                         16);
 
 
-                Change it to:
-                nop; nop.  */
+                 relocation = (htab->sgot->output_section->vma
+                               + htab->sgot->output_offset + off
+                               - roff
+                               - input_section->output_section->vma
+                               - input_section->output_offset
+                               - 12);
+                 bfd_put_32 (output_bfd, relocation,
+                             contents + roff + 8);
+                 /* Skip R_X86_64_PLT32.  */
+                 rel++;
+                 continue;
+               }
+             else if (ELF64_R_TYPE (rel->r_info) == R_X86_64_GOTPC32_TLSDESC)
+               {
+                 /* GDesc -> IE transition.
+                    It's originally something like:
+                    leaq x@tlsdesc(%rip), %rax
 
 
-             unsigned int val, type;
-             bfd_vma roff;
+                    Change it to:
+                    movq x@gottpoff(%rip), %rax # before xchg %ax,%ax
+                  */
 
 
-             /* First, make sure it's a call *(%eax).  */
-             roff = rel->r_offset;
-             BFD_ASSERT (roff + 2 <= input_section->size);
-             type = bfd_get_8 (input_bfd, contents + roff);
-             BFD_ASSERT (type == 0xff);
-             val = bfd_get_8 (input_bfd, contents + roff + 1);
-             BFD_ASSERT (val == 0x10);
+                 unsigned int val, type, type2;
 
 
-             /* Now modify the instruction as appropriate.  Use
-                xchg %ax,%ax instead of 2 nops.  */
-             bfd_put_8 (output_bfd, 0x66, contents + roff);
-             bfd_put_8 (output_bfd, 0x90, contents + roff + 1);
+                 type = bfd_get_8 (input_bfd, contents + roff - 3);
+                 type2 = bfd_get_8 (input_bfd, contents + roff - 2);
+                 val = bfd_get_8 (input_bfd, contents + roff - 1);
 
 
-             continue;
+                 /* Now modify the instruction as appropriate. To
+                    turn a leaq into a movq in the form we use it, it
+                    suffices to change the second byte from 0x8d to
+                    0x8b.  */
+                 bfd_put_8 (output_bfd, 0x8b, contents + roff - 2);
+
+                 bfd_put_32 (output_bfd,
+                             htab->sgot->output_section->vma
+                             + htab->sgot->output_offset + off
+                             - rel->r_offset
+                             - input_section->output_section->vma
+                             - input_section->output_offset
+                             - 4,
+                             contents + roff);
+                 continue;
+               }
+             else if (ELF64_R_TYPE (rel->r_info) == R_X86_64_TLSDESC_CALL)
+               {
+                 /* GDesc -> IE transition.
+                    It's originally:
+                    call *(%rax)
+
+                    Change it to:
+                    xchg %ax,%ax.  */
+
+                 unsigned int val, type;
+
+                 type = bfd_get_8 (input_bfd, contents + roff);
+                 val = bfd_get_8 (input_bfd, contents + roff + 1);
+                 bfd_put_8 (output_bfd, 0x66, contents + roff);
+                 bfd_put_8 (output_bfd, 0x90, contents + roff + 1);
+                 continue;
+               }
+             else
+               BFD_ASSERT (FALSE);
            }
            }
-         else
-           BFD_ASSERT (FALSE);
          break;
 
        case R_X86_64_TLSLD:
          break;
 
        case R_X86_64_TLSLD:
-         if (! info->shared)
+         if (! elf64_x86_64_tls_transition (info, input_bfd,
+                                            input_section, contents,
+                                            symtab_hdr, sym_hashes,
+                                            &r_type, GOT_UNKNOWN,
+                                            rel, relend, h))
+           return FALSE;
+
+         if (r_type != R_X86_64_TLSLD)
            {
              /* LD->LE transition:
            {
              /* LD->LE transition:
-                Ensure it is:
-                leaq foo@tlsld(%rip), %rdi; call __tls_get_addr@plt.
+                leaq foo@tlsld(%rip), %rdi; call __tls_get_addr.
                 We change it into:
                 .word 0x6666; .byte 0x66; movl %fs:0, %rax.  */
                 We change it into:
                 .word 0x6666; .byte 0x66; movl %fs:0, %rax.  */
-             BFD_ASSERT (rel->r_offset >= 3);
-             BFD_ASSERT (bfd_get_8 (input_bfd, contents + rel->r_offset - 3)
-                         == 0x48);
-             BFD_ASSERT (bfd_get_8 (input_bfd, contents + rel->r_offset - 2)
-                         == 0x8d);
-             BFD_ASSERT (bfd_get_8 (input_bfd, contents + rel->r_offset - 1)
-                         == 0x3d);
-             BFD_ASSERT (rel->r_offset + 9 <= input_section->size);
-             BFD_ASSERT (bfd_get_8 (input_bfd, contents + rel->r_offset + 4)
-                         == 0xe8);
-             BFD_ASSERT (rel + 1 < relend);
-             BFD_ASSERT (ELF64_R_TYPE (rel[1].r_info) == R_X86_64_PLT32);
+
+             BFD_ASSERT (r_type == R_X86_64_TPOFF32);
              memcpy (contents + rel->r_offset - 3,
                      "\x66\x66\x66\x64\x48\x8b\x04\x25\0\0\0", 12);
              memcpy (contents + rel->r_offset - 3,
                      "\x66\x66\x66\x64\x48\x8b\x04\x25\0\0\0", 12);
-             /* Skip R_X86_64_PLT32.  */
+             /* Skip R_X86_64_PC32/R_X86_64_PLT32.  */
              rel++;
              continue;
            }
              rel++;
              continue;
            }
@@ -3035,12 +3286,6 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 
          if (r == bfd_reloc_overflow)
            {
 
          if (r == bfd_reloc_overflow)
            {
-             if (h != NULL
-                 && h->root.type == bfd_link_hash_undefweak
-                 && howto->pc_relative)
-               /* Ignore reloc overflow on branches to undefweak syms.  */
-               continue;
-
              if (! ((*info->callbacks->reloc_overflow)
                     (info, (h ? &h->root : NULL), name, howto->name,
                      (bfd_vma) 0, input_bfd, input_section,
              if (! ((*info->callbacks->reloc_overflow)
                     (info, (h ? &h->root : NULL), name, howto->name,
                      (bfd_vma) 0, input_bfd, input_section,
@@ -3181,6 +3426,8 @@ elf64_x86_64_finish_dynamic_symbol (bfd *output_bfd,
       if (info->shared
          && SYMBOL_REFERENCES_LOCAL (info, h))
        {
       if (info->shared
          && 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_X86_64_RELATIVE);
          rela.r_addend = (h->root.u.def.value
          BFD_ASSERT((h->got.offset & 1) != 0);
          rela.r_info = ELF64_R_INFO (0, R_X86_64_RELATIVE);
          rela.r_addend = (h->root.u.def.value
@@ -3459,11 +3706,12 @@ elf64_x86_64_section_from_shdr (bfd *abfd,
 
 static bfd_boolean
 elf64_x86_64_add_symbol_hook (bfd *abfd,
 
 static bfd_boolean
 elf64_x86_64_add_symbol_hook (bfd *abfd,
-                             struct bfd_link_info *info ATTRIBUTE_UNUSED,
+                             struct bfd_link_info *info,
                              Elf_Internal_Sym *sym,
                              const char **namep ATTRIBUTE_UNUSED,
                              flagword *flagsp ATTRIBUTE_UNUSED,
                              Elf_Internal_Sym *sym,
                              const char **namep ATTRIBUTE_UNUSED,
                              flagword *flagsp ATTRIBUTE_UNUSED,
-                             asection **secp, bfd_vma *valp)
+                             asection **secp,
+                             bfd_vma *valp)
 {
   asection *lcomm;
 
 {
   asection *lcomm;
 
@@ -3486,6 +3734,10 @@ elf64_x86_64_add_symbol_hook (bfd *abfd,
       *valp = sym->st_size;
       break;
     }
       *valp = sym->st_size;
       break;
     }
+
+  if (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC)
+    elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE;
+
   return TRUE;
 }
 
   return TRUE;
 }
 
@@ -3592,7 +3844,7 @@ elf64_x86_64_merge_symbol (struct bfd_link_info *info ATTRIBUTE_UNUSED,
        }
       else if (sym->st_shndx == SHN_X86_64_LCOMMON
               && (elf_section_flags (*oldsec) & SHF_X86_64_LARGE) == 0)
        }
       else if (sym->st_shndx == SHN_X86_64_LCOMMON
               && (elf_section_flags (*oldsec) & SHF_X86_64_LARGE) == 0)
-       *psec = *sec = bfd_com_section_ptr; 
+       *psec = *sec = bfd_com_section_ptr;
     }
 
   return TRUE;
     }
 
   return TRUE;
@@ -3603,7 +3855,7 @@ elf64_x86_64_additional_program_headers (bfd *abfd,
                                         struct bfd_link_info *info ATTRIBUTE_UNUSED)
 {
   asection *s;
                                         struct bfd_link_info *info ATTRIBUTE_UNUSED)
 {
   asection *s;
-  int count = 0; 
+  int count = 0;
 
   /* Check to see if we need a large readonly segment.  */
   s = bfd_get_section_by_name (abfd, ".lrodata");
 
   /* Check to see if we need a large readonly segment.  */
   s = bfd_get_section_by_name (abfd, ".lrodata");
@@ -3633,16 +3885,16 @@ elf64_x86_64_hash_symbol (struct elf_link_hash_entry *h)
   return _bfd_elf_hash_symbol (h);
 }
 
   return _bfd_elf_hash_symbol (h);
 }
 
-static const struct bfd_elf_special_section 
+static const struct bfd_elf_special_section
   elf64_x86_64_special_sections[]=
 {
   elf64_x86_64_special_sections[]=
 {
-  { ".gnu.linkonce.lb",        16, -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE + SHF_X86_64_LARGE},
-  { ".gnu.linkonce.lr",        16, -2, SHT_PROGBITS, SHF_ALLOC + SHF_X86_64_LARGE},
-  { ".gnu.linkonce.lt",        16, -2, SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR + SHF_X86_64_LARGE},
-  { ".lbss",   5, -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE + SHF_X86_64_LARGE},
-  { ".ldata",  6, -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_X86_64_LARGE},
-  { ".lrodata",        8, -2, SHT_PROGBITS, SHF_ALLOC + SHF_X86_64_LARGE},
-  { NULL,      0,  0, 0,            0 }
+  { STRING_COMMA_LEN (".gnu.linkonce.lb"), -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE + SHF_X86_64_LARGE},
+  { STRING_COMMA_LEN (".gnu.linkonce.lr"), -2, SHT_PROGBITS, SHF_ALLOC + SHF_X86_64_LARGE},
+  { STRING_COMMA_LEN (".gnu.linkonce.lt"), -2, SHT_PROGBITS, SHF_ALLOC + SHF_EXECINSTR + SHF_X86_64_LARGE},
+  { STRING_COMMA_LEN (".lbss"),                   -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE + SHF_X86_64_LARGE},
+  { STRING_COMMA_LEN (".ldata"),          -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_X86_64_LARGE},
+  { STRING_COMMA_LEN (".lrodata"),        -2, SHT_PROGBITS, SHF_ALLOC + SHF_X86_64_LARGE},
+  { NULL,                      0,          0, 0,            0 }
 };
 
 #define TARGET_LITTLE_SYM                  bfd_elf64_x86_64_vec
 };
 
 #define TARGET_LITTLE_SYM                  bfd_elf64_x86_64_vec
@@ -3666,8 +3918,11 @@ static const struct bfd_elf_special_section
 #define bfd_elf64_bfd_link_hash_table_create \
   elf64_x86_64_link_hash_table_create
 #define bfd_elf64_bfd_reloc_type_lookup            elf64_x86_64_reloc_type_lookup
 #define bfd_elf64_bfd_link_hash_table_create \
   elf64_x86_64_link_hash_table_create
 #define bfd_elf64_bfd_reloc_type_lookup            elf64_x86_64_reloc_type_lookup
+#define bfd_elf64_bfd_reloc_name_lookup \
+  elf64_x86_64_reloc_name_lookup
 
 #define elf_backend_adjust_dynamic_symbol   elf64_x86_64_adjust_dynamic_symbol
 
 #define elf_backend_adjust_dynamic_symbol   elf64_x86_64_adjust_dynamic_symbol
+#define elf_backend_relocs_compatible      _bfd_elf_relocs_compatible
 #define elf_backend_check_relocs           elf64_x86_64_check_relocs
 #define elf_backend_copy_indirect_symbol    elf64_x86_64_copy_indirect_symbol
 #define elf_backend_create_dynamic_sections elf64_x86_64_create_dynamic_sections
 #define elf_backend_check_relocs           elf64_x86_64_check_relocs
 #define elf_backend_copy_indirect_symbol    elf64_x86_64_copy_indirect_symbol
 #define elf_backend_create_dynamic_sections elf64_x86_64_create_dynamic_sections
@@ -3681,6 +3936,7 @@ static const struct bfd_elf_special_section
 #define elf_backend_relocate_section       elf64_x86_64_relocate_section
 #define elf_backend_size_dynamic_sections   elf64_x86_64_size_dynamic_sections
 #define elf_backend_always_size_sections    elf64_x86_64_always_size_sections
 #define elf_backend_relocate_section       elf64_x86_64_relocate_section
 #define elf_backend_size_dynamic_sections   elf64_x86_64_size_dynamic_sections
 #define elf_backend_always_size_sections    elf64_x86_64_always_size_sections
+#define elf_backend_init_index_section     _bfd_elf_init_1_index_section
 #define elf_backend_plt_sym_val                    elf64_x86_64_plt_sym_val
 #define elf_backend_object_p               elf64_x86_64_elf_object_p
 #define bfd_elf64_mkobject                 elf64_x86_64_mkobject
 #define elf_backend_plt_sym_val                    elf64_x86_64_plt_sym_val
 #define elf_backend_object_p               elf64_x86_64_elf_object_p
 #define bfd_elf64_mkobject                 elf64_x86_64_mkobject
@@ -3709,4 +3965,22 @@ static const struct bfd_elf_special_section
 #define elf_backend_hash_symbol \
   elf64_x86_64_hash_symbol
 
 #define elf_backend_hash_symbol \
   elf64_x86_64_hash_symbol
 
+#undef  elf_backend_post_process_headers
+#define elf_backend_post_process_headers  _bfd_elf_set_osabi
+
+#include "elf64-target.h"
+
+/* FreeBSD support.  */
+
+#undef  TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM                  bfd_elf64_x86_64_freebsd_vec
+#undef  TARGET_LITTLE_NAME
+#define TARGET_LITTLE_NAME                 "elf64-x86-64-freebsd"
+
+#undef ELF_OSABI
+#define        ELF_OSABI                           ELFOSABI_FREEBSD
+
+#undef  elf64_bed
+#define elf64_bed elf64_x86_64_fbsd_bed
+
 #include "elf64-target.h"
 #include "elf64-target.h"
This page took 0.044093 seconds and 4 git commands to generate.