bfd/

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

diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 39d5abbe6fd3b22a633aa055b6ed05f283a15d32..f63fd03ea4496a32e83338d7c39f5dbc18704029 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -1,5 +1,6 @@
 /* X86-64 specific support for 64-bit ELF
 /* X86-64 specific support for 64-bit ELF

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

    Contributed by Jan Hubicka <jh@suse.cz>.
 
    This file is part of BFD, the Binary File Descriptor library.
    Contributed by Jan Hubicka <jh@suse.cz>.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -16,7 +17,7 @@
 
    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 "bfd.h"
 #include "sysdep.h"


@@ -102,6 +103,15 @@ static reloc_howto_type x86_64_elf_howto_table[] =
   HOWTO(R_X86_64_TPOFF32, 0, 2, 32, FALSE, 0, complain_overflow_signed,
        bfd_elf_generic_reloc, "R_X86_64_TPOFF32", FALSE, 0xffffffff,
        0xffffffff, FALSE),
   HOWTO(R_X86_64_TPOFF32, 0, 2, 32, FALSE, 0, complain_overflow_signed,
        bfd_elf_generic_reloc, "R_X86_64_TPOFF32", FALSE, 0xffffffff,
        0xffffffff, FALSE),

+  HOWTO(R_X86_64_PC64, 0, 4, 64, TRUE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_X86_64_PC64", FALSE, MINUS_ONE, MINUS_ONE,
+       TRUE),
+  HOWTO(R_X86_64_GOTOFF64, 0, 4, 64, FALSE, 0, complain_overflow_bitfield,
+       bfd_elf_generic_reloc, "R_X86_64_GOTOFF64",
+       FALSE, MINUS_ONE, MINUS_ONE, FALSE),
+  HOWTO(R_X86_64_GOTPC32, 0, 2, 32, TRUE, 0, complain_overflow_signed,
+       bfd_elf_generic_reloc, "R_X86_64_GOTPC32",
+       FALSE, 0xffffffff, 0xffffffff, TRUE),

 
 /* GNU extension to record C++ vtable hierarchy.  */
   HOWTO (R_X86_64_GNU_VTINHERIT, 0, 4, 0, FALSE, 0, complain_overflow_dont,
 
 /* GNU extension to record C++ vtable hierarchy.  */
   HOWTO (R_X86_64_GNU_VTINHERIT, 0, 4, 0, FALSE, 0, complain_overflow_dont,


@@ -146,6 +156,9 @@ static const struct elf_reloc_map x86_64_reloc_map[] =
   { BFD_RELOC_X86_64_DTPOFF32, R_X86_64_DTPOFF32, },
   { BFD_RELOC_X86_64_GOTTPOFF, R_X86_64_GOTTPOFF, },
   { BFD_RELOC_X86_64_TPOFF32,  R_X86_64_TPOFF32, },
   { BFD_RELOC_X86_64_DTPOFF32, R_X86_64_DTPOFF32, },
   { BFD_RELOC_X86_64_GOTTPOFF, R_X86_64_GOTTPOFF, },
   { BFD_RELOC_X86_64_TPOFF32,  R_X86_64_TPOFF32, },

+  { BFD_RELOC_64_PCREL,                R_X86_64_PC64, },
+  { BFD_RELOC_X86_64_GOTOFF64, R_X86_64_GOTOFF64, },
+  { BFD_RELOC_X86_64_GOTPC32,  R_X86_64_GOTPC32, },

   { BFD_RELOC_VTABLE_INHERIT,  R_X86_64_GNU_VTINHERIT, },
   { BFD_RELOC_VTABLE_ENTRY,    R_X86_64_GNU_VTENTRY, },
 };
   { BFD_RELOC_VTABLE_INHERIT,  R_X86_64_GNU_VTINHERIT, },
   { BFD_RELOC_VTABLE_ENTRY,    R_X86_64_GNU_VTENTRY, },
 };


@@ -178,13 +191,13 @@ elf64_x86_64_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr,
   r_type = ELF64_R_TYPE (dst->r_info);
   if (r_type < (unsigned int) R_X86_64_GNU_VTINHERIT)
     {
   r_type = ELF64_R_TYPE (dst->r_info);
   if (r_type < (unsigned int) R_X86_64_GNU_VTINHERIT)
     {

-      BFD_ASSERT (r_type <= (unsigned int) R_X86_64_TPOFF32);
+      BFD_ASSERT (r_type <= (unsigned int) R_X86_64_GOTPC32);

       i = r_type;
     }
   else
     {
       BFD_ASSERT (r_type < (unsigned int) R_X86_64_max);
       i = r_type;
     }
   else
     {
       BFD_ASSERT (r_type < (unsigned int) R_X86_64_max);

-      i = r_type - ((unsigned int) R_X86_64_GNU_VTINHERIT - R_X86_64_TPOFF32 - 1);
+      i = r_type - ((unsigned int) R_X86_64_GNU_VTINHERIT - R_X86_64_GOTPC32 - 1);

     }
   cache_ptr->howto = &x86_64_elf_howto_table[i];
   BFD_ASSERT (r_type == cache_ptr->howto->type);
     }
   cache_ptr->howto = &x86_64_elf_howto_table[i];
   BFD_ASSERT (r_type == cache_ptr->howto->type);


