* merge.c (_bfd_merged_section_offset): Remove "addend" param.
[platform/upstream/binutils.git] / bfd / elf64-alpha.c
index 8efd4ee..21785d5 100644 (file)
@@ -1,23 +1,23 @@
 /* Alpha specific support for 64-bit ELF
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@tamu.edu>.
 
-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   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
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-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.  */
+   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.  */
 
 /* We need a published ABI spec for this.  Until one comes out, don't
    assume this'll remain unchanged forever.  */
@@ -47,94 +47,116 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define ECOFF_64
 #include "ecoffswap.h"
 
-static int alpha_elf_dynamic_symbol_p
-  PARAMS((struct elf_link_hash_entry *, struct bfd_link_info *));
+static bfd_boolean alpha_elf_dynamic_symbol_p
+  PARAMS ((struct elf_link_hash_entry *, struct bfd_link_info *));
 static struct bfd_hash_entry * elf64_alpha_link_hash_newfunc
-  PARAMS((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
+  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
 static struct bfd_link_hash_table * elf64_alpha_bfd_link_hash_table_create
-  PARAMS((bfd *));
+  PARAMS ((bfd *));
 
 static bfd_reloc_status_type elf64_alpha_reloc_nil
-  PARAMS((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static bfd_reloc_status_type elf64_alpha_reloc_bad
-  PARAMS((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static bfd_reloc_status_type elf64_alpha_do_reloc_gpdisp
-  PARAMS((bfd *, bfd_vma, bfd_byte *, bfd_byte *));
+  PARAMS ((bfd *, bfd_vma, bfd_byte *, bfd_byte *));
 static bfd_reloc_status_type elf64_alpha_reloc_gpdisp
-  PARAMS((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 
 static reloc_howto_type * elf64_alpha_bfd_reloc_type_lookup
-  PARAMS((bfd *, bfd_reloc_code_real_type));
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
 static void elf64_alpha_info_to_howto
-  PARAMS((bfd *, arelent *, Elf64_Internal_Rela *));
-
-static boolean elf64_alpha_mkobject
-  PARAMS((bfd *));
-static boolean elf64_alpha_object_p
-  PARAMS((bfd *));
-static boolean elf64_alpha_section_from_shdr
-  PARAMS((bfd *, Elf64_Internal_Shdr *, char *));
-static boolean elf64_alpha_fake_sections
-  PARAMS((bfd *, Elf64_Internal_Shdr *, asection *));
-static boolean elf64_alpha_create_got_section
-  PARAMS((bfd *, struct bfd_link_info *));
-static boolean elf64_alpha_create_dynamic_sections
-  PARAMS((bfd *, struct bfd_link_info *));
-
-static boolean elf64_alpha_read_ecoff_info
-  PARAMS((bfd *, asection *, struct ecoff_debug_info *));
-static boolean elf64_alpha_is_local_label_name
-  PARAMS((bfd *, const char *));
-static boolean elf64_alpha_find_nearest_line
-  PARAMS((bfd *, asection *, asymbol **, bfd_vma, const char **,
-         const char **, unsigned int *));
+  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
+
+static bfd_boolean elf64_alpha_mkobject
+  PARAMS ((bfd *));
+static bfd_boolean elf64_alpha_object_p
+  PARAMS ((bfd *));
+static bfd_boolean elf64_alpha_section_from_shdr
+  PARAMS ((bfd *, Elf_Internal_Shdr *, const char *));
+static bfd_boolean elf64_alpha_section_flags
+  PARAMS ((flagword *, const Elf_Internal_Shdr *));
+static bfd_boolean elf64_alpha_fake_sections
+  PARAMS ((bfd *, Elf_Internal_Shdr *, asection *));
+static bfd_boolean elf64_alpha_create_got_section
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean elf64_alpha_create_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+
+static bfd_boolean elf64_alpha_read_ecoff_info
+  PARAMS ((bfd *, asection *, struct ecoff_debug_info *));
+static bfd_boolean elf64_alpha_is_local_label_name
+  PARAMS ((bfd *, const char *));
+static bfd_boolean elf64_alpha_find_nearest_line
+  PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
+          const char **, unsigned int *));
 
 #if defined(__STDC__) || defined(ALMOST_STDC)
 struct alpha_elf_link_hash_entry;
 #endif
 
-static boolean elf64_alpha_output_extsym
-  PARAMS((struct alpha_elf_link_hash_entry *, PTR));
+static bfd_boolean elf64_alpha_output_extsym
+  PARAMS ((struct alpha_elf_link_hash_entry *, PTR));
 
-static boolean elf64_alpha_can_merge_gots
-  PARAMS((bfd *, bfd *));
+static bfd_boolean elf64_alpha_can_merge_gots
+  PARAMS ((bfd *, bfd *));
 static void elf64_alpha_merge_gots
-  PARAMS((bfd *, bfd *));
-static boolean elf64_alpha_calc_got_offsets_for_symbol
+  PARAMS ((bfd *, bfd *));
+static bfd_boolean elf64_alpha_calc_got_offsets_for_symbol
   PARAMS ((struct alpha_elf_link_hash_entry *, PTR));
-static void elf64_alpha_calc_got_offsets PARAMS ((struct bfd_link_info *));
-static boolean elf64_alpha_size_got_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf64_alpha_always_size_sections
+static void elf64_alpha_calc_got_offsets
+  PARAMS ((struct bfd_link_info *));
+static bfd_boolean elf64_alpha_size_got_sections
+  PARAMS ((struct bfd_link_info *));
+static bfd_boolean elf64_alpha_size_plt_section
+  PARAMS ((struct bfd_link_info *));
+static bfd_boolean elf64_alpha_size_plt_section_1
+  PARAMS ((struct alpha_elf_link_hash_entry *, PTR));
+static bfd_boolean elf64_alpha_always_size_sections
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf64_alpha_calc_dynrel_sizes
+static int alpha_dynamic_entries_for_reloc
+  PARAMS ((int, int, int));
+static bfd_boolean elf64_alpha_calc_dynrel_sizes
   PARAMS ((struct alpha_elf_link_hash_entry *, struct bfd_link_info *));
-static boolean elf64_alpha_add_symbol_hook
-  PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
+static bfd_boolean elf64_alpha_size_rela_got_section
+  PARAMS ((struct bfd_link_info *));
+static bfd_boolean elf64_alpha_size_rela_got_1
+  PARAMS ((struct alpha_elf_link_hash_entry *, struct bfd_link_info *));
+static bfd_boolean elf64_alpha_add_symbol_hook
+  PARAMS ((bfd *, struct bfd_link_info *, Elf_Internal_Sym *,
           const char **, flagword *, asection **, bfd_vma *));
-static boolean elf64_alpha_check_relocs
-  PARAMS((bfd *, struct bfd_link_info *, asection *sec,
+static struct alpha_elf_got_entry *get_got_entry
+  PARAMS ((bfd *, struct alpha_elf_link_hash_entry *, unsigned long,
+          unsigned long, bfd_vma));
+static bfd_boolean elf64_alpha_check_relocs
+  PARAMS ((bfd *, struct bfd_link_info *, asection *sec,
          const Elf_Internal_Rela *));
-static boolean elf64_alpha_adjust_dynamic_symbol
-  PARAMS((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean elf64_alpha_size_dynamic_sections
-  PARAMS((bfd *, struct bfd_link_info *));
-static boolean elf64_alpha_relocate_section
-  PARAMS((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+static bfd_boolean elf64_alpha_adjust_dynamic_symbol
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
+static bfd_boolean elf64_alpha_size_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+static void elf64_alpha_emit_dynrel
+  PARAMS ((bfd *, struct bfd_link_info *, asection *, asection *,
+          bfd_vma, long, long, bfd_vma));
+static bfd_boolean elf64_alpha_relocate_section_r
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+          Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
+static bfd_boolean elf64_alpha_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
          Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean elf64_alpha_finish_dynamic_symbol
-  PARAMS((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
-         Elf_Internal_Sym *));
-static boolean elf64_alpha_finish_dynamic_sections
-  PARAMS((bfd *, struct bfd_link_info *));
-static boolean elf64_alpha_final_link
-  PARAMS((bfd *, struct bfd_link_info *));
-static boolean elf64_alpha_merge_ind_symbols
-  PARAMS((struct alpha_elf_link_hash_entry *, PTR));
+static bfd_boolean elf64_alpha_finish_dynamic_symbol
+  PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
+          Elf_Internal_Sym *));
+static bfd_boolean elf64_alpha_finish_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean elf64_alpha_final_link
+  PARAMS ((bfd *, struct bfd_link_info *));
+static bfd_boolean elf64_alpha_merge_ind_symbols
+  PARAMS ((struct alpha_elf_link_hash_entry *, PTR));
 static Elf_Internal_Rela * elf64_alpha_find_reloc_at_ofs
   PARAMS ((Elf_Internal_Rela *, Elf_Internal_Rela *, bfd_vma, int));
 static enum elf_reloc_type_class elf64_alpha_reloc_type_class
-  PARAMS ((int));
+  PARAMS ((const Elf_Internal_Rela *));
 \f
 struct alpha_elf_link_hash_entry
 {
@@ -146,50 +168,67 @@ struct alpha_elf_link_hash_entry
   /* Cumulative flags for all the .got entries.  */
   int flags;
 
-  /* Contexts (LITUSE) in which a literal was referenced.  */
-#define ALPHA_ELF_LINK_HASH_LU_ADDR 0x01
-#define ALPHA_ELF_LINK_HASH_LU_MEM  0x02
-#define ALPHA_ELF_LINK_HASH_LU_BYTE 0x04
-#define ALPHA_ELF_LINK_HASH_LU_FUNC 0x08
+  /* Contexts in which a literal was referenced.  */
+#define ALPHA_ELF_LINK_HASH_LU_ADDR    0x01
+#define ALPHA_ELF_LINK_HASH_LU_MEM     0x02
+#define ALPHA_ELF_LINK_HASH_LU_BYTE    0x04
+#define ALPHA_ELF_LINK_HASH_LU_JSR     0x08
+#define ALPHA_ELF_LINK_HASH_LU_TLSGD   0x10
+#define ALPHA_ELF_LINK_HASH_LU_TLSLDM  0x20
+#define ALPHA_ELF_LINK_HASH_LU_FUNC    0x38
+#define ALPHA_ELF_LINK_HASH_TLS_IE     0x40
+#define ALPHA_ELF_LINK_HASH_PLT_LOC    0x80
+
+  /* Used to undo the localization of a plt symbol.  */
+  asection *plt_old_section;
+  bfd_vma plt_old_value;
 
   /* Used to implement multiple .got subsections.  */
   struct alpha_elf_got_entry
   {
     struct alpha_elf_got_entry *next;
 
-    /* which .got subsection?  */
+    /* Which .got subsection?  */
     bfd *gotobj;
 
-    /* the addend in effect for this entry.  */
-    bfd_signed_vma addend;
+    /* The addend in effect for this entry.  */
+    bfd_vma addend;
 
-    /* the .got offset for this entry.  */
+    /* The .got offset for this entry.  */
     int got_offset;
 
-    int flags;
+    /* How many references to this entry?  */
+    int use_count;
+
+    /* The relocation type of this entry.  */
+    unsigned char reloc_type;
 
-    /* An additional flag.  */
-#define ALPHA_ELF_GOT_ENTRY_RELOCS_DONE 0x10
+    /* How a LITERAL is used.  */
+    unsigned char flags;
 
-    int use_count;
+    /* Have we initialized the dynamic relocation for this entry?  */
+    unsigned char reloc_done;
+
+    /* Have we adjusted this entry for SEC_MERGE?  */
+    unsigned char reloc_xlated;
   } *got_entries;
 
-  /* used to count non-got, non-plt relocations for delayed sizing
+  /* Used to count non-got, non-plt relocations for delayed sizing
      of relocation sections.  */
   struct alpha_elf_reloc_entry
   {
     struct alpha_elf_reloc_entry *next;
 
-    /* which .reloc section? */
+    /* Which .reloc section? */
     asection *srel;
 
-    /* what kind of relocation? */
+    /* What kind of relocation? */
     unsigned int rtype;
 
-    /* is this against read-only section? */
+    /* Is this against read-only section? */
     unsigned int reltext : 1;
 
-    /* how many did we find?  */
+    /* How many did we find?  */
     unsigned long count;
   } *reloc_entries;
 };
@@ -217,7 +256,7 @@ struct alpha_elf_link_hash_table
 #define alpha_elf_link_hash_traverse(table, func, info)                        \
   (elf_link_hash_traverse                                              \
    (&(table)->root,                                                    \
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func), \
+    (bfd_boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func), \
     (info)))
 
 /* Get the Alpha ELF linker hash table from a link_info structure.  */
@@ -230,47 +269,17 @@ struct alpha_elf_link_hash_table
 #define alpha_elf_sym_hashes(abfd) \
   ((struct alpha_elf_link_hash_entry **)elf_sym_hashes(abfd))
 
-/* Should we do dynamic things to this symbol?  */
+/* Should we do dynamic things to this symbol?  This differs from the 
+   generic version in that we never need to consider function pointer
+   equality wrt PLT entries -- we don't create a PLT entry if a symbol's
+   address is ever taken.  */
 
-static int
+static inline bfd_boolean
 alpha_elf_dynamic_symbol_p (h, info)
      struct elf_link_hash_entry *h;
      struct bfd_link_info *info;
 {
-  if (h == NULL)
-    return false;
-
-  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;
-
-  if (h->dynindx == -1)
-    return false;
-
-  if (h->root.type == bfd_link_hash_undefweak
-      || h->root.type == bfd_link_hash_defweak)
-    return true;
-
-  switch (ELF_ST_VISIBILITY (h->other))
-    {
-    case STV_DEFAULT:
-      break;
-    case STV_HIDDEN:
-    case STV_INTERNAL:
-      return false;
-    case STV_PROTECTED:
-      if (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)
-        return false;
-      break;
-    }
-
-  if ((info->shared && !info->symbolic)
-      || ((h->elf_link_hash_flags
-          & (ELF_LINK_HASH_DEF_DYNAMIC | ELF_LINK_HASH_REF_REGULAR))
-         == (ELF_LINK_HASH_DEF_DYNAMIC | ELF_LINK_HASH_REF_REGULAR)))
-    return true;
-
-  return false;
+  return _bfd_elf_dynamic_symbol_p (h, info, 0);
 }
 
 /* Create an entry in a Alpha ELF linker hash table.  */
@@ -319,16 +328,16 @@ elf64_alpha_bfd_link_hash_table_create (abfd)
      bfd *abfd;
 {
   struct alpha_elf_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct alpha_elf_link_hash_table);
 
-  ret = ((struct alpha_elf_link_hash_table *)
-        bfd_zalloc (abfd, sizeof (struct alpha_elf_link_hash_table)));
+  ret = (struct alpha_elf_link_hash_table *) bfd_zmalloc (amt);
   if (ret == (struct alpha_elf_link_hash_table *) NULL)
     return NULL;
 
   if (! _bfd_elf_link_hash_table_init (&ret->root, abfd,
                                       elf64_alpha_link_hash_newfunc))
     {
-      bfd_release (abfd, ret);
+      free (ret);
       return NULL;
     }
 
@@ -358,39 +367,32 @@ struct alpha_elf_obj_tdata
   /* For every got, this is the section.  */
   asection *got;
 
-  /* For every got, this is it's total number of *entries*.  */
-  int total_got_entries;
+  /* For every got, this is it's total number of words.  */
+  int total_got_size;
 
-  /* For every got, this is the sum of the number of *entries* required
+  /* For every got, this is the sum of the number of words required
      to hold all of the member object's local got.  */
-  int n_local_got_entries;
+  int local_got_size;
 };
 
 #define alpha_elf_tdata(abfd) \
   ((struct alpha_elf_obj_tdata *) (abfd)->tdata.any)
 
-static boolean
+static bfd_boolean
 elf64_alpha_mkobject (abfd)
      bfd *abfd;
 {
-  abfd->tdata.any = bfd_zalloc (abfd, sizeof (struct alpha_elf_obj_tdata));
+  bfd_size_type amt = sizeof (struct alpha_elf_obj_tdata);
+  abfd->tdata.any = bfd_zalloc (abfd, amt);
   if (abfd->tdata.any == NULL)
-    return false;
-  return true;
+    return FALSE;
+  return TRUE;
 }
 
-static boolean
+static bfd_boolean
 elf64_alpha_object_p (abfd)
      bfd *abfd;
 {
-  /* Allocate our special target data.  */
-  struct alpha_elf_obj_tdata *new_tdata;
-  new_tdata = bfd_zalloc (abfd, sizeof (struct alpha_elf_obj_tdata));
-  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 Alpha ELF file.  */
   return bfd_default_set_arch_mach (abfd, bfd_arch_alpha, 0);
 }
@@ -408,45 +410,45 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         0,                     /* rightshift */
         0,                     /* size (0 = byte, 1 = short, 2 = long) */
         8,                     /* bitsize */
-        true,                  /* pc_relative */
+        TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */
         elf64_alpha_reloc_nil, /* special_function */
         "NONE",                /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0,                     /* src_mask */
         0,                     /* dst_mask */
-        true),                 /* pcrel_offset */
+        TRUE),                 /* pcrel_offset */
 
   /* A 32 bit reference to a symbol.  */
   HOWTO (R_ALPHA_REFLONG,      /* type */
         0,                     /* rightshift */
         2,                     /* size (0 = byte, 1 = short, 2 = long) */
         32,                    /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         0,                     /* special_function */
         "REFLONG",             /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0xffffffff,            /* src_mask */
         0xffffffff,            /* dst_mask */
-        false),                /* pcrel_offset */
+        FALSE),                /* pcrel_offset */
 
   /* A 64 bit reference to a symbol.  */
   HOWTO (R_ALPHA_REFQUAD,      /* type */
         0,                     /* rightshift */
         4,                     /* size (0 = byte, 1 = short, 2 = long) */
         64,                    /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         0,                     /* special_function */
         "REFQUAD",             /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         MINUS_ONE,             /* src_mask */
         MINUS_ONE,             /* dst_mask */
-        false),                /* pcrel_offset */
+        FALSE),                /* pcrel_offset */
 
   /* A 32 bit GP relative offset.  This is just like REFLONG except
      that when the value is used the value of the gp register will be
@@ -455,30 +457,30 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         0,                     /* rightshift */
         2,                     /* size (0 = byte, 1 = short, 2 = long) */
         32,                    /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         0,                     /* special_function */
         "GPREL32",             /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0xffffffff,            /* src_mask */
         0xffffffff,            /* dst_mask */
-        false),                /* pcrel_offset */
+        FALSE),                /* pcrel_offset */
 
   /* Used for an instruction that refers to memory off the GP register.  */
   HOWTO (R_ALPHA_LITERAL,      /* type */
         0,                     /* rightshift */
         1,                     /* size (0 = byte, 1 = short, 2 = long) */
         16,                    /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         0,                     /* special_function */
         "ELF_LITERAL",         /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         0xffff,                /* dst_mask */
-        false),                /* pcrel_offset */
+        FALSE),                /* pcrel_offset */
 
   /* This reloc only appears immediately following an ELF_LITERAL reloc.
      It identifies a use of the literal.  The symbol index is special:
@@ -491,15 +493,15 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         0,                     /* rightshift */
         1,                     /* size (0 = byte, 1 = short, 2 = long) */
         32,                    /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */
         elf64_alpha_reloc_nil, /* special_function */
         "LITUSE",              /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0,                     /* src_mask */
         0,                     /* dst_mask */
-        false),                /* pcrel_offset */
+        FALSE),                /* pcrel_offset */
 
   /* Load the gp register.  This is always used for a ldah instruction
      which loads the upper 16 bits of the gp register.  The symbol
@@ -521,90 +523,90 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         16,                    /* rightshift */
         2,                     /* size (0 = byte, 1 = short, 2 = long) */
         16,                    /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */
         elf64_alpha_reloc_gpdisp, /* special_function */
         "GPDISP",              /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         0xffff,                /* dst_mask */
-        true),                 /* pcrel_offset */
+        TRUE),                 /* pcrel_offset */
 
   /* A 21 bit branch.  */
   HOWTO (R_ALPHA_BRADDR,       /* type */
         2,                     /* rightshift */
         2,                     /* size (0 = byte, 1 = short, 2 = long) */
         21,                    /* bitsize */
-        true,                  /* pc_relative */
+        TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         0,                     /* special_function */
         "BRADDR",              /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0x1fffff,              /* src_mask */
         0x1fffff,              /* dst_mask */
-        true),                 /* pcrel_offset */
+        TRUE),                 /* pcrel_offset */
 
   /* A hint for a jump to a register.  */
   HOWTO (R_ALPHA_HINT,         /* type */
         2,                     /* rightshift */
         1,                     /* size (0 = byte, 1 = short, 2 = long) */
         14,                    /* bitsize */
-        true,                  /* pc_relative */
+        TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */
         0,                     /* special_function */
         "HINT",                /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0x3fff,                /* src_mask */
         0x3fff,                /* dst_mask */
-        true),                 /* pcrel_offset */
+        TRUE),                 /* pcrel_offset */
 
   /* 16 bit PC relative offset.  */
   HOWTO (R_ALPHA_SREL16,       /* type */
         0,                     /* rightshift */
         1,                     /* size (0 = byte, 1 = short, 2 = long) */
         16,                    /* bitsize */
-        true,                  /* pc_relative */
+        TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         0,                     /* special_function */
         "SREL16",              /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         0xffff,                /* dst_mask */
-        true),                 /* pcrel_offset */
+        TRUE),                 /* pcrel_offset */
 
   /* 32 bit PC relative offset.  */
   HOWTO (R_ALPHA_SREL32,       /* type */
         0,                     /* rightshift */
         2,                     /* size (0 = byte, 1 = short, 2 = long) */
         32,                    /* bitsize */
-        true,                  /* pc_relative */
+        TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         0,                     /* special_function */
         "SREL32",              /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0xffffffff,            /* src_mask */
         0xffffffff,            /* dst_mask */
-        true),                 /* pcrel_offset */
+        TRUE),                 /* pcrel_offset */
 
   /* A 64 bit PC relative offset.  */
   HOWTO (R_ALPHA_SREL64,       /* type */
         0,                     /* rightshift */
         4,                     /* size (0 = byte, 1 = short, 2 = long) */
         64,                    /* bitsize */
-        true,                  /* pc_relative */
+        TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         0,                     /* special_function */
         "SREL64",              /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         MINUS_ONE,             /* src_mask */
         MINUS_ONE,             /* dst_mask */
-        true),                 /* pcrel_offset */
+        TRUE),                 /* pcrel_offset */
 
   /* Skip 12 - 16; deprecated ECOFF relocs.  */
   SKIP_HOWTO (12),
@@ -618,45 +620,45 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         0,                     /* rightshift */
         1,                     /* size (0 = byte, 1 = short, 2 = long) */
         16,                    /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         0,                     /* special_function */
         "GPRELHIGH",           /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         0xffff,                /* dst_mask */
-        false),                /* pcrel_offset */
+        FALSE),                /* pcrel_offset */
 
   /* The low 16 bits of the displacement from GP to the target.  */
   HOWTO (R_ALPHA_GPRELLOW,
         0,                     /* rightshift */
         1,                     /* size (0 = byte, 1 = short, 2 = long) */
         16,                    /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */
         0,                     /* special_function */
         "GPRELLOW",            /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         0xffff,                /* dst_mask */
-        false),                /* pcrel_offset */
+        FALSE),                /* pcrel_offset */
 
   /* A 16-bit displacement from the GP to the target.  */
   HOWTO (R_ALPHA_GPREL16,
         0,                     /* rightshift */
         1,                     /* size (0 = byte, 1 = short, 2 = long) */
         16,                    /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         0,                     /* special_function */
         "GPREL16",             /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         0xffff,                /* dst_mask */
-        false),                /* pcrel_offset */
+        FALSE),                /* pcrel_offset */
 
   /* Skip 20 - 23; deprecated ECOFF relocs.  */
   SKIP_HOWTO (20),
@@ -674,60 +676,272 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         0,
         0,
         0,
-        false,
+        FALSE,
         0,
         complain_overflow_dont,
         bfd_elf_generic_reloc,
         "COPY",
-        false,
+        FALSE,
         0,
         0,