@@ -195,7 +208,7 @@ static bfd_boolean
 elf64_x86_64_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
 {
   int offset;
 elf64_x86_64_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
 {
   int offset;

-  size_t raw_size;
+  size_t size;

 
   switch (note->descsz)
     {
 
   switch (note->descsz)
     {


@@ -213,14 +226,14 @@ elf64_x86_64_grok_prstatus (bfd *abfd, Elf_Internal_Note *note)
 
        /* pr_reg */
        offset = 112;
 
        /* pr_reg */
        offset = 112;

-       raw_size = 216;
+       size = 216;

 
        break;
     }
 
   /* Make a ".reg/999" section.  */
   return _bfd_elfcore_make_pseudosection (abfd, ".reg",
 
        break;
     }
 
   /* Make a ".reg/999" section.  */
   return _bfd_elfcore_make_pseudosection (abfd, ".reg",

-                                         raw_size, note->descpos + offset);
+                                         size, note->descpos + offset);

 }
 
 static bfd_boolean
 }
 
 static bfd_boolean


@@ -458,12 +471,13 @@ create_got_section (bfd *dynobj, struct bfd_link_info *info)
   if (!htab->sgot || !htab->sgotplt)
     abort ();
 
   if (!htab->sgot || !htab->sgotplt)
     abort ();
 

-  htab->srelgot = bfd_make_section (dynobj, ".rela.got");
+  htab->srelgot = bfd_make_section_with_flags (dynobj, ".rela.got",
+                                              (SEC_ALLOC | SEC_LOAD
+                                               | SEC_HAS_CONTENTS
+                                               | SEC_IN_MEMORY
+                                               | SEC_LINKER_CREATED
+                                               | SEC_READONLY));

   if (htab->srelgot == NULL
   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;
       || ! bfd_set_section_alignment (dynobj, htab->srelgot, 3))
     return FALSE;
   return TRUE;


@@ -553,14 +567,17 @@ elf64_x86_64_copy_indirect_symbol (const struct elf_backend_data *bed,
 
   if (ELIMINATE_COPY_RELOCS
       && ind->root.type != bfd_link_hash_indirect
 
   if (ELIMINATE_COPY_RELOCS
       && ind->root.type != bfd_link_hash_indirect

-      && (dir->elf_link_hash_flags & ELF_LINK_HASH_DYNAMIC_ADJUSTED) != 0)
-    /* If called to transfer flags for a weakdef during processing
-       of elf_adjust_dynamic_symbol, don't copy ELF_LINK_NON_GOT_REF.
-       We clear it ourselves for ELIMINATE_COPY_RELOCS.  */
-    dir->elf_link_hash_flags |=
-      (ind->elf_link_hash_flags & (ELF_LINK_HASH_REF_DYNAMIC
-                                  | ELF_LINK_HASH_REF_REGULAR
-                                  | ELF_LINK_HASH_REF_REGULAR_NONWEAK));
+      && 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;
+      dir->pointer_equality_needed |= ind->pointer_equality_needed;
+    }

   else
     _bfd_elf_link_hash_copy_indirect (bed, dir, ind);
 }
   else
     _bfd_elf_link_hash_copy_indirect (bed, dir, ind);
 }


@@ -578,14 +595,6 @@ elf64_x86_64_mkobject (bfd *abfd)
 static bfd_boolean
 elf64_x86_64_elf_object_p (bfd *abfd)
 {
 static bfd_boolean
 elf64_x86_64_elf_object_p (bfd *abfd)
 {

-  /* Allocate our special target data.  */
-  struct elf64_x86_64_obj_tdata *new_tdata;
-  bfd_size_type amt = sizeof (struct elf64_x86_64_obj_tdata);
-  new_tdata = bfd_zalloc (abfd, amt);
-  if (new_tdata == NULL)
-    return FALSE;
-  new_tdata->root = *abfd->tdata.elf_obj_data;
-  abfd->tdata.any = new_tdata;

   /* Set the right machine number for an x86-64 elf64 file.  */
   bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_x86_64);
   return TRUE;
   /* Set the right machine number for an x86-64 elf64 file.  */
   bfd_default_set_arch_mach (abfd, bfd_arch_i386, bfd_mach_x86_64);
   return TRUE;


@@ -647,9 +656,8 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
 
       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),
-                                r_symndx);
+         (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
+                                abfd, r_symndx);

          return FALSE;
        }
 
          return FALSE;
        }
 


@@ -669,9 +677,10 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
          if (info->shared)
            {
              (*_bfd_error_handler)
          if (info->shared)
            {
              (*_bfd_error_handler)

-               (_("%s: relocation %s can not be used when making a shared object; recompile with -fPIC"),
-                bfd_archive_filename (abfd),
-                x86_64_elf_howto_table[r_type].name);
+               (_("%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"),
+                abfd,
+                x86_64_elf_howto_table[r_type].name,
+                (h) ? h->root.root.string : "a local symbol");

              bfd_set_error (bfd_error_bad_value);
              return FALSE;
            }
              bfd_set_error (bfd_error_bad_value);
              return FALSE;
            }