-        true),
+        TRUE),
 
   /* A dynamic relocation for a .got entry.  */
   HOWTO (R_ALPHA_GLOB_DAT,
         0,
         0,
         0,
-        false,
+        FALSE,
         0,
         complain_overflow_dont,
         bfd_elf_generic_reloc,
         "GLOB_DAT",
-        false,
+        FALSE,
         0,
         0,
-        true),
+        TRUE),
 
   /* A dynamic relocation for a .plt entry.  */
   HOWTO (R_ALPHA_JMP_SLOT,
         0,
         0,
         0,
-        false,
+        FALSE,
         0,
         complain_overflow_dont,
         bfd_elf_generic_reloc,
         "JMP_SLOT",
-        false,
+        FALSE,
         0,
         0,
-        true),
+        TRUE),
 
   /* A dynamic relocation to add the base of the DSO to a 64-bit field.  */
   HOWTO (R_ALPHA_RELATIVE,
         0,
         0,
         0,
-        false,
+        FALSE,
         0,
         complain_overflow_dont,
         bfd_elf_generic_reloc,
         "RELATIVE",
-        false,
+        FALSE,
         0,
         0,
-        true)
+        TRUE),
+
+  /* A 21 bit branch that adjusts for gp loads.  */
+  HOWTO (R_ALPHA_BRSGP,                /* type */
+        2,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        21,                    /* bitsize */
+        TRUE,                  /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_signed, /* complain_on_overflow */
+        0,                     /* special_function */
+        "BRSGP",               /* name */
+        FALSE,                 /* partial_inplace */
+        0x1fffff,              /* src_mask */
+        0x1fffff,              /* dst_mask */
+        TRUE),                 /* pcrel_offset */
+
+  /* Creates a tls_index for the symbol in the got.  */
+  HOWTO (R_ALPHA_TLSGD,                /* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        FALSE,                 /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_signed, /* complain_on_overflow */
+        0,                     /* special_function */
+        "TLSGD",               /* name */
+        FALSE,                 /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
+        FALSE),                /* pcrel_offset */
+
+  /* Creates a tls_index for the (current) module in the got.  */
+  HOWTO (R_ALPHA_TLSLDM,       /* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        FALSE,                 /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_signed, /* complain_on_overflow */
+        0,                     /* special_function */
+        "TLSLDM",              /* name */
+        FALSE,                 /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
+        FALSE),                /* pcrel_offset */
+
+  /* A dynamic relocation for a DTP module entry.  */
+  HOWTO (R_ALPHA_DTPMOD64,     /* type */
+        0,                     /* rightshift */
+        4,                     /* size (0 = byte, 1 = short, 2 = long) */
+        64,                    /* bitsize */
+        FALSE,                 /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_bitfield, /* complain_on_overflow */
+        0,                     /* special_function */
+        "DTPMOD64",            /* name */
+        FALSE,                 /* partial_inplace */
+        MINUS_ONE,             /* src_mask */
+        MINUS_ONE,             /* dst_mask */
+        FALSE),                /* pcrel_offset */
+
+  /* Creates a 64-bit offset in the got for the displacement
+     from DTP to the target.  */
+  HOWTO (R_ALPHA_GOTDTPREL,    /* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        FALSE,                 /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_signed, /* complain_on_overflow */
+        0,                     /* special_function */
+        "GOTDTPREL",           /* name */
+        FALSE,                 /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
+        FALSE),                /* pcrel_offset */
+
+  /* A dynamic relocation for a displacement from DTP to the target.  */
+  HOWTO (R_ALPHA_DTPREL64,     /* type */
+        0,                     /* rightshift */
+        4,                     /* size (0 = byte, 1 = short, 2 = long) */
+        64,                    /* bitsize */
+        FALSE,                 /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_bitfield, /* complain_on_overflow */
+        0,                     /* special_function */
+        "DTPREL64",            /* name */
+        FALSE,                 /* partial_inplace */
+        MINUS_ONE,             /* src_mask */
+        MINUS_ONE,             /* dst_mask */
+        FALSE),                /* pcrel_offset */
+
+  /* The high 16 bits of the displacement from DTP to the target.  */
+  HOWTO (R_ALPHA_DTPRELHI,     /* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        FALSE,                 /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_signed, /* complain_on_overflow */
+        0,                     /* special_function */
+        "DTPRELHI",            /* name */
+        FALSE,                 /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
+        FALSE),                /* pcrel_offset */
+
+  /* The low 16 bits of the displacement from DTP to the target.  */
+  HOWTO (R_ALPHA_DTPRELLO,     /* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        FALSE,                 /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_dont, /* complain_on_overflow */
+        0,                     /* special_function */
+        "DTPRELLO",            /* name */
+        FALSE,                 /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
+        FALSE),                /* pcrel_offset */
+
+  /* A 16-bit displacement from DTP to the target.  */
+  HOWTO (R_ALPHA_DTPREL16,     /* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        FALSE,                 /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_signed, /* complain_on_overflow */
+        0,                     /* special_function */
+        "DTPREL16",            /* name */
+        FALSE,                 /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
+        FALSE),                /* pcrel_offset */
+
+  /* Creates a 64-bit offset in the got for the displacement
+     from TP to the target.  */
+  HOWTO (R_ALPHA_GOTTPREL,     /* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        FALSE,                 /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_signed, /* complain_on_overflow */
+        0,                     /* special_function */
+        "GOTTPREL",            /* name */
+        FALSE,                 /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
+        FALSE),                /* pcrel_offset */
+
+  /* A dynamic relocation for a displacement from TP to the target.  */
+  HOWTO (R_ALPHA_TPREL64,      /* type */
+        0,                     /* rightshift */
+        4,                     /* size (0 = byte, 1 = short, 2 = long) */
+        64,                    /* bitsize */
+        FALSE,                 /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_bitfield, /* complain_on_overflow */
+        0,                     /* special_function */
+        "TPREL64",             /* name */
+        FALSE,                 /* partial_inplace */
+        MINUS_ONE,             /* src_mask */
+        MINUS_ONE,             /* dst_mask */
+        FALSE),                /* pcrel_offset */
+
+  /* The high 16 bits of the displacement from TP to the target.  */
+  HOWTO (R_ALPHA_TPRELHI,      /* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        FALSE,                 /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_signed, /* complain_on_overflow */
+        0,                     /* special_function */
+        "TPRELHI",             /* name */
+        FALSE,                 /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
+        FALSE),                /* pcrel_offset */
+
+  /* The low 16 bits of the displacement from TP to the target.  */
+  HOWTO (R_ALPHA_TPRELLO,      /* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        FALSE,                 /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_dont, /* complain_on_overflow */
+        0,                     /* special_function */
+        "TPRELLO",             /* name */
+        FALSE,                 /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
+        FALSE),                /* pcrel_offset */
+
+  /* A 16-bit displacement from TP to the target.  */
+  HOWTO (R_ALPHA_TPREL16,      /* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        FALSE,                 /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_signed, /* complain_on_overflow */
+        0,                     /* special_function */
+        "TPREL16",             /* name */
+        FALSE,                 /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
+        FALSE),                /* pcrel_offset */
 };
 
 /* A relocation function which doesn't do anything.  */
@@ -801,8 +1015,8 @@ elf64_alpha_do_reloc_gpdisp (abfd, gpdisp, p_ldah, p_lda)
            | (((gpdisp >> 16) + ((gpdisp >> 15) & 1)) & 0xffff));
   i_lda = (i_lda & 0xffff0000) | (gpdisp & 0xffff);
 
-  bfd_put_32 (abfd, i_ldah, p_ldah);
-  bfd_put_32 (abfd, i_lda, p_lda);
+  bfd_put_32 (abfd, (bfd_vma) i_ldah, p_ldah);
+  bfd_put_32 (abfd, (bfd_vma) i_lda, p_lda);
 
   return ret;
 }
@@ -881,6 +1095,20 @@ static const struct elf_reloc_map elf64_alpha_reloc_map[] =
   {BFD_RELOC_ALPHA_GPREL_HI16,         R_ALPHA_GPRELHIGH},
   {BFD_RELOC_ALPHA_GPREL_LO16,         R_ALPHA_GPRELLOW},
   {BFD_RELOC_GPREL16,                  R_ALPHA_GPREL16},
+  {BFD_RELOC_ALPHA_BRSGP,              R_ALPHA_BRSGP},
+  {BFD_RELOC_ALPHA_TLSGD,              R_ALPHA_TLSGD},
+  {BFD_RELOC_ALPHA_TLSLDM,             R_ALPHA_TLSLDM},
+  {BFD_RELOC_ALPHA_DTPMOD64,           R_ALPHA_DTPMOD64},
+  {BFD_RELOC_ALPHA_GOTDTPREL16,                R_ALPHA_GOTDTPREL},
+  {BFD_RELOC_ALPHA_DTPREL64,           R_ALPHA_DTPREL64},
+  {BFD_RELOC_ALPHA_DTPREL_HI16,                R_ALPHA_DTPRELHI},
+  {BFD_RELOC_ALPHA_DTPREL_LO16,                R_ALPHA_DTPRELLO},
+  {BFD_RELOC_ALPHA_DTPREL16,           R_ALPHA_DTPREL16},
+  {BFD_RELOC_ALPHA_GOTTPREL16,         R_ALPHA_GOTTPREL},
+  {BFD_RELOC_ALPHA_TPREL64,            R_ALPHA_TPREL64},
+  {BFD_RELOC_ALPHA_TPREL_HI16,         R_ALPHA_TPRELHI},
+  {BFD_RELOC_ALPHA_TPREL_LO16,         R_ALPHA_TPRELLO},
+  {BFD_RELOC_ALPHA_TPREL16,            R_ALPHA_TPREL16},
 };
 
 /* Given a BFD reloc type, return a HOWTO structure.  */
@@ -907,7 +1135,7 @@ static void
 elf64_alpha_info_to_howto (abfd, cache_ptr, dst)
      bfd *abfd ATTRIBUTE_UNUSED;
      arelent *cache_ptr;
-     Elf64_Internal_Rela *dst;
+     Elf_Internal_Rela *dst;
 {
   unsigned r_type;
 
@@ -915,6 +1143,21 @@ elf64_alpha_info_to_howto (abfd, cache_ptr, dst)
   BFD_ASSERT (r_type < (unsigned int) R_ALPHA_max);
   cache_ptr->howto = &elf64_alpha_howto_table[r_type];
 }
+
+/* These two relocations create a two-word entry in the got.  */
+#define alpha_got_entry_size(r_type) \
+  (r_type == R_ALPHA_TLSGD || r_type == R_ALPHA_TLSLDM ? 16 : 8)
+
+/* This is PT_TLS segment p_vaddr.  */
+#define alpha_get_dtprel_base(info) \
+  (elf_hash_table (info)->tls_sec->vma)
+
+/* Main program TLS (whose template starts at PT_TLS p_vaddr)
+   is assigned offset round(16, PT_TLS p_align).  */
+#define alpha_get_tprel_base(info) \
+  (elf_hash_table (info)->tls_sec->vma                                 \
+   - align_power ((bfd_vma) 16,                                                \
+                 elf_hash_table (info)->tls_sec->alignment_power))
 \f
 /* These functions do relaxation for Alpha ELF.
 
@@ -936,39 +1179,46 @@ elf64_alpha_info_to_howto (abfd, cache_ptr, dst)
 #define OP_LDQ         0x29
 #define OP_BR          0x30
 #define OP_BSR         0x34
-#define INSN_UNOP      0x2fe00000
+#define INSN_UNOP      0x2ffe0000
+#define INSN_ADDQ      0x40000400
+#define INSN_RDUNIQ    0x0000009e
 
 struct alpha_relax_info
 {
   bfd *abfd;
   asection *sec;
   bfd_byte *contents;
+  Elf_Internal_Shdr *symtab_hdr;
   Elf_Internal_Rela *relocs, *relend;
   struct bfd_link_info *link_info;
-  boolean changed_contents;
-  boolean changed_relocs;
   bfd_vma gp;
   bfd *gotobj;
   asection *tsec;
   struct alpha_elf_link_hash_entry *h;
+  struct alpha_elf_got_entry **first_gotent;
   struct alpha_elf_got_entry *gotent;
+  bfd_boolean changed_contents;
+  bfd_boolean changed_relocs;
   unsigned char other;
 };
 
-static Elf_Internal_Rela * elf64_alpha_relax_with_lituse
-  PARAMS((struct alpha_relax_info *info, bfd_vma symval,
-          Elf_Internal_Rela *irel, Elf_Internal_Rela *irelend));
-
-static boolean elf64_alpha_relax_without_lituse
+static bfd_boolean elf64_alpha_relax_with_lituse
   PARAMS((struct alpha_relax_info *info, bfd_vma symval,
           Elf_Internal_Rela *irel));
-
 static bfd_vma elf64_alpha_relax_opt_call
   PARAMS((struct alpha_relax_info *info, bfd_vma symval));
-
-static boolean elf64_alpha_relax_section
+static bfd_boolean elf64_alpha_relax_got_load
+  PARAMS((struct alpha_relax_info *info, bfd_vma symval,
+          Elf_Internal_Rela *irel, unsigned long));
+static bfd_boolean elf64_alpha_relax_gprelhilo
+  PARAMS((struct alpha_relax_info *info, bfd_vma symval,
+          Elf_Internal_Rela *irel, bfd_boolean));
+static bfd_boolean elf64_alpha_relax_tls_get_addr
+  PARAMS((struct alpha_relax_info *info, bfd_vma symval,
+          Elf_Internal_Rela *irel, bfd_boolean));
+static bfd_boolean elf64_alpha_relax_section
   PARAMS((bfd *abfd, asection *sec, struct bfd_link_info *link_info,
-         boolean *again));
+         bfd_boolean *again));
 
 static Elf_Internal_Rela *
 elf64_alpha_find_reloc_at_ofs (rel, relend, offset, type)
@@ -986,19 +1236,19 @@ elf64_alpha_find_reloc_at_ofs (rel, relend, offset, type)
   return NULL;
 }
 
-static Elf_Internal_Rela *
-elf64_alpha_relax_with_lituse (info, symval, irel, irelend)
+static bfd_boolean
+elf64_alpha_relax_with_lituse (info, symval, irel)
      struct alpha_relax_info *info;
      bfd_vma symval;
-     Elf_Internal_Rela *irel, *irelend;
+     Elf_Internal_Rela *irel;
 {
-  Elf_Internal_Rela *urel;
+  Elf_Internal_Rela *urel, *irelend = info->relend;
   int flags, count, i;
   bfd_signed_vma disp;
-  boolean fits16;
-  boolean fits32;
-  boolean lit_reused = false;
-  boolean all_optimized = true;
+  bfd_boolean fits16;
+  bfd_boolean fits32;
+  bfd_boolean lit_reused = FALSE;
+  bfd_boolean all_optimized = TRUE;
   unsigned int lit_insn;
 
   lit_insn = bfd_get_32 (info->abfd, info->contents + irel->r_offset);
@@ -1006,17 +1256,21 @@ elf64_alpha_relax_with_lituse (info, symval, irel, irelend)
     {
       ((*_bfd_error_handler)
        ("%s: %s+0x%lx: warning: LITERAL relocation against unexpected insn",
-       bfd_get_filename (info->abfd), info->sec->name,
-       (unsigned long)irel->r_offset));
-      return irel;
+       bfd_archive_filename (info->abfd), info->sec->name,
+       (unsigned long) irel->r_offset));
+      return TRUE;
     }
 
+  /* Can't relax dynamic symbols.  */
+  if (alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info))
+    return TRUE;
+
   /* Summarize how this particular LITERAL is used.  */
   for (urel = irel+1, flags = count = 0; urel < irelend; ++urel, ++count)
     {
       if (ELF64_R_TYPE (urel->r_info) != R_ALPHA_LITUSE)
        break;
-      if (urel->r_addend >= 0 && urel->r_addend <= 3)
+      if (urel->r_addend <= 3)
        flags |= 1 << urel->r_addend;
     }
 
@@ -1033,25 +1287,27 @@ elf64_alpha_relax_with_lituse (info, symval, irel, irelend)
 
       switch (urel->r_addend)
        {
-       default: /* 0 = ADDRESS FORMAT */
+       case LITUSE_ALPHA_ADDR:
+       default:
          /* This type is really just a placeholder to note that all
             uses cannot be optimized, but to still allow some.  */
-         all_optimized = false;
+         all_optimized = FALSE;
          break;
 
-       case 1: /* MEM FORMAT */
+       case LITUSE_ALPHA_BASE:
          /* We can always optimize 16-bit displacements.  */
 
          /* Extract the displacement from the instruction, sign-extending
             it if necessary, then test whether it is within 16 or 32 bits
             displacement from GP.  */
          insn_disp = insn & 0x0000ffff;
-         if (insn_disp & 0x00008000)
-           insn_disp |= 0xffff0000;  /* Negative: sign-extend.  */
+         if (insn_disp & 0x8000)
+           insn_disp |= ~0xffff;  /* Negative: sign-extend.  */
 
          xdisp = disp + insn_disp;
-         fits16 = (xdisp >= - (bfd_signed_vma) 0x00008000 && xdisp < 0x00008000);
-         fits32 = (xdisp >= - (bfd_signed_vma) 0x80000000 && xdisp < 0x7fff8000);
+         fits16 = (xdisp >= - (bfd_signed_vma) 0x8000 && xdisp < 0x8000);
+         fits32 = (xdisp >= - (bfd_signed_vma) 0x80000000
+                   && xdisp < 0x7fff8000);
 
          if (fits16)
            {
@@ -1061,10 +1317,11 @@ elf64_alpha_relax_with_lituse (info, symval, irel, irelend)
              urel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
                                           R_ALPHA_GPREL16);
              urel->r_addend = irel->r_addend;
-             info->changed_relocs = true;
+             info->changed_relocs = TRUE;
 
-             bfd_put_32 (info->abfd, insn, info->contents + urel->r_offset);
-             info->changed_contents = true;
+             bfd_put_32 (info->abfd, (bfd_vma) insn,
+                         info->contents + urel->r_offset);
+             info->changed_contents = TRUE;
            }
 
          /* If all mem+byte, we can optimize 32-bit mem displacements.  */
@@ -1075,46 +1332,52 @@ elf64_alpha_relax_with_lituse (info, symval, irel, irelend)
              irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
                                           R_ALPHA_GPRELHIGH);
              lit_insn = (OP_LDAH << 26) | (lit_insn & 0x03ff0000);
-             bfd_put_32 (info->abfd, lit_insn,
+             bfd_put_32 (info->abfd, (bfd_vma) lit_insn,
                          info->contents + irel->r_offset);
-             lit_reused = true;
-             info->changed_contents = true;
+             lit_reused = TRUE;
+             info->changed_contents = TRUE;
 
              urel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
                                           R_ALPHA_GPRELLOW);
              urel->r_addend = irel->r_addend;
-             info->changed_relocs = true;
+             info->changed_relocs = TRUE;
            }
          else
-           all_optimized = false;
+           all_optimized = FALSE;
          break;
 
-       case 2: /* BYTE OFFSET FORMAT */
+       case LITUSE_ALPHA_BYTOFF:
          /* We can always optimize byte instructions.  */
 
          /* FIXME: sanity check the insn for byte op.  Check that the
             literal dest reg is indeed Rb in the byte insn.  */
 
-         insn = (insn & ~0x001ff000) | ((symval & 7) << 13) | 0x1000;
+         insn &= ~ (unsigned) 0x001ff000;
+         insn |= ((symval & 7) << 13) | 0x1000;
 
          urel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
          urel->r_addend = 0;
-         info->changed_relocs = true;
+         info->changed_relocs = TRUE;
 
-         bfd_put_32 (info->abfd, insn, info->contents + urel->r_offset);
-         info->changed_contents = true;
+         bfd_put_32 (info->abfd, (bfd_vma) insn,
+                     info->contents + urel->r_offset);
+         info->changed_contents = TRUE;
          break;
 
-       case 3: /* CALL FORMAT */
+       case LITUSE_ALPHA_JSR:
+       case LITUSE_ALPHA_TLSGD:
+       case LITUSE_ALPHA_TLSLDM:
          {
-           /* If not zero, place to jump without needing pv.  */
-           bfd_vma optdest = elf64_alpha_relax_opt_call (info, symval);
-           bfd_vma org = (info->sec->output_section->vma
-                          + info->sec->output_offset
-                          + urel->r_offset + 4);
+           bfd_vma optdest, org;
            bfd_signed_vma odisp;
 
+           /* If not zero, place to jump without needing pv.  */
+           optdest = elf64_alpha_relax_opt_call (info, symval);
+           org = (info->sec->output_section->vma
+                  + info->sec->output_offset
+                  + urel->r_offset + 4);
            odisp = (optdest ? optdest : symval) - org;
+
            if (odisp >= -0x400000 && odisp < 0x400000)
              {
                Elf_Internal_Rela *xrel;
@@ -1132,9 +1395,10 @@ elf64_alpha_relax_with_lituse (info, symval, irel, irelend)
                if (optdest)
                  urel->r_addend += optdest - symval;
                else
-                 all_optimized = false;
+                 all_optimized = FALSE;
 
-               bfd_put_32 (info->abfd, insn, info->contents + urel->r_offset);
+               bfd_put_32 (info->abfd, (bfd_vma) insn,
+                           info->contents + urel->r_offset);
 
                /* Kill any HINT reloc that might exist for this insn.  */
                xrel = (elf64_alpha_find_reloc_at_ofs
@@ -1143,11 +1407,11 @@ elf64_alpha_relax_with_lituse (info, symval, irel, irelend)
                if (xrel)
                  xrel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
 
-               info->changed_contents = true;
-               info->changed_relocs = true;
+               info->changed_contents = TRUE;
+               info->changed_relocs = TRUE;
              }
            else
-             all_optimized = false;
+             all_optimized = FALSE;
 
            /* Even if the target is not in range for a direct branch,
               if we share a GP, we can eliminate the gp reload.  */
@@ -1155,10 +1419,11 @@ elf64_alpha_relax_with_lituse (info, symval, irel, irelend)
              {
                Elf_Internal_Rela *gpdisp
                  = (elf64_alpha_find_reloc_at_ofs
-                    (irel, irelend, urel->r_offset + 4, R_ALPHA_GPDISP));
+                    (info->relocs, irelend, urel->r_offset + 4,
+                     R_ALPHA_GPDISP));
                if (gpdisp)
                  {
-                   bfd_byte *p_ldah = info->contents + gpdisp->r_offset; 
+                   bfd_byte *p_ldah = info->contents + gpdisp->r_offset;
                    bfd_byte *p_lda = p_ldah + gpdisp->r_addend;
                    unsigned int ldah = bfd_get_32 (info->abfd, p_ldah);
                    unsigned int lda = bfd_get_32 (info->abfd, p_lda);
@@ -1170,12 +1435,12 @@ elf64_alpha_relax_with_lituse (info, symval, irel, irelend)
                       In that case the insn would use $27 as the base.  */
                    if (ldah == 0x27ba0000 && lda == 0x23bd0000)
                      {
-                       bfd_put_32 (info->abfd, INSN_UNOP, p_ldah);
-                       bfd_put_32 (info->abfd, INSN_UNOP, p_lda);
+                       bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, p_ldah);
+                       bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, p_lda);
 
                        gpdisp->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
-                       info->changed_contents = true;
-                       info->changed_relocs = true;
+                       info->changed_contents = TRUE;
+                       info->changed_relocs = TRUE;
                      }
                  }
              }
@@ -1188,26 +1453,30 @@ elf64_alpha_relax_with_lituse (info, symval, irel, irelend)
      got entry by one, possibly eliminating it.  */
   if (all_optimized)
     {
-      info->gotent->use_count -= 1;
-      alpha_elf_tdata (info->gotent->gotobj)->total_got_entries -= 1;
-      if (!info->h)
-       alpha_elf_tdata (info->gotent->gotobj)->n_local_got_entries -= 1;
+      if (--info->gotent->use_count == 0)
+       {
+         int sz = alpha_got_entry_size (R_ALPHA_LITERAL);
+         alpha_elf_tdata (info->gotobj)->total_got_size -= sz;
+         if (!info->h)
+           alpha_elf_tdata (info->gotobj)->local_got_size -= sz;
+       }
 
       /* If the literal instruction is no longer needed (it may have been
-        reused.  We can eliminate it.
-        ??? For now, I don't want to deal with compacting the section,
+        reused.  We can eliminate it.  */
+      /* ??? For now, I don't want to deal with compacting the section,
         so just nop it out.  */
       if (!lit_reused)
        {
          irel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
-         info->changed_relocs = true;
+         info->changed_relocs = TRUE;
 
-         bfd_put_32 (info->abfd, INSN_UNOP, info->contents + irel->r_offset);
-         info->changed_contents = true;
+         bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP,
+                     info->contents + irel->r_offset);
+         info->changed_contents = TRUE;
        }
     }
 