@@ -736,9 +745,8 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
                else
                  {
                    (*_bfd_error_handler)
                else
                  {
                    (*_bfd_error_handler)

-                     (_("%s: %s' accessed both as normal and thread local symbol"),
-                      bfd_archive_filename (abfd),
-                      h ? h->root.root.string : "<local>");
+                     (_("%B: %s' accessed both as normal and thread local symbol"),
+                      abfd, h ? h->root.root.string : "<local>");

                    return FALSE;
                  }
              }
                    return FALSE;
                  }
              }


@@ -753,7 +761,8 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
          }
          /* Fall through */
 
          }
          /* Fall through */
 

-         //case R_X86_64_GOTPCREL:
+       case R_X86_64_GOTOFF64:
+       case R_X86_64_GOTPC32:

        create_got:
          if (htab->sgot == NULL)
            {
        create_got:
          if (htab->sgot == NULL)
            {


@@ -777,7 +786,7 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
          if (h == NULL)
            continue;
 
          if (h == NULL)
            continue;
 

-         h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
+         h->needs_plt = 1;

          h->plt.refcount += 1;
          break;
 
          h->plt.refcount += 1;
          break;
 


@@ -794,9 +803,10 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
              && (sec->flags & SEC_READONLY) != 0)
            {
              (*_bfd_error_handler)
              && (sec->flags & SEC_READONLY) != 0)
            {
              (*_bfd_error_handler)

-               (_("%s: relocation %s can not be used when making a shared object; recompile with -fPIC"),
-                bfd_archive_filename (abfd),
-                x86_64_elf_howto_table[r_type].name);
+               (_("%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"),
+                abfd,
+                x86_64_elf_howto_table[r_type].name,
+                (h) ? h->root.root.string : "a local symbol");

              bfd_set_error (bfd_error_bad_value);
              return FALSE;
            }
              bfd_set_error (bfd_error_bad_value);
              return FALSE;
            }


@@ -805,6 +815,7 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
        case R_X86_64_PC8:
        case R_X86_64_PC16:
        case R_X86_64_PC32:
        case R_X86_64_PC8:
        case R_X86_64_PC16:
        case R_X86_64_PC32:

+       case R_X86_64_PC64:

        case R_X86_64_64:
          if (h != NULL && !info->shared)
            {
        case R_X86_64_64:
          if (h != NULL && !info->shared)
            {


@@ -814,11 +825,13 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
                 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.  */
              h->plt.refcount += 1;
 
              /* We may need a .plt entry if the function this reloc
                 refers to is in a shared lib.  */
              h->plt.refcount += 1;

+             if (r_type != R_X86_64_PC32 && r_type != R_X86_64_PC64)
+               h->pointer_equality_needed = 1;

            }
 
          /* If we are creating a shared library, and this is a reloc
            }
 
          /* If we are creating a shared library, and this is a reloc


@@ -846,19 +859,18 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
               && (sec->flags & SEC_ALLOC) != 0
               && (((r_type != R_X86_64_PC8)
                    && (r_type != R_X86_64_PC16)
               && (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_PC32)
+                   && (r_type != R_X86_64_PC64))

                   || (h != NULL
                       && (! info->symbolic
                           || h->root.type == bfd_link_hash_defweak
                   || (h != NULL
                       && (! info->symbolic
                           || h->root.type == bfd_link_hash_defweak

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

              || (ELIMINATE_COPY_RELOCS
                  && !info->shared
                  && (sec->flags & SEC_ALLOC) != 0
                  && h != NULL
                  && (h->root.type == bfd_link_hash_defweak
              || (ELIMINATE_COPY_RELOCS
                  && !info->shared
                  && (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 elf64_x86_64_dyn_relocs *p;
              struct elf64_x86_64_dyn_relocs **head;
            {
              struct elf64_x86_64_dyn_relocs *p;
              struct elf64_x86_64_dyn_relocs **head;


@@ -883,8 +895,8 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
                                 name + 5) != 0)
                    {
                      (*_bfd_error_handler)
                                 name + 5) != 0)
                    {
                      (*_bfd_error_handler)

-                       (_("%s: bad relocation section name `%s\'"),
-                        bfd_archive_filename (abfd), name);
+                       (_("%B: bad relocation section name `%s\'"),
+                        abfd, name);

                    }
 
                  if (htab->elf.dynobj == NULL)
                    }
 
                  if (htab->elf.dynobj == NULL)


@@ -897,13 +909,14 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
                    {
                      flagword flags;
 
                    {
                      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;
                      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
                      if (sreloc == NULL

-                         || ! bfd_set_section_flags (dynobj, sreloc, flags)

                          || ! bfd_set_section_alignment (dynobj, sreloc, 3))
                        return FALSE;
                    }
                          || ! bfd_set_section_alignment (dynobj, sreloc, 3))
                        return FALSE;
                    }


@@ -950,7 +963,8 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
              p->count += 1;
              if (r_type == R_X86_64_PC8
                  || r_type == R_X86_64_PC16
              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_PC32
+                 || r_type == R_X86_64_PC64)

                p->pc_count += 1;
            }
          break;
                p->pc_count += 1;
            }
          break;


@@ -958,14 +972,14 @@ elf64_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec,
          /* This relocation describes the C++ object vtable hierarchy.
             Reconstruct it for later use during GC.  */
        case R_X86_64_GNU_VTINHERIT:
          /* This relocation describes the C++ object vtable hierarchy.
             Reconstruct it for later use during GC.  */
        case R_X86_64_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_X86_64_GNU_VTENTRY:
            return FALSE;
          break;
 
          /* This relocation describes which C++ vtable entries are actually
             used.  Record for later use during GC.  */
        case R_X86_64_GNU_VTENTRY:

-         if (!_bfd_elf64_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+         if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))

            return FALSE;
          break;
 
            return FALSE;
          break;
 


@@ -1048,6 +1062,9 @@ elf64_x86_64_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info,
          struct elf64_x86_64_dyn_relocs *p;
 
          h = sym_hashes[r_symndx - symtab_hdr->sh_info];
          struct elf64_x86_64_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 elf64_x86_64_link_hash_entry *) h;
 
          for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)
          eh = (struct elf64_x86_64_link_hash_entry *) h;
 
          for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next)


@@ -1092,6 +1109,7 @@ elf64_x86_64_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info,
        case R_X86_64_PC8:
        case R_X86_64_PC16:
        case R_X86_64_PC32:
        case R_X86_64_PC8:
        case R_X86_64_PC16:
        case R_X86_64_PC32:

+       case R_X86_64_PC64:

          if (info->shared)
            break;
          /* Fall thru */
          if (info->shared)
            break;
          /* Fall thru */


@@ -1130,7 +1148,7 @@ elf64_x86_64_adjust_dynamic_symbol (struct bfd_link_info *info,
      will fill in the contents of the procedure linkage table later,
      when we know the address of the .got section.  */
   if (h->type == STT_FUNC
      will fill in the contents of the procedure linkage table later,
      when we know the address of the .got section.  */
   if (h->type == STT_FUNC

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

     {
       if (h->plt.refcount <= 0
          || SYMBOL_CALLS_LOCAL (info, h)
     {
       if (h->plt.refcount <= 0
          || SYMBOL_CALLS_LOCAL (info, h)


@@ -1143,7 +1161,7 @@ elf64_x86_64_adjust_dynamic_symbol (struct bfd_link_info *info,
             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;

        }
 
       return TRUE;
        }
 
       return TRUE;


@@ -1159,16 +1177,14 @@ elf64_x86_64_adjust_dynamic_symbol (struct bfd_link_info *info,
   /* 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)
       if (ELIMINATE_COPY_RELOCS || info->nocopyreloc)

-       h->elf_link_hash_flags
-         = ((h->elf_link_hash_flags & ~ELF_LINK_NON_GOT_REF)
-            | (h->weakdef->elf_link_hash_flags & ELF_LINK_NON_GOT_REF));
+       h->non_got_ref = h->u.weakdef->non_got_ref;

       return TRUE;
     }
 
       return TRUE;
     }
 


@@ -1184,13 +1200,13 @@ elf64_x86_64_adjust_dynamic_symbol (struct bfd_link_info *info,
 
   /* 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;
     }
 


@@ -1211,7 +1227,7 @@ elf64_x86_64_adjust_dynamic_symbol (struct bfd_link_info *info,
         we'll be keeping the dynamic relocs and avoiding the copy reloc.  */
       if (p == NULL)
        {
         we'll be keeping the dynamic relocs and avoiding the copy reloc.  */
       if (p == NULL)
        {

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

          return TRUE;
        }
     }
          return TRUE;
        }
     }


@@ -1233,8 +1249,8 @@ elf64_x86_64_adjust_dynamic_symbol (struct bfd_link_info *info,
      runtime process image.  */
   if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
     {
      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;
+      htab->srelbss->size += sizeof (Elf64_External_Rela);
+      h->needs_copy = 1;

     }
 
   /* We need to figure out the alignment required for this symbol.  I
     }
 
   /* We need to figure out the alignment required for this symbol.  I


@@ -1248,7 +1264,7 @@ elf64_x86_64_adjust_dynamic_symbol (struct bfd_link_info *info,
 
   /* Apply the required alignment.  */
   s = htab->sdynbss;
 
   /* Apply the required alignment.  */
   s = htab->sdynbss;

-  s->_raw_size = BFD_ALIGN (s->_raw_size, (bfd_size_type) (1 << power_of_two));
+  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))
   if (power_of_two > bfd_get_section_alignment (htab->elf.dynobj, s))
     {
       if (! bfd_set_section_alignment (htab->elf.dynobj, s, power_of_two))


@@ -1257,25 +1273,14 @@ elf64_x86_64_adjust_dynamic_symbol (struct bfd_link_info *info,
 
   /* Define the symbol as being at this point in the section.  */
   h->root.u.def.section = s;
 
   /* 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;
+  h->root.u.def.value = s->size;

 
   /* Increment the section size to make room for the symbol.  */
 
   /* Increment the section size to make room for the symbol.  */

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

 
   return TRUE;
 }
 
 
   return TRUE;
 }
 

-/* This is the condition under which elf64_x86_64_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 elf64_x86_64_relocate_section.  */
-#define WILL_CALL_FINISH_DYNAMIC_SYMBOL(DYN, SHARED, H) \
-  ((DYN)                                                               \
-   && ((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.  */
 


@@ -1302,9 +1307,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->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;
        }
 


@@ -1315,10 +1320,10 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
 
          /* If this is the first .plt entry, make room for the special
             first entry.  */
 
          /* If this is the first .plt entry, make room for the special
             first entry.  */

-         if (s->_raw_size == 0)
-           s->_raw_size += PLT_ENTRY_SIZE;
+         if (s->size == 0)
+           s->size += PLT_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


@@ -1326,32 +1331,32 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * 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;

        }
     }
   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;

     }
 
   /* If R_X86_64_GOTTPOFF symbol is now local to the binary,
     }
 
   /* If R_X86_64_GOTTPOFF symbol is now local to the binary,


@@ -1370,32 +1375,32 @@ 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->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_X86_64_TLSGD needs 2 consecutive GOT slots.  */
       if (tls_type == GOT_TLS_GD)
       /* R_X86_64_TLSGD needs 2 consecutive GOT slots.  */
       if (tls_type == GOT_TLS_GD)

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

       dyn = htab->elf.dynamic_sections_created;
       /* R_X86_64_TLSGD needs one dynamic relocation if local symbol
         and two if global.
         R_X86_64_GOTTPOFF needs one dynamic relocation.  */
       if ((tls_type == GOT_TLS_GD && h->dynindx == -1)
          || tls_type == GOT_TLS_IE)
       dyn = htab->elf.dynamic_sections_created;
       /* R_X86_64_TLSGD needs one dynamic relocation if local symbol
         and two if global.
         R_X86_64_GOTTPOFF needs one dynamic relocation.  */
       if ((tls_type == GOT_TLS_GD && h->dynindx == -1)
          || tls_type == GOT_TLS_IE)

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

       else if (tls_type == GOT_TLS_GD)
       else if (tls_type == GOT_TLS_GD)

-       htab->srelgot->_raw_size += 2 * sizeof (Elf64_External_Rela);
+       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)))
       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->_raw_size += sizeof (Elf64_External_Rela);