-  return irel + count;
+  return TRUE;
 }
 
 static bfd_vma
@@ -1245,7 +1514,7 @@ elf64_alpha_relax_opt_call (info, symval)
        }
       else
        {
-         tsec_relocs = (_bfd_elf64_link_read_relocs
+         tsec_relocs = (_bfd_elf_link_read_relocs
                         (info->abfd, info->tsec, (PTR) NULL,
                         (Elf_Internal_Rela *) NULL,
                         info->link_info->keep_memory));
@@ -1282,11 +1551,12 @@ elf64_alpha_relax_opt_call (info, symval)
   return symval + 8;
 }
 
-static boolean
-elf64_alpha_relax_without_lituse (info, symval, irel)
+static bfd_boolean
+elf64_alpha_relax_got_load (info, symval, irel, r_type)
      struct alpha_relax_info *info;
      bfd_vma symval;
      Elf_Internal_Rela *irel;
+     unsigned long r_type;
 {
   unsigned int insn;
   bfd_signed_vma disp;
@@ -1296,37 +1566,75 @@ elf64_alpha_relax_without_lituse (info, symval, irel)
 
   if (insn >> 26 != OP_LDQ)
     {
+      reloc_howto_type *howto = elf64_alpha_howto_table + r_type;
       ((*_bfd_error_handler)
-       ("%s: %s+0x%lx: warning: LITERAL relocation against unexpected insn",
-       bfd_get_filename (info->abfd), info->sec->name,
-       (unsigned long) irel->r_offset));
-      return true;
+       ("%s: %s+0x%lx: warning: %s relocation against unexpected insn",
+       bfd_archive_filename (info->abfd), info->sec->name,
+       (unsigned long) irel->r_offset, howto->name));
+      return TRUE;
     }
 
-  /* So we aren't told much.  Do what we can with the address load and
-     fake the rest.  All of the optimizations here require that the
-     offset from the GP fit in 16 bits.  */
+  /* Can't relax dynamic symbols.  */
+  if (alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info))
+    return TRUE;
 
-  disp = symval - info->gp;
-  if (disp < -0x8000 || disp >= 0x8000)
-    return true;
+  /* Can't use local-exec relocations in shared libraries.  */
+  if (r_type == R_ALPHA_GOTTPREL && info->link_info->shared)
+    return TRUE;
+
+  if (r_type == R_ALPHA_LITERAL)
+    disp = symval - info->gp;
+  else
+    {
+      bfd_vma dtp_base, tp_base;
 
-  /* On the LITERAL instruction itself, consider exchanging
-     `ldq R,X(gp)' for `lda R,Y(gp)'.  */
+      BFD_ASSERT (elf_hash_table (info->link_info)->tls_sec != NULL);
+      dtp_base = alpha_get_dtprel_base (info->link_info);
+      tp_base = alpha_get_tprel_base (info->link_info);
+      disp = symval - (r_type == R_ALPHA_GOTDTPREL ? dtp_base : tp_base);
+    }
 
-  insn = (OP_LDA << 26) | (insn & 0x03ff0000);
-  bfd_put_32 (info->abfd, insn, info->contents + irel->r_offset);
-  info->changed_contents = true;
+  if (disp < -0x8000 || disp >= 0x8000)
+    return TRUE;
 
-  irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info), R_ALPHA_GPREL16);
-  info->changed_relocs = true;
+  /* Exchange LDQ for LDA.  In the case of the TLS relocs, we're loading
+     a constant, so force the base register to be $31.  */
+  if (r_type == R_ALPHA_LITERAL)
+    insn = (OP_LDA << 26) | (insn & 0x03ff0000);
+  else
+    insn = (OP_LDA << 26) | (insn & (31 << 21)) | (31 << 16);
+  bfd_put_32 (info->abfd, (bfd_vma) insn, info->contents + irel->r_offset);
+  info->changed_contents = TRUE;
 
   /* Reduce the use count on this got entry by one, possibly
      eliminating it.  */
-  info->gotent->use_count -= 1;
-  alpha_elf_tdata (info->gotent->gotobj)->total_got_entries -= 1;
-  if (!info->h)
-    alpha_elf_tdata (info->gotent->gotobj)->n_local_got_entries -= 1;
+  if (--info->gotent->use_count == 0)
+    {
+      int sz = alpha_got_entry_size (r_type);
+      alpha_elf_tdata (info->gotobj)->total_got_size -= sz;
+      if (!info->h)
+       alpha_elf_tdata (info->gotobj)->local_got_size -= sz;
+    }
+
+  /* Smash the existing GOT relocation for its 16-bit immediate pair.  */
+  switch (r_type)
+    {
+    case R_ALPHA_LITERAL:
+      r_type = R_ALPHA_GPREL16;
+      break;
+    case R_ALPHA_GOTDTPREL:
+      r_type = R_ALPHA_DTPREL16;
+      break;
+    case R_ALPHA_GOTTPREL:
+      r_type = R_ALPHA_TPREL16;
+      break;
+    default:
+      BFD_ASSERT (0);
+      return FALSE;
+    }
+
+  irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info), r_type);
+  info->changed_relocs = TRUE;
 
   /* ??? Search forward through this basic block looking for insns
      that use the target register.  Stop after an insn modifying the
@@ -1341,148 +1649,462 @@ elf64_alpha_relax_without_lituse (info, symval, irel)
      This would mean that we'd have to _add_ relocations, the pain of
      which gives one pause.  */
 
-  return true;
+  return TRUE;
 }
 
-static boolean
-elf64_alpha_relax_section (abfd, sec, link_info, again)
-     bfd *abfd;
-     asection *sec;
-     struct bfd_link_info *link_info;
-     boolean *again;
+static bfd_boolean
+elf64_alpha_relax_gprelhilo (info, symval, irel, hi)
+     struct alpha_relax_info *info;
+     bfd_vma symval;
+     Elf_Internal_Rela *irel;
+     bfd_boolean hi;
 {
-  Elf_Internal_Shdr *symtab_hdr;
-  Elf_Internal_Rela *internal_relocs;
-  Elf_Internal_Rela *free_relocs = NULL;
-  Elf_Internal_Rela *irel, *irelend;
-  bfd_byte *free_contents = NULL;
-  Elf64_External_Sym *extsyms = NULL;
-  Elf64_External_Sym *free_extsyms = NULL;
-  struct alpha_elf_got_entry **local_got_entries;
-  struct alpha_relax_info info;
-
-  /* We are not currently changing any sizes, so only one pass.  */
-  *again = false;
+  unsigned int insn;
+  bfd_signed_vma disp;
+  bfd_byte *pos = info->contents + irel->r_offset;
 
-  if (link_info->relocateable
-      || (sec->flags & SEC_RELOC) == 0
-      || sec->reloc_count == 0)
-    return true;
+  /* ??? This assumes that the compiler doesn't render
 
-  /* If this is the first time we have been called for this section,
-     initialize the cooked size.  */
-  if (sec->_cooked_size == 0)
-    sec->_cooked_size = sec->_raw_size;
+       array[i]
+     as
+       ldah    t, array(gp)    !gprelhigh
+       s8addl  i, t, t
+       ldq     r, array(t)     !gprellow
 
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  local_got_entries = alpha_elf_tdata(abfd)->local_got_entries;
+     which would indeed be the most efficient way to implement this.  */
 
-  /* Load the relocations for this section.  */
-  internal_relocs = (_bfd_elf64_link_read_relocs
-                    (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
-                     link_info->keep_memory));
-  if (internal_relocs == NULL)
-    goto error_return;
-  if (! link_info->keep_memory)
-    free_relocs = internal_relocs;
+  return TRUE;
 
-  memset(&info, 0, sizeof (info));
-  info.abfd = abfd;
-  info.sec = sec;
-  info.link_info = link_info;
-  info.relocs = internal_relocs;
-  info.relend = irelend = internal_relocs + sec->reloc_count;
+  disp = symval - info->gp;
+  if (disp < -0x8000 || disp >= 0x8000)
+    return TRUE;
 
-  /* Find the GP for this object.  */
-  info.gotobj = alpha_elf_tdata (abfd)->gotobj;
-  if (info.gotobj)
+  if (hi)
     {
-      asection *sgot = alpha_elf_tdata (info.gotobj)->got;
-      info.gp = _bfd_get_gp_value (info.gotobj);
-      if (info.gp == 0)
-       {
-         info.gp = (sgot->output_section->vma
-                    + sgot->output_offset
-                    + 0x8000);
-         _bfd_set_gp_value (info.gotobj, info.gp);
-       }
-    }
+      /* Nop out the high instruction.  */
 
-  for (irel = internal_relocs; irel < irelend; irel++)
+      bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos);
+      info->changed_contents = TRUE;
+
+      irel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+      irel->r_addend = 0;
+      info->changed_relocs = TRUE;
+    }
+  else
     {
-      bfd_vma symval;
-      Elf_Internal_Sym isym;
-      struct alpha_elf_got_entry *gotent;
+      /* Adjust the low instruction to reference GP directly.  */
 
-      if (ELF64_R_TYPE (irel->r_info) != (int) R_ALPHA_LITERAL)
-       continue;
+      insn = bfd_get_32 (info->abfd, pos);
+      insn = (insn & 0xffe00000) | (29 << 16);
+      bfd_put_32 (info->abfd, (bfd_vma) insn, pos);
+      info->changed_contents = TRUE;
 
-      /* Get the section contents.  */
-      if (info.contents == NULL)
-       {
-         if (elf_section_data (sec)->this_hdr.contents != NULL)
-           info.contents = elf_section_data (sec)->this_hdr.contents;
-         else
-           {
-             info.contents = (bfd_byte *) bfd_malloc (sec->_raw_size);
-             if (info.contents == NULL)
-               goto error_return;
-             free_contents = info.contents;
+      irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
+                                  R_ALPHA_GPREL16);
+      info->changed_relocs = TRUE;
+    }
 
-             if (! bfd_get_section_contents (abfd, sec, info.contents,
-                                             (file_ptr) 0, sec->_raw_size))
-               goto error_return;
-           }
-       }
+  return TRUE;
+}
 
-      /* Read this BFD's symbols if we haven't done so already.  */
-      if (extsyms == NULL)
+static bfd_boolean
+elf64_alpha_relax_tls_get_addr (info, symval, irel, is_gd)
+     struct alpha_relax_info *info;
+     bfd_vma symval;
+     Elf_Internal_Rela *irel;
+     bfd_boolean is_gd;
+{
+  bfd_byte *pos[5];
+  unsigned int insn;
+  Elf_Internal_Rela *gpdisp, *hint;
+  bfd_boolean dynamic, use_gottprel, pos1_unusable;
+  unsigned long new_symndx;
+
+  dynamic = alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info);
+
+  /* If a TLS symbol is accessed using IE at least once, there is no point
+     to use dynamic model for it.  */
+  if (is_gd && info->h && (info->h->flags & ALPHA_ELF_LINK_HASH_TLS_IE))
+    ;
+
+  /* If the symbol is local, and we've already committed to DF_STATIC_TLS,
+     then we might as well relax to IE.  */
+  else if (info->link_info->shared && !dynamic
+          && (info->link_info->flags & DF_STATIC_TLS))
+    ;
+
+  /* Otherwise we must be building an executable to do anything.  */
+  else if (info->link_info->shared)
+    return TRUE;
+
+  /* The TLSGD/TLSLDM relocation must be followed by a LITERAL and
+     the matching LITUSE_TLS relocations.  */
+  if (irel + 2 >= info->relend)
+    return TRUE;
+  if (ELF64_R_TYPE (irel[1].r_info) != R_ALPHA_LITERAL
+      || ELF64_R_TYPE (irel[2].r_info) != R_ALPHA_LITUSE
+      || irel[2].r_addend != (is_gd ? LITUSE_ALPHA_TLSGD : LITUSE_ALPHA_TLSLDM))
+    return TRUE;
+
+  /* There must be a GPDISP relocation positioned immediately after the
+     LITUSE relocation.  */
+  gpdisp = elf64_alpha_find_reloc_at_ofs (info->relocs, info->relend,
+                                         irel[2].r_offset + 4, R_ALPHA_GPDISP);
+  if (!gpdisp)
+    return TRUE;
+
+  pos[0] = info->contents + irel[0].r_offset;
+  pos[1] = info->contents + irel[1].r_offset;
+  pos[2] = info->contents + irel[2].r_offset;
+  pos[3] = info->contents + gpdisp->r_offset;
+  pos[4] = pos[3] + gpdisp->r_addend;
+  pos1_unusable = FALSE;
+
+  /* Generally, the positions are not allowed to be out of order, lest the
+     modified insn sequence have different register lifetimes.  We can make
+     an exception when pos 1 is adjacent to pos 0.  */
+  if (pos[1] + 4 == pos[0])
+    {
+      bfd_byte *tmp = pos[0];
+      pos[0] = pos[1];
+      pos[1] = tmp;
+    }
+  else if (pos[1] < pos[0])
+    pos1_unusable = TRUE;
+  if (pos[1] >= pos[2] || pos[2] >= pos[3])
+    return TRUE;
+
+  /* Reduce the use count on the LITERAL relocation.  Do this before we
+     smash the symndx when we adjust the relocations below.  */
+  {
+    struct alpha_elf_got_entry *lit_gotent;
+    struct alpha_elf_link_hash_entry *lit_h;
+    unsigned long indx;
+
+    BFD_ASSERT (ELF64_R_SYM (irel[1].r_info) >= info->symtab_hdr->sh_info);
+    indx = ELF64_R_SYM (irel[1].r_info) - info->symtab_hdr->sh_info;
+    lit_h = alpha_elf_sym_hashes (info->abfd)[indx];
+
+    while (lit_h->root.root.type == bfd_link_hash_indirect
+          || lit_h->root.root.type == bfd_link_hash_warning)
+      lit_h = (struct alpha_elf_link_hash_entry *) lit_h->root.root.u.i.link;
+
+    for (lit_gotent = lit_h->got_entries; lit_gotent ;
+        lit_gotent = lit_gotent->next)
+      if (lit_gotent->gotobj == info->gotobj
+         && lit_gotent->reloc_type == R_ALPHA_LITERAL
+         && lit_gotent->addend == irel[1].r_addend)
+       break;
+    BFD_ASSERT (lit_gotent);
+
+    if (--lit_gotent->use_count == 0)
+      {
+       int sz = alpha_got_entry_size (R_ALPHA_LITERAL);
+       alpha_elf_tdata (info->gotobj)->total_got_size -= sz;
+      }
+  }
+
+  /* Change
+
+       lda     $16,x($gp)              !tlsgd!1
+       ldq     $27,__tls_get_addr($gp) !literal!1
+       jsr     $26,($27)__tls_get_addr !lituse_tlsgd!1
+       ldah    $29,0($26)              !gpdisp!2
+       lda     $29,0($29)              !gpdisp!2
+     to
+       ldq     $16,x($gp)              !gottprel
+       unop
+       call_pal rduniq
+       addq    $16,$0,$0
+       unop
+     or the first pair to
+       lda     $16,x($gp)              !tprel
+       unop
+     or
+       ldah    $16,x($gp)              !tprelhi
+       lda     $16,x($16)              !tprello
+
+     as appropriate.  */
+
+  use_gottprel = FALSE;
+  new_symndx = is_gd ? ELF64_R_SYM (irel->r_info) : 0;
+  switch (!dynamic && !info->link_info->shared)
+    {
+    case 1:
+      {
+       bfd_vma tp_base;
+       bfd_signed_vma disp;
+
+       BFD_ASSERT (elf_hash_table (info->link_info)->tls_sec != NULL);
+       tp_base = alpha_get_tprel_base (info->link_info);
+       disp = symval - tp_base;
+
+       if (disp >= -0x8000 && disp < 0x8000)
+         {
+           insn = (OP_LDA << 26) | (16 << 21) | (31 << 16);
+           bfd_put_32 (info->abfd, (bfd_vma) insn, pos[0]);
+           bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos[1]);
+
+           irel[0].r_offset = pos[0] - info->contents;
+           irel[0].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_TPREL16);
+           irel[1].r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+           break;
+         }
+       else if (disp >= -(bfd_signed_vma) 0x80000000
+                && disp < (bfd_signed_vma) 0x7fff8000
+                && !pos1_unusable)
+         {
+           insn = (OP_LDAH << 26) | (16 << 21) | (31 << 16);
+           bfd_put_32 (info->abfd, (bfd_vma) insn, pos[0]);
+           insn = (OP_LDA << 26) | (16 << 21) | (16 << 16);
+           bfd_put_32 (info->abfd, (bfd_vma) insn, pos[1]);
+
+           irel[0].r_offset = pos[0] - info->contents;
+           irel[0].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_TPRELHI);
+           irel[1].r_offset = pos[1] - info->contents;
+           irel[1].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_TPRELLO);
+           break;
+         }
+      }
+      /* FALLTHRU */
+
+    default:
+      use_gottprel = TRUE;
+
+      insn = (OP_LDQ << 26) | (16 << 21) | (29 << 16);
+      bfd_put_32 (info->abfd, (bfd_vma) insn, pos[0]);
+      bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos[1]);
+
+      irel[0].r_offset = pos[0] - info->contents;
+      irel[0].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_GOTTPREL);
+      irel[1].r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+      break;
+    }
+
+  bfd_put_32 (info->abfd, (bfd_vma) INSN_RDUNIQ, pos[2]);
+
+  insn = INSN_ADDQ | (16 << 21) | (0 << 16) | (0 << 0);
+  bfd_put_32 (info->abfd, (bfd_vma) insn, pos[3]);
+
+  bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos[4]);
+
+  irel[2].r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+  gpdisp->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+
+  hint = elf64_alpha_find_reloc_at_ofs (info->relocs, info->relend,
+                                       irel[2].r_offset, R_ALPHA_HINT);
+  if (hint)
+    hint->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+
+  info->changed_contents = TRUE;
+  info->changed_relocs = TRUE;
+
+  /* Reduce the use count on the TLSGD/TLSLDM relocation.  */
+  if (--info->gotent->use_count == 0)
+    {
+      int sz = alpha_got_entry_size (info->gotent->reloc_type);
+      alpha_elf_tdata (info->gotobj)->total_got_size -= sz;
+      if (!info->h)
+       alpha_elf_tdata (info->gotobj)->local_got_size -= sz;
+    }
+
+  /* If we've switched to a GOTTPREL relocation, increment the reference
+     count on that got entry.  */
+  if (use_gottprel)
+    {
+      struct alpha_elf_got_entry *tprel_gotent;
+
+      for (tprel_gotent = *info->first_gotent; tprel_gotent ;
+          tprel_gotent = tprel_gotent->next)
+       if (tprel_gotent->gotobj == info->gotobj
+           && tprel_gotent->reloc_type == R_ALPHA_GOTTPREL
+           && tprel_gotent->addend == irel->r_addend)
+         break;
+      if (tprel_gotent)
+       tprel_gotent->use_count++;
+      else
        {
-         if (symtab_hdr->contents != NULL)
-           extsyms = (Elf64_External_Sym *) symtab_hdr->contents;
+         if (info->gotent->use_count == 0)
+           tprel_gotent = info->gotent;
          else
            {
-             extsyms = ((Elf64_External_Sym *)
-                        bfd_malloc (symtab_hdr->sh_size));
-             if (extsyms == NULL)
-               goto error_return;
-             free_extsyms = extsyms;
-             if (bfd_seek (abfd, symtab_hdr->sh_offset, SEEK_SET) != 0
-                 || (bfd_read (extsyms, 1, symtab_hdr->sh_size, abfd)
-                     != symtab_hdr->sh_size))
-               goto error_return;
+             tprel_gotent = (struct alpha_elf_got_entry *)
+               bfd_alloc (info->abfd, sizeof (struct alpha_elf_got_entry));
+             if (!tprel_gotent)
+               return FALSE;
+
+             tprel_gotent->next = *info->first_gotent;
+             *info->first_gotent = tprel_gotent;
+
+             tprel_gotent->gotobj = info->gotobj;
+             tprel_gotent->addend = irel->r_addend;
+             tprel_gotent->got_offset = -1;
+             tprel_gotent->reloc_done = 0;
+             tprel_gotent->reloc_xlated = 0;
            }
+
+         tprel_gotent->use_count = 1;
+         tprel_gotent->reloc_type = R_ALPHA_GOTTPREL;
+       }
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf64_alpha_relax_section (abfd, sec, link_info, again)
+     bfd *abfd;
+     asection *sec;
+     struct bfd_link_info *link_info;
+     bfd_boolean *again;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *irel, *irelend;
+  Elf_Internal_Sym *isymbuf = NULL;
+  struct alpha_elf_got_entry **local_got_entries;
+  struct alpha_relax_info info;
+
+  /* We are not currently changing any sizes, so only one pass.  */
+  *again = FALSE;
+
+  if (link_info->relocatable
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0)
+    return TRUE;
+
+  /* If this is the first time we have been called for this section,
+     initialize the cooked size.  */
+  if (sec->_cooked_size == 0)
+    sec->_cooked_size = sec->_raw_size;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  local_got_entries = alpha_elf_tdata(abfd)->local_got_entries;
+
+  /* Load the relocations for this section.  */
+  internal_relocs = (_bfd_elf_link_read_relocs
+                    (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
+                     link_info->keep_memory));
+  if (internal_relocs == NULL)
+    return FALSE;
+
+  memset(&info, 0, sizeof (info));
+  info.abfd = abfd;
+  info.sec = sec;
+  info.link_info = link_info;
+  info.symtab_hdr = symtab_hdr;
+  info.relocs = internal_relocs;
+  info.relend = irelend = internal_relocs + sec->reloc_count;
+
+  /* Find the GP for this object.  Do not store the result back via
+     _bfd_set_gp_value, since this could change again before final.  */
+  info.gotobj = alpha_elf_tdata (abfd)->gotobj;
+  if (info.gotobj)
+    {
+      asection *sgot = alpha_elf_tdata (info.gotobj)->got;
+      info.gp = (sgot->output_section->vma
+                + sgot->output_offset
+                + 0x8000);
+    }
+
+  /* Get the section contents.  */
+  if (elf_section_data (sec)->this_hdr.contents != NULL)
+    info.contents = elf_section_data (sec)->this_hdr.contents;
+  else
+    {
+      info.contents = (bfd_byte *) bfd_malloc (sec->_raw_size);
+      if (info.contents == NULL)
+       goto error_return;
+
+      if (! bfd_get_section_contents (abfd, sec, info.contents,
+                                     (file_ptr) 0, sec->_raw_size))
+       goto error_return;
+    }
+
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma symval;
+      struct alpha_elf_got_entry *gotent;
+      unsigned long r_type = ELF64_R_TYPE (irel->r_info);
+      unsigned long r_symndx = ELF64_R_SYM (irel->r_info);
+
+      /* Early exit for unhandled or unrelaxable relocations.  */
+      switch (r_type)
+       {
+       case R_ALPHA_LITERAL:
+       case R_ALPHA_GPRELHIGH:
+       case R_ALPHA_GPRELLOW:
+       case R_ALPHA_GOTDTPREL:
+       case R_ALPHA_GOTTPREL:
+       case R_ALPHA_TLSGD:
+         break;
+
+       case R_ALPHA_TLSLDM:
+         /* The symbol for a TLSLDM reloc is ignored.  Collapse the
+             reloc to the 0 symbol so that they all match.  */
+         r_symndx = 0;
+         break;
+
+       default:
+         continue;
        }
 
       /* Get the value of the symbol referred to by the reloc.  */
-      if (ELF64_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+      if (r_symndx < symtab_hdr->sh_info)
        {
          /* A local symbol.  */
-         bfd_elf64_swap_symbol_in (abfd,
-                                   extsyms + ELF64_R_SYM (irel->r_info),
-                                   &isym);
-         if (isym.st_shndx == SHN_UNDEF)
-           info.tsec = bfd_und_section_ptr;
-         else if (isym.st_shndx > 0 && isym.st_shndx < SHN_LORESERVE)
-           info.tsec = bfd_section_from_elf_index (abfd, isym.st_shndx);
-         else if (isym.st_shndx == SHN_ABS)
-           info.tsec = bfd_abs_section_ptr;
-         else if (isym.st_shndx == SHN_COMMON)
-           info.tsec = bfd_com_section_ptr;
+         Elf_Internal_Sym *isym;
+
+         /* Read this BFD's local symbols.  */
+         if (isymbuf == NULL)
+           {
+             isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+             if (isymbuf == NULL)
+               isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+                                               symtab_hdr->sh_info, 0,
+                                               NULL, NULL, NULL);
+             if (isymbuf == NULL)
+               goto error_return;
+           }
+
+         isym = isymbuf + r_symndx;
+
+         /* Given the symbol for a TLSLDM reloc is ignored, this also
+            means forcing the symbol value to the tp base.  */
+         if (r_type == R_ALPHA_TLSLDM)
+           {
+             info.tsec = bfd_abs_section_ptr;
+             symval = alpha_get_tprel_base (info.link_info);
+           }
          else
-           continue;   /* who knows.  */
+           {
+             symval = isym->st_value;
+             if (isym->st_shndx == SHN_UNDEF)
+               continue;
+             else if (isym->st_shndx == SHN_ABS)
+               info.tsec = bfd_abs_section_ptr;
+             else if (isym->st_shndx == SHN_COMMON)
+               info.tsec = bfd_com_section_ptr;
+             else
+               info.tsec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+           }
 
          info.h = NULL;
-         info.other = isym.st_other;
-         gotent = local_got_entries[ELF64_R_SYM(irel->r_info)];
-         symval = isym.st_value;
+         info.other = isym->st_other;
+         if (local_got_entries)
+           info.first_gotent = &local_got_entries[r_symndx];
+         else
+           {
+             info.first_gotent = &info.gotent;
+             info.gotent = NULL;
+           }
        }
       else
        {
          unsigned long indx;
          struct alpha_elf_link_hash_entry *h;
 
-         indx = ELF64_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+         indx = r_symndx - symtab_hdr->sh_info;
          h = alpha_elf_sym_hashes (abfd)[indx];
          BFD_ASSERT (h != NULL);
 
@@ -1490,66 +2112,113 @@ elf64_alpha_relax_section (abfd, sec, link_info, again)
                 || h->root.root.type == bfd_link_hash_warning)
            h = (struct alpha_elf_link_hash_entry *)h->root.root.u.i.link;
 
-         /* We can't do anthing with undefined or dynamic symbols.  */
-         if (h->root.root.type == bfd_link_hash_undefined
-             || h->root.root.type == bfd_link_hash_undefweak
-             || alpha_elf_dynamic_symbol_p (&h->root, link_info))
+         /* If the symbol is undefined, we can't do anything with it.  */
+         if (h->root.root.type == bfd_link_hash_undefweak
+             || h->root.root.type == bfd_link_hash_undefined)
            continue;
 
+         /* If the symbol isn't defined in the current module, again
+            we can't do anything.  */
+         if (!(h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR))
+           {
+             /* Except for TLSGD relocs, which can sometimes be
+                relaxed to GOTTPREL relocs.  */
+             if (r_type != R_ALPHA_TLSGD)
+               continue;
+             info.tsec = bfd_abs_section_ptr;
+             symval = 0;
+           }
+         else
+           {
+             info.tsec = h->root.root.u.def.section;
+             symval = h->root.root.u.def.value;
+           }
+
          info.h = h;
-         info.tsec = h->root.root.u.def.section;
          info.other = h->root.other;
-         gotent = h->got_entries;
-         symval = h->root.root.u.def.value;
+         info.first_gotent = &h->got_entries;
        }
 
       /* Search for the got entry to be used by this relocation.  */