+       htab->srelgot->size += sizeof (Elf64_External_Rela);

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


@@ -1445,9 +1450,9 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
         symbols which turn out to need copy relocs or are not
         dynamic.  */
 
         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))))


@@ -1455,9 +1460,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->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;
            }
 


@@ -1476,7 +1481,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * 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;


@@ -1536,7 +1541,7 @@ elf64_x86_64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
          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;
        }
     }


@@ -1575,7 +1580,7 @@ elf64_x86_64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
              else if (p->count != 0)
                {
                  srel = elf_section_data (p->sec)->sreloc;
              else if (p->count != 0)
                {
                  srel = elf_section_data (p->sec)->sreloc;

-                 srel->_raw_size += p->count * sizeof (Elf64_External_Rela);
+                 srel->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;
 


@@ -1597,14 +1602,14 @@ elf64_x86_64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
        {
          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)
              if (*local_tls_type == GOT_TLS_GD)

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

              if (info->shared
                  || *local_tls_type == GOT_TLS_GD
                  || *local_tls_type == GOT_TLS_IE)
              if (info->shared
                  || *local_tls_type == GOT_TLS_GD
                  || *local_tls_type == GOT_TLS_IE)

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

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


@@ -1615,9 +1620,9 @@ elf64_x86_64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
     {
       /* Allocate 2 got entries and 1 dynamic reloc for R_X86_64_TLSLD
         relocs.  */
     {
       /* Allocate 2 got entries and 1 dynamic reloc for R_X86_64_TLSLD
         relocs.  */

-      htab->tls_ld_got.offset = htab->sgot->_raw_size;
-      htab->sgot->_raw_size += 2 * GOT_ENTRY_SIZE;
-      htab->srelgot->_raw_size += sizeof (Elf64_External_Rela);
+      htab->tls_ld_got.offset = htab->sgot->size;
+      htab->sgot->size += 2 * GOT_ENTRY_SIZE;
+      htab->srelgot->size += sizeof (Elf64_External_Rela);

     }
   else
     htab->tls_ld_got.offset = -1;
     }
   else
     htab->tls_ld_got.offset = -1;


@@ -1636,14 +1641,15 @@ elf64_x86_64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
 
       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.  */
        }
       else if (strncmp (bfd_get_section_name (dynobj, s), ".rela", 5) == 0)
        {
        {
          /* 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)
        {

-         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


@@ -1656,7 +1662,7 @@ elf64_x86_64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
          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 mostly to handle .rela.bss and
        {
          /* If we don't need this section, strip it from the
             output file.  This is mostly to handle .rela.bss and


@@ -1668,7 +1674,7 @@ elf64_x86_64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
             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;
        }
 


@@ -1677,7 +1683,7 @@ elf64_x86_64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
         section's contents are written out.  This should not happen,
         but this way if it does, we get a R_X86_64_NONE reloc instead
         of garbage.  */
         section's contents are written out.  This should not happen,
         but this way if it does, we get a R_X86_64_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;
     }


@@ -1690,7 +1696,7 @@ elf64_x86_64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
         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->executable)
        {
 
       if (info->executable)
        {


@@ -1698,7 +1704,7 @@ elf64_x86_64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
            return FALSE;
        }
 
            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)


@@ -1739,10 +1745,10 @@ elf64_x86_64_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
 static bfd_vma
 dtpoff_base (struct bfd_link_info *info)
 {
 static bfd_vma
 dtpoff_base (struct bfd_link_info *info)
 {

-  /* If tls_segment is NULL, we should have signalled an error already.  */
-  if (elf_hash_table (info)->tls_segment == NULL)
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)

     return 0;
     return 0;

-  return elf_hash_table (info)->tls_segment->start;
+  return elf_hash_table (info)->tls_sec->vma;

 }
 
 /* Return the relocation value for @tpoff relocation
 }
 
 /* Return the relocation value for @tpoff relocation


@@ -1751,14 +1757,30 @@ dtpoff_base (struct bfd_link_info *info)
 static bfd_vma
 tpoff (struct bfd_link_info *info, bfd_vma address)
 {
 static bfd_vma
 tpoff (struct bfd_link_info *info, bfd_vma address)
 {

-  struct elf_link_tls_segment *tls_segment
-    = elf_hash_table (info)->tls_segment;
+  struct elf_link_hash_table *htab = elf_hash_table (info);

 
   /* If tls_segment is NULL, we should have signalled an error already.  */
 
   /* If tls_segment is NULL, we should have signalled an error already.  */

-  if (tls_segment == NULL)
+  if (htab->tls_sec == NULL)

     return 0;
     return 0;

-  return address - align_power (tls_segment->size, tls_segment->align)
-        - tls_segment->start;
+  return address - htab->tls_size - htab->tls_sec->vma;
+}
+
+/* Is the instruction before OFFSET in CONTENTS a 32bit relative
+   branch?  */
+
+static bfd_boolean
+is_32bit_relative_branch (bfd_byte *contents, bfd_vma offset)
+{
+  /* Opcode            Instruction
+     0xe8              call
+     0xe9              jump
+     0x0f 0x8x         conditional jump */
+  return ((offset > 0
+          && (contents [offset - 1] == 0xe8
+              || contents [offset - 1] == 0xe9))
+         || (offset > 1
+             && contents [offset - 2] == 0x0f
+             && (contents [offset - 1] & 0xf0) == 0x80));

 }
 
 /* Relocate an x86_64 ELF section.  */
 }
 
 /* Relocate an x86_64 ELF section.  */


@@ -1823,49 +1845,16 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
          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;

 
 

-         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->executable
-                  && !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);

        }
       /* When generating a shared object, the relocations handled here are
         copied into the output file to be resolved at run time.  */
        }
       /* When generating a shared object, the relocations handled here are
         copied into the output file to be resolved at run time.  */


@@ -1961,10 +1950,48 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
          if (off >= (bfd_vma) -2)
            abort ();
 
          if (off >= (bfd_vma) -2)
            abort ();
 

-         relocation = htab->sgot->output_offset + off;
-         if (r_type == R_X86_64_GOTPCREL)
-           relocation += htab->sgot->output_section->vma;
+         relocation = htab->sgot->output_section->vma
+                      + htab->sgot->output_offset + off;
+         if (r_type != R_X86_64_GOTPCREL)
+           relocation -= htab->sgotplt->output_section->vma
+                         - htab->sgotplt->output_offset;
+
+         break;
+
+       case R_X86_64_GOTOFF64:
+         /* Relocation is relative to the start of the global offset
+            table.  */
+
+         /* Check to make sure it isn't a protected function symbol
+            for shared library since it may not be local when used
+            as function address.  */
+         if (info->shared
+             && h
+             && h->def_regular
+             && h->type == STT_FUNC
+             && ELF_ST_VISIBILITY (h->other) == STV_PROTECTED)
+           {
+             (*_bfd_error_handler)
+               (_("%B: relocation R_X86_64_GOTOFF64 against protected function `%s' can not be used when making a shared object"),
+                input_bfd, h->root.root.string);
+             bfd_set_error (bfd_error_bad_value);
+             return FALSE;
+           }
+
+         /* Note that sgot is not involved in this
+            calculation.  We always want the start of .got.plt.  If we
+            defined _GLOBAL_OFFSET_TABLE_ in a different way, as is
+            permitted by the ABI, we might have to change this
+            calculation.  */
+         relocation -= htab->sgotplt->output_section->vma
+                       + htab->sgotplt->output_offset;
+         break;

 
 

+       case R_X86_64_GOTPC32:
+         /* Use global offset table as symbol value.  */
+         relocation = htab->sgotplt->output_section->vma
+                      + htab->sgotplt->output_offset;
+         unresolved_reloc = FALSE;

          break;
 
        case R_X86_64_PLT32:
          break;
 
        case R_X86_64_PLT32:


@@ -1994,9 +2021,38 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
        case R_X86_64_PC8:
        case R_X86_64_PC16:
        case R_X86_64_PC32:
        case R_X86_64_PC8:
        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