-      while (gotent->gotobj != info.gotobj || gotent->addend != irel->r_addend)
-       gotent = gotent->next;
+      for (gotent = *info.first_gotent; gotent ; gotent = gotent->next)
+       if (gotent->gotobj == info.gotobj
+           && gotent->reloc_type == r_type
+           && gotent->addend == irel->r_addend)
+         break;
       info.gotent = gotent;
 
       symval += info.tsec->output_section->vma + info.tsec->output_offset;
       symval += irel->r_addend;
 
-      BFD_ASSERT(info.gotent != NULL);
+      switch (r_type)
+       {
+       case R_ALPHA_LITERAL:
+         BFD_ASSERT(info.gotent != NULL);
 
-      /* If there exist LITUSE relocations immediately following, this
-        opens up all sorts of interesting optimizations, because we
-        now know every location that this address load is used.  */
+         /* If there exist LITUSE relocations immediately following, this
+            opens up all sorts of interesting optimizations, because we
+            now know every location that this address load is used.  */
+         if (irel+1 < irelend
+             && ELF64_R_TYPE (irel[1].r_info) == R_ALPHA_LITUSE)
+           {
+             if (!elf64_alpha_relax_with_lituse (&info, symval, irel))
+               goto error_return;
+           }
+         else
+           {
+             if (!elf64_alpha_relax_got_load (&info, symval, irel, r_type))
+               goto error_return;
+           }
+         break;
 
-      if (irel+1 < irelend && ELF64_R_TYPE (irel[1].r_info) == R_ALPHA_LITUSE)
-       {
-         irel = elf64_alpha_relax_with_lituse (&info, symval, irel, irelend);
-         if (irel == NULL)
+       case R_ALPHA_GPRELHIGH:
+       case R_ALPHA_GPRELLOW:
+         if (!elf64_alpha_relax_gprelhilo (&info, symval, irel,
+                                           r_type == R_ALPHA_GPRELHIGH))
            goto error_return;
-       }
-      else
-       {
-         if (!elf64_alpha_relax_without_lituse (&info, symval, irel))
+         break;
+
+       case R_ALPHA_GOTDTPREL:
+       case R_ALPHA_GOTTPREL:
+         BFD_ASSERT(info.gotent != NULL);
+         if (!elf64_alpha_relax_got_load (&info, symval, irel, r_type))
            goto error_return;
+         break;
+
+       case R_ALPHA_TLSGD:
+       case R_ALPHA_TLSLDM:
+         BFD_ASSERT(info.gotent != NULL);
+         if (!elf64_alpha_relax_tls_get_addr (&info, symval, irel,
+                                              r_type == R_ALPHA_TLSGD))
+           goto error_return;
+         break;
        }
     }
 
-  if (!elf64_alpha_size_got_sections (abfd, link_info))
-    return false;
+  if (!elf64_alpha_size_plt_section (link_info))
+    return FALSE;
+  if (!elf64_alpha_size_got_sections (link_info))
+    return FALSE;
+  if (!elf64_alpha_size_rela_got_section (link_info))
+    return FALSE;
 
-  if (info.changed_relocs)
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
     {
-      elf_section_data (sec)->relocs = internal_relocs;
-    }
-  else if (free_relocs != NULL)
-    {
-      free (free_relocs);
+      if (!link_info->keep_memory)
+       free (isymbuf);
+      else
+       {
+         /* Cache the symbols for elf_link_input_bfd.  */
+         symtab_hdr->contents = (unsigned char *) isymbuf;
+       }
     }
 
-  if (info.changed_contents)
+  if (info.contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != info.contents)
     {
-      elf_section_data (sec)->this_hdr.contents = info.contents;
-    }
-  else if (free_contents != NULL)
-    {
-      if (! link_info->keep_memory)
-       free (free_contents);
+      if (!info.changed_contents && !link_info->keep_memory)
+       free (info.contents);
       else
        {
          /* Cache the section contents for elf_link_input_bfd.  */
@@ -1557,44 +2226,44 @@ elf64_alpha_relax_section (abfd, sec, link_info, again)
        }
     }
 
-  if (free_extsyms != NULL)
+  if (elf_section_data (sec)->relocs != internal_relocs)
     {
-      if (! link_info->keep_memory)
-       free (free_extsyms);
+      if (!info.changed_relocs)
+       free (internal_relocs);
       else
-       {
-         /* Cache the symbols for elf_link_input_bfd.  */
-         symtab_hdr->contents = extsyms;
-       }
+       elf_section_data (sec)->relocs = internal_relocs;
     }
 
   *again = info.changed_contents || info.changed_relocs;
 
-  return true;
+  return TRUE;
 
  error_return:
-  if (free_relocs != NULL)
-    free (free_relocs);
-  if (free_contents != NULL)
-    free (free_contents);
-  if (free_extsyms != NULL)
-    free (free_extsyms);
-  return false;
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (info.contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != info.contents)
+    free (info.contents);
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+  return FALSE;
 }
 \f
 /* PLT/GOT Stuff */
 #define PLT_HEADER_SIZE 32
-#define PLT_HEADER_WORD1       0xc3600000      /* br   $27,.+4     */
-#define PLT_HEADER_WORD2       0xa77b000c      /* ldq  $27,12($27) */
-#define PLT_HEADER_WORD3       0x47ff041f      /* nop              */
-#define PLT_HEADER_WORD4       0x6b7b0000      /* jmp  $27,($27)   */
+#define PLT_HEADER_WORD1       (bfd_vma) 0xc3600000    /* br   $27,.+4     */
+#define PLT_HEADER_WORD2       (bfd_vma) 0xa77b000c    /* ldq  $27,12($27) */
+#define PLT_HEADER_WORD3       (bfd_vma) 0x47ff041f    /* nop              */
+#define PLT_HEADER_WORD4       (bfd_vma) 0x6b7b0000    /* jmp  $27,($27)   */
 
 #define PLT_ENTRY_SIZE 12
 #define PLT_ENTRY_WORD1                0xc3800000      /* br   $28, plt0   */
 #define PLT_ENTRY_WORD2                0
 #define PLT_ENTRY_WORD3                0
 
-#define MAX_GOT_ENTRIES                (64*1024 / 8)
+#define MAX_GOT_SIZE           (64*1024)
 
 #define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so"
 \f
@@ -1603,11 +2272,11 @@ elf64_alpha_relax_section (abfd, sec, link_info, again)
    FIXME: We need to handle the SHF_ALPHA_GPREL flag, but I'm not sure
    how to.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_section_from_shdr (abfd, hdr, name)
      bfd *abfd;
-     Elf64_Internal_Shdr *hdr;
-     char *name;
+     Elf_Internal_Shdr *hdr;
+     const char *name;
 {
   asection *newsect;
 
@@ -1620,14 +2289,14 @@ elf64_alpha_section_from_shdr (abfd, hdr, name)
     {
     case SHT_ALPHA_DEBUG:
       if (strcmp (name, ".mdebug") != 0)
-       return false;
+       return FALSE;
       break;
     default:
-      return false;
+      return FALSE;
     }
 
   if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
-    return false;
+    return FALSE;
   newsect = hdr->bfd_section;
 
   if (hdr->sh_type == SHT_ALPHA_DEBUG)
@@ -1635,19 +2304,32 @@ elf64_alpha_section_from_shdr (abfd, hdr, name)
       if (! bfd_set_section_flags (abfd, newsect,
                                   (bfd_get_section_flags (abfd, newsect)
                                    | SEC_DEBUGGING)))
-       return false;
+       return FALSE;
     }
 
-  return true;
+  return TRUE;
+}
+
+/* Convert Alpha specific section flags to bfd internal section flags.  */
+
+static bfd_boolean
+elf64_alpha_section_flags (flags, hdr)
+     flagword *flags;
+     const Elf_Internal_Shdr *hdr;
+{
+  if (hdr->sh_flags & SHF_ALPHA_GPREL)
+    *flags |= SEC_SMALL_DATA;
+
+  return TRUE;
 }
 
 /* Set the correct type for an Alpha ELF section.  We do this by the
    section name, which is a hack, but ought to work.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_fake_sections (abfd, hdr, sec)
      bfd *abfd;
-     Elf64_Internal_Shdr *hdr;
+     Elf_Internal_Shdr *hdr;
      asection *sec;
 {
   register const char *name;
@@ -1664,30 +2346,31 @@ elf64_alpha_fake_sections (abfd, hdr, sec)
       else
        hdr->sh_entsize = 1;
     }
-  else if (strcmp (name, ".sdata") == 0
+  else if ((sec->flags & SEC_SMALL_DATA)
+          || strcmp (name, ".sdata") == 0
           || strcmp (name, ".sbss") == 0
           || strcmp (name, ".lit4") == 0
           || strcmp (name, ".lit8") == 0)
     hdr->sh_flags |= SHF_ALPHA_GPREL;
 
-  return true;
+  return TRUE;
 }
 
 /* Hook called by the linker routine which adds symbols from an object
    file.  We use it to put .comm items in .sbss, and not .bss.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
      bfd *abfd;
      struct bfd_link_info *info;
-     const Elf_Internal_Sym *sym;
+     Elf_Internal_Sym *sym;
      const char **namep ATTRIBUTE_UNUSED;
      flagword *flagsp ATTRIBUTE_UNUSED;
      asection **secp;
      bfd_vma *valp;
 {
   if (sym->st_shndx == SHN_COMMON
-      && !info->relocateable
+      && !info->relocatable
       && sym->st_size <= elf_gp_size (abfd))
     {
       /* Common symbols less than or equal to -G nn bytes are
@@ -1702,27 +2385,32 @@ elf64_alpha_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
              || !bfd_set_section_flags (abfd, scomm, (SEC_ALLOC
                                                       | SEC_IS_COMMON
                                                       | SEC_LINKER_CREATED)))
-           return false;
+           return FALSE;
        }
 
       *secp = scomm;
       *valp = sym->st_size;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Create the .got section.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_create_got_section(abfd, info)
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
 {
   asection *s;
 
-  if (bfd_get_section_by_name (abfd, ".got"))
-    return true;
+  if ((s = bfd_get_section_by_name (abfd, ".got")))
+    {
+      /* Check for a non-linker created .got?  */
+      if (alpha_elf_tdata (abfd)->got == NULL)
+       alpha_elf_tdata (abfd)->got = s;
+      return TRUE;
+    }
 
   s = bfd_make_section (abfd, ".got");
   if (s == NULL
@@ -1731,22 +2419,23 @@ elf64_alpha_create_got_section(abfd, info)
                                           | SEC_IN_MEMORY
                                           | SEC_LINKER_CREATED))
       || !bfd_set_section_alignment (abfd, s, 3))
-    return false;
+    return FALSE;
 
   alpha_elf_tdata (abfd)->got = s;
 
-  return true;
+  return TRUE;
 }
 
 /* Create all the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_create_dynamic_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
 {
   asection *s;
   struct elf_link_hash_entry *h;
+  struct bfd_link_hash_entry *bh;
 
   /* We need to create .plt, .rela.plt, .got, and .rela.got sections.  */
 
@@ -1758,23 +2447,23 @@ elf64_alpha_create_dynamic_sections (abfd, info)
                                            | SEC_LINKER_CREATED
                                            | SEC_CODE))
       || ! bfd_set_section_alignment (abfd, s, 3))
-    return false;
+    return FALSE;
 
   /* Define the symbol _PROCEDURE_LINKAGE_TABLE_ at the start of the
      .plt section.  */
-  h = NULL;
+  bh = NULL;
   if (! (_bfd_generic_link_add_one_symbol
         (info, abfd, "_PROCEDURE_LINKAGE_TABLE_", BSF_GLOBAL, s,
-         (bfd_vma) 0, (const char *) NULL, false,
-         get_elf_backend_data (abfd)->collect,
-         (struct bfd_link_hash_entry **) &h)))
-    return false;
+         (bfd_vma) 0, (const char *) NULL, FALSE,
+         get_elf_backend_data (abfd)->collect, &bh)))
+    return FALSE;
+  h = (struct elf_link_hash_entry *) bh;
   h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
   h->type = STT_OBJECT;
 
   if (info->shared
-      && ! _bfd_elf_link_record_dynamic_symbol (info, h))
-    return false;
+      && ! bfd_elf_link_record_dynamic_symbol (info, h))
+    return FALSE;
 
   s = bfd_make_section (abfd, ".rela.plt");
   if (s == NULL
@@ -1784,13 +2473,13 @@ elf64_alpha_create_dynamic_sections (abfd, info)
                                           | SEC_LINKER_CREATED
                                           | SEC_READONLY))
       || ! bfd_set_section_alignment (abfd, s, 3))
-    return false;
+    return FALSE;
 
   /* We may or may not have created a .got section for this object, but
      we definitely havn't done the rest of the work.  */
 
   if (!elf64_alpha_create_got_section (abfd, info))
-    return false;
+    return FALSE;
 
   s = bfd_make_section(abfd, ".rela.got");
   if (s == NULL
@@ -1800,35 +2489,35 @@ elf64_alpha_create_dynamic_sections (abfd, info)
                                           | SEC_LINKER_CREATED
                                           | SEC_READONLY))
       || !bfd_set_section_alignment (abfd, s, 3))
-    return false;
+    return FALSE;
 
   /* Define the symbol _GLOBAL_OFFSET_TABLE_ at the start of the
      dynobj's .got section.  We don't do this in the linker script
      because we don't want to define the symbol if we are not creating
      a global offset table.  */
-  h = NULL;
+  bh = NULL;
   if (!(_bfd_generic_link_add_one_symbol
        (info, abfd, "_GLOBAL_OFFSET_TABLE_", BSF_GLOBAL,
         alpha_elf_tdata(abfd)->got, (bfd_vma) 0, (const char *) NULL,
-        false, get_elf_backend_data (abfd)->collect,
-        (struct bfd_link_hash_entry **) &h)))
-    return false;
+        FALSE, get_elf_backend_data (abfd)->collect, &bh)))
+    return FALSE;
+  h = (struct elf_link_hash_entry *) bh;
   h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
   h->type = STT_OBJECT;
 
   if (info->shared
-      && ! _bfd_elf_link_record_dynamic_symbol (info, h))
-    return false;
+      && ! bfd_elf_link_record_dynamic_symbol (info, h))
+    return FALSE;
 
   elf_hash_table (info)->hgot = h;
 
-  return true;
+  return TRUE;
 }
 \f
 /* Read ECOFF debugging information from a .mdebug section into a
    ecoff_debug_info structure.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_read_ecoff_info (abfd, section, debug)
      bfd *abfd;
      asection *section;
@@ -1841,13 +2530,12 @@ elf64_alpha_read_ecoff_info (abfd, section, debug)
   swap = get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
   memset (debug, 0, sizeof (*debug));
 
-  ext_hdr = (char *) bfd_malloc ((size_t) swap->external_hdr_size);
+  ext_hdr = (char *) bfd_malloc (swap->external_hdr_size);
   if (ext_hdr == NULL && swap->external_hdr_size != 0)
     goto error_return;
 
-  if (bfd_get_section_contents (abfd, section, ext_hdr, (file_ptr) 0,
-                               swap->external_hdr_size)
-      == false)
+  if (! bfd_get_section_contents (abfd, section, ext_hdr, (file_ptr) 0,
+                                 swap->external_hdr_size))
     goto error_return;
 
   symhdr = &debug->symbolic_header;
@@ -1860,12 +2548,12 @@ elf64_alpha_read_ecoff_info (abfd, section, debug)
     debug->ptr = NULL;                                                 \
   else                                                                 \
     {                                                                  \
-      debug->ptr = (type) bfd_malloc ((size_t) (size * symhdr->count));        \
+      bfd_size_type amt = (bfd_size_type) size * symhdr->count;                \
+      debug->ptr = (type) bfd_malloc (amt);                            \
       if (debug->ptr == NULL)                                          \
        goto error_return;                                              \
       if (bfd_seek (abfd, (file_ptr) symhdr->offset, SEEK_SET) != 0    \
-         || (bfd_read (debug->ptr, size, symhdr->count,                \
-                       abfd) != size * symhdr->count))                 \
+         || bfd_bread (debug->ptr, amt, abfd) != amt)                  \
        goto error_return;                                              \
     }
 
@@ -1884,9 +2572,8 @@ elf64_alpha_read_ecoff_info (abfd, section, debug)
 #undef READ
 
   debug->fdr = NULL;
-  debug->adjust = NULL;
 
-  return true;
+  return TRUE;
 
  error_return:
   if (ext_hdr != NULL)
@@ -1913,12 +2600,12 @@ elf64_alpha_read_ecoff_info (abfd, section, debug)
     free (debug->external_rfd);
   if (debug->external_ext != NULL)
     free (debug->external_ext);
-  return false;
+  return FALSE;
 }
 
 /* Alpha ELF local labels start with '$'.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_is_local_label_name (abfd, name)
      bfd *abfd ATTRIBUTE_UNUSED;
      const char *name;
@@ -1937,7 +2624,7 @@ struct mips_elf_find_line
   struct ecoff_find_line i;
 };
 
-static boolean
+static bfd_boolean
 elf64_alpha_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
                               functionname_ptr, line_ptr)
      bfd *abfd;
@@ -1954,7 +2641,7 @@ elf64_alpha_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
                                     filename_ptr, functionname_ptr,
                                     line_ptr, 0,
                                     &elf_tdata (abfd)->dwarf2_find_line_info))
-    return true;
+    return TRUE;
 
   msec = bfd_get_section_by_name (abfd, ".mdebug");
   if (msec != NULL)
@@ -1978,30 +2665,28 @@ elf64_alpha_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
          char *fraw_src;
          char *fraw_end;
          struct fdr *fdr_ptr;
+         bfd_size_type amt = sizeof (struct mips_elf_find_line);
 
-         fi = ((struct mips_elf_find_line *)
-               bfd_zalloc (abfd, sizeof (struct mips_elf_find_line)));
+         fi = (struct mips_elf_find_line *) bfd_zalloc (abfd, amt);
          if (fi == NULL)
            {
              msec->flags = origflags;
-             return false;
+             return FALSE;
            }
 
          if (!elf64_alpha_read_ecoff_info (abfd, msec, &fi->d))
            {
              msec->flags = origflags;
-             return false;
+             return FALSE;
            }
 
          /* Swap in the FDR information.  */
-         fi->d.fdr = ((struct fdr *)
-                      bfd_alloc (abfd,
-                                 (fi->d.symbolic_header.ifdMax *
-                                  sizeof (struct fdr))));
+         amt = fi->d.symbolic_header.ifdMax * sizeof (struct fdr);
+         fi->d.fdr = (struct fdr *) bfd_alloc (abfd, amt);
          if (fi->d.fdr == NULL)
            {
              msec->flags = origflags;
-             return false;
+             return FALSE;
            }
          external_fdr_size = swap->external_fdr_size;
          fdr_ptr = fi->d.fdr;
@@ -2026,7 +2711,7 @@ elf64_alpha_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
                                  line_ptr))
        {
          msec->flags = origflags;
-         return true;
+         return TRUE;
        }
 
       msec->flags = origflags;
@@ -2047,36 +2732,39 @@ struct extsym_info
   struct bfd_link_info *info;
   struct ecoff_debug_info *debug;
   const struct ecoff_debug_swap *swap;
-  boolean failed;
+  bfd_boolean failed;
 };
 
-static boolean
+static bfd_boolean
 elf64_alpha_output_extsym (h, data)
      struct alpha_elf_link_hash_entry *h;
      PTR data;
 {
   struct extsym_info *einfo = (struct extsym_info *) data;
-  boolean strip;
+  bfd_boolean strip;
   asection *sec, *output_section;
 
+  if (h->root.root.type == bfd_link_hash_warning)
+    h = (struct alpha_elf_link_hash_entry *) h->root.root.u.i.link;
+
   if (h->root.indx == -2)
-    strip = false;
+    strip = FALSE;
   else if (((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-           || (h->root.elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) != 0)
-          && (h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0
-          && (h->root.elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR) == 0)
-    strip = true;
+           || (h->root.elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) != 0)
+          && (h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0
+          && (h->root.elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR) == 0)
+    strip = TRUE;
   else if (einfo->info->strip == strip_all
-          || (einfo->info->strip == strip_some
-              && bfd_hash_lookup (einfo->info->keep_hash,
-                                  h->root.root.root.string,
-                                  false, false) == NULL))
-    strip = true;
+          || (einfo->info->strip == strip_some
+              && bfd_hash_lookup (einfo->info->keep_hash,
+                                  h->root.root.root.string,
+                                  FALSE, FALSE) == NULL))
+    strip = TRUE;
   else
-    strip = false;
+    strip = FALSE;
 
   if (strip)
-    return true;
+    return TRUE;
 
   if (h->esym.ifd == -2)
     {
@@ -2089,44 +2777,44 @@ elf64_alpha_output_extsym (h, data)
       h->esym.asym.st = stGlobal;
 
       if (h->root.root.type != bfd_link_hash_defined
-         && h->root.root.type != bfd_link_hash_defweak)
-       h->esym.asym.sc = scAbs;
+         && h->root.root.type != bfd_link_hash_defweak)
+       h->esym.asym.sc = scAbs;
       else
-       {
-         const char *name;
-
-         sec = h->root.root.u.def.section;
-         output_section = sec->output_section;
-
-         /* When making a shared library and symbol h is the one from
-            the another shared library, OUTPUT_SECTION may be null.  */
-         if (output_section == NULL)
-           h->esym.asym.sc = scUndefined;
-         else
-           {
-             name = bfd_section_name (output_section->owner, output_section);
-
-             if (strcmp (name, ".text") == 0)
-               h->esym.asym.sc = scText;
-             else if (strcmp (name, ".data") == 0)
-               h->esym.asym.sc = scData;
-             else if (strcmp (name, ".sdata") == 0)
-               h->esym.asym.sc = scSData;
-             else if (strcmp (name, ".rodata") == 0
-                      || strcmp (name, ".rdata") == 0)
-               h->esym.asym.sc = scRData;
-             else if (strcmp (name, ".bss") == 0)
-               h->esym.asym.sc = scBss;
-             else if (strcmp (name, ".sbss") == 0)
-               h->esym.asym.sc = scSBss;
-             else if (strcmp (name, ".init") == 0)
-               h->esym.asym.sc = scInit;
-             else if (strcmp (name, ".fini") == 0)
-               h->esym.asym.sc = scFini;
-             else
-               h->esym.asym.sc = scAbs;
-           }
-       }
+       {
+         const char *name;
+
+         sec = h->root.root.u.def.section;
+         output_section = sec->output_section;
+
+         /* When making a shared library and symbol h is the one from
+            the another shared library, OUTPUT_SECTION may be null.  */
+         if (output_section == NULL)
+           h->esym.asym.sc = scUndefined;
+         else
+           {
+             name = bfd_section_name (output_section->owner, output_section);
+
+             if (strcmp (name, ".text") == 0)
+               h->esym.asym.sc = scText;
+             else if (strcmp (name, ".data") == 0)
+               h->esym.asym.sc = scData;
+             else if (strcmp (name, ".sdata") == 0)
+               h->esym.asym.sc = scSData;
+             else if (strcmp (name, ".rodata") == 0
+                      || strcmp (name, ".rdata") == 0)
+               h->esym.asym.sc = scRData;
+             else if (strcmp (name, ".bss") == 0)
+               h->esym.asym.sc = scBss;
+             else if (strcmp (name, ".sbss") == 0)
+               h->esym.asym.sc = scSBss;
+             else if (strcmp (name, ".init") == 0)
+               h->esym.asym.sc = scInit;
+             else if (strcmp (name, ".fini") == 0)
+               h->esym.asym.sc = scFini;
+             else
+               h->esym.asym.sc = scAbs;
+           }
+       }
 
       h->esym.asym.reserved = 0;
       h->esym.asym.index = indexNil;
@@ -2138,18 +2826,18 @@ elf64_alpha_output_extsym (h, data)
           || h->root.root.type == bfd_link_hash_defweak)
     {
       if (h->esym.asym.sc == scCommon)
-       h->esym.asym.sc = scBss;
+       h->esym.asym.sc = scBss;
       else if (h->esym.asym.sc == scSCommon)
-       h->esym.asym.sc = scSBss;
+       h->esym.asym.sc = scSBss;
 
       sec = h->root.root.u.def.section;
       output_section = sec->output_section;
       if (output_section != NULL)
-       h->esym.asym.value = (h->root.root.u.def.value
-                             + sec->output_offset
-                             + output_section->vma);
+       h->esym.asym.value = (h->root.root.u.def.value
+                             + sec->output_offset
+                             + output_section->vma);
       else
-       h->esym.asym.value = 0;
+       h->esym.asym.value = 0;
     }
   else if ((h->root.elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0)
     {
@@ -2171,30 +2859,98 @@ elf64_alpha_output_extsym (h, data)
     }
 
   if (! bfd_ecoff_debug_one_external (einfo->abfd, einfo->debug, einfo->swap,
-                                     h->root.root.root.string,
-                                     &h->esym))
+                                     h->root.root.root.string,
+                                     &h->esym))
     {
-      einfo->failed = true;
-      return false;
+      einfo->failed = TRUE;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
+\f
+/* Search for and possibly create a got entry.  */
 
-/* FIXME:  Create a runtime procedure table from the .mdebug section.
-
-static boolean
-mips_elf_create_procedure_table (handle, abfd, info, s, debug)
-     PTR handle;
+static struct alpha_elf_got_entry *
+get_got_entry (abfd, h, r_type, r_symndx, r_addend)
      bfd *abfd;
-     struct bfd_link_info *info;
-     asection *s;
-     struct ecoff_debug_info *debug;
-*/
-\f
+     struct alpha_elf_link_hash_entry *h;
+     unsigned long r_type, r_symndx;
+     bfd_vma r_addend;
+{
+  struct alpha_elf_got_entry *gotent;
+  struct alpha_elf_got_entry **slot;
+
+  if (h)
+    slot = &h->got_entries;
+  else
+    {
+      /* This is a local .got entry -- record for merge.  */
+
+      struct alpha_elf_got_entry **local_got_entries;
+
+      local_got_entries = alpha_elf_tdata(abfd)->local_got_entries;
+      if (!local_got_entries)
+       {
+         bfd_size_type size;
+         Elf_Internal_Shdr *symtab_hdr;
+
+         symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
+         size = symtab_hdr->sh_info;
+         size *= sizeof (struct alpha_elf_got_entry *);
+
+         local_got_entries
+           = (struct alpha_elf_got_entry **) bfd_zalloc (abfd, size);
+         if (!local_got_entries)
+           return NULL;
+
+         alpha_elf_tdata (abfd)->local_got_entries = local_got_entries;
+       }
+
+      slot = &local_got_entries[r_symndx];
+    }
+
+  for (gotent = *slot; gotent ; gotent = gotent->next)
+    if (gotent->gotobj == abfd
+       && gotent->reloc_type == r_type
+       && gotent->addend == r_addend)
+      break;
+
+  if (!gotent)
+    {
+      int entry_size;
+      bfd_size_type amt;
+
+      amt = sizeof (struct alpha_elf_got_entry);
+      gotent = (struct alpha_elf_got_entry *) bfd_alloc (abfd, amt);
+      if (!gotent)
+       return NULL;
+
+      gotent->gotobj = abfd;
+      gotent->addend = r_addend;
+      gotent->got_offset = -1;
+      gotent->use_count = 1;
+      gotent->reloc_type = r_type;
+      gotent->reloc_done = 0;
+      gotent->reloc_xlated = 0;
+
+      gotent->next = *slot;
+      *slot = gotent;
+
+      entry_size = alpha_got_entry_size (r_type);
+      alpha_elf_tdata (abfd)->total_got_size += entry_size;
+      if (!h)
+       alpha_elf_tdata(abfd)->local_got_size += entry_size;
+    }
+  else
+    gotent->use_count += 1;
+
+  return gotent;
+}
+
 /* Handle dynamic relocations when doing an Alpha ELF link.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_check_relocs (abfd, info, sec, relocs)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2206,12 +2962,12 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
   const char *rel_sec_name;
   Elf_Internal_Shdr *symtab_hdr;
   struct alpha_elf_link_hash_entry **sym_hashes;
-  struct alpha_elf_got_entry **local_got_entries;
   const Elf_Internal_Rela *rel, *relend;
-  int got_created;
+  bfd_boolean got_created;
+  bfd_size_type amt;
 
-  if (info->relocateable)
-    return true;
+  if (info->relocatable)
+    return TRUE;
 
   dynobj = elf_hash_table(info)->dynobj;
   if (dynobj == NULL)
@@ -2221,14 +2977,23 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
   rel_sec_name = NULL;
   symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
   sym_hashes = alpha_elf_sym_hashes(abfd);
-  local_got_entries = alpha_elf_tdata(abfd)->local_got_entries;
-  got_created = 0;
+  got_created = FALSE;
 
   relend = relocs + sec->reloc_count;
   for (rel = relocs; rel < relend; ++rel)
     {
+      enum {
+       NEED_GOT = 1,
+       NEED_GOT_ENTRY = 2,
+       NEED_DYNREL = 4
+      };
+
       unsigned long r_symndx, r_type;
       struct alpha_elf_link_hash_entry *h;
+      unsigned int gotent_flags;
+      bfd_boolean maybe_dynamic;
+      unsigned int need;
+      bfd_vma addend;
 
       r_symndx = ELF64_R_SYM (rel->r_info);
       if (r_symndx < symtab_hdr->sh_info)
@@ -2243,138 +3008,90 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
 
          h->root.elf_link_hash_flags |= ELF_LINK_HASH_REF_REGULAR;
        }
+
+      /* We can only get preliminary data on whether a symbol is
+         locally or externally defined, as not all of the input files
+         have yet been processed.  Do something with what we know, as
+         this may help reduce memory usage and processing time later.  */
+      maybe_dynamic = FALSE;
+      if (h && ((info->shared
+                && (!info->symbolic || info->unresolved_syms_in_shared_libs == RM_IGNORE))
+               || ! (h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)
+               || h->root.root.type == bfd_link_hash_defweak))
+        maybe_dynamic = TRUE;
+
+      need = 0;
+      gotent_flags = 0;
       r_type = ELF64_R_TYPE (rel->r_info);
+      addend = rel->r_addend;
 
       switch (r_type)
        {
        case R_ALPHA_LITERAL:
-         {
-           struct alpha_elf_got_entry *gotent;
-           int flags = 0;
-
-           if (h)
-             {
-               /* Search for and possibly create a got entry.  */
-               for (gotent = h->got_entries; gotent ; gotent = gotent->next)
-                 if (gotent->gotobj == abfd &&
-                     gotent->addend == rel->r_addend)
-                   break;
-
-               if (!gotent)
-                 {
-                   gotent = ((struct alpha_elf_got_entry *)
-                             bfd_alloc (abfd,
-                                        sizeof (struct alpha_elf_got_entry)));
-                   if (!gotent)
-                     return false;
-
-                   gotent->gotobj = abfd;
-                   gotent->addend = rel->r_addend;
-                   gotent->got_offset = -1;
-                   gotent->flags = 0;
-                   gotent->use_count = 1;
-
-                   gotent->next = h->got_entries;
-                   h->got_entries = gotent;
-
-                   alpha_elf_tdata (abfd)->total_got_entries++;
-                 }
-               else
-                 gotent->use_count += 1;
-             }
-           else
-             {
-               /* This is a local .got entry -- record for merge.  */
-               if (!local_got_entries)
-                 {
-                   size_t size;
-                   size = (symtab_hdr->sh_info
-                           * sizeof (struct alpha_elf_got_entry *));
-
-                   local_got_entries = ((struct alpha_elf_got_entry **)
-                                        bfd_alloc (abfd, size));
-                   if (!local_got_entries)
-                     return false;
-
-                   memset (local_got_entries, 0, size);
-                   alpha_elf_tdata (abfd)->local_got_entries =
-                     local_got_entries;
-                 }
-
-               for (gotent = local_got_entries[ELF64_R_SYM(rel->r_info)];
-                    gotent != NULL && gotent->addend != rel->r_addend;
-                    gotent = gotent->next)
-                 continue;
-               if (!gotent)
-                 {
-                   gotent = ((struct alpha_elf_got_entry *)
-                             bfd_alloc (abfd,
-                                        sizeof (struct alpha_elf_got_entry)));
-                   if (!gotent)
-                     return false;
-
-                   gotent->gotobj = abfd;
-                   gotent->addend = rel->r_addend;
-                   gotent->got_offset = -1;
-                   gotent->flags = 0;
-                   gotent->use_count = 1;
-
-                   gotent->next = local_got_entries[ELF64_R_SYM(rel->r_info)];
-                   local_got_entries[ELF64_R_SYM(rel->r_info)] = gotent;
-
-                   alpha_elf_tdata(abfd)->total_got_entries++;
-                   alpha_elf_tdata(abfd)->n_local_got_entries++;
-                 }
-               else
-                 gotent->use_count += 1;
-             }
-
-           /* Remember how this literal is used from its LITUSEs.
-              This will be important when it comes to decide if we can
-              create a .plt entry for a function symbol.  */
-           if (rel+1 < relend
-               && ELF64_R_TYPE (rel[1].r_info) == R_ALPHA_LITUSE)
-             {
-               do
-                 {
-                   ++rel;
-                   if (rel->r_addend >= 1 && rel->r_addend <= 3)
-                     flags |= 1 << rel->r_addend;
-                 }
-               while (rel+1 < relend &&
-                      ELF64_R_TYPE (rel[1].r_info) == R_ALPHA_LITUSE);
-             }
-           else
-             {
-               /* No LITUSEs -- presumably the address is not being
-                  loaded for nothing.  */
-               flags = ALPHA_ELF_LINK_HASH_LU_ADDR;
-             }
-
-           gotent->flags |= flags;
-           if (h)
-             {
-               /* Make a guess as to whether a .plt entry will be needed.  */
-               if ((h->flags |= flags) == ALPHA_ELF_LINK_HASH_LU_FUNC)
-                 h->root.elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
-               else
-                 h->root.elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
-             }
-         }
-         /* FALLTHRU */
+         need = NEED_GOT | NEED_GOT_ENTRY;
+
+         /* Remember how this literal is used from its LITUSEs.
+            This will be important when it comes to decide if we can
+            create a .plt entry for a function symbol.  */
+         while (++rel < relend && ELF64_R_TYPE (rel->r_info) == R_ALPHA_LITUSE)
+           if (rel->r_addend >= 1 && rel->r_addend <= 5)
+             gotent_flags |= 1 << rel->r_addend;
+         --rel;
+
+         /* No LITUSEs -- presumably the address is used somehow.  */
+         if (gotent_flags == 0)
+           gotent_flags = ALPHA_ELF_LINK_HASH_LU_ADDR;
+         break;
 
        case R_ALPHA_GPDISP:
        case R_ALPHA_GPREL16:
        case R_ALPHA_GPREL32:
        case R_ALPHA_GPRELHIGH:
        case R_ALPHA_GPRELLOW:
-         /* We don't actually use the .got here, but the sections must
-            be created before the linker maps input sections to output
-            sections.  */
+       case R_ALPHA_BRSGP:
+         need = NEED_GOT;
+         break;
+
+       case R_ALPHA_REFLONG:
+       case R_ALPHA_REFQUAD:
+         if ((info->shared && (sec->flags & SEC_ALLOC)) || maybe_dynamic)
+           need = NEED_DYNREL;
+         break;
+
+       case R_ALPHA_TLSLDM:
+         /* The symbol for a TLSLDM reloc is ignored.  Collapse the
+            reloc to the 0 symbol so that they all match.  */
+         r_symndx = 0;
+         h = 0;
+         maybe_dynamic = FALSE;
+         /* FALLTHRU */
+
+       case R_ALPHA_TLSGD:
+       case R_ALPHA_GOTDTPREL:
+         need = NEED_GOT | NEED_GOT_ENTRY;
+         break;
+
+       case R_ALPHA_GOTTPREL:
+         need = NEED_GOT | NEED_GOT_ENTRY;
+         gotent_flags = ALPHA_ELF_LINK_HASH_TLS_IE;
+         if (info->shared)
+           info->flags |= DF_STATIC_TLS;
+         break;
+
+       case R_ALPHA_TPREL64:
+         if (info->shared || maybe_dynamic)
+           need = NEED_DYNREL;
+         if (info->shared)
+           info->flags |= DF_STATIC_TLS;
+         break;
+       }
+
+      if (need & NEED_GOT)
+       {
          if (!got_created)
            {
              if (!elf64_alpha_create_got_section (abfd, info))
-               return false;
+               return FALSE;
 
              /* Make sure the object's gotobj is set to itself so
                 that we default to every object with its own .got.
@@ -2384,24 +3101,43 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
 
              got_created = 1;
            }
-         break;
+       }
 
-       case R_ALPHA_SREL16:
-       case R_ALPHA_SREL32:
-       case R_ALPHA_SREL64:
-         if (h == NULL)
-           break;
-         /* FALLTHRU */
+      if (need & NEED_GOT_ENTRY)
+       {
+         struct alpha_elf_got_entry *gotent;
 
-       case R_ALPHA_REFLONG:
-       case R_ALPHA_REFQUAD:
+         gotent = get_got_entry (abfd, h, r_type, r_symndx, addend);
+         if (!gotent)
+           return FALSE;
+
+         if (gotent_flags)
+           {
+             gotent->flags |= gotent_flags;
+             if (h)
+               {
+                 gotent_flags |= h->flags;
+                 h->flags = gotent_flags;
+
+                 /* Make a guess as to whether a .plt entry is needed.  */
+                 if ((gotent_flags & ALPHA_ELF_LINK_HASH_LU_FUNC)
+                     && !(gotent_flags & ~ALPHA_ELF_LINK_HASH_LU_FUNC))
+                   h->root.elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
+                 else
+                   h->root.elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
+               }
+           }
+       }
+
+      if (need & NEED_DYNREL)
+       {
          if (rel_sec_name == NULL)
            {
              rel_sec_name = (bfd_elf_string_from_elf_section
                              (abfd, elf_elfheader(abfd)->e_shstrndx,
                               elf_section_data(sec)->rel_hdr.sh_name));
              if (rel_sec_name == NULL)
-               return false;
+               return FALSE;
 
              BFD_ASSERT (strncmp (rel_sec_name, ".rela", 5) == 0
                          && strcmp (bfd_get_section_name (abfd, sec),
@@ -2417,19 +3153,17 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
              sreloc = bfd_get_section_by_name (dynobj, rel_sec_name);
              if (sreloc == NULL)
                {
+                 flagword flags;
+
                  sreloc = bfd_make_section (dynobj, rel_sec_name);
+                 flags = (SEC_HAS_CONTENTS | SEC_IN_MEMORY
+                          | SEC_LINKER_CREATED | SEC_READONLY);
+                 if (sec->flags & SEC_ALLOC)
+                   flags |= SEC_ALLOC | SEC_LOAD;
                  if (sreloc == NULL
-                     || !bfd_set_section_flags (dynobj, sreloc,
-                                                (((sec->flags
-                                                   & SEC_ALLOC)
-                                                  ? (SEC_ALLOC
-                                                     | SEC_LOAD) : 0)
-                                                 | SEC_HAS_CONTENTS
-                                                 | SEC_IN_MEMORY
-                                                 | SEC_LINKER_CREATED
-                                                 | SEC_READONLY))
+                     || !bfd_set_section_flags (dynobj, sreloc, flags)
                      || !bfd_set_section_alignment (dynobj, sreloc, 3))
-                   return false;
+                   return FALSE;
                }
            }
 
@@ -2449,16 +3183,16 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
 
              if (!rent)
                {
-                 rent = ((struct alpha_elf_reloc_entry *)
-                         bfd_alloc (abfd,
-                                    sizeof (struct alpha_elf_reloc_entry)));
+                 amt = sizeof (struct alpha_elf_reloc_entry);
+                 rent = (struct alpha_elf_reloc_entry *) bfd_alloc (abfd, amt);
                  if (!rent)
-                   return false;
+                   return FALSE;
 
                  rent->srel = sreloc;
                  rent->rtype = r_type;
                  rent->count = 1;
-                 rent->reltext = (sec->flags & SEC_READONLY) != 0;
+                 rent->reltext = ((sec->flags & (SEC_READONLY | SEC_ALLOC))
+                                  == (SEC_READONLY | SEC_ALLOC));
 
                  rent->next = h->reloc_entries;
                  h->reloc_entries = rent;
@@ -2466,19 +3200,19 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
              else
                rent->count++;
            }
-         else if (info->shared && (sec->flags & SEC_ALLOC))
+         else if (info->shared)
            {
              /* If this is a shared library, and the section is to be
                 loaded into memory, we need a RELATIVE reloc.  */
              sreloc->_raw_size += sizeof (Elf64_External_Rela);
-             if (sec->flags & SEC_READONLY)
+             if ((sec->flags & (SEC_READONLY | SEC_ALLOC))
+                 == (SEC_READONLY | SEC_ALLOC))
                info->flags |= DF_TEXTREL;
            }
-         break;
        }
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Adjust a symbol defined by a dynamic object and referenced by a
@@ -2487,7 +3221,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
    change the definition to something the rest of the link can
    understand.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_adjust_dynamic_symbol (info, h)
      struct bfd_link_info *info;
      struct elf_link_hash_entry *h;
@@ -2502,12 +3236,12 @@ elf64_alpha_adjust_dynamic_symbol (info, h)
   /* Now that we've seen all of the input symbols, finalize our decision
      about whether this symbol should get a .plt entry.  */
 
-  if (h->root.type != bfd_link_hash_undefweak
-      && alpha_elf_dynamic_symbol_p (h, info)
+  if (alpha_elf_dynamic_symbol_p (h, info)
       && ((h->type == STT_FUNC
           && !(ah->flags & ALPHA_ELF_LINK_HASH_LU_ADDR))
          || (h->type == STT_NOTYPE
-             && ah->flags == ALPHA_ELF_LINK_HASH_LU_FUNC))
+             && (ah->flags & ALPHA_ELF_LINK_HASH_LU_FUNC)
+             && !(ah->flags & ~ALPHA_ELF_LINK_HASH_LU_FUNC)))
       /* Don't prevent otherwise valid programs from linking by attempting
         to create a new .got entry somewhere.  A Correct Solution would be
         to add a new .got section to a new object file and let it be merged
@@ -2518,7 +3252,7 @@ elf64_alpha_adjust_dynamic_symbol (info, h)
 
       s = bfd_get_section_by_name(dynobj, ".plt");
       if (!s && !elf64_alpha_create_dynamic_sections (dynobj, info))
-       return false;
+       return FALSE;
 
       /* The first bit of the .plt is reserved.  */
       if (s->_raw_size == 0)
@@ -2534,6 +3268,9 @@ elf64_alpha_adjust_dynamic_symbol (info, h)
       if (! info->shared
          && h->root.type != bfd_link_hash_defweak)
        {
+         ah->plt_old_section = h->root.u.def.section;
+         ah->plt_old_value = h->root.u.def.value;
+         ah->flags |= ALPHA_ELF_LINK_HASH_PLT_LOC;
          h->root.u.def.section = s;
          h->root.u.def.value = h->plt.offset;
        }
@@ -2543,7 +3280,7 @@ elf64_alpha_adjust_dynamic_symbol (info, h)
       BFD_ASSERT (s != NULL);
       s->_raw_size += sizeof (Elf64_External_Rela);
 
-      return true;
+      return TRUE;
     }
   else
     h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
@@ -2557,7 +3294,7 @@ elf64_alpha_adjust_dynamic_symbol (info, h)
                  || 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;
-      return true;
+      return TRUE;
     }
 
   /* This is a reference to a symbol defined by a dynamic object which
@@ -2565,14 +3302,14 @@ elf64_alpha_adjust_dynamic_symbol (info, h)
      symbols even in regular objects, does not need the hackery of a
      .dynbss section and COPY dynamic relocations.  */
 
-  return true;
+  return TRUE;
 }
 
 /* Symbol versioning can create new symbols, and make our old symbols
    indirect to the new ones.  Consolidate the got and reloc information
    in these situations.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_merge_ind_symbols (hi, dummy)
      struct alpha_elf_link_hash_entry *hi;
      PTR dummy ATTRIBUTE_UNUSED;
@@ -2580,7 +3317,7 @@ elf64_alpha_merge_ind_symbols (hi, dummy)
   struct alpha_elf_link_hash_entry *hs;
 
   if (hi->root.root.type != bfd_link_hash_indirect)
-    return true;
+    return TRUE;
   hs = hi;
   do {
     hs = (struct alpha_elf_link_hash_entry *)hs->root.root.u.i.link;
@@ -2604,8 +3341,13 @@ elf64_alpha_merge_ind_symbols (hi, dummy)
        {
          gin = gi->next;
          for (gs = gsh; gs ; gs = gs->next)
-           if (gi->gotobj == gs->gotobj && gi->addend == gs->addend)
-             goto got_found;
+           if (gi->gotobj == gs->gotobj
+               && gi->reloc_type == gs->reloc_type
+               && gi->addend == gs->addend)
+             {
+               gi->use_count += gs->use_count;
+               goto got_found;
+             }
          gi->next = hs->got_entries;
          hs->got_entries = gi;
        got_found:;
@@ -2626,7 +3368,7 @@ elf64_alpha_merge_ind_symbols (hi, dummy)
        {
          rin = ri->next;
          for (rs = rsh; rs ; rs = rs->next)
-           if (ri->rtype == rs->rtype)
+           if (ri->rtype == rs->rtype && ri->srel == rs->srel)
              {
                rs->count += ri->count;
                goto found_reloc;
@@ -2638,25 +3380,25 @@ elf64_alpha_merge_ind_symbols (hi, dummy)
     }
   hi->reloc_entries = NULL;
 
-  return true;
+  return TRUE;
 }
 
 /* Is it possible to merge two object file's .got tables?  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_can_merge_gots (a, b)
      bfd *a, *b;
 {
-  int total = alpha_elf_tdata (a)->total_got_entries;
+  int total = alpha_elf_tdata (a)->total_got_size;
   bfd *bsub;
 
   /* Trivial quick fallout test.  */
-  if (total + alpha_elf_tdata (b)->total_got_entries <= MAX_GOT_ENTRIES)
-    return true;
+  if (total + alpha_elf_tdata (b)->total_got_size <= MAX_GOT_SIZE)
+    return TRUE;
 
   /* By their nature, local .got entries cannot be merged.  */
-  if ((total += alpha_elf_tdata (b)->n_local_got_entries) > MAX_GOT_ENTRIES)
-    return false;
+  if ((total += alpha_elf_tdata (b)->local_got_size) > MAX_GOT_SIZE)
+    return FALSE;
 
   /* Failing the common trivial comparison, we must effectively
      perform the merge.  Not actually performing the merge means that
@@ -2686,17 +3428,20 @@ elf64_alpha_can_merge_gots (a, b)
                continue;
 
              for (ae = h->got_entries; ae ; ae = ae->next)
-               if (ae->gotobj == a && ae->addend == be->addend)
+               if (ae->gotobj == a
+                   && ae->reloc_type == be->reloc_type
+                   && ae->addend == be->addend)
                  goto global_found;
 
-             if (++total > MAX_GOT_ENTRIES)
-               return false;
+             total += alpha_got_entry_size (be->reloc_type);
+             if (total > MAX_GOT_SIZE)
+               return FALSE;
            global_found:;
            }
        }
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Actually merge two .got tables.  */
@@ -2705,14 +3450,14 @@ static void
 elf64_alpha_merge_gots (a, b)
      bfd *a, *b;
 {
-  int total = alpha_elf_tdata (a)->total_got_entries;
+  int total = alpha_elf_tdata (a)->total_got_size;
   bfd *bsub;
 
   /* Remember local expansion.  */
   {
-    int e = alpha_elf_tdata (b)->n_local_got_entries;
+    int e = alpha_elf_tdata (b)->local_got_size;
     total += e;
-    alpha_elf_tdata (a)->n_local_got_entries += e;
+    alpha_elf_tdata (a)->local_got_size += e;
   }
 
   for (bsub = b; bsub ; bsub = alpha_elf_tdata (bsub)->in_got_link_next)
@@ -2762,7 +3507,9 @@ elf64_alpha_merge_gots (a, b)
                continue;
 
              for (ae = *start; ae ; ae = ae->next)
-               if (ae->gotobj == a && ae->addend == be->addend)
+               if (ae->gotobj == a
+                   && ae->reloc_type == be->reloc_type
+                   && ae->addend == be->addend)
                  {
                    ae->flags |= be->flags;
                    ae->use_count += be->use_count;
@@ -2770,7 +3517,7 @@ elf64_alpha_merge_gots (a, b)
                    goto global_found;
                  }
              be->gotobj = a;
-             total += 1;
+             total += alpha_got_entry_size (be->reloc_type);
 
            global_found:;
            }
@@ -2778,7 +3525,7 @@ elf64_alpha_merge_gots (a, b)
 
       alpha_elf_tdata (bsub)->gotobj = a;
     }
-  alpha_elf_tdata (a)->total_got_entries = total;
+  alpha_elf_tdata (a)->total_got_size = total;
 
   /* Merge the two in_got chains.  */
   {
@@ -2794,24 +3541,37 @@ elf64_alpha_merge_gots (a, b)
 
 /* Calculate the offsets for the got entries.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_calc_got_offsets_for_symbol (h, arg)
      struct alpha_elf_link_hash_entry *h;
      PTR arg ATTRIBUTE_UNUSED;
 {
+  bfd_boolean result = TRUE;
   struct alpha_elf_got_entry *gotent;
 
+  if (h->root.root.type == bfd_link_hash_warning)
+    h = (struct alpha_elf_link_hash_entry *) h->root.root.u.i.link;
+
   for (gotent = h->got_entries; gotent; gotent = gotent->next)
     if (gotent->use_count > 0)
       {
-       bfd_size_type *plge
-         = &alpha_elf_tdata (gotent->gotobj)->got->_raw_size;
+       struct alpha_elf_obj_tdata *td;
+       bfd_size_type *plge;
 
+       td = alpha_elf_tdata (gotent->gotobj);
+       if (td == NULL)
+         {
+           _bfd_error_handler (_("Symbol %s has no GOT subsection for offset 0x%x"),
+                               h->root.root.root.string, gotent->got_offset);
+           result = FALSE;
+           continue;
+         }
+       plge = &td->got->_raw_size;
        gotent->got_offset = *plge;
-       *plge += 8;
+       *plge += alpha_got_entry_size (gotent->reloc_type);
       }
 
-  return true;
+  return result;
 }
 
 static void
@@ -2850,7 +3610,7 @@ elf64_alpha_calc_got_offsets (info)
              if (gotent->use_count > 0)
                {
                  gotent->got_offset = got_offset;
-                 got_offset += 8;
+                 got_offset += alpha_got_entry_size (gotent->reloc_type);
                }
        }
 
@@ -2861,9 +3621,8 @@ elf64_alpha_calc_got_offsets (info)
 
 /* Constructs the gots.  */
 
-static boolean
-elf64_alpha_size_got_sections (output_bfd, info)
-     bfd *output_bfd ATTRIBUTE_UNUSED;
+static bfd_boolean
+elf64_alpha_size_got_sections (info)
      struct bfd_link_info *info;
 {
   bfd *i, *got_list, *cur_got_obj = NULL;
@@ -2881,17 +3640,17 @@ elf64_alpha_size_got_sections (output_bfd, info)
          if (this_got == NULL)
            continue;
 
-         /* We are assuming no merging has yet ocurred.  */
+         /* We are assuming no merging has yet occurred.  */
          BFD_ASSERT (this_got == i);
 
-          if (alpha_elf_tdata (this_got)->total_got_entries > MAX_GOT_ENTRIES)
+          if (alpha_elf_tdata (this_got)->total_got_size > MAX_GOT_SIZE)
            {
              /* Yikes! A single object file has too many entries.  */
              (*_bfd_error_handler)
                (_("%s: .got subsegment exceeds 64K (size %d)"),
-                bfd_get_filename (i),
-                alpha_elf_tdata (this_got)->total_got_entries * 8);
-             return false;
+                bfd_archive_filename (i),
+                alpha_elf_tdata (this_got)->total_got_size);
+             return FALSE;
            }
 
          if (got_list == NULL)
@@ -2903,7 +3662,7 @@ elf64_alpha_size_got_sections (output_bfd, info)
 
       /* Strange degenerate case of no got references.  */
       if (got_list == NULL)
-       return true;
+       return TRUE;
 
       alpha_elf_hash_table (info)->got_list = got_list;
 
@@ -2934,26 +3693,105 @@ elf64_alpha_size_got_sections (output_bfd, info)
   if (1 || something_changed)
     elf64_alpha_calc_got_offsets (info);
 
-  return true;
+  return TRUE;
 }
 
-static boolean
+/* Called from relax_section to rebuild the PLT in light of
+   potential changes in the function's status.  */
+
+static bfd_boolean
+elf64_alpha_size_plt_section (info)
+     struct bfd_link_info *info;
+{
+  asection *splt, *spltrel;
+  unsigned long entries;
+  bfd *dynobj;
+
+  dynobj = elf_hash_table(info)->dynobj;
+  splt = bfd_get_section_by_name(dynobj, ".plt");
+  if (splt == NULL)
+    return TRUE;
+
+  splt->_raw_size = 0;
+
+  alpha_elf_link_hash_traverse (alpha_elf_hash_table (info),
+                               elf64_alpha_size_plt_section_1, splt);
+
+  splt->_cooked_size = splt->_raw_size;
+
+  /* Every plt entry requires a JMP_SLOT relocation.  */
+  spltrel = bfd_get_section_by_name (dynobj, ".rela.plt");
+  if (splt->_raw_size)
+    entries = (splt->_raw_size - PLT_HEADER_SIZE) / PLT_ENTRY_SIZE;
+  else
+    entries = 0;
+  spltrel->_raw_size = entries * sizeof (Elf64_External_Rela);
+  spltrel->_cooked_size = spltrel->_raw_size;
+
+  return TRUE;
+}
+
+static bfd_boolean
+elf64_alpha_size_plt_section_1 (h, data)
+     struct alpha_elf_link_hash_entry *h;
+     PTR data;
+{
+  asection *splt = (asection *) data;
+  struct alpha_elf_got_entry *gotent;
+
+  /* If we didn't need an entry before, we still don't.  */
+  if (!(h->root.elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT))
+    return TRUE;
+
+  /* There must still be a LITERAL got entry for the function.  */
+  for (gotent = h->got_entries; gotent ; gotent = gotent->next)
+    if (gotent->reloc_type == R_ALPHA_LITERAL
+       && gotent->use_count > 0)
+      break;
+
+  /* If there is, reset the PLT offset.  If not, there's no longer
+     a need for the PLT entry.  */
+  if (gotent)
+    {
+      if (splt->_raw_size == 0)
+       splt->_raw_size = PLT_HEADER_SIZE;
+      h->root.plt.offset = splt->_raw_size;
+      splt->_raw_size += PLT_ENTRY_SIZE;
+    }
+  else
+    {
+      h->root.elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
+      h->root.plt.offset = -1;
+
+      /* Undo the definition frobbing begun in adjust_dynamic_symbol.  */
+      if (h->flags & ALPHA_ELF_LINK_HASH_PLT_LOC)
+       {
+         h->root.root.u.def.section = h->plt_old_section;
+         h->root.root.u.def.value = h->plt_old_value;
+         h->flags &= ~ALPHA_ELF_LINK_HASH_PLT_LOC;
+       }
+    }
+
+  return TRUE;
+}
+
+static bfd_boolean
 elf64_alpha_always_size_sections (output_bfd, info)
-     bfd *output_bfd;
+     bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
 {
   bfd *i;
 
-  if (info->relocateable)
-    return true;
+  if (info->relocatable)
+    return TRUE;
 
   /* First, take care of the indirect symbols created by versioning.  */
   alpha_elf_link_hash_traverse (alpha_elf_hash_table (info),
                                elf64_alpha_merge_ind_symbols,
                                NULL);
 
-  if (!elf64_alpha_size_got_sections (output_bfd, info))
-    return false;
+  if (!elf64_alpha_size_got_sections (info))
+    return FALSE;
 
   /* Allocate space for all of the .got subsections.  */
   i = alpha_elf_hash_table (info)->got_list;
@@ -2964,20 +3802,59 @@ elf64_alpha_always_size_sections (output_bfd, info)
        {
          s->contents = (bfd_byte *) bfd_zalloc (i, s->_raw_size);
          if (s->contents == NULL)
-           return false;
+           return FALSE;
        }
     }
 
-  return true;
+  return TRUE;
+}
+
+/* The number of dynamic relocations required by a static relocation.  */
+
+static int
+alpha_dynamic_entries_for_reloc (r_type, dynamic, shared)
+     int r_type, dynamic, shared;
+{
+  switch (r_type)
+    {
+    /* May appear in GOT entries.  */
+    case R_ALPHA_TLSGD:
+      return (dynamic ? 2 : shared ? 1 : 0);
+    case R_ALPHA_TLSLDM:
+      return shared;
+    case R_ALPHA_LITERAL:
+    case R_ALPHA_GOTTPREL:
+      return dynamic || shared;
+    case R_ALPHA_GOTDTPREL:
+      return dynamic;
+
+    /* May appear in data sections.  */
+    case R_ALPHA_REFLONG:
+    case R_ALPHA_REFQUAD:
+    case R_ALPHA_TPREL64:
+      return dynamic || shared;
+
+    /* Everything else is illegal.  We'll issue an error during
+       relocate_section.  */
+    default:
+      return 0;
+    }
 }
 
 /* Work out the sizes of the dynamic relocation entries.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_calc_dynrel_sizes (h, info)
      struct alpha_elf_link_hash_entry *h;
      struct bfd_link_info *info;
 {
+  bfd_boolean dynamic;
+  struct alpha_elf_reloc_entry *relent;
+  unsigned long entries;
+
+  if (h->root.root.type == bfd_link_hash_warning)
+    h = (struct alpha_elf_link_hash_entry *) h->root.root.u.i.link;
+
   /* If the symbol was defined as a common symbol in a regular object
      file, and there was no definition in any dynamic object, then the
      linker will have allocated space for the symbol in a common
@@ -2993,64 +3870,138 @@ elf64_alpha_calc_dynrel_sizes (h, info)
       && (h->root.root.type == bfd_link_hash_defined
          || h->root.root.type == bfd_link_hash_defweak)
       && !(h->root.root.u.def.section->owner->flags & DYNAMIC))
-    {
-      h->root.elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
-    }
+    h->root.elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
 
   /* If the symbol is dynamic, we'll need all the relocations in their
      natural form.  If this is a shared object, and it has been forced
      local, we'll need the same number of RELATIVE relocations.  */
 