+             && (!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)))
+           {
+             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);
+             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;
+           }
+         /* Fall through.  */
+

        case R_X86_64_8:
        case R_X86_64_16:
        case R_X86_64_32:
        case R_X86_64_8:
        case R_X86_64_16:
        case R_X86_64_32:

+       case R_X86_64_PC64:

        case R_X86_64_64:
          /* FIXME: The ABI says the linker should make sure the value is
             the same when it's zeroextended to 64 bit.  */
        case R_X86_64_64:
          /* FIXME: The ABI says the linker should make sure the value is
             the same when it's zeroextended to 64 bit.  */


@@ -2014,17 +2070,16 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                   || h->root.type != bfd_link_hash_undefweak)
               && ((r_type != R_X86_64_PC8
                    && r_type != R_X86_64_PC16
                   || 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_PC32
+                   && r_type != R_X86_64_PC64)

                   || !SYMBOL_CALLS_LOCAL (info, h)))
              || (ELIMINATE_COPY_RELOCS
                  && !info->shared
                  && h != NULL
                  && h->dynindx != -1
                   || !SYMBOL_CALLS_LOCAL (info, h)))
              || (ELIMINATE_COPY_RELOCS
                  && !info->shared
                  && 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)))
            {


@@ -2060,10 +2115,10 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                       && (r_type == R_X86_64_PC8
                           || r_type == R_X86_64_PC16
                           || r_type == R_X86_64_PC32
                       && (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
                           || !info->shared
                           || !info->symbolic

-                          || (h->elf_link_hash_flags
-                              & ELF_LINK_HASH_DEF_REGULAR) == 0))
+                          || !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;


@@ -2081,16 +2136,7 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                    {
                      long sindx;
 
                    {
                      long sindx;
 

-                     if (h == NULL)
-                       sec = local_sections[r_symndx];
-                     else
-                       {
-                         BFD_ASSERT (h->root.type == bfd_link_hash_defined
-                                     || (h->root.type
-                                         == bfd_link_hash_defweak));
-                         sec = h->root.u.def.section;
-                       }
-                     if (sec != NULL && bfd_is_abs_section (sec))
+                     if (bfd_is_abs_section (sec))

                        sindx = 0;
                      else if (sec == NULL || sec->owner == NULL)
                        {
                        sindx = 0;
                      else if (sec == NULL || sec->owner == NULL)
                        {


@@ -2167,7 +2213,7 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                    BFD_ASSERT (bfd_get_8 (input_bfd,
                                           contents + rel->r_offset - 4 + i)
                                == tlsgd[i]);
                    BFD_ASSERT (bfd_get_8 (input_bfd,
                                           contents + rel->r_offset - 4 + i)
                                == tlsgd[i]);

-                 BFD_ASSERT (rel->r_offset + 12 <= input_section->_raw_size);
+                 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)
                  for (i = 0; i < 4; i++)
                    BFD_ASSERT (bfd_get_8 (input_bfd,
                                           contents + rel->r_offset + 4 + i)


@@ -2203,7 +2249,7 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                  reg = bfd_get_8 (input_bfd, contents + rel->r_offset - 1);
                  BFD_ASSERT ((reg & 0xc7) == 5);
                  reg >>= 3;
                  reg = bfd_get_8 (input_bfd, contents + rel->r_offset - 1);
                  BFD_ASSERT ((reg & 0xc7) == 5);
                  reg >>= 3;

-                 BFD_ASSERT (rel->r_offset + 4 <= input_section->_raw_size);
+                 BFD_ASSERT (rel->r_offset + 4 <= input_section->size);

                  if (type == 0x8b)
                    {
                      /* movq */
                  if (type == 0x8b)
                    {
                      /* movq */


@@ -2340,7 +2386,7 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                BFD_ASSERT (bfd_get_8 (input_bfd,
                                       contents + rel->r_offset - 4 + i)
                            == tlsgd[i]);
                BFD_ASSERT (bfd_get_8 (input_bfd,
                                       contents + rel->r_offset - 4 + i)
                            == tlsgd[i]);

-             BFD_ASSERT (rel->r_offset + 12 <= input_section->_raw_size);
+             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)
              for (i = 0; i < 4; i++)
                BFD_ASSERT (bfd_get_8 (input_bfd,
                                       contents + rel->r_offset + 4 + i)


@@ -2380,7 +2426,7 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                          == 0x8d);
              BFD_ASSERT (bfd_get_8 (input_bfd, contents + rel->r_offset - 1)
                          == 0x3d);
                          == 0x8d);
              BFD_ASSERT (bfd_get_8 (input_bfd, contents + rel->r_offset - 1)
                          == 0x3d);

-             BFD_ASSERT (rel->r_offset + 9 <= input_section->_raw_size);
+             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 (bfd_get_8 (input_bfd, contents + rel->r_offset + 4)
                          == 0xe8);
              BFD_ASSERT (rel + 1 < relend);


@@ -2446,11 +2492,11 @@ elf64_x86_64_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
         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 relocation against symbol `%s'"),
+          input_bfd,
+          input_section,

           (long) rel->r_offset,
           h->root.root.string);
 
           (long) rel->r_offset,
           h->root.root.string);
 


@@ -2477,18 +2523,23 @@ 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)
 
              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;
            }


@@ -2578,14 +2629,19 @@ elf64_x86_64_finish_dynamic_symbol (bfd *output_bfd,
       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
        {
          /* Mark the symbol as undefined, rather than as defined in

-            the .plt section.  Leave the value alone.  This is a clue
+            the .plt section.  Leave the value if there were any
+            relocations where pointer equality matters (this is a clue

             for the dynamic linker, to make function pointer
             comparisons work between an application and shared
             for the dynamic linker, to make function pointer
             comparisons work between an application and shared

-            library.  */
+            library), otherwise set it to zero.  If a function is only
+            called from a binary, there is no need to slow down
+            shared libraries because of that.  */

          sym->st_shndx = SHN_UNDEF;
          sym->st_shndx = SHN_UNDEF;

+         if (!h->pointer_equality_needed)
+           sym->st_value = 0;

        }
     }
 
        }
     }
 


@@ -2633,7 +2689,7 @@ elf64_x86_64_finish_dynamic_symbol (bfd *output_bfd,
       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;


@@ -2704,7 +2760,7 @@ elf64_x86_64_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *inf
        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;


@@ -2718,7 +2774,8 @@ elf64_x86_64_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *inf
              continue;
 
            case DT_PLTGOT:
              continue;
 
            case DT_PLTGOT:

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

              break;
 
            case DT_JMPREL:
              break;
 
            case DT_JMPREL:


@@ -2727,10 +2784,7 @@ elf64_x86_64_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *inf
 
            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:


@@ -2744,10 +2798,7 @@ elf64_x86_64_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *inf
              if (htab->srelplt != NULL)
                {
                  s = htab->srelplt->output_section;
              if (htab->srelplt != NULL)
                {
                  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;
            }


@@ -2756,7 +2807,7 @@ elf64_x86_64_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *inf
        }
 
       /* 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 the first entry in the procedure linkage table.  */
          memcpy (htab->splt->contents, elf64_x86_64_plt0_entry,
        {
          /* Fill in the first entry in the procedure linkage table.  */
          memcpy (htab->splt->contents, elf64_x86_64_plt0_entry,


@@ -2790,7 +2841,7 @@ elf64_x86_64_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *inf
   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)

        {
          /* Set the first entry in the global offset table to the address of
             the dynamic section.  */
        {
          /* Set the first entry in the global offset table to the address of
             the dynamic section.  */


@@ -2809,9 +2860,40 @@ elf64_x86_64_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *inf
        GOT_ENTRY_SIZE;
     }
 
        GOT_ENTRY_SIZE;
     }
 

+  if (htab->sgot && htab->sgot->size > 0)
+    elf_section_data (htab->sgot->output_section)->this_hdr.sh_entsize
+      = GOT_ENTRY_SIZE;
+

   return TRUE;
 }
 
   return TRUE;
 }
 

+/* 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
+elf64_x86_64_plt_sym_val (bfd_vma i, const asection *plt,
+                         const arelent *rel ATTRIBUTE_UNUSED)
+{
+  return plt->vma + (i + 1) * PLT_ENTRY_SIZE;
+}
+
+/* Handle an x86-64 specific section when reading an object file.  This
+   is called when elfcode.h finds a section with an unknown type.  */
+
+static bfd_boolean
+elf64_x86_64_section_from_shdr (bfd *abfd,
+                               Elf_Internal_Shdr *hdr,
+                               const char *name,
+                               int shindex)
+{
+  if (hdr->sh_type != SHT_X86_64_UNWIND)
+    return FALSE;
+
+  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
+    return FALSE;
+
+  return TRUE;
+}

 
 #define TARGET_LITTLE_SYM                  bfd_elf64_x86_64_vec
 #define TARGET_LITTLE_NAME                 "elf64-x86-64"
 
 #define TARGET_LITTLE_SYM                  bfd_elf64_x86_64_vec
 #define TARGET_LITTLE_NAME                 "elf64-x86-64"


@@ -2825,7 +2907,6 @@ elf64_x86_64_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *inf
 #define elf_backend_plt_readonly           1
 #define elf_backend_want_plt_sym           0
 #define elf_backend_got_header_size        (GOT_ENTRY_SIZE*3)
 #define elf_backend_plt_readonly           1
 #define elf_backend_want_plt_sym           0
 #define elf_backend_got_header_size        (GOT_ENTRY_SIZE*3)

-#define elf_backend_plt_header_size        PLT_ENTRY_SIZE

 #define elf_backend_rela_normal                    1
 
 #define elf_info_to_howto                  elf64_x86_64_info_to_howto
 #define elf_backend_rela_normal                    1
 
 #define elf_info_to_howto                  elf64_x86_64_info_to_howto


@@ -2847,7 +2928,11 @@ elf64_x86_64_finish_dynamic_sections (bfd *output_bfd, struct bfd_link_info *inf
 #define elf_backend_reloc_type_class       elf64_x86_64_reloc_type_class
 #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_reloc_type_class       elf64_x86_64_reloc_type_class
 #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_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_object_p               elf64_x86_64_elf_object_p
 #define bfd_elf64_mkobject                 elf64_x86_64_mkobject
 

+#define elf_backend_section_from_shdr \
+       elf64_x86_64_section_from_shdr
+

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