-  if (alpha_elf_dynamic_symbol_p (&h->root, info) || info->shared)
+  dynamic = alpha_elf_dynamic_symbol_p (&h->root, info);
+
+  for (relent = h->reloc_entries; relent; relent = relent->next)
     {
-      struct alpha_elf_reloc_entry *relent;
-      bfd *dynobj;
-      struct alpha_elf_got_entry *gotent;
-      bfd_size_type count;
-      asection *srel;
+      entries = alpha_dynamic_entries_for_reloc (relent->rtype, dynamic,
+                                                info->shared);
+      if (entries)
+       {
+         relent->srel->_raw_size +=
+           entries * sizeof (Elf64_External_Rela) * relent->count;
+         if (relent->reltext)
+           info->flags |= DT_TEXTREL;
+       }
+    }
 
-      for (relent = h->reloc_entries; relent; relent = relent->next)
-       if (relent->rtype == R_ALPHA_REFLONG
-           || relent->rtype == R_ALPHA_REFQUAD)
-         {
-           relent->srel->_raw_size +=
-             sizeof (Elf64_External_Rela) * relent->count;
-           if (relent->reltext)
-             info->flags |= DT_TEXTREL;
-         }
+  return TRUE;
+}
+
+/* Set the sizes of the dynamic relocation sections.  */
 
-      dynobj = elf_hash_table(info)->dynobj;
-      count = 0;
+static bfd_boolean
+elf64_alpha_size_rela_got_section (info)
+     struct bfd_link_info *info;
+{
+  unsigned long entries;
+  bfd *i, *dynobj;
+  asection *srel;
 
-      for (gotent = h->got_entries; gotent ; gotent = gotent->next)
-       count++;
+  /* Shared libraries often require RELATIVE relocs, and some relocs
+     require attention for the main application as well.  */
 
-      /* If we are using a .plt entry, subtract one, as the first
-        reference uses a .rela.plt entry instead.  */
-      if (h->root.plt.offset != MINUS_ONE)
-       count--;
+  entries = 0;
+  for (i = alpha_elf_hash_table(info)->got_list;
+       i ; i = alpha_elf_tdata(i)->got_link_next)
+    {
+      bfd *j;
 
-      if (count > 0)
+      for (j = i; j ; j = alpha_elf_tdata(j)->in_got_link_next)
        {
-         srel = bfd_get_section_by_name (dynobj, ".rela.got");
-         BFD_ASSERT (srel != NULL);
-         srel->_raw_size += sizeof (Elf64_External_Rela) * count;
+         struct alpha_elf_got_entry **local_got_entries, *gotent;
+         int k, n;
+
+         local_got_entries = alpha_elf_tdata(j)->local_got_entries;
+         if (!local_got_entries)
+           continue;
+
+         for (k = 0, n = elf_tdata(j)->symtab_hdr.sh_info; k < n; ++k)
+           for (gotent = local_got_entries[k];
+                gotent ; gotent = gotent->next)
+             if (gotent->use_count > 0)
+               entries += (alpha_dynamic_entries_for_reloc
+                           (gotent->reloc_type, 0, info->shared));
        }
     }
 
-  return true;
+  dynobj = elf_hash_table(info)->dynobj;
+  srel = bfd_get_section_by_name (dynobj, ".rela.got");
+  if (!srel)
+    {
+      BFD_ASSERT (entries == 0);
+      return TRUE;
+    }
+  srel->_raw_size = sizeof (Elf64_External_Rela) * entries;
+
+  /* Now do the non-local symbols.  */
+  alpha_elf_link_hash_traverse (alpha_elf_hash_table (info),
+                               elf64_alpha_size_rela_got_1, info);
+
+  srel->_cooked_size = srel->_raw_size;
+
+  return TRUE;
+}
+
+/* Subroutine of elf64_alpha_size_rela_got_section for doing the
+   global symbols.  */
+
+static bfd_boolean
+elf64_alpha_size_rela_got_1 (h, info)
+     struct alpha_elf_link_hash_entry *h;
+     struct bfd_link_info *info;
+{
+  bfd_boolean dynamic;
+  struct alpha_elf_got_entry *gotent;
+  unsigned long entries;
+
+  if (h->root.root.type == bfd_link_hash_warning)
+    h = (struct alpha_elf_link_hash_entry *) h->root.root.u.i.link;
+
+  /* If the symbol is dynamic, we'll need all the relocations in their
+     natural form.  If this is a shared object, and it has been forced
+     local, we'll need the same number of RELATIVE relocations.  */
+
+  dynamic = alpha_elf_dynamic_symbol_p (&h->root, info);
+
+  entries = 0;
+  for (gotent = h->got_entries; gotent ; gotent = gotent->next)
+    if (gotent->use_count > 0)
+      entries += alpha_dynamic_entries_for_reloc (gotent->reloc_type,
+                                                 dynamic, info->shared);
+
+  /* If we are using a .plt entry, subtract one, as the first
+     reference uses a .rela.plt entry instead.  */
+  if (h->root.plt.offset != MINUS_ONE)
+    entries--;
+
+  if (entries > 0)
+    {
+      bfd *dynobj = elf_hash_table(info)->dynobj;
+      asection *srel = bfd_get_section_by_name (dynobj, ".rela.got");
+      BFD_ASSERT (srel != NULL);
+      srel->_raw_size += sizeof (Elf64_External_Rela) * entries;
+    }
+
+  return TRUE;
 }
 
 /* Set the sizes of the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_size_dynamic_sections (output_bfd, info)
      bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
 {
   bfd *dynobj;
   asection *s;
-  boolean relplt;
+  bfd_boolean relplt;
 
   dynobj = elf_hash_table(info)->dynobj;
   BFD_ASSERT(dynobj != NULL);
@@ -3058,7 +4009,7 @@ elf64_alpha_size_dynamic_sections (output_bfd, info)
   if (elf_hash_table (info)->dynamic_sections_created)
     {
       /* Set the contents of the .interp section to the interpreter.  */
-      if (!info->shared)
+      if (info->executable)
        {
          s = bfd_get_section_by_name (dynobj, ".interp");
          BFD_ASSERT (s != NULL);
@@ -3071,38 +4022,20 @@ elf64_alpha_size_dynamic_sections (output_bfd, info)
         collected information in check_relocs that we can now apply to
         size the dynamic relocation sections.  */
       alpha_elf_link_hash_traverse (alpha_elf_hash_table (info),
-                                   elf64_alpha_calc_dynrel_sizes,
-                                   info);
-
-      /* When building shared libraries, each local .got entry needs a
-        RELATIVE reloc.  */
-      if (info->shared)
-       {
-         bfd *i;
-         asection *srel;
-         bfd_size_type count;
+                                   elf64_alpha_calc_dynrel_sizes, info);
 
-         srel = bfd_get_section_by_name (dynobj, ".rela.got");
-         BFD_ASSERT (srel != NULL);
-
-         for (i = alpha_elf_hash_table(info)->got_list, count = 0;
-              i != NULL;
-              i = alpha_elf_tdata(i)->got_link_next)
-           count += alpha_elf_tdata(i)->n_local_got_entries;
-
-         srel->_raw_size += count * sizeof (Elf64_External_Rela);
-       }
+      elf64_alpha_size_rela_got_section (info);
     }
   /* else we're not dynamic and by definition we don't need such things.  */
 
   /* The check_relocs and adjust_dynamic_symbol entry points have
      determined the sizes of the various dynamic sections.  Allocate
      memory for them.  */
-  relplt = false;
+  relplt = FALSE;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       const char *name;
-      boolean strip;
+      bfd_boolean strip;
 
       if (!(s->flags & SEC_LINKER_CREATED))
        continue;
@@ -3119,7 +4052,7 @@ elf64_alpha_size_dynamic_sections (output_bfd, info)
         it is that function which decides whether anything needs to
         go into these sections.  */
 
-      strip = false;
+      strip = FALSE;
 
       if (strncmp (name, ".rela", 5) == 0)
        {
@@ -3128,7 +4061,7 @@ elf64_alpha_size_dynamic_sections (output_bfd, info)
          if (!strip)
            {
              if (strcmp(name, ".rela.plt") == 0)
-               relplt = true;
+               relplt = TRUE;
 
              /* We use the reloc_count field as a counter if we need
                 to copy relocs into the output file.  */
@@ -3141,60 +4074,158 @@ elf64_alpha_size_dynamic_sections (output_bfd, info)
          continue;
        }
 
-      if (strip)
-       _bfd_strip_section_from_output (info, s);
-      else
-       {
-         /* Allocate memory for the section contents.  */
-         s->contents = (bfd_byte *) bfd_zalloc(dynobj, s->_raw_size);
-         if (s->contents == NULL && s->_raw_size != 0)
-           return false;
-       }
-    }
+      if (strip)
+       _bfd_strip_section_from_output (info, s);
+      else
+       {
+         /* Allocate memory for the section contents.  */
+         s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
+         if (s->contents == NULL && s->_raw_size != 0)
+           return FALSE;
+       }
+    }
+
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Add some entries to the .dynamic section.  We fill in the
+        values later, in elf64_alpha_finish_dynamic_sections, but we
+        must add the entries now so that we get the correct size for
+        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_elf_add_dynamic_entry (info, TAG, VAL)
+
+      if (info->executable)
+       {
+         if (!add_dynamic_entry (DT_DEBUG, 0))
+           return FALSE;
+       }
+
+      if (relplt)
+       {
+         if (!add_dynamic_entry (DT_PLTGOT, 0)
+             || !add_dynamic_entry (DT_PLTRELSZ, 0)
+             || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+             || !add_dynamic_entry (DT_JMPREL, 0))
+           return FALSE;
+       }
+
+      if (!add_dynamic_entry (DT_RELA, 0)
+         || !add_dynamic_entry (DT_RELASZ, 0)
+         || !add_dynamic_entry (DT_RELAENT, sizeof (Elf64_External_Rela)))
+       return FALSE;
+
+      if (info->flags & DF_TEXTREL)
+       {
+         if (!add_dynamic_entry (DT_TEXTREL, 0))
+           return FALSE;
+       }
+    }
+#undef add_dynamic_entry
+
+  return TRUE;
+}
+
+/* Emit a dynamic relocation for (DYNINDX, RTYPE, ADDEND) at (SEC, OFFSET)
+   into the next available slot in SREL.  */
+
+static void
+elf64_alpha_emit_dynrel (abfd, info, sec, srel, offset, dynindx, rtype, addend)
+     bfd *abfd;
+     struct bfd_link_info *info;
+     asection *sec, *srel;
+     bfd_vma offset, addend;
+     long dynindx, rtype;
+{
+  Elf_Internal_Rela outrel;
+  bfd_byte *loc;
+
+  BFD_ASSERT (srel != NULL);
+
+  outrel.r_info = ELF64_R_INFO (dynindx, rtype);
+  outrel.r_addend = addend;
+
+  offset = _bfd_elf_section_offset (abfd, info, sec, offset);
+  if ((offset | 1) != (bfd_vma) -1)
+    outrel.r_offset = sec->output_section->vma + sec->output_offset + offset;
+  else
+    memset (&outrel, 0, sizeof (outrel));
+
+  loc = srel->contents;
+  loc += srel->reloc_count++ * sizeof (Elf64_External_Rela);
+  bfd_elf64_swap_reloca_out (abfd, &outrel, loc);
+  BFD_ASSERT (sizeof (Elf64_External_Rela) * srel->reloc_count
+             <= srel->_cooked_size);
+}
+
+/* Relocate an Alpha ELF section for a relocatable link.
+
+   We don't have to change anything unless the reloc is against a section
+   symbol, in which case we have to adjust according to where the section
+   symbol winds up in the output section.  */
+
+static bfd_boolean
+elf64_alpha_relocate_section_r (output_bfd, info, input_bfd, input_section,
+                               contents, relocs, local_syms, local_sections)
+     bfd *output_bfd ATTRIBUTE_UNUSED;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents ATTRIBUTE_UNUSED;
+     Elf_Internal_Rela *relocs;
+     Elf_Internal_Sym *local_syms;
+     asection **local_sections;
+{
+  unsigned long symtab_hdr_sh_info;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  bfd_boolean ret_val = TRUE;
+
+  symtab_hdr_sh_info = elf_tdata (input_bfd)->symtab_hdr.sh_info;
 
-  if (elf_hash_table (info)->dynamic_sections_created)
+  relend = relocs + input_section->reloc_count;
+  for (rel = relocs; rel < relend; rel++)
     {
-      /* Add some entries to the .dynamic section.  We fill in the
-        values later, in elf64_alpha_finish_dynamic_sections, but we
-        must add the entries now so that we get the correct size for
-        the .dynamic section.  The DT_DEBUG entry is filled in by the
-        dynamic linker and used by the debugger.  */
-      if (!info->shared)
-       {
-         if (!bfd_elf64_add_dynamic_entry (info, DT_DEBUG, 0))
-           return false;
-       }
-
-      if (! bfd_elf64_add_dynamic_entry (info, DT_PLTGOT, 0))
-       return false;
+      unsigned long r_symndx;
+      Elf_Internal_Sym *sym;
+      asection *sec;
+      unsigned long r_type;
 
-      if (relplt)
+      r_type = ELF64_R_TYPE(rel->r_info);
+      if (r_type >= R_ALPHA_max)
        {
-         if (! bfd_elf64_add_dynamic_entry (info, DT_PLTRELSZ, 0)
-             || ! bfd_elf64_add_dynamic_entry (info, DT_PLTREL, DT_RELA)
-             || ! bfd_elf64_add_dynamic_entry (info, DT_JMPREL, 0))
-           return false;
+         (*_bfd_error_handler)
+           (_("%s: unknown relocation type %d"),
+            bfd_archive_filename (input_bfd), (int)r_type);
+         bfd_set_error (bfd_error_bad_value);
+         ret_val = FALSE;
+         continue;
        }
 
-      if (! bfd_elf64_add_dynamic_entry (info, DT_RELA, 0)
-         || ! bfd_elf64_add_dynamic_entry (info, DT_RELASZ, 0)
-         || ! bfd_elf64_add_dynamic_entry (info, DT_RELAENT,
-                                           sizeof (Elf64_External_Rela)))
-       return false;
+      r_symndx = ELF64_R_SYM(rel->r_info);
 
-      if (info->flags & DF_TEXTREL)
+      /* The symbol associated with GPDISP and LITUSE is
+        immaterial.  Only the addend is significant.  */
+      if (r_type == R_ALPHA_GPDISP || r_type == R_ALPHA_LITUSE)
+       continue;
+
+      if (r_symndx < symtab_hdr_sh_info)
        {
-         if (! bfd_elf64_add_dynamic_entry (info, DT_TEXTREL, 0))
-           return false;
+         sym = local_syms + r_symndx;
+         if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
+           {
+             sec = local_sections[r_symndx];
+             rel->r_addend += sec->output_offset + sym->st_value;
+           }
        }
     }
 
-  return true;
+  return ret_val;
 }
 
 /* Relocate an Alpha ELF section.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
                              contents, relocs, local_syms, local_sections)
      bfd *output_bfd;
@@ -3209,22 +4240,38 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Shdr *symtab_hdr;
   Elf_Internal_Rela *rel;
   Elf_Internal_Rela *relend;
-  asection *sec, *sgot, *srel, *srelgot;
+  asection *sgot, *srel, *srelgot;
   bfd *dynobj, *gotobj;
-  bfd_vma gp;
-  boolean ret_val = true;
+  bfd_vma gp, tp_base, dtp_base;
+  struct alpha_elf_got_entry **local_got_entries;
+  bfd_boolean ret_val;
+  const char *section_name;
+
+  /* Handle relocatable links with a smaller loop.  */
+  if (info->relocatable)
+    return elf64_alpha_relocate_section_r (output_bfd, info, input_bfd,
+                                          input_section, contents, relocs,
+                                          local_syms, local_sections);
+
+  /* This is a final link.  */
+
+  ret_val = TRUE;
 
-  srelgot = srel = NULL;
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+
   dynobj = elf_hash_table (info)->dynobj;
   if (dynobj)
-    {
-      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-    }
+    srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+  else
+    srelgot = NULL;
+
+  section_name = (bfd_elf_string_from_elf_section
+                 (input_bfd, elf_elfheader(input_bfd)->e_shstrndx,
+                  elf_section_data(input_section)->rel_hdr.sh_name));
+  BFD_ASSERT(section_name != NULL);
+  srel = bfd_get_section_by_name (dynobj, section_name);
 
   /* Find the gp value for this input bfd.  */
-  sgot = NULL;
-  gp = 0;
   gotobj = alpha_elf_tdata (input_bfd)->gotobj;
   if (gotobj)
     {
@@ -3238,109 +4285,147 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
          _bfd_set_gp_value (gotobj, gp);
        }
     }
+  else
+    {
+      sgot = NULL;
+      gp = 0;
+    }
+
+  local_got_entries = alpha_elf_tdata(input_bfd)->local_got_entries;
+
+  if (elf_hash_table (info)->tls_sec != NULL)
+    {
+      dtp_base = alpha_get_dtprel_base (info);
+      tp_base = alpha_get_tprel_base (info);
+    }
+  else
+    dtp_base = tp_base = 0;
 
-  rel = relocs;
   relend = relocs + input_section->reloc_count;
-  for (; rel < relend; rel++)
+  for (rel = relocs; rel < relend; rel++)
     {
-      int r_type;
+      struct alpha_elf_link_hash_entry *h = NULL;
+      struct alpha_elf_got_entry *gotent;
+      bfd_reloc_status_type r;
       reloc_howto_type *howto;
       unsigned long r_symndx;
-      struct alpha_elf_link_hash_entry *h;
-      Elf_Internal_Sym *sym;
-      bfd_vma relocation;
-      bfd_signed_vma addend;
-      bfd_reloc_status_type r;
+      Elf_Internal_Sym *sym = NULL;
+      asection *sec = NULL;
+      bfd_vma value;
+      bfd_vma addend;
+      bfd_boolean dynamic_symbol_p;
+      bfd_boolean undef_weak_ref = FALSE;
+      unsigned long r_type;
 
       r_type = ELF64_R_TYPE(rel->r_info);
-      if (r_type < 0 || r_type >= (int) R_ALPHA_max)
+      if (r_type >= R_ALPHA_max)
        {
+         (*_bfd_error_handler)
+           (_("%s: unknown relocation type %d"),
+            bfd_archive_filename (input_bfd), (int)r_type);
          bfd_set_error (bfd_error_bad_value);
-         return false;
+         ret_val = FALSE;
+         continue;
        }
-      howto = elf64_alpha_howto_table + r_type;
 
+      howto = elf64_alpha_howto_table + r_type;
       r_symndx = ELF64_R_SYM(rel->r_info);
 
-      if (info->relocateable)
-       {
-         /* This is a relocateable link.  We don't have to change
-            anything, unless the reloc is against a section symbol,
-            in which case we have to adjust according to where the
-            section symbol winds up in the output section.  */
-
-         /* The symbol associated with GPDISP and LITUSE is
-            immaterial.  Only the addend is significant.  */
-         if (r_type == R_ALPHA_GPDISP || r_type == R_ALPHA_LITUSE)
-           continue;
+      /* The symbol for a TLSLDM reloc is ignored.  Collapse the
+        reloc to the 0 symbol so that they all match.  */
+      if (r_type == R_ALPHA_TLSLDM)
+       r_symndx = 0;
 
-         if (r_symndx < symtab_hdr->sh_info)
+      if (r_symndx < symtab_hdr->sh_info)
+       {
+         asection *msec;
+         sym = local_syms + r_symndx;
+         sec = local_sections[r_symndx];
+         msec = sec;
+         value = _bfd_elf_rela_local_sym (output_bfd, sym, &msec, rel);
+
+         /* If this is a tp-relative relocation against sym 0,
+            this is hackery from relax_section.  Force the value to
+            be the tls base.  */
+         if (r_symndx == 0
+             && (r_type == R_ALPHA_TLSLDM
+                 || r_type == R_ALPHA_GOTTPREL
+                 || r_type == R_ALPHA_TPREL64
+                 || r_type == R_ALPHA_TPRELHI
+                 || r_type == R_ALPHA_TPRELLO
+                 || r_type == R_ALPHA_TPREL16))
+           value = tp_base;
+
+         if (local_got_entries)
+           gotent = local_got_entries[r_symndx];
+         else
+           gotent = NULL;
+
+         /* Need to adjust local GOT entries' addends for SEC_MERGE
+            unless it has been done already.  */
+         if ((sec->flags & SEC_MERGE)
+             && ELF_ST_TYPE (sym->st_info) == STT_SECTION
+             && sec->sec_info_type == ELF_INFO_TYPE_MERGE
+             && gotent
+             && !gotent->reloc_xlated)
            {
-             sym = local_syms + r_symndx;
-             if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
+             struct alpha_elf_got_entry *ent;
+
+             for (ent = gotent; ent; ent = ent->next)
                {
-                 sec = local_sections[r_symndx];
-                 rel->r_addend += sec->output_offset + sym->st_value;
+                 ent->reloc_xlated = 1;
+                 if (ent->use_count == 0)
+                   continue;
+                 msec = sec;
+                 ent->addend =
+                   _bfd_merged_section_offset (output_bfd, &msec,
+                                               elf_section_data (sec)->
+                                                 sec_info,
+                                               sym->st_value + ent->addend);
+                 ent->addend -= sym->st_value;
+                 ent->addend += msec->output_section->vma
+                                + msec->output_offset
+                                - sec->output_section->vma
+                                - sec->output_offset;
                }
            }
 
-         continue;
-       }
-
-      /* This is a final link.  */
-
-      h = NULL;
-      sym = NULL;
-      sec = NULL;
-
-      if (r_symndx < symtab_hdr->sh_info)
-       {
-         sym = local_syms + r_symndx;
-         sec = local_sections[r_symndx];
-         relocation = (sec->output_section->vma
-                       + sec->output_offset
-                       + sym->st_value);
+         dynamic_symbol_p = FALSE;
        }
       else
        {
-         h = alpha_elf_sym_hashes (input_bfd)[r_symndx - symtab_hdr->sh_info];
+         bfd_boolean warned;
+         bfd_boolean unresolved_reloc;
+         struct elf_link_hash_entry *hh;
+         struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
 
-         while (h->root.root.type == bfd_link_hash_indirect
-                || h->root.root.type == bfd_link_hash_warning)
-           h = (struct alpha_elf_link_hash_entry *)h->root.root.u.i.link;
+         RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+                                  r_symndx, symtab_hdr, sym_hashes,
+                                  hh, sec, value,
+                                  unresolved_reloc, warned);
 
-         if (h->root.root.type == bfd_link_hash_defined
-             || h->root.root.type == bfd_link_hash_defweak)
-           {
-             sec = h->root.root.u.def.section;
+         if (warned)
+           continue;
 
-             if (sec->output_section == NULL)
-               relocation = 0;
-             else
-               {
-                 relocation = (h->root.root.u.def.value
-                               + sec->output_section->vma
-                               + sec->output_offset);
-               }
-           }
-         else if (h->root.root.type == bfd_link_hash_undefweak)
-           relocation = 0;
-         else if (info->shared && !info->symbolic
-                  && !info->no_undefined
-                  && ELF_ST_VISIBILITY (h->root.other) == STV_DEFAULT)
-           relocation = 0;
-         else
-           {
-             if (!((*info->callbacks->undefined_symbol)
-                   (info, h->root.root.root.string, input_bfd,
-                    input_section, rel->r_offset,
-                    (!info->shared || info->no_undefined
-                     || ELF_ST_VISIBILITY (h->root.other)))))
-               ret_val = false;
-             relocation = 0;
-           }
+         if (value == 0
+             && ! unresolved_reloc
+             && hh->root.type == bfd_link_hash_undefweak)
+           undef_weak_ref = TRUE;
+
+         h = (struct alpha_elf_link_hash_entry *) hh;
+          dynamic_symbol_p = alpha_elf_dynamic_symbol_p (&h->root, info);
+         gotent = h->got_entries;
        }
+
       addend = rel->r_addend;
+      value += addend;
+
+      /* Search for the proper got entry.  */
+      for (; gotent ; gotent = gotent->next)
+       if (gotent->gotobj == gotobj
+           && gotent->reloc_type == r_type
+           && gotent->addend == addend)
+         break;
 
       switch (r_type)
        {
@@ -3350,200 +4435,370 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 
            BFD_ASSERT(gp != 0);
 
-           relocation = (input_section->output_section->vma
-                         + input_section->output_offset
-                         + rel->r_offset);
+           value = (input_section->output_section->vma
+                    + input_section->output_offset
+                    + rel->r_offset);
 
-           p_ldah = contents + rel->r_offset - input_section->vma;
+           p_ldah = contents + rel->r_offset;
            p_lda = p_ldah + rel->r_addend;
 
-           r = elf64_alpha_do_reloc_gpdisp (input_bfd, gp - relocation,
+           r = elf64_alpha_do_reloc_gpdisp (input_bfd, gp - value,
                                             p_ldah, p_lda);
          }
          break;
 
        case R_ALPHA_LITERAL:
-         {
-           struct alpha_elf_got_entry *gotent;
-           boolean dynamic_symbol;
-
-           BFD_ASSERT(sgot != NULL);
-           BFD_ASSERT(gp != 0);
-
-           if (h != NULL)
-             {
-               gotent = h->got_entries;
-               dynamic_symbol = alpha_elf_dynamic_symbol_p (&h->root, info);
-             }
-           else
-             {
-               gotent = (alpha_elf_tdata(input_bfd)->
-                         local_got_entries[r_symndx]);
-               dynamic_symbol = false;
-             }
-
-           BFD_ASSERT(gotent != NULL);
-
-           while (gotent->gotobj != gotobj || gotent->addend != addend)
-             gotent = gotent->next;
-
-           BFD_ASSERT(gotent->use_count >= 1);
-
-           /* Initialize the .got entry's value.  */
-           if (!(gotent->flags & ALPHA_ELF_GOT_ENTRY_RELOCS_DONE))
-             {
-               bfd_put_64 (output_bfd, relocation+addend,
-                           sgot->contents + gotent->got_offset);
-
-               /* If the symbol has been forced local, output a
-                  RELATIVE reloc, otherwise it will be handled in
-                  finish_dynamic_symbol.  */
-               if (info->shared && !dynamic_symbol)
-                 {
-                   Elf_Internal_Rela outrel;
-
-                   BFD_ASSERT(srelgot != NULL);
-
-                   outrel.r_offset = (sgot->output_section->vma
-                                      + sgot->output_offset
-                                      + gotent->got_offset);
-                   outrel.r_info = ELF64_R_INFO(0, R_ALPHA_RELATIVE);
-                   outrel.r_addend = relocation+addend;
-
-                   bfd_elf64_swap_reloca_out (output_bfd, &outrel,
-                                              ((Elf64_External_Rela *)
-                                               srelgot->contents)
-                                              + srelgot->reloc_count++);
-                   BFD_ASSERT (sizeof (Elf64_External_Rela)
-                               * srelgot->reloc_count
-                               <= srelgot->_cooked_size);
-                 }
+         BFD_ASSERT(sgot != NULL);
+         BFD_ASSERT(gp != 0);
+         BFD_ASSERT(gotent != NULL);
+         BFD_ASSERT(gotent->use_count >= 1);
 
-               gotent->flags |= ALPHA_ELF_GOT_ENTRY_RELOCS_DONE;
-             }
+         if (!gotent->reloc_done)
+           {
+             gotent->reloc_done = 1;
+
+             bfd_put_64 (output_bfd, value,
+                         sgot->contents + gotent->got_offset);
+
+             /* If the symbol has been forced local, output a
+                RELATIVE reloc, otherwise it will be handled in
+                finish_dynamic_symbol.  */
+             if (info->shared && !dynamic_symbol_p)
+               elf64_alpha_emit_dynrel (output_bfd, info, sgot, srelgot,
+                                        gotent->got_offset, 0,
+                                        R_ALPHA_RELATIVE, value);
+           }
 
-           /* Figure the gprel relocation.  */
-           addend = 0;
-           relocation = (sgot->output_section->vma
-                         + sgot->output_offset
-                         + gotent->got_offset);
-           relocation -= gp;
-         }
-         /* overflow handled by _bfd_final_link_relocate */
+         value = (sgot->output_section->vma
+                  + sgot->output_offset
+                  + gotent->got_offset);
+         value -= gp;
          goto default_reloc;
 
-       case R_ALPHA_GPREL16:
        case R_ALPHA_GPREL32:
+         /* If the target section was a removed linkonce section,
+            r_symndx will be zero.  In this case, assume that the
+            switch will not be used, so don't fill it in.  If we
+            do nothing here, we'll get relocation truncated messages,
+            due to the placement of the application above 4GB.  */
+         if (r_symndx == 0)
+           {
+             r = bfd_reloc_ok;
+             break;
+           }
+         /* FALLTHRU */
+
+       case R_ALPHA_GPREL16:
        case R_ALPHA_GPRELLOW:
-         if (h && alpha_elf_dynamic_symbol_p (&h->root, info))
+         if (dynamic_symbol_p)
             {
               (*_bfd_error_handler)
                 (_("%s: gp-relative relocation against dynamic symbol %s"),
-                 bfd_get_filename (input_bfd), h->root.root.root.string);
-              ret_val = false;
+                 bfd_archive_filename (input_bfd), h->root.root.root.string);
+              ret_val = FALSE;
             }
          BFD_ASSERT(gp != 0);
-         relocation -= gp;
+         value -= gp;
          goto default_reloc;
 
        case R_ALPHA_GPRELHIGH:
-         if (h && alpha_elf_dynamic_symbol_p (&h->root, info))
+         if (dynamic_symbol_p)
             {
               (*_bfd_error_handler)
                 (_("%s: gp-relative relocation against dynamic symbol %s"),
-                 bfd_get_filename (input_bfd), h->root.root.root.string);
-              ret_val = false;
+                 bfd_archive_filename (input_bfd), h->root.root.root.string);
+              ret_val = FALSE;
             }
          BFD_ASSERT(gp != 0);
-         relocation -= gp;
-         relocation += addend;
-         addend = 0;
-         relocation = (((bfd_signed_vma) relocation >> 16)
-                       + ((relocation >> 15) & 1));
+         value -= gp;
+         value = ((bfd_signed_vma) value >> 16) + ((value >> 15) & 1);
          goto default_reloc;
 
-       case R_ALPHA_BRADDR:
        case R_ALPHA_HINT:
+         /* A call to a dynamic symbol is definitely out of range of
+            the 16-bit displacement.  Don't bother writing anything.  */
+         if (dynamic_symbol_p)
+           {
+             r = bfd_reloc_ok;
+             break;
+           }
+         /* The regular PC-relative stuff measures from the start of
+            the instruction rather than the end.  */
+         value -= 4;
+         goto default_reloc;
+
+       case R_ALPHA_BRADDR:
+         if (dynamic_symbol_p)
+            {
+              (*_bfd_error_handler)
+                (_("%s: pc-relative relocation against dynamic symbol %s"),
+                 bfd_archive_filename (input_bfd), h->root.root.root.string);
+              ret_val = FALSE;
+            }
          /* The regular PC-relative stuff measures from the start of
             the instruction rather than the end.  */
-         addend -= 4;
+         value -= 4;
          goto default_reloc;
 
+       case R_ALPHA_BRSGP:
+         {
+           int other;
+           const char *name;
+
+           /* The regular PC-relative stuff measures from the start of
+              the instruction rather than the end.  */
+           value -= 4;
+
+           /* The source and destination gp must be the same.  Note that
+              the source will always have an assigned gp, since we forced
+              one in check_relocs, but that the destination may not, as
+              it might not have had any relocations at all.  Also take
+              care not to crash if H is an undefined symbol.  */
+           if (h != NULL && sec != NULL
+               && alpha_elf_tdata (sec->owner)->gotobj
+               && gotobj != alpha_elf_tdata (sec->owner)->gotobj)
+             {
+               (*_bfd_error_handler)
+                 (_("%s: change in gp: BRSGP %s"),
+                  bfd_archive_filename (input_bfd), h->root.root.root.string);
+               ret_val = FALSE;
+             }
+
+           /* The symbol should be marked either NOPV or STD_GPLOAD.  */
+           if (h != NULL)
+             other = h->root.other;
+           else
+             other = sym->st_other;
+           switch (other & STO_ALPHA_STD_GPLOAD)
+             {
+             case STO_ALPHA_NOPV:
+               break;
+             case STO_ALPHA_STD_GPLOAD:
+               value += 8;
+               break;
+             default:
+               if (h != NULL)
+                 name = h->root.root.root.string;
+               else
+                 {
+                   name = (bfd_elf_string_from_elf_section
+                           (input_bfd, symtab_hdr->sh_link, sym->st_name));
+                   if (name == NULL)
+                     name = _("<unknown>");
+                   else if (name[0] == 0)
+                     name = bfd_section_name (input_bfd, sec);
+                 }
+               (*_bfd_error_handler)
+                 (_("%s: !samegp reloc against symbol without .prologue: %s"),
+                  bfd_archive_filename (input_bfd), name);
+               ret_val = FALSE;
+               break;
+             }
+
+           goto default_reloc;
+         }
+
        case R_ALPHA_REFLONG:
        case R_ALPHA_REFQUAD:
+       case R_ALPHA_DTPREL64:
+       case R_ALPHA_TPREL64:
          {
-           Elf_Internal_Rela outrel;
-           boolean skip;
+           long dynindx, dyntype = r_type;
+           bfd_vma dynaddend;
 
            /* Careful here to remember RELATIVE relocations for global
               variables for symbolic shared objects.  */
 
-           if (h && alpha_elf_dynamic_symbol_p (&h->root, info))
+           if (dynamic_symbol_p)
              {
                BFD_ASSERT(h->root.dynindx != -1);
-               outrel.r_info = ELF64_R_INFO(h->root.dynindx, r_type);
-               outrel.r_addend = addend;
-               addend = 0, relocation = 0;
+               dynindx = h->root.dynindx;
+               dynaddend = addend;
+               addend = 0, value = 0;
+             }
+           else if (r_type == R_ALPHA_DTPREL64)
+             {
+               BFD_ASSERT (elf_hash_table (info)->tls_sec != NULL);
+               value -= dtp_base;
+               goto default_reloc;
+             }
+           else if (r_type == R_ALPHA_TPREL64)
+             {
+               BFD_ASSERT (elf_hash_table (info)->tls_sec != NULL);
+               if (!info->shared)
+                 {
+                   value -= tp_base;
+                   goto default_reloc;
+                 }
+               dynindx = 0;
+               dynaddend = value - dtp_base;
              }
-           else if (info->shared && (input_section->flags & SEC_ALLOC))
+           else if (info->shared
+                    && r_symndx != 0
+                    && (input_section->flags & SEC_ALLOC))
              {
-               outrel.r_info = ELF64_R_INFO(0, R_ALPHA_RELATIVE);
-               outrel.r_addend = relocation + addend;
+               if (r_type == R_ALPHA_REFLONG)
+                 {
+                   (*_bfd_error_handler)
+                     (_("%s: unhandled dynamic relocation against %s"),
+                      bfd_archive_filename (input_bfd),
+                      h->root.root.root.string);
+                   ret_val = FALSE;
+                 }
+               dynindx = 0;
+               dyntype = R_ALPHA_RELATIVE;
+               dynaddend = value;
              }
            else
              goto default_reloc;
 
-           if (!srel)
-             {
-               const char *name;
+           elf64_alpha_emit_dynrel (output_bfd, info, input_section,
+                                    srel, rel->r_offset, dynindx,
+                                    dyntype, dynaddend);
+         }
+         goto default_reloc;
 
-               name = (bfd_elf_string_from_elf_section
-                       (input_bfd, elf_elfheader(input_bfd)->e_shstrndx,
-                        elf_section_data(input_section)->rel_hdr.sh_name));
-               BFD_ASSERT(name != NULL);
+       case R_ALPHA_SREL16:
+       case R_ALPHA_SREL32:
+       case R_ALPHA_SREL64:
+         if (dynamic_symbol_p)
+            {
+              (*_bfd_error_handler)
+                (_("%s: pc-relative relocation against dynamic symbol %s"),
+                 bfd_archive_filename (input_bfd), h->root.root.root.string);
+              ret_val = FALSE;
+            }
 
-               srel = bfd_get_section_by_name (dynobj, name);
-               BFD_ASSERT(srel != NULL);
-             }
+         /* ??? .eh_frame references to discarded sections will be smashed
+            to relocations against SHN_UNDEF.  The .eh_frame format allows
+            NULL to be encoded as 0 in any format, so this works here.  */
+         if (r_symndx == 0)
+           howto = (elf64_alpha_howto_table
+                    + (r_type - R_ALPHA_SREL32 + R_ALPHA_REFLONG));
+         goto default_reloc;
 
-           skip = false;
+       case R_ALPHA_TLSLDM:
+         /* Ignore the symbol for the relocation.  The result is always
+            the current module.  */
+         dynamic_symbol_p = 0;
+         /* FALLTHRU */
 
-           if (elf_section_data (input_section)->stab_info == NULL)
-             outrel.r_offset = rel->r_offset;
-           else
-             {
-               bfd_vma off;
-
-               off = (_bfd_stab_section_offset
-                      (output_bfd, &elf_hash_table (info)->stab_info,
-                       input_section,
-                       &elf_section_data (input_section)->stab_info,
-                       rel->r_offset));
-               if (off == (bfd_vma) -1)
-                 skip = true;
-               outrel.r_offset = off;
-             }
+       case R_ALPHA_TLSGD:
+         if (!gotent->reloc_done)
+           {
+             gotent->reloc_done = 1;
+
+             /* Note that the module index for the main program is 1.  */
+             bfd_put_64 (output_bfd, !info->shared && !dynamic_symbol_p,
+                         sgot->contents + gotent->got_offset);
+
+             /* If the symbol has been forced local, output a
+                DTPMOD64 reloc, otherwise it will be handled in
+                finish_dynamic_symbol.  */
+             if (info->shared && !dynamic_symbol_p)
+               elf64_alpha_emit_dynrel (output_bfd, info, sgot, srelgot,
+                                        gotent->got_offset, 0,
+                                        R_ALPHA_DTPMOD64, 0);
+
+             if (dynamic_symbol_p || r_type == R_ALPHA_TLSLDM)
+               value = 0;
+             else
+               {
+                 BFD_ASSERT (elf_hash_table (info)->tls_sec != NULL);
+                 value -= dtp_base;
+               }
+             bfd_put_64 (output_bfd, value,
+                         sgot->contents + gotent->got_offset + 8);
+           }
 
-           if (! skip)
-             outrel.r_offset += (input_section->output_section->vma
-                                 + input_section->output_offset);
-           else
-             memset (&outrel, 0, sizeof outrel);
-
-           bfd_elf64_swap_reloca_out (output_bfd, &outrel,
-                                      ((Elf64_External_Rela *)
-                                       srel->contents)
-                                      + srel->reloc_count++);
-           BFD_ASSERT (sizeof (Elf64_External_Rela) * srel->reloc_count
-                       <= srel->_cooked_size);
-         }
+         value = (sgot->output_section->vma
+                  + sgot->output_offset
+                  + gotent->got_offset);
+         value -= gp;
+         goto default_reloc;
+
+       case R_ALPHA_DTPRELHI:
+       case R_ALPHA_DTPRELLO:
+       case R_ALPHA_DTPREL16:
+         if (dynamic_symbol_p)
+            {
+              (*_bfd_error_handler)
+                (_("%s: dtp-relative relocation against dynamic symbol %s"),
+                 bfd_archive_filename (input_bfd), h->root.root.root.string);
+              ret_val = FALSE;
+            }
+         BFD_ASSERT (elf_hash_table (info)->tls_sec != NULL);
+         value -= dtp_base;
+         if (r_type == R_ALPHA_DTPRELHI)
+           value = ((bfd_signed_vma) value >> 16) + ((value >> 15) & 1);
+         goto default_reloc;
+
+       case R_ALPHA_TPRELHI:
+       case R_ALPHA_TPRELLO:
+       case R_ALPHA_TPREL16:
+         if (info->shared)
+           {
+             (*_bfd_error_handler)
+               (_("%s: TLS local exec code cannot be linked into shared objects"),
+               bfd_archive_filename (input_bfd));
+              ret_val = FALSE;
+           }
+         else if (dynamic_symbol_p)
+            {
+              (*_bfd_error_handler)
+                (_("%s: tp-relative relocation against dynamic symbol %s"),
+                 bfd_archive_filename (input_bfd), h->root.root.root.string);
+              ret_val = FALSE;
+            }
+         BFD_ASSERT (elf_hash_table (info)->tls_sec != NULL);
+         value -= tp_base;
+         if (r_type == R_ALPHA_TPRELHI)
+           value = ((bfd_signed_vma) value >> 16) + ((value >> 15) & 1);
+         goto default_reloc;
+
+       case R_ALPHA_GOTDTPREL:
+       case R_ALPHA_GOTTPREL:
+         BFD_ASSERT(sgot != NULL);
+         BFD_ASSERT(gp != 0);
+         BFD_ASSERT(gotent != NULL);
+         BFD_ASSERT(gotent->use_count >= 1);
+
+         if (!gotent->reloc_done)
+           {
+             gotent->reloc_done = 1;
+
+             if (dynamic_symbol_p)
+               value = 0;
+             else
+               {
+                 BFD_ASSERT (elf_hash_table (info)->tls_sec != NULL);
+                 if (r_type == R_ALPHA_GOTDTPREL)
+                   value -= dtp_base;
+                 else if (!info->shared)
+                   value -= tp_base;
+                 else
+                   {
+                     elf64_alpha_emit_dynrel (output_bfd, info, sgot, srelgot,
+                                              gotent->got_offset, 0,
+                                              R_ALPHA_TPREL64,
+                                              value - dtp_base);
+                     value = 0;
+                   }
+               }
+             bfd_put_64 (output_bfd, value,
+                         sgot->contents + gotent->got_offset);
+           }
+
+         value = (sgot->output_section->vma
+                  + sgot->output_offset
+                  + gotent->got_offset);
+         value -= gp;
          goto default_reloc;
 
        default:
        default_reloc:
          r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-                                       contents, rel->r_offset, relocation,
-                                       addend);
+                                       contents, rel->r_offset, value, 0);
          break;
        }
 
@@ -3556,6 +4811,15 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
          {
            const char *name;
 
+           /* Don't warn if the overflow is due to pc relative reloc
+              against discarded section.  Section optimization code should
+              handle it.  */
+
+           if (r_symndx < symtab_hdr->sh_info
+               && sec != NULL && howto->pc_relative
+               && elf_discarded_section (sec))
+             break;
+
            if (h != NULL)
              name = h->root.root.root.string;
            else
@@ -3563,14 +4827,14 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
                name = (bfd_elf_string_from_elf_section
                        (input_bfd, symtab_hdr->sh_link, sym->st_name));
                if (name == NULL)
-                 return false;
+                 return FALSE;
                if (*name == '\0')
                  name = bfd_section_name (input_bfd, sec);
              }
            if (! ((*info->callbacks->reloc_overflow)
                   (info, name, howto->name, (bfd_vma) 0,
                    input_bfd, input_section, rel->r_offset)))
-             ret_val = false;
+             ret_val = FALSE;
          }
          break;
 
@@ -3586,7 +4850,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -3600,6 +4864,7 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
       /* Fill in the .plt entry for this symbol.  */
       asection *splt, *sgot, *srel;
       Elf_Internal_Rela outrel;
+      bfd_byte *loc;
       bfd_vma got_addr, plt_addr;
       bfd_vma plt_index;
       struct alpha_elf_got_entry *gotent;
@@ -3629,7 +4894,7 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
 
       /* Fill in the entry in the procedure linkage table.  */
       {
-       unsigned insn1, insn2, insn3;
+       bfd_vma insn1, insn2, insn3;
 
        insn1 = PLT_ENTRY_WORD1 | ((-(h->plt.offset + 4) >> 2) & 0x1fffff);
        insn2 = PLT_ENTRY_WORD2;
@@ -3645,9 +4910,8 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
       outrel.r_info = ELF64_R_INFO(h->dynindx, R_ALPHA_JMP_SLOT);
       outrel.r_addend = 0;
 
-      bfd_elf64_swap_reloca_out (output_bfd, &outrel,
-                                ((Elf64_External_Rela *)srel->contents
-                                 + plt_index));
+      loc = srel->contents + plt_index * sizeof (Elf64_External_Rela);
+      bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
 
       if (!(h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR))
        {
@@ -3676,20 +4940,9 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
                          sgot->contents + gotent->got_offset);
 
              if (info->shared)
-               {
-                 outrel.r_offset = (sgot->output_section->vma
-                                    + sgot->output_offset
-                                    + gotent->got_offset);
-                 outrel.r_info = ELF64_R_INFO(0, R_ALPHA_RELATIVE);
-                 outrel.r_addend = plt_addr;
-
-                 bfd_elf64_swap_reloca_out (output_bfd, &outrel,
-                                            ((Elf64_External_Rela *)
-                                             srel->contents)
-                                            + srel->reloc_count++);
-                 BFD_ASSERT (sizeof (Elf64_External_Rela) * srel->reloc_count
-                             <= srel->_cooked_size);
-               }
+               elf64_alpha_emit_dynrel (output_bfd, info, sgot, srel,
+                                        gotent->got_offset, 0,
+                                        R_ALPHA_RELATIVE, plt_addr);
 
              gotent = gotent->next;
            }
@@ -3700,28 +4953,51 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
     {
       /* Fill in the dynamic relocations for this symbol's .got entries.  */
       asection *srel;
-      Elf_Internal_Rela outrel;
       struct alpha_elf_got_entry *gotent;
 
       srel = bfd_get_section_by_name (dynobj, ".rela.got");
       BFD_ASSERT (srel != NULL);
 
-      outrel.r_info = ELF64_R_INFO (h->dynindx, R_ALPHA_GLOB_DAT);
       for (gotent = ((struct alpha_elf_link_hash_entry *) h)->got_entries;
           gotent != NULL;
           gotent = gotent->next)
        {
-         asection *sgot = alpha_elf_tdata (gotent->gotobj)->got;
-         outrel.r_offset = (sgot->output_section->vma
-                            + sgot->output_offset
-                            + gotent->got_offset);
-         outrel.r_addend = gotent->addend;
-
-         bfd_elf64_swap_reloca_out (output_bfd, &outrel,
-                                    ((Elf64_External_Rela *)srel->contents
-                                     + srel->reloc_count++));
-         BFD_ASSERT (sizeof (Elf64_External_Rela) * srel->reloc_count
-                     <= srel->_cooked_size);
+         asection *sgot;
+         long r_type;
+
+         if (gotent->use_count == 0)
+           continue;
+
+         sgot = alpha_elf_tdata (gotent->gotobj)->got;
+
+         r_type = gotent->reloc_type;
+         switch (r_type)
+           {
+           case R_ALPHA_LITERAL:
+             r_type = R_ALPHA_GLOB_DAT;
+             break;
+           case R_ALPHA_TLSGD:
+             r_type = R_ALPHA_DTPMOD64;
+             break;
+           case R_ALPHA_GOTDTPREL:
+             r_type = R_ALPHA_DTPREL64;
+             break;
+           case R_ALPHA_GOTTPREL:
+             r_type = R_ALPHA_TPREL64;
+             break;
+           case R_ALPHA_TLSLDM:
+           default:
+             abort ();
+           }
+
+         elf64_alpha_emit_dynrel (output_bfd, info, sgot, srel, 
+                                  gotent->got_offset, h->dynindx,
+                                  r_type, gotent->addend);
+
+         if (gotent->reloc_type == R_ALPHA_TLSGD)
+           elf64_alpha_emit_dynrel (output_bfd, info, sgot, srel, 
+                                    gotent->got_offset + 8, h->dynindx,
+                                    R_ALPHA_DTPREL64, gotent->addend);
        }
     }
 
@@ -3731,12 +5007,12 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
       || strcmp (h->root.root.string, "_PROCEDURE_LINKAGE_TABLE_") == 0)
     sym->st_shndx = SHN_ABS;
 
-  return true;
+  return TRUE;
 }
 
 /* Finish up the dynamic sections.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_finish_dynamic_sections (output_bfd, info)
      bfd *output_bfd;
      struct bfd_link_info *info;
@@ -3806,7 +5082,7 @@ elf64_alpha_finish_dynamic_sections (output_bfd, info)
          bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
        }
 
-      /* Initialize the PLT0 entry */
+      /* Initialize the PLT0 entry */
       if (splt->_raw_size > 0)
        {
          bfd_put_32 (output_bfd, PLT_HEADER_WORD1, splt->contents);
@@ -3815,22 +5091,21 @@ elf64_alpha_finish_dynamic_sections (output_bfd, info)
          bfd_put_32 (output_bfd, PLT_HEADER_WORD4, splt->contents + 12);
 
          /* The next two words will be filled in by ld.so */
-         bfd_put_64 (output_bfd, 0, splt->contents + 16);
-         bfd_put_64 (output_bfd, 0, splt->contents + 24);
+         bfd_put_64 (output_bfd, (bfd_vma) 0, splt->contents + 16);
+         bfd_put_64 (output_bfd, (bfd_vma) 0, splt->contents + 24);
 
-         elf_section_data (splt->output_section)->this_hdr.sh_entsize =
-           PLT_HEADER_SIZE;
+         elf_section_data (splt->output_section)->this_hdr.sh_entsize = 0;
        }
     }
 
-  return true;
+  return TRUE;
 }
 
 /* We need to use a special link routine to handle the .mdebug section.
    We need to merge all instances of these sections together, not write
    them all out sequentially.  */
 
-static boolean
+static bfd_boolean
 elf64_alpha_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -3887,7 +5162,7 @@ elf64_alpha_final_link (abfd, info)
 
          mdebug_handle = bfd_ecoff_debug_init (abfd, &debug, swap, info);
          if (mdebug_handle == (PTR) NULL)
-           return false;
+           return FALSE;
 
          if (1)
            {
@@ -3926,7 +5201,7 @@ elf64_alpha_final_link (abfd, info)
 
                  if (! bfd_ecoff_debug_one_external (abfd, &debug, swap,
                                                      name[i], &esym))
-                   return false;
+                   return FALSE;
                }
            }
 
@@ -3943,7 +5218,7 @@ elf64_alpha_final_link (abfd, info)
 
              if (p->type != bfd_indirect_link_order)
                {
-                 if (p->type == bfd_fill_link_order)
+                 if (p->type == bfd_data_link_order)
                    continue;
                  abort ();
                }
@@ -3971,12 +5246,12 @@ elf64_alpha_final_link (abfd, info)
                 ecoff_debug_info structure, so we do that now.  */
              if (!elf64_alpha_read_ecoff_info (input_bfd, input_section,
                                                &input_debug))
-               return false;
+               return FALSE;
 
              if (! (bfd_ecoff_debug_accumulate
                     (mdebug_handle, abfd, &debug, swap, input_bfd,
                      &input_debug, input_swap, info)))
-               return false;
+               return FALSE;
 
              /* Loop through the external symbols.  For each one with
                 interesting information, try to find the symbol in
@@ -4002,7 +5277,7 @@ elf64_alpha_final_link (abfd, info)
 
                  name = input_debug.ssext + ext.asym.iss;
                  h = alpha_elf_link_hash_lookup (alpha_elf_hash_table (info),
-                                                 name, false, false, true);
+                                                 name, FALSE, FALSE, TRUE);
                  if (h == NULL || h->esym.ifd != -2)
                    continue;
 
@@ -4039,12 +5314,12 @@ elf64_alpha_final_link (abfd, info)
          einfo.info = info;
          einfo.debug = &debug;
          einfo.swap = swap;
-         einfo.failed = false;
+         einfo.failed = FALSE;
          elf_link_hash_traverse (elf_hash_table (info),
                                  elf64_alpha_output_extsym,
                                  (PTR) &einfo);
          if (einfo.failed)
-           return false;
+           return FALSE;
 
          /* Set the size of the .mdebug section.  */
          o->_raw_size = bfd_ecoff_debug_size (abfd, &debug, swap);
@@ -4058,8 +5333,8 @@ elf64_alpha_final_link (abfd, info)
     }
 
   /* Invoke the regular ELF backend linker to do all the work.  */
-  if (! bfd_elf64_bfd_final_link (abfd, info))
-    return false;
+  if (! bfd_elf_final_link (abfd, info))
+    return FALSE;
 
   /* Now write out the computed sections.  */
 
@@ -4078,9 +5353,10 @@ elf64_alpha_final_link (abfd, info)
 
        sgot = alpha_elf_tdata(i)->got;
        if (! bfd_set_section_contents (abfd, sgot->output_section,
-                                       sgot->contents, sgot->output_offset,
+                                       sgot->contents,
+                                       (file_ptr) sgot->output_offset,
                                        sgot->_raw_size))
-         return false;
+         return FALSE;
       }
   }
 
@@ -4090,19 +5366,19 @@ elf64_alpha_final_link (abfd, info)
       if (! bfd_ecoff_write_accumulated_debug (mdebug_handle, abfd, &debug,
                                               swap, info,
                                               mdebug_sec->filepos))
-       return false;
+       return FALSE;
 
       bfd_ecoff_debug_free (mdebug_handle, abfd, &debug, swap, info);
     }
 
-  return true;
+  return TRUE;
 }
 
 static enum elf_reloc_type_class
-elf64_alpha_reloc_type_class (type)
-     int type;
+elf64_alpha_reloc_type_class (rela)
+     const Elf_Internal_Rela *rela;
 {
-  switch (type)
+  switch ((int) ELF64_R_TYPE (rela->r_info))
     {
     case R_ALPHA_RELATIVE:
       return reloc_class_relative;
@@ -4115,6 +5391,13 @@ elf64_alpha_reloc_type_class (type)
     }
 }
 \f
+static struct bfd_elf_special_section const elf64_alpha_special_sections[]=
+{
+  { ".sdata", 6, -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_ALPHA_GPREL },
+  { ".sbss",  5, -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE + SHF_ALPHA_GPREL },
+  { NULL,     0,  0, 0,            0 }
+};
+
 /* ECOFF swapping routines.  These are used when dealing with the
    .mdebug section, which is in the ECOFF debugging format.  Copied
    from elf32-mips.c.  */
@@ -4162,7 +5445,7 @@ elf64_alpha_ecoff_debug_swap =
 \f
 /* Use a non-standard hash bucket size of 8.  */
 
-const struct elf_size_info alpha_elf_size_info =
+static const struct elf_size_info alpha_elf_size_info =
 {
   sizeof (Elf64_External_Ehdr),
   sizeof (Elf64_External_Phdr),
@@ -4174,20 +5457,21 @@ const struct elf_size_info alpha_elf_size_info =
   sizeof (Elf_External_Note),
   8,
   1,
-  64, 8,
+  64, 3,
   ELFCLASS64, EV_CURRENT,
   bfd_elf64_write_out_phdrs,
   bfd_elf64_write_shdrs_and_ehdr,
   bfd_elf64_write_relocs,
+  bfd_elf64_swap_symbol_in,
   bfd_elf64_swap_symbol_out,
   bfd_elf64_slurp_reloc_table,
   bfd_elf64_slurp_symbol_table,
   bfd_elf64_swap_dyn_in,
   bfd_elf64_swap_dyn_out,
-  NULL,
-  NULL,
-  NULL,
-  NULL
+  bfd_elf64_swap_reloc_in,
+  bfd_elf64_swap_reloc_out,
+  bfd_elf64_swap_reloca_in,
+  bfd_elf64_swap_reloca_out
 };
 
 #define TARGET_LITTLE_SYM      bfd_elf64_alpha_vec
@@ -4211,6 +5495,8 @@ const struct elf_size_info alpha_elf_size_info =
 
 #define elf_backend_section_from_shdr \
   elf64_alpha_section_from_shdr
+#define elf_backend_section_flags \
+  elf64_alpha_section_flags
 #define elf_backend_fake_sections \
   elf64_alpha_fake_sections
 
@@ -4250,11 +5536,53 @@ const struct elf_size_info alpha_elf_size_info =
 #define elf_backend_size_info \
   alpha_elf_size_info
 
+#define elf_backend_special_sections \
+  elf64_alpha_special_sections
+
 /* A few constants that determine how the .plt section is set up.  */
 #define elf_backend_want_got_plt 0
 #define elf_backend_plt_readonly 0
 #define elf_backend_want_plt_sym 1
 #define elf_backend_got_header_size 0
-#define elf_backend_plt_header_size PLT_HEADER_SIZE
+
+#include "elf64-target.h"
+\f
+/* FreeBSD support.  */
+
+#undef TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM      bfd_elf64_alpha_freebsd_vec
+#undef TARGET_LITTLE_NAME
+#define TARGET_LITTLE_NAME     "elf64-alpha-freebsd"
+
+/* The kernel recognizes executables as valid only if they carry a
+   "FreeBSD" label in the ELF header.  So we put this label on all
+   executables and (for simplicity) also all other object files.  */
+
+static void elf64_alpha_fbsd_post_process_headers
+  PARAMS ((bfd *, struct bfd_link_info *));
+
+static void
+elf64_alpha_fbsd_post_process_headers (abfd, link_info)
+     bfd * abfd;
+     struct bfd_link_info * link_info ATTRIBUTE_UNUSED;
+{
+  Elf_Internal_Ehdr * i_ehdrp; /* ELF file header, internal form.  */
+
+  i_ehdrp = elf_elfheader (abfd);
+
+  /* Put an ABI label supported by FreeBSD >= 4.1.  */
+  i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_FREEBSD;
+#ifdef OLD_FREEBSD_ABI_LABEL
+  /* The ABI label supported by FreeBSD <= 4.0 is quite nonstandard.  */
+  memcpy (&i_ehdrp->e_ident[EI_ABIVERSION], "FreeBSD", 8);
+#endif
+}
+
+#undef elf_backend_post_process_headers
+#define elf_backend_post_process_headers \
+  elf64_alpha_fbsd_post_process_headers
+
+#undef  elf64_bed
+#define elf64_bed elf64_alpha_fbsd_bed
 
 #include "elf64-target.h"