COFF buffer overflow in mark_relocs

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

diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c
index 6b247348d99c70882e78a80e7bc9cb7333910e79..681f792c7131a58aff32bc659664604e2aba080c 100644 (file)
--- a/bfd/elf64-alpha.c
+++ b/bfd/elf64-alpha.c
@@ -1,13 +1,12 @@
 /* Alpha specific support for 64-bit ELF
 /* Alpha specific support for 64-bit ELF

-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1996-2016 Free Software Foundation, Inc.

    Contributed by Richard Henderson <rth@tamu.edu>.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Contributed by Richard Henderson <rth@tamu.edu>.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

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

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


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

-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+

 
 /* We need a published ABI spec for this.  Until one comes out, don't
    assume this'll remain unchanged forever.  */
 
 
 /* We need a published ABI spec for this.  Until one comes out, don't
    assume this'll remain unchanged forever.  */
 

-#include "bfd.h"

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

+#include "bfd.h"

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


@@ -47,188 +48,138 @@
 #define ECOFF_64
 #include "ecoffswap.h"
 
 #define ECOFF_64
 #include "ecoffswap.h"
 

-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 *));
-static struct bfd_link_hash_table * elf64_alpha_bfd_link_hash_table_create
-  PARAMS ((bfd *));
-
-static bfd_reloc_status_type elf64_alpha_reloc_nil
-  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 **));
-static bfd_reloc_status_type elf64_alpha_do_reloc_gpdisp
-  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 **));
-
-static reloc_howto_type * elf64_alpha_bfd_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static void elf64_alpha_info_to_howto
-  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_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;
+\f
+/* Instruction data for plt generation and relaxation.  */
+
+#define OP_LDA         0x08
+#define OP_LDAH                0x09
+#define OP_LDQ         0x29
+#define OP_BR          0x30
+#define OP_BSR         0x34
+
+#define INSN_LDA       (OP_LDA << 26)
+#define INSN_LDAH      (OP_LDAH << 26)
+#define INSN_LDQ       (OP_LDQ << 26)
+#define INSN_BR                (OP_BR << 26)
+
+#define INSN_ADDQ      0x40000400
+#define INSN_RDUNIQ    0x0000009e
+#define INSN_SUBQ      0x40000520
+#define INSN_S4SUBQ    0x40000560
+#define INSN_UNOP      0x2ffe0000
+
+#define INSN_JSR       0x68004000
+#define INSN_JMP       0x68000000
+#define INSN_JSR_MASK  0xfc00c000
+
+#define INSN_A(I,A)            (I | (A << 21))
+#define INSN_AB(I,A,B)         (I | (A << 21) | (B << 16))
+#define INSN_ABC(I,A,B,C)      (I | (A << 21) | (B << 16) | C)
+#define INSN_ABO(I,A,B,O)      (I | (A << 21) | (B << 16) | ((O) & 0xffff))
+#define INSN_AD(I,A,D)         (I | (A << 21) | (((D) >> 2) & 0x1fffff))
+
+/* PLT/GOT Stuff */
+
+/* Set by ld emulation.  Putting this into the link_info or hash structure
+   is simply working too hard.  */
+#ifdef USE_SECUREPLT
+bfd_boolean elf64_alpha_use_secureplt = TRUE;
+#else
+bfd_boolean elf64_alpha_use_secureplt = FALSE;

 #endif
 
 #endif
 

-static bfd_boolean elf64_alpha_output_extsym
-  PARAMS ((struct alpha_elf_link_hash_entry *, PTR));
-
-static bfd_boolean elf64_alpha_can_merge_gots
-  PARAMS ((bfd *, bfd *));
-static void elf64_alpha_merge_gots
-  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 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 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 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 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 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 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 ((const Elf_Internal_Rela *));
+#define OLD_PLT_HEADER_SIZE    32
+#define OLD_PLT_ENTRY_SIZE     12
+#define NEW_PLT_HEADER_SIZE    36
+#define NEW_PLT_ENTRY_SIZE     4
+
+#define PLT_HEADER_SIZE \
+  (elf64_alpha_use_secureplt ? NEW_PLT_HEADER_SIZE : OLD_PLT_HEADER_SIZE)
+#define PLT_ENTRY_SIZE \
+  (elf64_alpha_use_secureplt ? NEW_PLT_ENTRY_SIZE : OLD_PLT_ENTRY_SIZE)
+
+#define MAX_GOT_SIZE           (64*1024)
+
+#define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so"

 \f
 \f

-struct alpha_elf_link_hash_entry
+
+/* Used to implement multiple .got subsections.  */
+struct alpha_elf_got_entry

 {
 {

-  struct elf_link_hash_entry root;
+  struct alpha_elf_got_entry *next;

 
 

-  /* External symbol information.  */
-  EXTR esym;
+  /* Which .got subsection?  */
+  bfd *gotobj;

 
 

-  /* Cumulative flags for all the .got entries.  */
-  int flags;
+  /* The addend in effect for this entry.  */
+  bfd_vma addend;

 
 

-  /* 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;
+  /* The .got offset for this entry.  */
+  int got_offset;

 
 

-  /* Used to implement multiple .got subsections.  */
-  struct alpha_elf_got_entry
-  {
-    struct alpha_elf_got_entry *next;
+  /* The .plt offset for this entry.  */
+  int plt_offset;
+
+  /* How many references to this entry?  */
+  int use_count;

 
 

-    /* Which .got subsection?  */
-    bfd *gotobj;
+  /* The relocation type of this entry.  */
+  unsigned char reloc_type;

 
 

-    /* The addend in effect for this entry.  */
-    bfd_vma addend;
+  /* How a LITERAL is used.  */
+  unsigned char flags;

 
 

-    /* The .got offset for this entry.  */
-    int got_offset;
+  /* Have we initialized the dynamic relocation for this entry?  */
+  unsigned char reloc_done;

 
 

-    /* How many references to this entry?  */
-    int use_count;
+  /* Have we adjusted this entry for SEC_MERGE?  */
+  unsigned char reloc_xlated;
+};

 
 

-    /* The relocation type of this entry.  */
-    unsigned char reloc_type;
+struct alpha_elf_reloc_entry
+{
+  struct alpha_elf_reloc_entry *next;

 
 

-    /* How a LITERAL is used.  */
-    unsigned char flags;
+  /* Which .reloc section? */
+  asection *srel;

 
 

-    /* Have we initialized the dynamic relocation for this entry?  */
-    unsigned char reloc_done;
+  /* What kind of relocation? */
+  unsigned int rtype;

 
 

-    /* Have we adjusted this entry for SEC_MERGE?  */
-    unsigned char reloc_xlated;
-  } *got_entries;
+  /* Is this against read-only section? */
+  unsigned int reltext : 1;

 
 

-  /* 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;
+  /* How many did we find?  */
+  unsigned long count;
+};
+
+struct alpha_elf_link_hash_entry
+{
+  struct elf_link_hash_entry root;
+
+  /* External symbol information.  */
+  EXTR esym;

 
 

-    /* Which .reloc section? */
-    asection *srel;
+  /* Cumulative flags for all the .got entries.  */
+  int flags;

 
 

-    /* What kind of relocation? */
-    unsigned int rtype;
+  /* 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_JSRDIRECT 0x40
+#define ALPHA_ELF_LINK_HASH_LU_PLT      0x38
+#define ALPHA_ELF_LINK_HASH_TLS_IE      0x80

 
 

-    /* Is this against read-only section? */
-    unsigned int reltext : 1;
+  /* Used to implement multiple .got subsections.  */
+  struct alpha_elf_got_entry *got_entries;

 
 

-    /* How many did we find?  */
-    unsigned long count;
-  } *reloc_entries;
+  /* Used to count non-got, non-plt relocations for delayed sizing
+     of relocation sections.  */
+  struct alpha_elf_reloc_entry *reloc_entries;

 };
 
 /* Alpha ELF linker hash table.  */
 };
 
 /* Alpha ELF linker hash table.  */


@@ -240,6 +191,10 @@ struct alpha_elf_link_hash_table
   /* The head of a list of .got subsections linked through
      alpha_elf_tdata(abfd)->got_link_next.  */
   bfd *got_list;
   /* The head of a list of .got subsections linked through
      alpha_elf_tdata(abfd)->got_link_next.  */
   bfd *got_list;

+
+  /* The most recent relax pass that we've seen.  The GOTs
+     should be regenerated if this doesn't match.  */
+  int relax_trip;

 };
 
 /* Look up an entry in a Alpha ELF linker hash table.  */
 };
 
 /* Look up an entry in a Alpha ELF linker hash table.  */


@@ -254,28 +209,28 @@ struct alpha_elf_link_hash_table
 #define alpha_elf_link_hash_traverse(table, func, info)                        \
   (elf_link_hash_traverse                                              \
    (&(table)->root,                                                    \
 #define alpha_elf_link_hash_traverse(table, func, info)                        \
   (elf_link_hash_traverse                                              \
    (&(table)->root,                                                    \

-    (bfd_boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func), \
+    (bfd_boolean (*) (struct elf_link_hash_entry *, void *)) (func),   \

     (info)))
 
 /* Get the Alpha ELF linker hash table from a link_info structure.  */
 
 #define alpha_elf_hash_table(p) \
     (info)))
 
 /* Get the Alpha ELF linker hash table from a link_info structure.  */
 
 #define alpha_elf_hash_table(p) \

-  ((struct alpha_elf_link_hash_table *) ((p)->hash))
+  (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
+  == ALPHA_ELF_DATA ? ((struct alpha_elf_link_hash_table *) ((p)->hash)) : NULL)

 
 /* Get the object's symbols as our own entry type.  */
 
 #define alpha_elf_sym_hashes(abfd) \
   ((struct alpha_elf_link_hash_entry **)elf_sym_hashes(abfd))
 
 
 /* Get the object's symbols as our own entry type.  */
 
 #define alpha_elf_sym_hashes(abfd) \
   ((struct alpha_elf_link_hash_entry **)elf_sym_hashes(abfd))
 

-/* Should we do dynamic things to this symbol?  This differs from the 
+/* 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 inline bfd_boolean
    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 inline bfd_boolean

-alpha_elf_dynamic_symbol_p (h, info)
-     struct elf_link_hash_entry *h;
-     struct bfd_link_info *info;
+alpha_elf_dynamic_symbol_p (struct elf_link_hash_entry *h,
+                           struct bfd_link_info *info)

 {
   return _bfd_elf_dynamic_symbol_p (h, info, 0);
 }
 {
   return _bfd_elf_dynamic_symbol_p (h, info, 0);
 }


@@ -283,10 +238,9 @@ alpha_elf_dynamic_symbol_p (h, info)
 /* Create an entry in a Alpha ELF linker hash table.  */
 
 static struct bfd_hash_entry *
 /* Create an entry in a Alpha ELF linker hash table.  */
 
 static struct bfd_hash_entry *

-elf64_alpha_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
+elf64_alpha_link_hash_newfunc (struct bfd_hash_entry *entry,
+                              struct bfd_hash_table *table,
+                              const char *string)

 {
   struct alpha_elf_link_hash_entry *ret =
     (struct alpha_elf_link_hash_entry *) entry;
 {
   struct alpha_elf_link_hash_entry *ret =
     (struct alpha_elf_link_hash_entry *) entry;


@@ -322,8 +276,7 @@ elf64_alpha_link_hash_newfunc (entry, table, string)
 /* Create a Alpha ELF linker hash table.  */
 
 static struct bfd_link_hash_table *
 /* Create a Alpha ELF linker hash table.  */
 
 static struct bfd_link_hash_table *

-elf64_alpha_bfd_link_hash_table_create (abfd)
-     bfd *abfd;
+elf64_alpha_bfd_link_hash_table_create (bfd *abfd)

 {
   struct alpha_elf_link_hash_table *ret;
   bfd_size_type amt = sizeof (struct alpha_elf_link_hash_table);
 {
   struct alpha_elf_link_hash_table *ret;
   bfd_size_type amt = sizeof (struct alpha_elf_link_hash_table);


@@ -332,8 +285,10 @@ elf64_alpha_bfd_link_hash_table_create (abfd)
   if (ret == (struct alpha_elf_link_hash_table *) NULL)
     return NULL;
 
   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))
+  if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
+                                     elf64_alpha_link_hash_newfunc,
+                                     sizeof (struct alpha_elf_link_hash_entry),
+                                     ALPHA_ELF_DATA))

     {
       free (ret);
       return NULL;
     {
       free (ret);
       return NULL;


@@ -342,6 +297,15 @@ elf64_alpha_bfd_link_hash_table_create (abfd)
   return &ret->root.root;
 }
 \f
   return &ret->root.root;
 }
 \f

+/* Alpha ELF follows MIPS ELF in using a special find_nearest_line
+   routine in order to handle the ECOFF debugging information.  */
+
+struct alpha_elf_find_line
+{
+  struct ecoff_debug_info d;
+  struct ecoff_find_line i;
+};
+

 /* We have some private fields hanging off of the elf_tdata structure.  */
 
 struct alpha_elf_obj_tdata
 /* We have some private fields hanging off of the elf_tdata structure.  */
 
 struct alpha_elf_obj_tdata


@@ -371,43 +335,159 @@ struct alpha_elf_obj_tdata
   /* For every got, this is the sum of the number of words required
      to hold all of the member object's local got.  */
   int local_got_size;
   /* For every got, this is the sum of the number of words required
      to hold all of the member object's local got.  */
   int local_got_size;

+
+  /* Used by elf64_alpha_find_nearest_line entry point.  */
+  struct alpha_elf_find_line *find_line_info;
+

 };
 
 #define alpha_elf_tdata(abfd) \
   ((struct alpha_elf_obj_tdata *) (abfd)->tdata.any)
 
 };
 
 #define alpha_elf_tdata(abfd) \
   ((struct alpha_elf_obj_tdata *) (abfd)->tdata.any)
 

+#define is_alpha_elf(bfd) \
+  (bfd_get_flavour (bfd) == bfd_target_elf_flavour \
+   && elf_tdata (bfd) != NULL \
+   && elf_object_id (bfd) == ALPHA_ELF_DATA)
+

 static bfd_boolean
 static bfd_boolean

-elf64_alpha_mkobject (abfd)
-     bfd *abfd;
+elf64_alpha_mkobject (bfd *abfd)

 {
 {

-  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 bfd_elf_allocate_object (abfd, sizeof (struct alpha_elf_obj_tdata),
+                                 ALPHA_ELF_DATA);

 }
 
 static bfd_boolean
 }
 
 static bfd_boolean

-elf64_alpha_object_p (abfd)
-     bfd *abfd;
+elf64_alpha_object_p (bfd *abfd)

 {
   /* Set the right machine number for an Alpha ELF file.  */
   return bfd_default_set_arch_mach (abfd, bfd_arch_alpha, 0);
 }
 \f
 {
   /* Set the right machine number for an Alpha ELF file.  */
   return bfd_default_set_arch_mach (abfd, bfd_arch_alpha, 0);
 }
 \f

+/* A relocation function which doesn't do anything.  */
+
+static bfd_reloc_status_type
+elf64_alpha_reloc_nil (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc,
+                      asymbol *sym ATTRIBUTE_UNUSED,
+                      void * data ATTRIBUTE_UNUSED, asection *sec,
+                      bfd *output_bfd, char **error_message ATTRIBUTE_UNUSED)
+{
+  if (output_bfd)
+    reloc->address += sec->output_offset;
+  return bfd_reloc_ok;
+}
+
+/* A relocation function used for an unsupported reloc.  */
+
+static bfd_reloc_status_type
+elf64_alpha_reloc_bad (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc,
+                      asymbol *sym ATTRIBUTE_UNUSED,
+                      void * data ATTRIBUTE_UNUSED, asection *sec,
+                      bfd *output_bfd, char **error_message ATTRIBUTE_UNUSED)
+{
+  if (output_bfd)
+    reloc->address += sec->output_offset;
+  return bfd_reloc_notsupported;
+}
+
+/* Do the work of the GPDISP relocation.  */
+
+static bfd_reloc_status_type
+elf64_alpha_do_reloc_gpdisp (bfd *abfd, bfd_vma gpdisp, bfd_byte *p_ldah,
+                            bfd_byte *p_lda)
+{
+  bfd_reloc_status_type ret = bfd_reloc_ok;
+  bfd_vma addend;
+  unsigned long i_ldah, i_lda;
+
+  i_ldah = bfd_get_32 (abfd, p_ldah);
+  i_lda = bfd_get_32 (abfd, p_lda);
+
+  /* Complain if the instructions are not correct.  */
+  if (((i_ldah >> 26) & 0x3f) != 0x09
+      || ((i_lda >> 26) & 0x3f) != 0x08)
+    ret = bfd_reloc_dangerous;
+
+  /* Extract the user-supplied offset, mirroring the sign extensions
+     that the instructions perform.  */
+  addend = ((i_ldah & 0xffff) << 16) | (i_lda & 0xffff);
+  addend = (addend ^ 0x80008000) - 0x80008000;
+
+  gpdisp += addend;
+
+  if ((bfd_signed_vma) gpdisp < -(bfd_signed_vma) 0x80000000
+      || (bfd_signed_vma) gpdisp >= (bfd_signed_vma) 0x7fff8000)
+    ret = bfd_reloc_overflow;
+
+  /* compensate for the sign extension again.  */
+  i_ldah = ((i_ldah & 0xffff0000)
+           | (((gpdisp >> 16) + ((gpdisp >> 15) & 1)) & 0xffff));
+  i_lda = (i_lda & 0xffff0000) | (gpdisp & 0xffff);
+
+  bfd_put_32 (abfd, (bfd_vma) i_ldah, p_ldah);
+  bfd_put_32 (abfd, (bfd_vma) i_lda, p_lda);
+
+  return ret;
+}
+
+/* The special function for the GPDISP reloc.  */
+
+static bfd_reloc_status_type
+elf64_alpha_reloc_gpdisp (bfd *abfd, arelent *reloc_entry,
+                         asymbol *sym ATTRIBUTE_UNUSED, void * data,
+                         asection *input_section, bfd *output_bfd,
+                         char **err_msg)
+{
+  bfd_reloc_status_type ret;
+  bfd_vma gp, relocation;
+  bfd_vma high_address;
+  bfd_byte *p_ldah, *p_lda;
+
+  /* Don't do anything if we're not doing a final link.  */
+  if (output_bfd)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  high_address = bfd_get_section_limit (abfd, input_section);
+  if (reloc_entry->address > high_address
+      || reloc_entry->address + reloc_entry->addend > high_address)
+    return bfd_reloc_outofrange;
+
+  /* The gp used in the portion of the output object to which this
+     input object belongs is cached on the input bfd.  */
+  gp = _bfd_get_gp_value (abfd);
+
+  relocation = (input_section->output_section->vma
+               + input_section->output_offset
+               + reloc_entry->address);
+
+  p_ldah = (bfd_byte *) data + reloc_entry->address;
+  p_lda = p_ldah + reloc_entry->addend;
+
+  ret = elf64_alpha_do_reloc_gpdisp (abfd, gp - relocation, p_ldah, p_lda);
+
+  /* Complain if the instructions are not correct.  */
+  if (ret == bfd_reloc_dangerous)
+    *err_msg = _("GPDISP relocation did not find ldah and lda instructions");
+
+  return ret;
+}
+

 /* In case we're on a 32-bit machine, construct a 64-bit "-1" value
    from smaller values.  Start with zero, widen, *then* decrement.  */
 #define MINUS_ONE      (((bfd_vma)0) - 1)
 
 /* In case we're on a 32-bit machine, construct a 64-bit "-1" value
    from smaller values.  Start with zero, widen, *then* decrement.  */
 #define MINUS_ONE      (((bfd_vma)0) - 1)
 

+

 #define SKIP_HOWTO(N) \
 #define SKIP_HOWTO(N) \

-  HOWTO(N, 0, 0, 0, 0, 0, 0, elf64_alpha_reloc_bad, 0, 0, 0, 0, 0)
+  HOWTO(N, 0, 0, 0, 0, 0, complain_overflow_dont, elf64_alpha_reloc_bad, 0, 0, 0, 0, 0)

 
 static reloc_howto_type elf64_alpha_howto_table[] =
 {
   HOWTO (R_ALPHA_NONE,         /* type */
         0,                     /* rightshift */
 
 static reloc_howto_type elf64_alpha_howto_table[] =
 {
   HOWTO (R_ALPHA_NONE,         /* type */
         0,                     /* rightshift */

-        0,                     /* size (0 = byte, 1 = short, 2 = long) */
-        8,                     /* bitsize */
+        3,                     /* size (0 = byte, 1 = short, 2 = long) */
+        0,                     /* bitsize */

         TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */
         TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */


@@ -426,7 +506,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "REFLONG",             /* name */
         FALSE,                 /* partial_inplace */
         0xffffffff,            /* src_mask */
         "REFLONG",             /* name */
         FALSE,                 /* partial_inplace */
         0xffffffff,            /* src_mask */


@@ -441,7 +521,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "REFQUAD",             /* name */
         FALSE,                 /* partial_inplace */
         MINUS_ONE,             /* src_mask */
         "REFQUAD",             /* name */
         FALSE,                 /* partial_inplace */
         MINUS_ONE,             /* src_mask */


@@ -458,7 +538,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "GPREL32",             /* name */
         FALSE,                 /* partial_inplace */
         0xffffffff,            /* src_mask */
         "GPREL32",             /* name */
         FALSE,                 /* partial_inplace */
         0xffffffff,            /* src_mask */


@@ -473,7 +553,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "ELF_LITERAL",         /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         "ELF_LITERAL",         /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */


@@ -539,7 +619,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "BRADDR",              /* name */
         FALSE,                 /* partial_inplace */
         0x1fffff,              /* src_mask */
         "BRADDR",              /* name */
         FALSE,                 /* partial_inplace */
         0x1fffff,              /* src_mask */


@@ -554,7 +634,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */
         TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "HINT",                /* name */
         FALSE,                 /* partial_inplace */
         0x3fff,                /* src_mask */
         "HINT",                /* name */
         FALSE,                 /* partial_inplace */
         0x3fff,                /* src_mask */


@@ -569,7 +649,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "SREL16",              /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         "SREL16",              /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */


@@ -584,7 +664,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "SREL32",              /* name */
         FALSE,                 /* partial_inplace */
         0xffffffff,            /* src_mask */
         "SREL32",              /* name */
         FALSE,                 /* partial_inplace */
         0xffffffff,            /* src_mask */


@@ -599,7 +679,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "SREL64",              /* name */
         FALSE,                 /* partial_inplace */
         MINUS_ONE,             /* src_mask */
         "SREL64",              /* name */
         FALSE,                 /* partial_inplace */
         MINUS_ONE,             /* src_mask */


@@ -621,7 +701,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "GPRELHIGH",           /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         "GPRELHIGH",           /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */


@@ -636,7 +716,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "GPRELLOW",            /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         "GPRELLOW",            /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */


@@ -651,7 +731,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "GPREL16",             /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         "GPREL16",             /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */


@@ -737,7 +817,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         TRUE,                  /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "BRSGP",               /* name */
         FALSE,                 /* partial_inplace */
         0x1fffff,              /* src_mask */
         "BRSGP",               /* name */
         FALSE,                 /* partial_inplace */
         0x1fffff,              /* src_mask */


@@ -752,7 +832,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "TLSGD",               /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         "TLSGD",               /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */


@@ -767,7 +847,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "TLSLDM",              /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         "TLSLDM",              /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */


@@ -782,7 +862,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "DTPMOD64",            /* name */
         FALSE,                 /* partial_inplace */
         MINUS_ONE,             /* src_mask */
         "DTPMOD64",            /* name */
         FALSE,                 /* partial_inplace */
         MINUS_ONE,             /* src_mask */


@@ -798,7 +878,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "GOTDTPREL",           /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         "GOTDTPREL",           /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */


@@ -813,7 +893,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "DTPREL64",            /* name */
         FALSE,                 /* partial_inplace */
         MINUS_ONE,             /* src_mask */
         "DTPREL64",            /* name */
         FALSE,                 /* partial_inplace */
         MINUS_ONE,             /* src_mask */


@@ -828,7 +908,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "DTPRELHI",            /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         "DTPRELHI",            /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */


@@ -843,7 +923,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "DTPRELLO",            /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         "DTPRELLO",            /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */


@@ -858,7 +938,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "DTPREL16",            /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         "DTPREL16",            /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */


@@ -874,7 +954,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "GOTTPREL",            /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         "GOTTPREL",            /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */


@@ -889,7 +969,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "TPREL64",             /* name */
         FALSE,                 /* partial_inplace */
         MINUS_ONE,             /* src_mask */
         "TPREL64",             /* name */
         FALSE,                 /* partial_inplace */
         MINUS_ONE,             /* src_mask */


@@ -904,7 +984,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "TPRELHI",             /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         "TPRELHI",             /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */


@@ -919,7 +999,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "TPRELLO",             /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         "TPRELLO",             /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */


@@ -934,7 +1014,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */

-        0,                     /* special_function */
+        bfd_elf_generic_reloc, /* special_function */

         "TPREL16",             /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */
         "TPREL16",             /* name */
         FALSE,                 /* partial_inplace */
         0xffff,                /* src_mask */


@@ -942,205 +1022,97 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         FALSE),                /* pcrel_offset */
 };
 
         FALSE),                /* pcrel_offset */
 };
 

-/* A relocation function which doesn't do anything.  */
+/* A mapping from BFD reloc types to Alpha ELF reloc types.  */

 
 

-static bfd_reloc_status_type
-elf64_alpha_reloc_nil (abfd, reloc, sym, data, sec, output_bfd, error_message)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     arelent *reloc;
-     asymbol *sym ATTRIBUTE_UNUSED;
-     PTR data ATTRIBUTE_UNUSED;
-     asection *sec;
-     bfd *output_bfd;
-     char **error_message ATTRIBUTE_UNUSED;
+struct elf_reloc_map

 {
 {

-  if (output_bfd)
-    reloc->address += sec->output_offset;
-  return bfd_reloc_ok;
-}
+  bfd_reloc_code_real_type bfd_reloc_val;
+  int elf_reloc_val;
+};

 
 

-/* A relocation function used for an unsupported reloc.  */
+static const struct elf_reloc_map elf64_alpha_reloc_map[] =
+{
+  {BFD_RELOC_NONE,                     R_ALPHA_NONE},
+  {BFD_RELOC_32,                       R_ALPHA_REFLONG},
+  {BFD_RELOC_64,                       R_ALPHA_REFQUAD},
+  {BFD_RELOC_CTOR,                     R_ALPHA_REFQUAD},
+  {BFD_RELOC_GPREL32,                  R_ALPHA_GPREL32},
+  {BFD_RELOC_ALPHA_ELF_LITERAL,                R_ALPHA_LITERAL},
+  {BFD_RELOC_ALPHA_LITUSE,             R_ALPHA_LITUSE},
+  {BFD_RELOC_ALPHA_GPDISP,             R_ALPHA_GPDISP},
+  {BFD_RELOC_23_PCREL_S2,              R_ALPHA_BRADDR},
+  {BFD_RELOC_ALPHA_HINT,               R_ALPHA_HINT},
+  {BFD_RELOC_16_PCREL,                 R_ALPHA_SREL16},
+  {BFD_RELOC_32_PCREL,                 R_ALPHA_SREL32},
+  {BFD_RELOC_64_PCREL,                 R_ALPHA_SREL64},
+  {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},
+};

 
 

-static bfd_reloc_status_type
-elf64_alpha_reloc_bad (abfd, reloc, sym, data, sec, output_bfd, error_message)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     arelent *reloc;
-     asymbol *sym ATTRIBUTE_UNUSED;
-     PTR data ATTRIBUTE_UNUSED;
-     asection *sec;
-     bfd *output_bfd;
-     char **error_message ATTRIBUTE_UNUSED;
+/* Given a BFD reloc type, return a HOWTO structure.  */
+
+static reloc_howto_type *
+elf64_alpha_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                                  bfd_reloc_code_real_type code)

 {
 {

-  if (output_bfd)
-    reloc->address += sec->output_offset;
-  return bfd_reloc_notsupported;
+  const struct elf_reloc_map *i, *e;
+  i = e = elf64_alpha_reloc_map;
+  e += sizeof (elf64_alpha_reloc_map) / sizeof (struct elf_reloc_map);
+  for (; i != e; ++i)
+    {
+      if (i->bfd_reloc_val == code)
+       return &elf64_alpha_howto_table[i->elf_reloc_val];
+    }
+  return 0;

 }
 
 }
 

-/* Do the work of the GPDISP relocation.  */
-
-static bfd_reloc_status_type
-elf64_alpha_do_reloc_gpdisp (abfd, gpdisp, p_ldah, p_lda)
-     bfd *abfd;
-     bfd_vma gpdisp;
-     bfd_byte *p_ldah;
-     bfd_byte *p_lda;
+static reloc_howto_type *
+elf64_alpha_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                                  const char *r_name)

 {
 {

-  bfd_reloc_status_type ret = bfd_reloc_ok;
-  bfd_vma addend;
-  unsigned long i_ldah, i_lda;
+  unsigned int i;

 
 

-  i_ldah = bfd_get_32 (abfd, p_ldah);
-  i_lda = bfd_get_32 (abfd, p_lda);
+  for (i = 0;
+       i < (sizeof (elf64_alpha_howto_table)
+           / sizeof (elf64_alpha_howto_table[0]));
+       i++)
+    if (elf64_alpha_howto_table[i].name != NULL
+       && strcasecmp (elf64_alpha_howto_table[i].name, r_name) == 0)
+      return &elf64_alpha_howto_table[i];

 
 

-  /* Complain if the instructions are not correct.  */
-  if (((i_ldah >> 26) & 0x3f) != 0x09
-      || ((i_lda >> 26) & 0x3f) != 0x08)
-    ret = bfd_reloc_dangerous;
+  return NULL;
+}

 
 

-  /* Extract the user-supplied offset, mirroring the sign extensions
-     that the instructions perform.  */
-  addend = ((i_ldah & 0xffff) << 16) | (i_lda & 0xffff);
-  addend = (addend ^ 0x80008000) - 0x80008000;
+/* Given an Alpha ELF reloc type, fill in an arelent structure.  */

 
 

-  gpdisp += addend;
+static void
+elf64_alpha_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr,
+                          Elf_Internal_Rela *dst)
+{
+  unsigned r_type = ELF64_R_TYPE(dst->r_info);

 
 

-  if ((bfd_signed_vma) gpdisp < -(bfd_signed_vma) 0x80000000
-      || (bfd_signed_vma) gpdisp >= (bfd_signed_vma) 0x7fff8000)
-    ret = bfd_reloc_overflow;
-
-  /* compensate for the sign extension again.  */
-  i_ldah = ((i_ldah & 0xffff0000)
-           | (((gpdisp >> 16) + ((gpdisp >> 15) & 1)) & 0xffff));
-  i_lda = (i_lda & 0xffff0000) | (gpdisp & 0xffff);
-
-  bfd_put_32 (abfd, (bfd_vma) i_ldah, p_ldah);
-  bfd_put_32 (abfd, (bfd_vma) i_lda, p_lda);
-
-  return ret;
-}
-
-/* The special function for the GPDISP reloc.  */
-
-static bfd_reloc_status_type
-elf64_alpha_reloc_gpdisp (abfd, reloc_entry, sym, data, input_section,
-                         output_bfd, err_msg)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *sym ATTRIBUTE_UNUSED;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **err_msg;
-{
-  bfd_reloc_status_type ret;
-  bfd_vma gp, relocation;
-  bfd_vma high_address;
-  bfd_byte *p_ldah, *p_lda;
-
-  /* Don't do anything if we're not doing a final link.  */
-  if (output_bfd)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  high_address = bfd_get_section_limit (abfd, input_section);
-  if (reloc_entry->address > high_address
-      || reloc_entry->address + reloc_entry->addend > high_address)
-    return bfd_reloc_outofrange;
-
-  /* The gp used in the portion of the output object to which this
-     input object belongs is cached on the input bfd.  */
-  gp = _bfd_get_gp_value (abfd);
-
-  relocation = (input_section->output_section->vma
-               + input_section->output_offset
-               + reloc_entry->address);
-
-  p_ldah = (bfd_byte *) data + reloc_entry->address;
-  p_lda = p_ldah + reloc_entry->addend;
-
-  ret = elf64_alpha_do_reloc_gpdisp (abfd, gp - relocation, p_ldah, p_lda);
-
-  /* Complain if the instructions are not correct.  */
-  if (ret == bfd_reloc_dangerous)
-    *err_msg = _("GPDISP relocation did not find ldah and lda instructions");
-
-  return ret;
-}
-
-/* A mapping from BFD reloc types to Alpha ELF reloc types.  */
-
-struct elf_reloc_map
-{
-  bfd_reloc_code_real_type bfd_reloc_val;
-  int elf_reloc_val;
-};
-
-static const struct elf_reloc_map elf64_alpha_reloc_map[] =
-{
-  {BFD_RELOC_NONE,                     R_ALPHA_NONE},
-  {BFD_RELOC_32,                       R_ALPHA_REFLONG},
-  {BFD_RELOC_64,                       R_ALPHA_REFQUAD},
-  {BFD_RELOC_CTOR,                     R_ALPHA_REFQUAD},
-  {BFD_RELOC_GPREL32,                  R_ALPHA_GPREL32},
-  {BFD_RELOC_ALPHA_ELF_LITERAL,                R_ALPHA_LITERAL},
-  {BFD_RELOC_ALPHA_LITUSE,             R_ALPHA_LITUSE},
-  {BFD_RELOC_ALPHA_GPDISP,             R_ALPHA_GPDISP},
-  {BFD_RELOC_23_PCREL_S2,              R_ALPHA_BRADDR},
-  {BFD_RELOC_ALPHA_HINT,               R_ALPHA_HINT},
-  {BFD_RELOC_16_PCREL,                 R_ALPHA_SREL16},
-  {BFD_RELOC_32_PCREL,                 R_ALPHA_SREL32},
-  {BFD_RELOC_64_PCREL,                 R_ALPHA_SREL64},
-  {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.  */
-
-static reloc_howto_type *
-elf64_alpha_bfd_reloc_type_lookup (abfd, code)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     bfd_reloc_code_real_type code;
-{
-  const struct elf_reloc_map *i, *e;
-  i = e = elf64_alpha_reloc_map;
-  e += sizeof (elf64_alpha_reloc_map) / sizeof (struct elf_reloc_map);
-  for (; i != e; ++i)
+  if (r_type >= R_ALPHA_max)

     {
     {

-      if (i->bfd_reloc_val == code)
-       return &elf64_alpha_howto_table[i->elf_reloc_val];
+      (*_bfd_error_handler) (_("%B: unrecognised Alpha reloc number: %d"),
+                            abfd, r_type);
+      bfd_set_error (bfd_error_bad_value);
+      r_type = R_ALPHA_NONE;

     }
     }

-  return 0;
-}
-
-/* Given an Alpha ELF reloc type, fill in an arelent structure.  */
-
-static void
-elf64_alpha_info_to_howto (abfd, cache_ptr, dst)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     arelent *cache_ptr;
-     Elf_Internal_Rela *dst;
-{
-  unsigned r_type;
-
-  r_type = ELF64_R_TYPE(dst->r_info);
-  BFD_ASSERT (r_type < (unsigned int) R_ALPHA_max);

   cache_ptr->howto = &elf64_alpha_howto_table[r_type];
 }
 
   cache_ptr->howto = &elf64_alpha_howto_table[r_type];
 }
 


@@ -1159,2966 +1131,2969 @@ elf64_alpha_info_to_howto (abfd, cache_ptr, dst)
    - align_power ((bfd_vma) 16,                                                \
                  elf_hash_table (info)->tls_sec->alignment_power))
 \f
    - align_power ((bfd_vma) 16,                                                \
                  elf_hash_table (info)->tls_sec->alignment_power))
 \f

-/* These functions do relaxation for Alpha ELF.
-
-   Currently I'm only handling what I can do with existing compiler
-   and assembler support, which means no instructions are removed,
-   though some may be nopped.  At this time GCC does not emit enough
-   information to do all of the relaxing that is possible.  It will
-   take some not small amount of work for that to happen.
-
-   There are a couple of interesting papers that I once read on this
-   subject, that I cannot find references to at the moment, that
-   related to Alpha in particular.  They are by David Wall, then of
-   DEC WRL.  */
-
-#define OP_LDA         0x08
-#define OP_LDAH                0x09
-#define INSN_JSR       0x68004000
-#define INSN_JSR_MASK  0xfc00c000
-#define OP_LDQ         0x29
-#define OP_BR          0x30
-#define OP_BSR         0x34
-#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;
-  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 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 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,
-         bfd_boolean *again));
-
-static Elf_Internal_Rela *
-elf64_alpha_find_reloc_at_ofs (rel, relend, offset, type)
-     Elf_Internal_Rela *rel, *relend;
-     bfd_vma offset;
-     int type;
-{
-  while (rel < relend)
-    {
-      if (rel->r_offset == offset
-         && ELF64_R_TYPE (rel->r_info) == (unsigned int) type)
-       return rel;
-      ++rel;
-    }
-  return NULL;
-}
+/* Handle an Alpha specific section when reading an object file.  This
+   is called when bfd_section_from_shdr finds a section with an unknown
+   type.
+   FIXME: We need to handle the SHF_ALPHA_GPREL flag, but I'm not sure
+   how to.  */

 
 static bfd_boolean
 
 static bfd_boolean

-elf64_alpha_relax_with_lituse (info, symval, irel)
-     struct alpha_relax_info *info;
-     bfd_vma symval;
-     Elf_Internal_Rela *irel;
+elf64_alpha_section_from_shdr (bfd *abfd,
+                              Elf_Internal_Shdr *hdr,
+                              const char *name,
+                              int shindex)

 {
 {

-  Elf_Internal_Rela *urel, *irelend = info->relend;
-  int flags, count, i;
-  bfd_signed_vma disp;
-  bfd_boolean fits16;
-  bfd_boolean fits32;
-  bfd_boolean lit_reused = FALSE;
-  bfd_boolean all_optimized = TRUE;
-  unsigned int lit_insn;
+  asection *newsect;

 
 

-  lit_insn = bfd_get_32 (info->abfd, info->contents + irel->r_offset);
-  if (lit_insn >> 26 != OP_LDQ)
+  /* There ought to be a place to keep ELF backend specific flags, but
+     at the moment there isn't one.  We just keep track of the
+     sections by their name, instead.  Fortunately, the ABI gives
+     suggested names for all the MIPS specific sections, so we will
+     probably get away with this.  */
+  switch (hdr->sh_type)

     {
     {

-      ((*_bfd_error_handler)
-       ("%B: %A+0x%lx: warning: LITERAL relocation against unexpected insn",
-       info->abfd, info->sec,
-       (unsigned long) irel->r_offset));
-      return TRUE;
+    case SHT_ALPHA_DEBUG:
+      if (strcmp (name, ".mdebug") != 0)
+       return FALSE;
+      break;
+    default:
+      return FALSE;

     }
 
     }
 

-  /* Can't relax dynamic symbols.  */
-  if (alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info))
-    return TRUE;
+  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
+    return FALSE;
+  newsect = hdr->bfd_section;

 
 

-  /* Summarize how this particular LITERAL is used.  */
-  for (urel = irel+1, flags = count = 0; urel < irelend; ++urel, ++count)
+  if (hdr->sh_type == SHT_ALPHA_DEBUG)

     {
     {

-      if (ELF64_R_TYPE (urel->r_info) != R_ALPHA_LITUSE)
-       break;
-      if (urel->r_addend <= 3)
-       flags |= 1 << urel->r_addend;
+      if (! bfd_set_section_flags (abfd, newsect,
+                                  (bfd_get_section_flags (abfd, newsect)
+                                   | SEC_DEBUGGING)))
+       return FALSE;

     }
 
     }
 

-  /* A little preparation for the loop...  */
-  disp = symval - info->gp;
+  return TRUE;
+}

 
 

-  for (urel = irel+1, i = 0; i < count; ++i, ++urel)
-    {
-      unsigned int insn;
-      int insn_disp;
-      bfd_signed_vma xdisp;
+/* Convert Alpha specific section flags to bfd internal section flags.  */

 
 

-      insn = bfd_get_32 (info->abfd, info->contents + urel->r_offset);
+static bfd_boolean
+elf64_alpha_section_flags (flagword *flags, const Elf_Internal_Shdr *hdr)
+{
+  if (hdr->sh_flags & SHF_ALPHA_GPREL)
+    *flags |= SEC_SMALL_DATA;

 
 

-      switch (urel->r_addend)
-       {
-       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;
-         break;
+  return TRUE;
+}

 
 

-       case LITUSE_ALPHA_BASE:
-         /* We can always optimize 16-bit displacements.  */
+/* Set the correct type for an Alpha ELF section.  We do this by the
+   section name, which is a hack, but ought to work.  */

 
 

-         /* 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 & 0x8000)
-           insn_disp |= ~0xffff;  /* Negative: sign-extend.  */
+static bfd_boolean
+elf64_alpha_fake_sections (bfd *abfd, Elf_Internal_Shdr *hdr, asection *sec)
+{
+  register const char *name;

 
 

-         xdisp = disp + insn_disp;
-         fits16 = (xdisp >= - (bfd_signed_vma) 0x8000 && xdisp < 0x8000);
-         fits32 = (xdisp >= - (bfd_signed_vma) 0x80000000
-                   && xdisp < 0x7fff8000);
+  name = bfd_get_section_name (abfd, sec);

 
 

-         if (fits16)
-           {
-             /* Take the op code and dest from this insn, take the base
-                register from the literal insn.  Leave the offset alone.  */
-             insn = (insn & 0xffe0ffff) | (lit_insn & 0x001f0000);
-             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;
+  if (strcmp (name, ".mdebug") == 0)
+    {
+      hdr->sh_type = SHT_ALPHA_DEBUG;
+      /* In a shared object on Irix 5.3, the .mdebug section has an
+         entsize of 0.  FIXME: Does this matter?  */
+      if ((abfd->flags & DYNAMIC) != 0 )
+       hdr->sh_entsize = 0;
+      else
+       hdr->sh_entsize = 1;
+    }
+  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;

 
 

-             bfd_put_32 (info->abfd, (bfd_vma) insn,
-                         info->contents + urel->r_offset);
-             info->changed_contents = TRUE;
-           }
+  return TRUE;
+}

 
 

-         /* If all mem+byte, we can optimize 32-bit mem displacements.  */
-         else if (fits32 && !(flags & ~6))
-           {
-             /* FIXME: sanity check that lit insn Ra is mem insn Rb.  */
+/* 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.  */

 
 

-             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, (bfd_vma) lit_insn,
-                         info->contents + irel->r_offset);
-             lit_reused = TRUE;
-             info->changed_contents = TRUE;
+static bfd_boolean
+elf64_alpha_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
+                            Elf_Internal_Sym *sym,
+                            const char **namep ATTRIBUTE_UNUSED,
+                            flagword *flagsp ATTRIBUTE_UNUSED,
+                            asection **secp, bfd_vma *valp)
+{
+  if (sym->st_shndx == SHN_COMMON
+      && !bfd_link_relocatable (info)
+      && sym->st_size <= elf_gp_size (abfd))
+    {
+      /* Common symbols less than or equal to -G nn bytes are
+        automatically put into .sbss.  */

 
 

-             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;
-           }
-         else
-           all_optimized = FALSE;
-         break;
+      asection *scomm = bfd_get_section_by_name (abfd, ".scommon");

 
 

-       case LITUSE_ALPHA_BYTOFF:
-         /* We can always optimize byte instructions.  */
+      if (scomm == NULL)
+       {
+         scomm = bfd_make_section_with_flags (abfd, ".scommon",
+                                              (SEC_ALLOC
+                                               | SEC_IS_COMMON
+                                               | SEC_LINKER_CREATED));
+         if (scomm == NULL)
+           return FALSE;
+       }

 
 

-         /* FIXME: sanity check the insn for byte op.  Check that the
-            literal dest reg is indeed Rb in the byte insn.  */
+      *secp = scomm;
+      *valp = sym->st_size;
+    }

 
 

-         insn &= ~ (unsigned) 0x001ff000;
-         insn |= ((symval & 7) << 13) | 0x1000;
+  return TRUE;
+}

 
 

-         urel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
-         urel->r_addend = 0;
-         info->changed_relocs = TRUE;
+/* Create the .got section.  */

 
 

-         bfd_put_32 (info->abfd, (bfd_vma) insn,
-                     info->contents + urel->r_offset);
-         info->changed_contents = TRUE;
-         break;
+static bfd_boolean
+elf64_alpha_create_got_section (bfd *abfd,
+                               struct bfd_link_info *info ATTRIBUTE_UNUSED)
+{
+  flagword flags;
+  asection *s;

 
 

-       case LITUSE_ALPHA_JSR:
-       case LITUSE_ALPHA_TLSGD:
-       case LITUSE_ALPHA_TLSLDM:
-         {
-           bfd_vma optdest, org;
-           bfd_signed_vma odisp;
+  if (! is_alpha_elf (abfd))
+    return FALSE;

 
 

-           /* 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;
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+          | SEC_LINKER_CREATED);
+  s = bfd_make_section_anyway_with_flags (abfd, ".got", flags);
+  if (s == NULL
+      || !bfd_set_section_alignment (abfd, s, 3))
+    return FALSE;

 
 

-           if (odisp >= -0x400000 && odisp < 0x400000)
-             {
-               Elf_Internal_Rela *xrel;
+  alpha_elf_tdata (abfd)->got = s;

 
 

-               /* Preserve branch prediction call stack when possible.  */
-               if ((insn & INSN_JSR_MASK) == INSN_JSR)
-                 insn = (OP_BSR << 26) | (insn & 0x03e00000);
-               else
-                 insn = (OP_BR << 26) | (insn & 0x03e00000);
+  /* Make sure the object's gotobj is set to itself so that we default
+     to every object with its own .got.  We'll merge .gots later once
+     we've collected each object's info.  */
+  alpha_elf_tdata (abfd)->gotobj = abfd;

 
 

-               urel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
-                                            R_ALPHA_BRADDR);
-               urel->r_addend = irel->r_addend;
+  return TRUE;
+}

 
 

-               if (optdest)
-                 urel->r_addend += optdest - symval;
-               else
-                 all_optimized = FALSE;
+/* Create all the dynamic sections.  */

 
 

-               bfd_put_32 (info->abfd, (bfd_vma) insn,
-                           info->contents + urel->r_offset);
+static bfd_boolean
+elf64_alpha_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info)
+{
+  asection *s;
+  flagword flags;
+  struct elf_link_hash_entry *h;

 
 

-               /* Kill any HINT reloc that might exist for this insn.  */
-               xrel = (elf64_alpha_find_reloc_at_ofs
-                       (info->relocs, info->relend, urel->r_offset,
-                        R_ALPHA_HINT));
-               if (xrel)
-                 xrel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+  if (! is_alpha_elf (abfd))
+    return FALSE;

 
 

-               info->changed_contents = TRUE;
-               info->changed_relocs = TRUE;
-             }
-           else
-             all_optimized = FALSE;
+  /* We need to create .plt, .rela.plt, .got, and .rela.got sections.  */

 
 

-           /* Even if the target is not in range for a direct branch,
-              if we share a GP, we can eliminate the gp reload.  */
-           if (optdest)
-             {
-               Elf_Internal_Rela *gpdisp
-                 = (elf64_alpha_find_reloc_at_ofs
-                    (info->relocs, irelend, urel->r_offset + 4,
-                     R_ALPHA_GPDISP));
-               if (gpdisp)
-                 {
-                   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);
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+          | SEC_LINKER_CREATED
+          | (elf64_alpha_use_secureplt ? SEC_READONLY : 0));
+  s = bfd_make_section_anyway_with_flags (abfd, ".plt", flags);
+  if (s == NULL || ! bfd_set_section_alignment (abfd, s, 4))
+    return FALSE;

 
 

-                   /* Verify that the instruction is "ldah $29,0($26)".
-                      Consider a function that ends in a noreturn call,
-                      and that the next function begins with an ldgp,
-                      and that by accident there is no padding between.
-                      In that case the insn would use $27 as the base.  */
-                   if (ldah == 0x27ba0000 && lda == 0x23bd0000)
-                     {
-                       bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, p_ldah);
-                       bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, p_lda);
+  /* Define the symbol _PROCEDURE_LINKAGE_TABLE_ at the start of the
+     .plt section.  */
+  h = _bfd_elf_define_linkage_sym (abfd, info, s,
+                                  "_PROCEDURE_LINKAGE_TABLE_");
+  elf_hash_table (info)->hplt = h;
+  if (h == NULL)
+    return FALSE;

 
 

-                       gpdisp->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
-                       info->changed_contents = TRUE;
-                       info->changed_relocs = TRUE;
-                     }
-                 }
-             }
-         }
-         break;
-       }
-    }
+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+          | SEC_LINKER_CREATED | SEC_READONLY);
+  s = bfd_make_section_anyway_with_flags (abfd, ".rela.plt", flags);
+  if (s == NULL || ! bfd_set_section_alignment (abfd, s, 3))
+    return FALSE;

 
 

-  /* If all cases were optimized, we can reduce the use count on this
-     got entry by one, possibly eliminating it.  */
-  if (all_optimized)
+  if (elf64_alpha_use_secureplt)

     {
     {

-      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;
-       }
+      flags = SEC_ALLOC | SEC_LINKER_CREATED;
+      s = bfd_make_section_anyway_with_flags (abfd, ".got.plt", flags);
+      if (s == NULL || ! bfd_set_section_alignment (abfd, s, 3))
+       return FALSE;
+    }

 
 

-      /* 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,
-        so just nop it out.  */
-      if (!lit_reused)
-       {
-         irel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
-         info->changed_relocs = TRUE;
+  /* We may or may not have created a .got section for this object, but
+     we definitely havn't done the rest of the work.  */

 
 

-         bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP,
-                     info->contents + irel->r_offset);
-         info->changed_contents = TRUE;
-       }
+  if (alpha_elf_tdata(abfd)->gotobj == NULL)
+    {
+      if (!elf64_alpha_create_got_section (abfd, info))
+       return FALSE;

     }
 
     }
 

+  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+          | SEC_LINKER_CREATED | SEC_READONLY);
+  s = bfd_make_section_anyway_with_flags (abfd, ".rela.got", flags);
+  if (s == NULL
+      || !bfd_set_section_alignment (abfd, s, 3))
+    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 = _bfd_elf_define_linkage_sym (abfd, info, alpha_elf_tdata(abfd)->got,
+                                  "_GLOBAL_OFFSET_TABLE_");
+  elf_hash_table (info)->hgot = h;
+  if (h == NULL)
+    return FALSE;
+

   return TRUE;
 }
   return TRUE;
 }

+\f
+/* Read ECOFF debugging information from a .mdebug section into a
+   ecoff_debug_info structure.  */

 
 

-static bfd_vma
-elf64_alpha_relax_opt_call (info, symval)
-     struct alpha_relax_info *info;
-     bfd_vma symval;
+static bfd_boolean
+elf64_alpha_read_ecoff_info (bfd *abfd, asection *section,
+                            struct ecoff_debug_info *debug)

 {
 {

-  /* If the function has the same gp, and we can identify that the
-     function does not use its function pointer, we can eliminate the
-     address load.  */
+  HDRR *symhdr;
+  const struct ecoff_debug_swap *swap;
+  char *ext_hdr = NULL;

 
 

-  /* If the symbol is marked NOPV, we are being told the function never
-     needs its procedure value.  */
-  if ((info->other & STO_ALPHA_STD_GPLOAD) == STO_ALPHA_NOPV)
-    return symval;
+  swap = get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
+  memset (debug, 0, sizeof (*debug));

 
 

-  /* If the symbol is marked STD_GP, we are being told the function does
-     a normal ldgp in the first two words.  */
-  else if ((info->other & STO_ALPHA_STD_GPLOAD) == STO_ALPHA_STD_GPLOAD)
-    ;
+  ext_hdr = (char *) bfd_malloc (swap->external_hdr_size);
+  if (ext_hdr == NULL && swap->external_hdr_size != 0)
+    goto error_return;

 
 

-  /* Otherwise, we may be able to identify a GP load in the first two
-     words, which we can then skip.  */
-  else
-    {
-      Elf_Internal_Rela *tsec_relocs, *tsec_relend, *tsec_free, *gpdisp;
-      bfd_vma ofs;
+  if (! bfd_get_section_contents (abfd, section, ext_hdr, (file_ptr) 0,
+                                 swap->external_hdr_size))
+    goto error_return;

 
 

-      /* Load the relocations from the section that the target symbol is in.  */
-      if (info->sec == info->tsec)
-       {
-         tsec_relocs = info->relocs;
-         tsec_relend = info->relend;
-         tsec_free = NULL;
-       }
-      else
-       {
-         tsec_relocs = (_bfd_elf_link_read_relocs
-                        (info->abfd, info->tsec, (PTR) NULL,
-                        (Elf_Internal_Rela *) NULL,
-                        info->link_info->keep_memory));
-         if (tsec_relocs == NULL)
-           return 0;
-         tsec_relend = tsec_relocs + info->tsec->reloc_count;
-         tsec_free = (info->link_info->keep_memory ? NULL : tsec_relocs);
-       }
+  symhdr = &debug->symbolic_header;
+  (*swap->swap_hdr_in) (abfd, ext_hdr, symhdr);

 
 

-      /* Recover the symbol's offset within the section.  */
-      ofs = (symval - info->tsec->output_section->vma
-            - info->tsec->output_offset);
+  /* The symbolic header contains absolute file offsets and sizes to
+     read.  */
+#define READ(ptr, offset, count, size, type)                           \
+  if (symhdr->count == 0)                                              \
+    debug->ptr = NULL;                                                 \
+  else                                                                 \
+    {                                                                  \
+      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_bread (debug->ptr, amt, abfd) != amt)                  \
+       goto error_return;                                              \
+    }

 
 

-      /* Look for a GPDISP reloc.  */
-      gpdisp = (elf64_alpha_find_reloc_at_ofs
-               (tsec_relocs, tsec_relend, ofs, R_ALPHA_GPDISP));
+  READ (line, cbLineOffset, cbLine, sizeof (unsigned char), unsigned char *);
+  READ (external_dnr, cbDnOffset, idnMax, swap->external_dnr_size, void *);
+  READ (external_pdr, cbPdOffset, ipdMax, swap->external_pdr_size, void *);
+  READ (external_sym, cbSymOffset, isymMax, swap->external_sym_size, void *);
+  READ (external_opt, cbOptOffset, ioptMax, swap->external_opt_size, void *);
+  READ (external_aux, cbAuxOffset, iauxMax, sizeof (union aux_ext),
+       union aux_ext *);
+  READ (ss, cbSsOffset, issMax, sizeof (char), char *);
+  READ (ssext, cbSsExtOffset, issExtMax, sizeof (char), char *);
+  READ (external_fdr, cbFdOffset, ifdMax, swap->external_fdr_size, void *);
+  READ (external_rfd, cbRfdOffset, crfd, swap->external_rfd_size, void *);
+  READ (external_ext, cbExtOffset, iextMax, swap->external_ext_size, void *);
+#undef READ

 
 

-      if (!gpdisp || gpdisp->r_addend != 4)
-       {
-         if (tsec_free)
-           free (tsec_free);
-         return 0;
-       }
-      if (tsec_free)
-        free (tsec_free);
-    }
+  debug->fdr = NULL;

 
 

-  /* We've now determined that we can skip an initial gp load.  Verify
-     that the call and the target use the same gp.   */
-  if (info->link_info->hash->creator != info->tsec->owner->xvec
-      || info->gotobj != alpha_elf_tdata (info->tsec->owner)->gotobj)
-    return 0;
+  return TRUE;

 
 

-  return symval + 8;
+ error_return:
+  if (ext_hdr != NULL)
+    free (ext_hdr);
+  if (debug->line != NULL)
+    free (debug->line);
+  if (debug->external_dnr != NULL)
+    free (debug->external_dnr);
+  if (debug->external_pdr != NULL)
+    free (debug->external_pdr);
+  if (debug->external_sym != NULL)
+    free (debug->external_sym);
+  if (debug->external_opt != NULL)
+    free (debug->external_opt);
+  if (debug->external_aux != NULL)
+    free (debug->external_aux);
+  if (debug->ss != NULL)
+    free (debug->ss);
+  if (debug->ssext != NULL)
+    free (debug->ssext);
+  if (debug->external_fdr != NULL)
+    free (debug->external_fdr);
+  if (debug->external_rfd != NULL)
+    free (debug->external_rfd);
+  if (debug->external_ext != NULL)
+    free (debug->external_ext);
+  return FALSE;

 }
 
 }
 

+/* Alpha ELF local labels start with '$'.  */
+

 static bfd_boolean
 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;
+elf64_alpha_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED, const char *name)

 {
 {

-  unsigned int insn;
-  bfd_signed_vma disp;
-
-  /* Get the instruction.  */
-  insn = bfd_get_32 (info->abfd, info->contents + irel->r_offset);
-
-  if (insn >> 26 != OP_LDQ)
-    {
-      reloc_howto_type *howto = elf64_alpha_howto_table + r_type;
-      ((*_bfd_error_handler)
-       ("%B: %A+0x%lx: warning: %s relocation against unexpected insn",
-       info->abfd, info->sec,
-       (unsigned long) irel->r_offset, howto->name));
-      return TRUE;
-    }
+  return name[0] == '$';
+}

 
 

-  /* Can't relax dynamic symbols.  */
-  if (alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info))
-    return TRUE;
+static bfd_boolean
+elf64_alpha_find_nearest_line (bfd *abfd, asymbol **symbols,
+                              asection *section, bfd_vma offset,
+                              const char **filename_ptr,
+                              const char **functionname_ptr,
+                              unsigned int *line_ptr,
+                              unsigned int *discriminator_ptr)
+{
+  asection *msec;

 
 

-  /* Can't use local-exec relocations in shared libraries.  */
-  if (r_type == R_ALPHA_GOTTPREL && info->link_info->shared)
+  if (_bfd_dwarf2_find_nearest_line (abfd, symbols, NULL, section, offset,
+                                    filename_ptr, functionname_ptr,
+                                    line_ptr, discriminator_ptr,
+                                    dwarf_debug_sections, 0,
+                                    &elf_tdata (abfd)->dwarf2_find_line_info))

     return TRUE;
 
     return TRUE;
 

-  if (r_type == R_ALPHA_LITERAL)
-    disp = symval - info->gp;
-  else
+  msec = bfd_get_section_by_name (abfd, ".mdebug");
+  if (msec != NULL)

     {
     {

-      bfd_vma dtp_base, tp_base;
+      flagword origflags;
+      struct alpha_elf_find_line *fi;
+      const struct ecoff_debug_swap * const swap =
+       get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;

 
 

-      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);
-    }
+      /* If we are called during a link, alpha_elf_final_link may have
+        cleared the SEC_HAS_CONTENTS field.  We force it back on here
+        if appropriate (which it normally will be).  */
+      origflags = msec->flags;
+      if (elf_section_data (msec)->this_hdr.sh_type != SHT_NOBITS)
+       msec->flags |= SEC_HAS_CONTENTS;

 
 

-  if (disp < -0x8000 || disp >= 0x8000)
-    return TRUE;
+      fi = alpha_elf_tdata (abfd)->find_line_info;
+      if (fi == NULL)
+       {
+         bfd_size_type external_fdr_size;
+         char *fraw_src;
+         char *fraw_end;
+         struct fdr *fdr_ptr;
+         bfd_size_type amt = sizeof (struct alpha_elf_find_line);

 
 

-  /* 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;
+         fi = (struct alpha_elf_find_line *) bfd_zalloc (abfd, amt);
+         if (fi == NULL)
+           {
+             msec->flags = origflags;
+             return FALSE;
+           }

 
 

-  /* Reduce the use count on this got entry by one, possibly
-     eliminating it.  */
-  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;
-    }
+         if (!elf64_alpha_read_ecoff_info (abfd, msec, &fi->d))
+           {
+             msec->flags = origflags;
+             return FALSE;
+           }

 
 

-  /* 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;
-    }
+         /* Swap in the FDR information.  */
+         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;
+           }
+         external_fdr_size = swap->external_fdr_size;
+         fdr_ptr = fi->d.fdr;
+         fraw_src = (char *) fi->d.external_fdr;
+         fraw_end = (fraw_src
+                     + fi->d.symbolic_header.ifdMax * external_fdr_size);
+         for (; fraw_src < fraw_end; fraw_src += external_fdr_size, fdr_ptr++)
+           (*swap->swap_fdr_in) (abfd, fraw_src, fdr_ptr);

 
 

-  irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info), r_type);
-  info->changed_relocs = TRUE;
+         alpha_elf_tdata (abfd)->find_line_info = fi;

 
 

-  /* ??? Search forward through this basic block looking for insns
-     that use the target register.  Stop after an insn modifying the
-     register is seen, or after a branch or call.
+         /* Note that we don't bother to ever free this information.
+             find_nearest_line is either called all the time, as in
+             objdump -l, so the information should be saved, or it is
+             rarely called, as in ld error messages, so the memory
+             wasted is unimportant.  Still, it would probably be a
+             good idea for free_cached_info to throw it away.  */
+       }

 
 

-     Any such memory load insn may be substituted by a load directly
-     off the GP.  This allows the memory load insn to be issued before
-     the calculated GP register would otherwise be ready.
+      if (_bfd_ecoff_locate_line (abfd, section, offset, &fi->d, swap,
+                                 &fi->i, filename_ptr, functionname_ptr,
+                                 line_ptr))
+       {
+         msec->flags = origflags;
+         return TRUE;
+       }

 
 

-     Any such jsr insn can be replaced by a bsr if it is in range.
+      msec->flags = origflags;
+    }

 
 

-     This would mean that we'd have to _add_ relocations, the pain of
-     which gives one pause.  */
+  /* Fall back on the generic ELF find_nearest_line routine.  */

 
 

-  return TRUE;
+  return _bfd_elf_find_nearest_line (abfd, symbols, section, offset,
+                                    filename_ptr, functionname_ptr,
+                                    line_ptr, discriminator_ptr);

 }
 }

+\f
+/* Structure used to pass information to alpha_elf_output_extsym.  */

 
 

-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;
+struct extsym_info

 {
 {

-  unsigned int insn;
-  bfd_signed_vma disp;
-  bfd_byte *pos = info->contents + irel->r_offset;
-
-  /* ??? This assumes that the compiler doesn't render
-
-       array[i]
-     as
-       ldah    t, array(gp)    !gprelhigh
-       s8addl  i, t, t
-       ldq     r, array(t)     !gprellow
+  bfd *abfd;
+  struct bfd_link_info *info;
+  struct ecoff_debug_info *debug;
+  const struct ecoff_debug_swap *swap;
+  bfd_boolean failed;
+};

 
 

-     which would indeed be the most efficient way to implement this.  */
+static bfd_boolean
+elf64_alpha_output_extsym (struct alpha_elf_link_hash_entry *h, void * data)
+{
+  struct extsym_info *einfo = (struct extsym_info *) data;
+  bfd_boolean strip;
+  asection *sec, *output_section;

 
 

-  return TRUE;
+  if (h->root.indx == -2)
+    strip = FALSE;
+  else if ((h->root.def_dynamic
+           || h->root.ref_dynamic
+           || h->root.root.type == bfd_link_hash_new)
+          && !h->root.def_regular
+          && !h->root.ref_regular)
+    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;
+  else
+    strip = FALSE;

 
 

-  disp = symval - info->gp;
-  if (disp < -0x8000 || disp >= 0x8000)
+  if (strip)

     return TRUE;
 
     return TRUE;
 

-  if (hi)
-    {
-      /* Nop out the high instruction.  */
-
-      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
+  if (h->esym.ifd == -2)

     {
     {

-      /* Adjust the low instruction to reference GP directly.  */
+      h->esym.jmptbl = 0;
+      h->esym.cobol_main = 0;
+      h->esym.weakext = 0;
+      h->esym.reserved = 0;
+      h->esym.ifd = ifdNil;
+      h->esym.asym.value = 0;
+      h->esym.asym.st = stGlobal;

 
 

-      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;
+      if (h->root.root.type != bfd_link_hash_defined
+         && h->root.root.type != bfd_link_hash_defweak)
+       h->esym.asym.sc = scAbs;
+      else
+       {
+         const char *name;

 
 

-      irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
-                                  R_ALPHA_GPREL16);
-      info->changed_relocs = TRUE;
-    }
+         sec = h->root.root.u.def.section;
+         output_section = sec->output_section;

 
 

-  return TRUE;
-}
+         /* 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);

 
 

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

 
 

-  /* 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;
+      h->esym.asym.reserved = 0;
+      h->esym.asym.index = indexNil;
+    }

 
 

-  /* 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;
+  if (h->root.root.type == bfd_link_hash_common)
+    h->esym.asym.value = h->root.root.u.c.size;
+  else if (h->root.root.type == bfd_link_hash_defined
+          || h->root.root.type == bfd_link_hash_defweak)
+    {
+      if (h->esym.asym.sc == scCommon)
+       h->esym.asym.sc = scBss;
+      else if (h->esym.asym.sc == scSCommon)
+       h->esym.asym.sc = scSBss;

 
 

-  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;
+      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);
+      else
+       h->esym.asym.value = 0;
+    }

 
 

-  /* 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])
+  if (! bfd_ecoff_debug_one_external (einfo->abfd, einfo->debug, einfo->swap,
+                                     h->root.root.root.string,
+                                     &h->esym))

     {
     {

-      bfd_byte *tmp = pos[0];
-      pos[0] = pos[1];
-      pos[1] = tmp;
+      einfo->failed = TRUE;
+      return FALSE;

     }
     }

-  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
+  return TRUE;
+}
+\f
+/* Search for and possibly create a got entry.  */

 
 

-     as appropriate.  */
+static struct alpha_elf_got_entry *
+get_got_entry (bfd *abfd, struct alpha_elf_link_hash_entry *h,
+              unsigned long r_type, unsigned long r_symndx,
+              bfd_vma r_addend)
+{
+  struct alpha_elf_got_entry *gotent;
+  struct alpha_elf_got_entry **slot;

 
 

-  use_gottprel = FALSE;
-  new_symndx = is_gd ? ELF64_R_SYM (irel->r_info) : 0;
-  switch (!dynamic && !info->link_info->shared)
+  if (h)
+    slot = &h->got_entries;
+  else

     {
     {

-    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;
+      /* This is a local .got entry -- record for merge.  */

 
 

-       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]);
+      struct alpha_elf_got_entry **local_got_entries;

 
 

-           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]);
+      local_got_entries = alpha_elf_tdata(abfd)->local_got_entries;
+      if (!local_got_entries)
+       {
+         bfd_size_type size;
+         Elf_Internal_Shdr *symtab_hdr;

 
 

-           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 */
+         symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
+         size = symtab_hdr->sh_info;
+         size *= sizeof (struct alpha_elf_got_entry *);

 
 

-    default:
-      use_gottprel = TRUE;
+         local_got_entries
+           = (struct alpha_elf_got_entry **) bfd_zalloc (abfd, size);
+         if (!local_got_entries)
+           return NULL;

 
 

-      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]);
+         alpha_elf_tdata (abfd)->local_got_entries = local_got_entries;
+       }

 
 

-      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;
+      slot = &local_got_entries[r_symndx];

     }
 
     }
 

-  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]);
+  for (gotent = *slot; gotent ; gotent = gotent->next)
+    if (gotent->gotobj == abfd
+       && gotent->reloc_type == r_type
+       && gotent->addend == r_addend)
+      break;

 
 

-  bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos[4]);
+  if (!gotent)
+    {
+      int entry_size;
+      bfd_size_type amt;

 
 

-  irel[2].r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
-  gpdisp->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+      amt = sizeof (struct alpha_elf_got_entry);
+      gotent = (struct alpha_elf_got_entry *) bfd_alloc (abfd, amt);
+      if (!gotent)
+       return NULL;

 
 

-  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);
+      gotent->gotobj = abfd;
+      gotent->addend = r_addend;
+      gotent->got_offset = -1;
+      gotent->plt_offset = -1;
+      gotent->use_count = 1;
+      gotent->reloc_type = r_type;
+      gotent->reloc_done = 0;
+      gotent->reloc_xlated = 0;

 
 

-  info->changed_contents = TRUE;
-  info->changed_relocs = TRUE;
+      gotent->next = *slot;
+      *slot = gotent;

 
 

-  /* 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;
+      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;

 
 

-  /* 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;
+  return 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 (info->gotent->use_count == 0)
-           tprel_gotent = info->gotent;
-         else
-           {
-             tprel_gotent = (struct alpha_elf_got_entry *)
-               bfd_alloc (info->abfd, sizeof (struct alpha_elf_got_entry));
-             if (!tprel_gotent)
-               return FALSE;
+static bfd_boolean
+elf64_alpha_want_plt (struct alpha_elf_link_hash_entry *ah)
+{
+  return ((ah->root.type == STT_FUNC
+         || ah->root.root.type == bfd_link_hash_undefweak
+         || ah->root.root.type == bfd_link_hash_undefined)
+         && (ah->flags & ALPHA_ELF_LINK_HASH_LU_PLT) != 0
+         && (ah->flags & ~ALPHA_ELF_LINK_HASH_LU_PLT) == 0);
+}

 
 

-             tprel_gotent->next = *info->first_gotent;
-             *info->first_gotent = tprel_gotent;
+/* Whether to sort relocs output by ld -r or ld --emit-relocs, by r_offset.
+   Don't do so for code sections.  We want to keep ordering of LITERAL/LITUSE
+   as is.  On the other hand, elf-eh-frame.c processing requires .eh_frame
+   relocs to be sorted.  */

 
 

-             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;
-           }
+static bfd_boolean
+elf64_alpha_sort_relocs_p (asection *sec)
+{
+  return (sec->flags & SEC_CODE) == 0;
+}

 
 

-         tprel_gotent->use_count = 1;
-         tprel_gotent->reloc_type = R_ALPHA_GOTTPREL;
-       }
-    }

 
 

-  return TRUE;
-}
+/* Handle dynamic relocations when doing an Alpha ELF link.  */

 
 static bfd_boolean
 
 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;
+elf64_alpha_check_relocs (bfd *abfd, struct bfd_link_info *info,
+                         asection *sec, const Elf_Internal_Rela *relocs)

 {
 {

+  bfd *dynobj;
+  asection *sreloc;

   Elf_Internal_Shdr *symtab_hdr;
   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;
+  struct alpha_elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel, *relend;
+  bfd_size_type amt;

 
 

-  /* We are not currently changing any sizes, so only one pass.  */
-  *again = FALSE;
+  if (bfd_link_relocatable (info))
+    return TRUE;

 
 

-  if (link_info->relocatable
-      || (sec->flags & SEC_RELOC) == 0
-      || sec->reloc_count == 0)
+  /* Don't do anything special with non-loaded, non-alloced sections.
+     In particular, any relocs in such sections should not affect GOT
+     and PLT reference counting (ie. we don't allow them to create GOT
+     or PLT entries), there's no possibility or desire to optimize TLS
+     relocs, and there's not much point in propagating relocs to shared
+     libs that the dynamic linker won't relocate.  */
+  if ((sec->flags & SEC_ALLOC) == 0)

     return TRUE;
 
     return TRUE;
 

-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  local_got_entries = alpha_elf_tdata(abfd)->local_got_entries;
+  BFD_ASSERT (is_alpha_elf (abfd));
+
+  dynobj = elf_hash_table (info)->dynobj;
+  if (dynobj == NULL)
+    elf_hash_table (info)->dynobj = dynobj = abfd;
+
+  sreloc = NULL;
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = alpha_elf_sym_hashes (abfd);
+
+  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;

 
 

-  /* 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;
+      r_symndx = ELF64_R_SYM (rel->r_info);
+      if (r_symndx < symtab_hdr->sh_info)
+       h = NULL;
+      else
+       {
+         h = sym_hashes[r_symndx - symtab_hdr->sh_info];

 
 

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

 
 

-  /* 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);
-    }
+         /* PR15323, ref flags aren't set for references in the same
+            object.  */
+         h->root.root.non_ir_ref = 1;
+         h->root.ref_regular = 1;
+       }

 
 

-  /* Get the section contents.  */
-  if (elf_section_data (sec)->this_hdr.contents != NULL)
-    info.contents = elf_section_data (sec)->this_hdr.contents;
-  else
-    {
-      if (!bfd_malloc_and_get_section (abfd, sec, &info.contents))
-       goto error_return;
-    }
+      /* 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 && ((bfd_link_pic (info)
+                && (!info->symbolic
+                    || info->unresolved_syms_in_shared_libs == RM_IGNORE))
+               || !h->root.def_regular
+               || h->root.root.type == bfd_link_hash_defweak))
+        maybe_dynamic = TRUE;

 
 

-  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);
+      need = 0;
+      gotent_flags = 0;
+      r_type = ELF64_R_TYPE (rel->r_info);
+      addend = rel->r_addend;

 
 

-      /* Early exit for unhandled or unrelaxable relocations.  */

       switch (r_type)
        {
        case R_ALPHA_LITERAL:
       switch (r_type)
        {
        case R_ALPHA_LITERAL:

+         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 <= 6)
+             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:
        case R_ALPHA_GPRELHIGH:
        case R_ALPHA_GPRELLOW:

-       case R_ALPHA_GOTDTPREL:
-       case R_ALPHA_GOTTPREL:
-       case R_ALPHA_TLSGD:
+       case R_ALPHA_BRSGP:
+         need = NEED_GOT;

          break;
 
          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;
+       case R_ALPHA_REFLONG:
+       case R_ALPHA_REFQUAD:
+         if (bfd_link_pic (info) || maybe_dynamic)
+           need = NEED_DYNREL;

          break;
 
          break;
 

-       default:
-         continue;
-       }
-
-      /* Get the value of the symbol referred to by the reloc.  */
-      if (r_symndx < symtab_hdr->sh_info)
-       {
-         /* A local symbol.  */
-         Elf_Internal_Sym *isym;
+       case R_ALPHA_TLSLDM:
+         /* The symbol for a TLSLDM reloc is ignored.  Collapse the
+            reloc to the STN_UNDEF (0) symbol so that they all match.  */
+         r_symndx = STN_UNDEF;
+         h = 0;
+         maybe_dynamic = FALSE;
+         /* FALLTHRU */

 
 

-         /* 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;
-           }
+       case R_ALPHA_TLSGD:
+       case R_ALPHA_GOTDTPREL:
+         need = NEED_GOT | NEED_GOT_ENTRY;
+         break;

 
 

-         isym = isymbuf + r_symndx;
+       case R_ALPHA_GOTTPREL:
+         need = NEED_GOT | NEED_GOT_ENTRY;
+         gotent_flags = ALPHA_ELF_LINK_HASH_TLS_IE;
+         if (bfd_link_pic (info))
+           info->flags |= DF_STATIC_TLS;
+         break;

 
 

-         /* 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
+       case R_ALPHA_TPREL64:
+         if (bfd_link_dll (info))

            {
            {

-             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->flags |= DF_STATIC_TLS;
+             need = NEED_DYNREL;

            }
            }

+         else if (maybe_dynamic)
+           need = NEED_DYNREL;
+         break;
+       }

 
 

-         info.h = NULL;
-         info.other = isym->st_other;
-         if (local_got_entries)
-           info.first_gotent = &local_got_entries[r_symndx];
-         else
+      if (need & NEED_GOT)
+       {
+         if (alpha_elf_tdata(abfd)->gotobj == NULL)

            {
            {

-             info.first_gotent = &info.gotent;
-             info.gotent = NULL;
+             if (!elf64_alpha_create_got_section (abfd, info))
+               return FALSE;

            }
        }
            }
        }

-      else
+
+      if (need & NEED_GOT_ENTRY)

        {
        {

-         unsigned long indx;
-         struct alpha_elf_link_hash_entry *h;
+         struct alpha_elf_got_entry *gotent;

 
 

-         indx = r_symndx - symtab_hdr->sh_info;
-         h = alpha_elf_sym_hashes (abfd)[indx];
-         BFD_ASSERT (h != NULL);
+         gotent = get_got_entry (abfd, h, r_type, r_symndx, addend);
+         if (!gotent)
+           return FALSE;

 
 

-         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;
+         if (gotent_flags)
+           {
+             gotent->flags |= gotent_flags;
+             if (h)
+               {
+                 gotent_flags |= h->flags;
+                 h->flags = gotent_flags;

 
 

-         /* 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;
+                 /* Make a guess as to whether a .plt entry is needed.  */
+                 /* ??? It appears that we won't make it into
+                    adjust_dynamic_symbol for symbols that remain
+                    totally undefined.  Copying this check here means
+                    we can create a plt entry for them too.  */
+                 h->root.needs_plt
+                   = (maybe_dynamic && elf64_alpha_want_plt (h));
+               }
+           }
+       }

 
 

-         /* If the symbol isn't defined in the current module, again
-            we can't do anything.  */
-         if (!h->root.def_regular)
+      if (need & NEED_DYNREL)
+       {
+         /* We need to create the section here now whether we eventually
+            use it or not so that it gets mapped to an output section by
+            the linker.  If not used, we'll kill it in size_dynamic_sections.  */
+         if (sreloc == NULL)

            {
            {

-             /* 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;
+             sreloc = _bfd_elf_make_dynamic_reloc_section
+               (sec, dynobj, 3, abfd, /*rela?*/ TRUE);
+
+             if (sreloc == NULL)
+               return FALSE;

            }
            }

-         else
+
+         if (h)

            {
            {

-             info.tsec = h->root.root.u.def.section;
-             symval = h->root.root.u.def.value;
-           }
+             /* Since we havn't seen all of the input symbols yet, we
+                don't know whether we'll actually need a dynamic relocation
+                entry for this reloc.  So make a record of it.  Once we
+                find out if this thing needs dynamic relocation we'll
+                expand the relocation sections by the appropriate amount.  */

 
 

-         info.h = h;
-         info.other = h->root.other;
-         info.first_gotent = &h->got_entries;
-       }
+             struct alpha_elf_reloc_entry *rent;

 
 

-      /* Search for the got entry to be used by this relocation.  */
-      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;
+             for (rent = h->reloc_entries; rent; rent = rent->next)
+               if (rent->rtype == r_type && rent->srel == sreloc)
+                 break;

 
 

-      symval += info.tsec->output_section->vma + info.tsec->output_offset;
-      symval += irel->r_addend;
+             if (!rent)
+               {
+                 amt = sizeof (struct alpha_elf_reloc_entry);
+                 rent = (struct alpha_elf_reloc_entry *) bfd_alloc (abfd, amt);
+                 if (!rent)
+                   return FALSE;

 
 

-      switch (r_type)
-       {
-       case R_ALPHA_LITERAL:
-         BFD_ASSERT(info.gotent != NULL);
+                 rent->srel = sreloc;
+                 rent->rtype = r_type;
+                 rent->count = 1;
+                 rent->reltext = (sec->flags & SEC_READONLY) != 0;

 
 

-         /* 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;
+                 rent->next = h->reloc_entries;
+                 h->reloc_entries = rent;
+               }
+             else
+               rent->count++;

            }
            }

-         else
+         else if (bfd_link_pic (info))

            {
            {

-             if (!elf64_alpha_relax_got_load (&info, symval, irel, r_type))
-               goto error_return;
+             /* If this is a shared library, and the section is to be
+                loaded into memory, we need a RELATIVE reloc.  */
+             sreloc->size += sizeof (Elf64_External_Rela);
+             if (sec->flags & SEC_READONLY)
+               info->flags |= DF_TEXTREL;

            }
            }

-         break;
+       }
+    }

 
 

-       case R_ALPHA_GPRELHIGH:
-       case R_ALPHA_GPRELLOW:
-         if (!elf64_alpha_relax_gprelhilo (&info, symval, irel,
-                                           r_type == R_ALPHA_GPRELHIGH))
-           goto error_return;
-         break;
+  return TRUE;
+}

 
 

-       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;
+/* Return the section that should be marked against GC for a given
+   relocation.  */

 
 

-       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;
-       }
+static asection *
+elf64_alpha_gc_mark_hook (asection *sec, struct bfd_link_info *info,
+                         Elf_Internal_Rela *rel,
+                         struct elf_link_hash_entry *h, Elf_Internal_Sym *sym)
+{
+  /* These relocations don't really reference a symbol.  Instead we store
+     extra data in their addend slot.  Ignore the symbol.  */
+  switch (ELF64_R_TYPE (rel->r_info))
+    {
+    case R_ALPHA_LITUSE:
+    case R_ALPHA_GPDISP:
+    case R_ALPHA_HINT:
+      return NULL;

     }
 
     }
 

-  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;
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
+}

 
 

-  if (isymbuf != NULL
-      && symtab_hdr->contents != (unsigned char *) isymbuf)
+/* Update the got entry reference counts for the section being removed.  */
+
+static bfd_boolean
+elf64_alpha_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info,
+                          asection *sec, const Elf_Internal_Rela *relocs)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  struct alpha_elf_link_hash_entry **sym_hashes;
+  const Elf_Internal_Rela *rel, *relend;
+
+  if (bfd_link_relocatable (info))
+    return TRUE;
+
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  sym_hashes = alpha_elf_sym_hashes (abfd);
+
+  relend = relocs + sec->reloc_count;
+  for (rel = relocs; rel < relend; rel++)

     {
     {

-      if (!link_info->keep_memory)
-       free (isymbuf);
-      else
+      unsigned long r_symndx, r_type;
+      struct alpha_elf_link_hash_entry *h = NULL;
+      struct alpha_elf_got_entry *gotent;
+
+      r_symndx = ELF64_R_SYM (rel->r_info);
+      if (r_symndx >= symtab_hdr->sh_info)

        {
        {

-         /* Cache the symbols for elf_link_input_bfd.  */
-         symtab_hdr->contents = (unsigned char *) isymbuf;
+         h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+         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;

        }
        }

-    }

 
 

-  if (info.contents != NULL
-      && elf_section_data (sec)->this_hdr.contents != info.contents)
-    {
-      if (!info.changed_contents && !link_info->keep_memory)
-       free (info.contents);
-      else
+      r_type = ELF64_R_TYPE (rel->r_info);
+      switch (r_type)

        {
        {

-         /* Cache the section contents for elf_link_input_bfd.  */
-         elf_section_data (sec)->this_hdr.contents = info.contents;
-       }
-    }
+       case R_ALPHA_LITERAL:
+         /* ??? Ignore re-computation of gotent_flags.  We're not
+            carrying a use-count for each bit in that mask.  */

 
 

-  if (elf_section_data (sec)->relocs != internal_relocs)
-    {
-      if (!info.changed_relocs)
-       free (internal_relocs);
-      else
-       elf_section_data (sec)->relocs = internal_relocs;
-    }
+       case R_ALPHA_TLSGD:
+       case R_ALPHA_GOTDTPREL:
+       case R_ALPHA_GOTTPREL:
+         /* Fetch the got entry from the tables.  */
+         gotent = get_got_entry (abfd, h, r_type, r_symndx, rel->r_addend);
+
+         /* The got entry *must* exist, since we should have created it
+            before during check_relocs.  Also note that get_got_entry
+            assumed this was going to be another use, and so incremented
+            the use count again.  Thus the use count must be at least the
+            one real use and the "use" we just added.  */
+         if (gotent == NULL || gotent->use_count < 2)
+           {
+             abort ();
+             return FALSE;
+           }
+         gotent->use_count -= 2;
+         break;

 
 

-  *again = info.changed_contents || info.changed_relocs;
+       default:
+         break;
+       }
+    }

 
   return TRUE;
 
   return TRUE;

-
- error_return:
-  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       (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_SIZE           (64*1024)

 
 

-#define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so"
-\f
-/* Handle an Alpha specific section when reading an object file.  This
-   is called when bfd_section_from_shdr finds a section with an unknown
-   type.
-   FIXME: We need to handle the SHF_ALPHA_GPREL flag, but I'm not sure
-   how to.  */
+/* Adjust a symbol defined by a dynamic object and referenced by a
+   regular object.  The current definition is in some section of the
+   dynamic object, but we're not including those sections.  We have to
+   change the definition to something the rest of the link can
+   understand.  */

 
 static bfd_boolean
 
 static bfd_boolean

-elf64_alpha_section_from_shdr (bfd *abfd,
-                              Elf_Internal_Shdr *hdr,
-                              const char *name,
-                              int shindex)
+elf64_alpha_adjust_dynamic_symbol (struct bfd_link_info *info,
+                                  struct elf_link_hash_entry *h)

 {
 {

-  asection *newsect;
+  bfd *dynobj;
+  asection *s;
+  struct alpha_elf_link_hash_entry *ah;

 
 

-  /* There ought to be a place to keep ELF backend specific flags, but
-     at the moment there isn't one.  We just keep track of the
-     sections by their name, instead.  Fortunately, the ABI gives
-     suggested names for all the MIPS specific sections, so we will
-     probably get away with this.  */
-  switch (hdr->sh_type)
+  dynobj = elf_hash_table(info)->dynobj;
+  ah = (struct alpha_elf_link_hash_entry *)h;
+
+  /* Now that we've seen all of the input symbols, finalize our decision
+     about whether this symbol should get a .plt entry.  Irritatingly, it
+     is common for folk to leave undefined symbols in shared libraries,
+     and they still expect lazy binding; accept undefined symbols in lieu
+     of STT_FUNC.  */
+  if (alpha_elf_dynamic_symbol_p (h, info) && elf64_alpha_want_plt (ah))

     {
     {

-    case SHT_ALPHA_DEBUG:
-      if (strcmp (name, ".mdebug") != 0)
+      h->needs_plt = TRUE;
+
+      s = bfd_get_linker_section (dynobj, ".plt");
+      if (!s && !elf64_alpha_create_dynamic_sections (dynobj, info))

        return FALSE;
        return FALSE;

-      break;
-    default:
-      return FALSE;
-    }

 
 

-  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex))
-    return FALSE;
-  newsect = hdr->bfd_section;
+      /* We need one plt entry per got subsection.  Delay allocation of
+        the actual plt entries until size_plt_section, called from
+        size_dynamic_sections or during relaxation.  */

 
 

-  if (hdr->sh_type == SHT_ALPHA_DEBUG)
+      return TRUE;
+    }
+  else
+    h->needs_plt = FALSE;
+
+  /* If this is a weak symbol, and there is a real definition, the
+     processor independent code will have arranged for us to see the
+     real definition first, and we can just use the same value.  */
+  if (h->u.weakdef != NULL)

     {
     {

-      if (! bfd_set_section_flags (abfd, newsect,
-                                  (bfd_get_section_flags (abfd, newsect)
-                                   | SEC_DEBUGGING)))
-       return FALSE;
+      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
+                 || h->u.weakdef->root.type == bfd_link_hash_defweak);
+      h->root.u.def.section = h->u.weakdef->root.u.def.section;
+      h->root.u.def.value = h->u.weakdef->root.u.def.value;
+      return TRUE;

     }
 
     }
 

+  /* This is a reference to a symbol defined by a dynamic object which
+     is not a function.  The Alpha, since it uses .got entries for all
+     symbols even in regular objects, does not need the hackery of a
+     .dynbss section and COPY dynamic relocations.  */
+

   return TRUE;
 }
 
   return TRUE;
 }
 

-/* Convert Alpha specific section flags to bfd internal section flags.  */
+/* Record STO_ALPHA_NOPV and STO_ALPHA_STD_GPLOAD.  */

 
 

-static bfd_boolean
-elf64_alpha_section_flags (flags, hdr)
-     flagword *flags;
-     const Elf_Internal_Shdr *hdr;
+static void
+elf64_alpha_merge_symbol_attribute (struct elf_link_hash_entry *h,
+                                   const Elf_Internal_Sym *isym,
+                                   bfd_boolean definition,
+                                   bfd_boolean dynamic)

 {
 {

-  if (hdr->sh_flags & SHF_ALPHA_GPREL)
-    *flags |= SEC_SMALL_DATA;
-
-  return TRUE;
+  if (!dynamic && definition)
+    h->other = ((h->other & ELF_ST_VISIBILITY (-1))
+               | (isym->st_other & ~ELF_ST_VISIBILITY (-1)));

 }
 
 }
 

-/* Set the correct type for an Alpha ELF section.  We do this by the
-   section name, which is a hack, but ought to work.  */
+/* 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 bfd_boolean
-elf64_alpha_fake_sections (abfd, hdr, sec)
-     bfd *abfd;
-     Elf_Internal_Shdr *hdr;
-     asection *sec;
+static void
+elf64_alpha_copy_indirect_symbol (struct bfd_link_info *info,
+                                 struct elf_link_hash_entry *dir,
+                                 struct elf_link_hash_entry *ind)

 {
 {

-  register const char *name;
+  struct alpha_elf_link_hash_entry *hi
+    = (struct alpha_elf_link_hash_entry *) ind;
+  struct alpha_elf_link_hash_entry *hs
+    = (struct alpha_elf_link_hash_entry *) dir;

 
 

-  name = bfd_get_section_name (abfd, sec);
+  /* Do the merging in the superclass.  */
+  _bfd_elf_link_hash_copy_indirect(info, dir, ind);

 
 

-  if (strcmp (name, ".mdebug") == 0)
-    {
-      hdr->sh_type = SHT_ALPHA_DEBUG;
-      /* In a shared object on Irix 5.3, the .mdebug section has an
-         entsize of 0.  FIXME: Does this matter?  */
-      if ((abfd->flags & DYNAMIC) != 0 )
-       hdr->sh_entsize = 0;
-      else
-       hdr->sh_entsize = 1;
-    }
-  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;
+  /* Merge the flags.  Whee.  */
+  hs->flags |= hi->flags;

 
 

-  return TRUE;
-}
+  /* ??? It's unclear to me what's really supposed to happen when
+     "merging" defweak and defined symbols, given that we don't
+     actually throw away the defweak.  This more-or-less copies
+     the logic related to got and plt entries in the superclass.  */
+  if (ind->root.type != bfd_link_hash_indirect)
+    return;

 
 

-/* 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.  */
+  /* Merge the .got entries.  Cannibalize the old symbol's list in
+     doing so, since we don't need it anymore.  */

 
 

-static bfd_boolean
-elf64_alpha_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     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->relocatable
-      && sym->st_size <= elf_gp_size (abfd))
+  if (hs->got_entries == NULL)
+    hs->got_entries = hi->got_entries;
+  else

     {
     {

-      /* Common symbols less than or equal to -G nn bytes are
-        automatically put into .sbss.  */
+      struct alpha_elf_got_entry *gi, *gs, *gin, *gsh;

 
 

-      asection *scomm = bfd_get_section_by_name (abfd, ".scommon");
+      gsh = hs->got_entries;
+      for (gi = hi->got_entries; gi ; gi = gin)
+       {
+         gin = gi->next;
+         for (gs = gsh; gs ; gs = gs->next)
+           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:;
+       }
+    }
+  hi->got_entries = NULL;

 
 

-      if (scomm == NULL)
+  /* And similar for the reloc entries.  */
+
+  if (hs->reloc_entries == NULL)
+    hs->reloc_entries = hi->reloc_entries;
+  else
+    {
+      struct alpha_elf_reloc_entry *ri, *rs, *rin, *rsh;
+
+      rsh = hs->reloc_entries;
+      for (ri = hi->reloc_entries; ri ; ri = rin)

        {
        {

-         scomm = bfd_make_section_with_flags (abfd, ".scommon",
-                                              (SEC_ALLOC
-                                               | SEC_IS_COMMON
-                                               | SEC_LINKER_CREATED));
-         if (scomm == NULL)
-           return FALSE;
+         rin = ri->next;
+         for (rs = rsh; rs ; rs = rs->next)
+           if (ri->rtype == rs->rtype && ri->srel == rs->srel)
+             {
+               rs->count += ri->count;
+               goto found_reloc;
+             }
+         ri->next = hs->reloc_entries;
+         hs->reloc_entries = ri;
+       found_reloc:;

        }
        }

-
-      *secp = scomm;
-      *valp = sym->st_size;

     }
     }

-
-  return TRUE;
+  hi->reloc_entries = NULL;

 }
 
 }
 

-/* Create the .got section.  */
+/* Is it possible to merge two object file's .got tables?  */

 
 static bfd_boolean
 
 static bfd_boolean

-elf64_alpha_create_got_section(abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+elf64_alpha_can_merge_gots (bfd *a, bfd *b)

 {
 {

-  asection *s;
+  int total = alpha_elf_tdata (a)->total_got_size;
+  bfd *bsub;

 
 

-  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;
-    }
+  /* Trivial quick fallout test.  */
+  if (total + alpha_elf_tdata (b)->total_got_size <= MAX_GOT_SIZE)
+    return TRUE;

 
 

-  s = bfd_make_section_with_flags (abfd, ".got", (SEC_ALLOC | SEC_LOAD
-                                                 | SEC_HAS_CONTENTS
-                                                 | SEC_IN_MEMORY
-                                                 | SEC_LINKER_CREATED));
-  if (s == NULL
-      || !bfd_set_section_alignment (abfd, s, 3))
+  /* By their nature, local .got entries cannot be merged.  */
+  if ((total += alpha_elf_tdata (b)->local_got_size) > MAX_GOT_SIZE)

     return FALSE;
 
     return FALSE;
 

-  alpha_elf_tdata (abfd)->got = s;
+  /* Failing the common trivial comparison, we must effectively
+     perform the merge.  Not actually performing the merge means that
+     we don't have to store undo information in case we fail.  */
+  for (bsub = b; bsub ; bsub = alpha_elf_tdata (bsub)->in_got_link_next)
+    {
+      struct alpha_elf_link_hash_entry **hashes = alpha_elf_sym_hashes (bsub);
+      Elf_Internal_Shdr *symtab_hdr = &elf_tdata (bsub)->symtab_hdr;
+      int i, n;

 
 

-  return TRUE;
-}
+      n = NUM_SHDR_ENTRIES (symtab_hdr) - symtab_hdr->sh_info;
+      for (i = 0; i < n; ++i)
+       {
+         struct alpha_elf_got_entry *ae, *be;
+         struct alpha_elf_link_hash_entry *h;

 
 

-/* Create all the dynamic sections.  */
+         h = hashes[i];
+         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;

 
 

-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;
+         for (be = h->got_entries; be ; be = be->next)
+           {
+             if (be->use_count == 0)
+               continue;
+             if (be->gotobj != b)
+               continue;

 
 

-  /* We need to create .plt, .rela.plt, .got, and .rela.got sections.  */
+             for (ae = h->got_entries; ae ; ae = ae->next)
+               if (ae->gotobj == a
+                   && ae->reloc_type == be->reloc_type
+                   && ae->addend == be->addend)
+                 goto global_found;

 
 

-  s = bfd_make_section_with_flags (abfd, ".plt",
-                                  (SEC_ALLOC | SEC_LOAD
-                                   | SEC_HAS_CONTENTS
-                                   | SEC_IN_MEMORY
-                                   | SEC_LINKER_CREATED
-                                   | SEC_CODE));
-  if (s == NULL
-      || ! bfd_set_section_alignment (abfd, s, 3))
-    return FALSE;
+             total += alpha_got_entry_size (be->reloc_type);
+             if (total > MAX_GOT_SIZE)
+               return FALSE;
+           global_found:;
+           }
+       }
+    }

 
 

-  /* Define the symbol _PROCEDURE_LINKAGE_TABLE_ at the start of the
-     .plt section.  */
-  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, &bh)))
-    return FALSE;
-  h = (struct elf_link_hash_entry *) bh;
-  h->def_regular = 1;
-  h->type = STT_OBJECT;
+  return TRUE;
+}

 
 

-  if (info->shared
-      && ! bfd_elf_link_record_dynamic_symbol (info, h))
-    return FALSE;
+/* Actually merge two .got tables.  */

 
 

-  s = bfd_make_section_with_flags (abfd, ".rela.plt",
-                                  (SEC_ALLOC | SEC_LOAD
-                                   | SEC_HAS_CONTENTS
-                                   | SEC_IN_MEMORY
-                                   | SEC_LINKER_CREATED
-                                   | SEC_READONLY));
-  if (s == NULL
-      || ! bfd_set_section_alignment (abfd, s, 3))
-    return FALSE;
+static void
+elf64_alpha_merge_gots (bfd *a, bfd *b)
+{
+  int total = alpha_elf_tdata (a)->total_got_size;
+  bfd *bsub;

 
 

-  /* We may or may not have created a .got section for this object, but
-     we definitely havn't done the rest of the work.  */
+  /* Remember local expansion.  */
+  {
+    int e = alpha_elf_tdata (b)->local_got_size;
+    total += e;
+    alpha_elf_tdata (a)->local_got_size += e;
+  }

 
 

-  if (!elf64_alpha_create_got_section (abfd, info))
-    return FALSE;
+  for (bsub = b; bsub ; bsub = alpha_elf_tdata (bsub)->in_got_link_next)
+    {
+      struct alpha_elf_got_entry **local_got_entries;
+      struct alpha_elf_link_hash_entry **hashes;
+      Elf_Internal_Shdr *symtab_hdr;
+      int i, n;

 
 

-  s = bfd_make_section_with_flags (abfd, ".rela.got",
-                                  (SEC_ALLOC | SEC_LOAD
-                                   | SEC_HAS_CONTENTS
-                                   | SEC_IN_MEMORY
-                                   | SEC_LINKER_CREATED
-                                   | SEC_READONLY));
-  if (s == NULL
-      || !bfd_set_section_alignment (abfd, s, 3))
-    return FALSE;
+      /* Let the local .got entries know they are part of a new subsegment.  */
+      local_got_entries = alpha_elf_tdata (bsub)->local_got_entries;
+      if (local_got_entries)
+        {
+         n = elf_tdata (bsub)->symtab_hdr.sh_info;
+         for (i = 0; i < n; ++i)
+           {
+             struct alpha_elf_got_entry *ent;
+             for (ent = local_got_entries[i]; ent; ent = ent->next)
+               ent->gotobj = a;
+           }
+        }

 
 

-  /* 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.  */
-  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, &bh)))
-    return FALSE;
-  h = (struct elf_link_hash_entry *) bh;
-  h->def_regular = 1;
-  h->type = STT_OBJECT;
+      /* Merge the global .got entries.  */
+      hashes = alpha_elf_sym_hashes (bsub);
+      symtab_hdr = &elf_tdata (bsub)->symtab_hdr;

 
 

-  if (info->shared
-      && ! bfd_elf_link_record_dynamic_symbol (info, h))
-    return FALSE;
+      n = NUM_SHDR_ENTRIES (symtab_hdr) - symtab_hdr->sh_info;
+      for (i = 0; i < n; ++i)
+        {
+         struct alpha_elf_got_entry *ae, *be, **pbe, **start;
+         struct alpha_elf_link_hash_entry *h;

 
 

-  elf_hash_table (info)->hgot = h;
+         h = hashes[i];
+         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;

 
 

-  return TRUE;
-}
-\f
-/* Read ECOFF debugging information from a .mdebug section into a
-   ecoff_debug_info structure.  */
+         pbe = start = &h->got_entries;
+         while ((be = *pbe) != NULL)
+           {
+             if (be->use_count == 0)
+               {
+                 *pbe = be->next;
+                 memset (be, 0xa5, sizeof (*be));
+                 goto kill;
+               }
+             if (be->gotobj != b)
+               goto next;

 
 

-static bfd_boolean
-elf64_alpha_read_ecoff_info (abfd, section, debug)
-     bfd *abfd;
-     asection *section;
-     struct ecoff_debug_info *debug;
-{
-  HDRR *symhdr;
-  const struct ecoff_debug_swap *swap;
-  char *ext_hdr = NULL;
+             for (ae = *start; ae ; ae = ae->next)
+               if (ae->gotobj == a
+                   && ae->reloc_type == be->reloc_type
+                   && ae->addend == be->addend)
+                 {
+                   ae->flags |= be->flags;
+                   ae->use_count += be->use_count;
+                   *pbe = be->next;
+                   memset (be, 0xa5, sizeof (*be));
+                   goto kill;
+                 }
+             be->gotobj = a;
+             total += alpha_got_entry_size (be->reloc_type);

 
 

-  swap = get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
-  memset (debug, 0, sizeof (*debug));
+           next:;
+             pbe = &be->next;
+           kill:;
+           }
+        }

 
 

-  ext_hdr = (char *) bfd_malloc (swap->external_hdr_size);
-  if (ext_hdr == NULL && swap->external_hdr_size != 0)
-    goto error_return;
+      alpha_elf_tdata (bsub)->gotobj = a;
+    }
+  alpha_elf_tdata (a)->total_got_size = total;

 
 

-  if (! bfd_get_section_contents (abfd, section, ext_hdr, (file_ptr) 0,
-                                 swap->external_hdr_size))
-    goto error_return;
+  /* Merge the two in_got chains.  */
+  {
+    bfd *next;

 
 

-  symhdr = &debug->symbolic_header;
-  (*swap->swap_hdr_in) (abfd, ext_hdr, symhdr);
+    bsub = a;
+    while ((next = alpha_elf_tdata (bsub)->in_got_link_next) != NULL)
+      bsub = next;

 
 

-  /* The symbolic header contains absolute file offsets and sizes to
-     read.  */
-#define READ(ptr, offset, count, size, type)                           \
-  if (symhdr->count == 0)                                              \
-    debug->ptr = NULL;                                                 \
-  else                                                                 \
-    {                                                                  \
-      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_bread (debug->ptr, amt, abfd) != amt)                  \
-       goto error_return;                                              \
-    }
+    alpha_elf_tdata (bsub)->in_got_link_next = b;
+  }
+}

 
 

-  READ (line, cbLineOffset, cbLine, sizeof (unsigned char), unsigned char *);
-  READ (external_dnr, cbDnOffset, idnMax, swap->external_dnr_size, PTR);
-  READ (external_pdr, cbPdOffset, ipdMax, swap->external_pdr_size, PTR);
-  READ (external_sym, cbSymOffset, isymMax, swap->external_sym_size, PTR);
-  READ (external_opt, cbOptOffset, ioptMax, swap->external_opt_size, PTR);
-  READ (external_aux, cbAuxOffset, iauxMax, sizeof (union aux_ext),
-       union aux_ext *);
-  READ (ss, cbSsOffset, issMax, sizeof (char), char *);
-  READ (ssext, cbSsExtOffset, issExtMax, sizeof (char), char *);
-  READ (external_fdr, cbFdOffset, ifdMax, swap->external_fdr_size, PTR);
-  READ (external_rfd, cbRfdOffset, crfd, swap->external_rfd_size, PTR);
-  READ (external_ext, cbExtOffset, iextMax, swap->external_ext_size, PTR);
-#undef READ
+/* Calculate the offsets for the got entries.  */

 
 

-  debug->fdr = NULL;
+static bfd_boolean
+elf64_alpha_calc_got_offsets_for_symbol (struct alpha_elf_link_hash_entry *h,
+                                        void * arg ATTRIBUTE_UNUSED)
+{
+  struct alpha_elf_got_entry *gotent;

 
 

-  return TRUE;
+  for (gotent = h->got_entries; gotent; gotent = gotent->next)
+    if (gotent->use_count > 0)
+      {
+       struct alpha_elf_obj_tdata *td;
+       bfd_size_type *plge;

 
 

- error_return:
-  if (ext_hdr != NULL)
-    free (ext_hdr);
-  if (debug->line != NULL)
-    free (debug->line);
-  if (debug->external_dnr != NULL)
-    free (debug->external_dnr);
-  if (debug->external_pdr != NULL)
-    free (debug->external_pdr);
-  if (debug->external_sym != NULL)
-    free (debug->external_sym);
-  if (debug->external_opt != NULL)
-    free (debug->external_opt);
-  if (debug->external_aux != NULL)
-    free (debug->external_aux);
-  if (debug->ss != NULL)
-    free (debug->ss);
-  if (debug->ssext != NULL)
-    free (debug->ssext);
-  if (debug->external_fdr != NULL)
-    free (debug->external_fdr);
-  if (debug->external_rfd != NULL)
-    free (debug->external_rfd);
-  if (debug->external_ext != NULL)
-    free (debug->external_ext);
-  return FALSE;
-}
+       td = alpha_elf_tdata (gotent->gotobj);
+       plge = &td->got->size;
+       gotent->got_offset = *plge;
+       *plge += alpha_got_entry_size (gotent->reloc_type);
+      }

 
 

-/* Alpha ELF local labels start with '$'.  */
+  return TRUE;
+}

 
 

-static bfd_boolean
-elf64_alpha_is_local_label_name (abfd, name)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     const char *name;
+static void
+elf64_alpha_calc_got_offsets (struct bfd_link_info *info)

 {
 {

-  return name[0] == '$';
-}
+  bfd *i, *got_list;
+  struct alpha_elf_link_hash_table * htab;

 
 

-/* Alpha ELF follows MIPS ELF in using a special find_nearest_line
-   routine in order to handle the ECOFF debugging information.  We
-   still call this mips_elf_find_line because of the slot
-   find_line_info in elf_obj_tdata is declared that way.  */
+  htab = alpha_elf_hash_table (info);
+  if (htab == NULL)
+    return;
+  got_list = htab->got_list;

 
 

-struct mips_elf_find_line
-{
-  struct ecoff_debug_info d;
-  struct ecoff_find_line i;
-};
+  /* First, zero out the .got sizes, as we may be recalculating the
+     .got after optimizing it.  */
+  for (i = got_list; i ; i = alpha_elf_tdata(i)->got_link_next)
+    alpha_elf_tdata(i)->got->size = 0;
+
+  /* Next, fill in the offsets for all the global entries.  */
+  alpha_elf_link_hash_traverse (htab,
+                               elf64_alpha_calc_got_offsets_for_symbol,
+                               NULL);
+
+  /* Finally, fill in the offsets for the local entries.  */
+  for (i = got_list; i ; i = alpha_elf_tdata(i)->got_link_next)
+    {
+      bfd_size_type got_offset = alpha_elf_tdata(i)->got->size;
+      bfd *j;
+
+      for (j = i; j ; j = alpha_elf_tdata(j)->in_got_link_next)
+       {
+         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)
+               {
+                 gotent->got_offset = got_offset;
+                 got_offset += alpha_got_entry_size (gotent->reloc_type);
+               }
+       }
+
+      alpha_elf_tdata(i)->got->size = got_offset;
+    }
+}
+
+/* Constructs the gots.  */

 
 static bfd_boolean
 
 static bfd_boolean

-elf64_alpha_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
-                              functionname_ptr, line_ptr)
-     bfd *abfd;
-     asection *section;
-     asymbol **symbols;
-     bfd_vma offset;
-     const char **filename_ptr;
-     const char **functionname_ptr;
-     unsigned int *line_ptr;
+elf64_alpha_size_got_sections (struct bfd_link_info *info,
+                               bfd_boolean may_merge)

 {
 {

-  asection *msec;
+  bfd *i, *got_list, *cur_got_obj = NULL;
+  struct alpha_elf_link_hash_table * htab;

 
 

-  if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
-                                    filename_ptr, functionname_ptr,
-                                    line_ptr, 0,
-                                    &elf_tdata (abfd)->dwarf2_find_line_info))
-    return TRUE;
+  htab = alpha_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;
+  got_list = htab->got_list;

 
 

-  msec = bfd_get_section_by_name (abfd, ".mdebug");
-  if (msec != NULL)
+  /* On the first time through, pretend we have an existing got list
+     consisting of all of the input files.  */
+  if (got_list == NULL)

     {
     {

-      flagword origflags;
-      struct mips_elf_find_line *fi;
-      const struct ecoff_debug_swap * const swap =
-       get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
+      for (i = info->input_bfds; i ; i = i->link.next)
+       {
+         bfd *this_got;

 
 

-      /* If we are called during a link, alpha_elf_final_link may have
-        cleared the SEC_HAS_CONTENTS field.  We force it back on here
-        if appropriate (which it normally will be).  */
-      origflags = msec->flags;
-      if (elf_section_data (msec)->this_hdr.sh_type != SHT_NOBITS)
-       msec->flags |= SEC_HAS_CONTENTS;
+         if (! is_alpha_elf (i))
+           continue;

 
 

-      fi = elf_tdata (abfd)->find_line_info;
-      if (fi == NULL)
-       {
-         bfd_size_type external_fdr_size;
-         char *fraw_src;
-         char *fraw_end;
-         struct fdr *fdr_ptr;
-         bfd_size_type amt = sizeof (struct mips_elf_find_line);
+         this_got = alpha_elf_tdata (i)->gotobj;
+         if (this_got == NULL)
+           continue;

 
 

-         fi = (struct mips_elf_find_line *) bfd_zalloc (abfd, amt);
-         if (fi == NULL)
-           {
-             msec->flags = origflags;
-             return FALSE;
-           }
+         /* We are assuming no merging has yet occurred.  */
+         BFD_ASSERT (this_got == i);

 
 

-         if (!elf64_alpha_read_ecoff_info (abfd, msec, &fi->d))
+          if (alpha_elf_tdata (this_got)->total_got_size > MAX_GOT_SIZE)

            {
            {

-             msec->flags = origflags;
+             /* Yikes! A single object file has too many entries.  */
+             (*_bfd_error_handler)
+               (_("%B: .got subsegment exceeds 64K (size %d)"),
+                i, alpha_elf_tdata (this_got)->total_got_size);

              return FALSE;
            }
 
              return FALSE;
            }
 

-         /* Swap in the FDR information.  */
-         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;
-           }
-         external_fdr_size = swap->external_fdr_size;
-         fdr_ptr = fi->d.fdr;
-         fraw_src = (char *) fi->d.external_fdr;
-         fraw_end = (fraw_src
-                     + fi->d.symbolic_header.ifdMax * external_fdr_size);
-         for (; fraw_src < fraw_end; fraw_src += external_fdr_size, fdr_ptr++)
-           (*swap->swap_fdr_in) (abfd, (PTR) fraw_src, fdr_ptr);
+         if (got_list == NULL)
+           got_list = this_got;
+         else
+           alpha_elf_tdata(cur_got_obj)->got_link_next = this_got;
+         cur_got_obj = this_got;
+       }

 
 

-         elf_tdata (abfd)->find_line_info = fi;
+      /* Strange degenerate case of no got references.  */
+      if (got_list == NULL)
+       return TRUE;

 
 

-         /* Note that we don't bother to ever free this information.
-             find_nearest_line is either called all the time, as in
-             objdump -l, so the information should be saved, or it is
-             rarely called, as in ld error messages, so the memory
-             wasted is unimportant.  Still, it would probably be a
-             good idea for free_cached_info to throw it away.  */
-       }
+      htab->got_list = got_list;
+    }

 
 

-      if (_bfd_ecoff_locate_line (abfd, section, offset, &fi->d, swap,
-                                 &fi->i, filename_ptr, functionname_ptr,
-                                 line_ptr))
+  cur_got_obj = got_list;
+  if (cur_got_obj == NULL)
+    return FALSE;
+
+  if (may_merge)
+    {
+      i = alpha_elf_tdata(cur_got_obj)->got_link_next;
+      while (i != NULL)

        {
        {

-         msec->flags = origflags;
-         return TRUE;
-       }
+         if (elf64_alpha_can_merge_gots (cur_got_obj, i))
+           {
+             elf64_alpha_merge_gots (cur_got_obj, i);

 
 

-      msec->flags = origflags;
+             alpha_elf_tdata(i)->got->size = 0;
+             i = alpha_elf_tdata(i)->got_link_next;
+             alpha_elf_tdata(cur_got_obj)->got_link_next = i;
+           }
+         else
+           {
+             cur_got_obj = i;
+             i = alpha_elf_tdata(i)->got_link_next;
+           }
+       }

     }
 
     }
 

-  /* Fall back on the generic ELF find_nearest_line routine.  */
+  /* Once the gots have been merged, fill in the got offsets for
+     everything therein.  */
+  elf64_alpha_calc_got_offsets (info);

 
 

-  return _bfd_elf_find_nearest_line (abfd, section, symbols, offset,
-                                    filename_ptr, functionname_ptr,
-                                    line_ptr);
+  return TRUE;

 }
 }

-\f
-/* Structure used to pass information to alpha_elf_output_extsym.  */
-
-struct extsym_info
-{
-  bfd *abfd;
-  struct bfd_link_info *info;
-  struct ecoff_debug_info *debug;
-  const struct ecoff_debug_swap *swap;
-  bfd_boolean failed;
-};

 
 static bfd_boolean
 
 static bfd_boolean

-elf64_alpha_output_extsym (h, data)
-     struct alpha_elf_link_hash_entry *h;
-     PTR data;
+elf64_alpha_size_plt_section_1 (struct alpha_elf_link_hash_entry *h,
+                               void * data)

 {
 {

-  struct extsym_info *einfo = (struct extsym_info *) data;
-  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;
-  else if ((h->root.def_dynamic
-           || h->root.ref_dynamic
-           || h->root.root.type == bfd_link_hash_new)
-          && !h->root.def_regular
-          && !h->root.ref_regular)
-    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;
-  else
-    strip = FALSE;
+  asection *splt = (asection *) data;
+  struct alpha_elf_got_entry *gotent;
+  bfd_boolean saw_one = FALSE;

 
 

-  if (strip)
+  /* If we didn't need an entry before, we still don't.  */
+  if (!h->root.needs_plt)

     return TRUE;
 
     return TRUE;
 

-  if (h->esym.ifd == -2)
-    {
-      h->esym.jmptbl = 0;
-      h->esym.cobol_main = 0;
-      h->esym.weakext = 0;
-      h->esym.reserved = 0;
-      h->esym.ifd = ifdNil;
-      h->esym.asym.value = 0;
-      h->esym.asym.st = stGlobal;
+  /* For each LITERAL got entry still in use, allocate a plt entry.  */
+  for (gotent = h->got_entries; gotent ; gotent = gotent->next)
+    if (gotent->reloc_type == R_ALPHA_LITERAL
+       && gotent->use_count > 0)
+      {
+       if (splt->size == 0)
+         splt->size = PLT_HEADER_SIZE;
+       gotent->plt_offset = splt->size;
+       splt->size += PLT_ENTRY_SIZE;
+       saw_one = TRUE;
+      }

 
 

-      if (h->root.root.type != bfd_link_hash_defined
-         && h->root.root.type != bfd_link_hash_defweak)
-       h->esym.asym.sc = scAbs;
-      else
-       {
-         const char *name;
+  /* If there weren't any, there's no longer a need for the PLT entry.  */
+  if (!saw_one)
+    h->root.needs_plt = FALSE;

 
 

-         sec = h->root.root.u.def.section;
-         output_section = sec->output_section;
+  return TRUE;
+}

 
 

-         /* 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);
+/* Called from relax_section to rebuild the PLT in light of potential changes
+   in the function's status.  */

 
 

-             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;
-           }
-       }
+static void
+elf64_alpha_size_plt_section (struct bfd_link_info *info)
+{
+  asection *splt, *spltrel, *sgotplt;
+  unsigned long entries;
+  bfd *dynobj;
+  struct alpha_elf_link_hash_table * htab;

 
 

-      h->esym.asym.reserved = 0;
-      h->esym.asym.index = indexNil;
-    }
+  htab = alpha_elf_hash_table (info);
+  if (htab == NULL)
+    return;

 
 

-  if (h->root.root.type == bfd_link_hash_common)
-    h->esym.asym.value = h->root.root.u.c.size;
-  else if (h->root.root.type == bfd_link_hash_defined
-          || h->root.root.type == bfd_link_hash_defweak)
-    {
-      if (h->esym.asym.sc == scCommon)
-       h->esym.asym.sc = scBss;
-      else if (h->esym.asym.sc == scSCommon)
-       h->esym.asym.sc = scSBss;
+  dynobj = elf_hash_table(info)->dynobj;
+  splt = bfd_get_linker_section (dynobj, ".plt");
+  if (splt == NULL)
+    return;

 
 

-      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);
-      else
-       h->esym.asym.value = 0;
-    }
-  else if (h->root.needs_plt)
+  splt->size = 0;
+
+  alpha_elf_link_hash_traverse (htab,
+                               elf64_alpha_size_plt_section_1, splt);
+
+  /* Every plt entry requires a JMP_SLOT relocation.  */
+  spltrel = bfd_get_linker_section (dynobj, ".rela.plt");
+  entries = 0;
+  if (splt->size)

     {
     {

-      /* Set type and value for a symbol with a function stub.  */
-      h->esym.asym.st = stProc;
-      sec = bfd_get_section_by_name (einfo->abfd, ".plt");
-      if (sec == NULL)
-       h->esym.asym.value = 0;
+      if (elf64_alpha_use_secureplt)
+       entries = (splt->size - NEW_PLT_HEADER_SIZE) / NEW_PLT_ENTRY_SIZE;

       else
       else

-       {
-         output_section = sec->output_section;
-         if (output_section != NULL)
-           h->esym.asym.value = (h->root.plt.offset
-                                 + sec->output_offset
-                                 + output_section->vma);
-         else
-           h->esym.asym.value = 0;
-       }
+       entries = (splt->size - OLD_PLT_HEADER_SIZE) / OLD_PLT_ENTRY_SIZE;

     }
     }

+  spltrel->size = entries * sizeof (Elf64_External_Rela);

 
 

-  if (! bfd_ecoff_debug_one_external (einfo->abfd, einfo->debug, einfo->swap,
-                                     h->root.root.root.string,
-                                     &h->esym))
+  /* When using the secureplt, we need two words somewhere in the data
+     segment for the dynamic linker to tell us where to go.  This is the
+     entire contents of the .got.plt section.  */
+  if (elf64_alpha_use_secureplt)

     {
     {

-      einfo->failed = TRUE;
-      return FALSE;
+      sgotplt = bfd_get_linker_section (dynobj, ".got.plt");
+      sgotplt->size = entries ? 16 : 0;

     }
     }

-
-  return TRUE;

 }
 }

-\f
-/* Search for and possibly create a got entry.  */

 
 

-static struct alpha_elf_got_entry *
-get_got_entry (abfd, h, r_type, r_symndx, r_addend)
-     bfd *abfd;
-     struct alpha_elf_link_hash_entry *h;
-     unsigned long r_type, r_symndx;
-     bfd_vma r_addend;
+static bfd_boolean
+elf64_alpha_always_size_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+                                 struct bfd_link_info *info)

 {
 {

-  struct alpha_elf_got_entry *gotent;
-  struct alpha_elf_got_entry **slot;
+  bfd *i;
+  struct alpha_elf_link_hash_table * htab;

 
 

-  if (h)
-    slot = &h->got_entries;
-  else
-    {
-      /* This is a local .got entry -- record for merge.  */
+  if (bfd_link_relocatable (info))
+    return TRUE;

 
 

-      struct alpha_elf_got_entry **local_got_entries;
+  htab = alpha_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;

 
 

-      local_got_entries = alpha_elf_tdata(abfd)->local_got_entries;
-      if (!local_got_entries)
+  if (!elf64_alpha_size_got_sections (info, TRUE))
+    return FALSE;
+
+  /* Allocate space for all of the .got subsections.  */
+  i = htab->got_list;
+  for ( ; i ; i = alpha_elf_tdata(i)->got_link_next)
+    {
+      asection *s = alpha_elf_tdata(i)->got;
+      if (s->size > 0)

        {
        {

-         bfd_size_type size;
-         Elf_Internal_Shdr *symtab_hdr;
+         s->contents = (bfd_byte *) bfd_zalloc (i, s->size);
+         if (s->contents == NULL)
+           return FALSE;
+       }
+    }

 
 

-         symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
-         size = symtab_hdr->sh_info;
-         size *= sizeof (struct alpha_elf_got_entry *);
+  return TRUE;
+}

 
 

-         local_got_entries
-           = (struct alpha_elf_got_entry **) bfd_zalloc (abfd, size);
-         if (!local_got_entries)
-           return NULL;
+/* The number of dynamic relocations required by a static relocation.  */

 
 

-         alpha_elf_tdata (abfd)->local_got_entries = local_got_entries;
-       }
+static int
+alpha_dynamic_entries_for_reloc (int r_type, int dynamic, int shared, int pie)
+{
+  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:
+      return dynamic || shared;
+    case R_ALPHA_GOTTPREL:
+      return dynamic || (shared && !pie);
+    case R_ALPHA_GOTDTPREL:
+      return dynamic;

 
 

-      slot = &local_got_entries[r_symndx];
+    /* May appear in data sections.  */
+    case R_ALPHA_REFLONG:
+    case R_ALPHA_REFQUAD:
+      return dynamic || shared;
+    case R_ALPHA_TPREL64:
+      return dynamic || (shared && !pie);
+
+    /* Everything else is illegal.  We'll issue an error during
+       relocate_section.  */
+    default:
+      return 0;

     }
     }

+}

 
 

-  for (gotent = *slot; gotent ; gotent = gotent->next)
-    if (gotent->gotobj == abfd
-       && gotent->reloc_type == r_type
-       && gotent->addend == r_addend)
-      break;
+/* Work out the sizes of the dynamic relocation entries.  */

 
 

-  if (!gotent)
-    {
-      int entry_size;
-      bfd_size_type amt;
+static bfd_boolean
+elf64_alpha_calc_dynrel_sizes (struct alpha_elf_link_hash_entry *h,
+                              struct bfd_link_info *info)
+{
+  bfd_boolean dynamic;
+  struct alpha_elf_reloc_entry *relent;
+  unsigned long entries;

 
 

-      amt = sizeof (struct alpha_elf_got_entry);
-      gotent = (struct alpha_elf_got_entry *) bfd_alloc (abfd, amt);
-      if (!gotent)
-       return NULL;
+  /* 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
+     section but the ELF_LINK_HASH_DEF_REGULAR flag will not have been
+     set.  This is done for dynamic symbols in
+     elf_adjust_dynamic_symbol but this is not done for non-dynamic
+     symbols, somehow.  */
+  if (!h->root.def_regular
+      && h->root.ref_regular
+      && !h->root.def_dynamic
+      && (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.def_regular = 1;

 
 

-      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;
+  /* 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);

 
 

-      gotent->next = *slot;
-      *slot = gotent;
+  /* If the symbol is a hidden undefined weak, then we never have any
+     relocations.  Avoid the loop which may want to add RELATIVE relocs
+     based on bfd_link_pic (info).  */
+  if (h->root.root.type == bfd_link_hash_undefweak && !dynamic)
+    return TRUE;

 
 

-      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;
+  for (relent = h->reloc_entries; relent; relent = relent->next)
+    {
+      entries = alpha_dynamic_entries_for_reloc (relent->rtype, dynamic,
+                                                bfd_link_pic (info),
+                                                bfd_link_pie (info));
+      if (entries)
+       {
+         relent->srel->size +=
+           entries * sizeof (Elf64_External_Rela) * relent->count;
+         if (relent->reltext)
+           info->flags |= DT_TEXTREL;
+       }

     }
     }

-  else
-    gotent->use_count += 1;

 
 

-  return gotent;
+  return TRUE;

 }
 
 }
 

-/* Handle dynamic relocations when doing an Alpha ELF link.  */
+/* Subroutine of elf64_alpha_size_rela_got_section for doing the
+   global symbols.  */

 
 static bfd_boolean
 
 static bfd_boolean

-elf64_alpha_check_relocs (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
+elf64_alpha_size_rela_got_1 (struct alpha_elf_link_hash_entry *h,
+                            struct bfd_link_info *info)

 {
 {

-  bfd *dynobj;
-  asection *sreloc;
-  const char *rel_sec_name;
-  Elf_Internal_Shdr *symtab_hdr;
-  struct alpha_elf_link_hash_entry **sym_hashes;
-  const Elf_Internal_Rela *rel, *relend;
-  bfd_boolean got_created;
-  bfd_size_type amt;
+  bfd_boolean dynamic;
+  struct alpha_elf_got_entry *gotent;
+  unsigned long entries;

 
 

-  if (info->relocatable)
+  /* If we're using a plt for this symbol, then all of its relocations
+     for its got entries go into .rela.plt.  */
+  if (h->root.needs_plt)

     return TRUE;
 
     return TRUE;
 

-  dynobj = elf_hash_table(info)->dynobj;
-  if (dynobj == NULL)
-    elf_hash_table(info)->dynobj = dynobj = abfd;
+  /* 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);

 
 

-  sreloc = NULL;
-  rel_sec_name = NULL;
-  symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
-  sym_hashes = alpha_elf_sym_hashes(abfd);
-  got_created = FALSE;
+  /* If the symbol is a hidden undefined weak, then we never have any
+     relocations.  Avoid the loop which may want to add RELATIVE relocs
+     based on bfd_link_pic (info).  */
+  if (h->root.root.type == bfd_link_hash_undefweak && !dynamic)
+    return TRUE;

 
 

-  relend = relocs + sec->reloc_count;
-  for (rel = relocs; rel < relend; ++rel)
+  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,
+                                                 bfd_link_pic (info),
+                                                 bfd_link_pie (info));
+
+  if (entries > 0)

     {
     {

-      enum {
-       NEED_GOT = 1,
-       NEED_GOT_ENTRY = 2,
-       NEED_DYNREL = 4
-      };
+      bfd *dynobj = elf_hash_table(info)->dynobj;
+      asection *srel = bfd_get_linker_section (dynobj, ".rela.got");
+      BFD_ASSERT (srel != NULL);
+      srel->size += sizeof (Elf64_External_Rela) * entries;
+    }

 
 

-      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;
+  return TRUE;
+}

 
 

-      r_symndx = ELF64_R_SYM (rel->r_info);
-      if (r_symndx < symtab_hdr->sh_info)
-       h = NULL;
-      else
+/* Set the sizes of the dynamic relocation sections.  */
+
+static void
+elf64_alpha_size_rela_got_section (struct bfd_link_info *info)
+{
+  unsigned long entries;
+  bfd *i, *dynobj;
+  asection *srel;
+  struct alpha_elf_link_hash_table * htab;
+
+  htab = alpha_elf_hash_table (info);
+  if (htab == NULL)
+    return;
+
+  /* Shared libraries often require RELATIVE relocs, and some relocs
+     require attention for the main application as well.  */
+
+  entries = 0;
+  for (i = htab->got_list;
+       i ; i = alpha_elf_tdata(i)->got_link_next)
+    {
+      bfd *j;
+
+      for (j = i; j ; j = alpha_elf_tdata(j)->in_got_link_next)

        {
        {

-         h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+         struct alpha_elf_got_entry **local_got_entries, *gotent;
+         int k, n;

 
 

-         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;
+         local_got_entries = alpha_elf_tdata(j)->local_got_entries;
+         if (!local_got_entries)
+           continue;

 
 

-         h->root.ref_regular = 1;
+         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, bfd_link_pic (info),
+                            bfd_link_pie (info)));

        }
        }

+    }

 
 

-      /* 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.def_regular
-               || h->root.root.type == bfd_link_hash_defweak))
-        maybe_dynamic = TRUE;
+  dynobj = elf_hash_table(info)->dynobj;
+  srel = bfd_get_linker_section (dynobj, ".rela.got");
+  if (!srel)
+    {
+      BFD_ASSERT (entries == 0);
+      return;
+    }
+  srel->size = sizeof (Elf64_External_Rela) * entries;

 
 

-      need = 0;
-      gotent_flags = 0;
-      r_type = ELF64_R_TYPE (rel->r_info);
-      addend = rel->r_addend;
+  /* Now do the non-local symbols.  */
+  alpha_elf_link_hash_traverse (htab,
+                               elf64_alpha_size_rela_got_1, info);
+}

 
 

-      switch (r_type)
-       {
-       case R_ALPHA_LITERAL:
-         need = NEED_GOT | NEED_GOT_ENTRY;
+/* Set the sizes of the dynamic sections.  */

 
 

-         /* 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;
+static bfd_boolean
+elf64_alpha_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
+                                  struct bfd_link_info *info)
+{
+  bfd *dynobj;
+  asection *s;
+  bfd_boolean relplt;
+  struct alpha_elf_link_hash_table * htab;

 
 

-         /* No LITUSEs -- presumably the address is used somehow.  */
-         if (gotent_flags == 0)
-           gotent_flags = ALPHA_ELF_LINK_HASH_LU_ADDR;
-         break;
+  htab = alpha_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;

 
 

-       case R_ALPHA_GPDISP:
-       case R_ALPHA_GPREL16:
-       case R_ALPHA_GPREL32:
-       case R_ALPHA_GPRELHIGH:
-       case R_ALPHA_GPRELLOW:
-       case R_ALPHA_BRSGP:
-         need = NEED_GOT;
-         break;
+  dynobj = elf_hash_table(info)->dynobj;
+  BFD_ASSERT(dynobj != NULL);

 
 

-       case R_ALPHA_REFLONG:
-       case R_ALPHA_REFQUAD:
-         if ((info->shared && (sec->flags & SEC_ALLOC)) || maybe_dynamic)
-           need = NEED_DYNREL;
-         break;
+  if (elf_hash_table (info)->dynamic_sections_created)
+    {
+      /* Set the contents of the .interp section to the interpreter.  */
+      if (bfd_link_executable (info) && !info->nointerp)
+       {
+         s = bfd_get_linker_section (dynobj, ".interp");
+         BFD_ASSERT (s != NULL);
+         s->size = sizeof ELF_DYNAMIC_INTERPRETER;
+         s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+       }

 
 

-       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 */
+      /* Now that we've seen all of the input files, we can decide which
+        symbols need dynamic relocation entries and which don't.  We've
+        collected information in check_relocs that we can now apply to
+        size the dynamic relocation sections.  */
+      alpha_elf_link_hash_traverse (htab,
+                                   elf64_alpha_calc_dynrel_sizes, info);

 
 

-       case R_ALPHA_TLSGD:
-       case R_ALPHA_GOTDTPREL:
-         need = NEED_GOT | NEED_GOT_ENTRY;
-         break;
+      elf64_alpha_size_rela_got_section (info);
+      elf64_alpha_size_plt_section (info);
+    }
+  /* else we're not dynamic and by definition we don't need such things.  */

 
 

-       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;
+  /* The check_relocs and adjust_dynamic_symbol entry points have
+     determined the sizes of the various dynamic sections.  Allocate
+     memory for them.  */
+  relplt = FALSE;
+  for (s = dynobj->sections; s != NULL; s = s->next)
+    {
+      const char *name;

 
 

-       case R_ALPHA_TPREL64:
-         if (info->shared || maybe_dynamic)
-           need = NEED_DYNREL;
-         if (info->shared)
-           info->flags |= DF_STATIC_TLS;
-         break;
-       }
+      if (!(s->flags & SEC_LINKER_CREATED))
+       continue;

 
 

-      if (need & NEED_GOT)
+      /* It's OK to base decisions on the section name, because none
+        of the dynobj section names depend upon the input files.  */
+      name = bfd_get_section_name (dynobj, s);
+
+      if (CONST_STRNEQ (name, ".rela"))

        {
        {

-         if (!got_created)
+         if (s->size != 0)

            {
            {

-             if (!elf64_alpha_create_got_section (abfd, info))
-               return FALSE;
-
-             /* Make sure the object's gotobj is set to itself so
-                that we default to every object with its own .got.
-                We'll merge .gots later once we've collected each
-                object's info.  */
-             alpha_elf_tdata(abfd)->gotobj = abfd;
+             if (strcmp (name, ".rela.plt") == 0)
+               relplt = TRUE;

 
 

-             got_created = 1;
+             /* We use the reloc_count field as a counter if we need
+                to copy relocs into the output file.  */
+             s->reloc_count = 0;

            }
        }
            }
        }

-
-      if (need & NEED_GOT_ENTRY)
+      else if (! CONST_STRNEQ (name, ".got")
+              && strcmp (name, ".plt") != 0
+              && strcmp (name, ".dynbss") != 0)

        {
        {

-         struct alpha_elf_got_entry *gotent;
+         /* It's not one of our dynamic sections, so don't allocate space.  */
+         continue;
+       }

 
 

-         gotent = get_got_entry (abfd, h, r_type, r_symndx, addend);
-         if (!gotent)
+      if (s->size == 0)
+       {
+         /* If we don't need this section, strip it from the output file.
+            This is to handle .rela.bss and .rela.plt.  We must create it
+            in create_dynamic_sections, because it must be created before
+            the linker maps input sections to output sections.  The
+            linker does that before adjust_dynamic_symbol is called, and
+            it is that function which decides whether anything needs to
+            go into these sections.  */
+         if (!CONST_STRNEQ (name, ".got"))
+           s->flags |= SEC_EXCLUDE;
+       }
+      else if ((s->flags & SEC_HAS_CONTENTS) != 0)
+       {
+         /* Allocate memory for the section contents.  */
+         s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
+         if (s->contents == NULL)

            return FALSE;
            return FALSE;

+       }
+    }

 
 

-         if (gotent_flags)
-           {
-             gotent->flags |= gotent_flags;
-             if (h)
-               {
-                 gotent_flags |= h->flags;
-                 h->flags = gotent_flags;
+  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)

 
 

-                 /* 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.needs_plt = 1;
-                 else
-                   h->root.needs_plt = 0;
-               }
-           }
+      if (bfd_link_executable (info))
+       {
+         if (!add_dynamic_entry (DT_DEBUG, 0))
+           return FALSE;

        }
 
        }
 

-      if (need & NEED_DYNREL)
+      if (relplt)

        {
        {

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

 
 

-             BFD_ASSERT (strncmp (rel_sec_name, ".rela", 5) == 0
-                         && strcmp (bfd_get_section_name (abfd, sec),
-                                    rel_sec_name+5) == 0);
-           }
+         if (elf64_alpha_use_secureplt
+             && !add_dynamic_entry (DT_ALPHA_PLTRO, 1))
+           return FALSE;
+       }

 
 

-         /* We need to create the section here now whether we eventually
-            use it or not so that it gets mapped to an output section by
-            the linker.  If not used, we'll kill it in
-            size_dynamic_sections.  */
-         if (sreloc == NULL)
-           {
-             sreloc = bfd_get_section_by_name (dynobj, rel_sec_name);
-             if (sreloc == NULL)
-               {
-                 flagword flags;
-
-                 flags = (SEC_HAS_CONTENTS | SEC_IN_MEMORY
-                          | SEC_LINKER_CREATED | SEC_READONLY);
-                 if (sec->flags & SEC_ALLOC)
-                   flags |= SEC_ALLOC | SEC_LOAD;
-                 sreloc = bfd_make_section_with_flags (dynobj,
-                                                       rel_sec_name,
-                                                       flags);
-                 if (sreloc == NULL
-                     || !bfd_set_section_alignment (dynobj, sreloc, 3))
-                   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 (h)
-           {
-             /* Since we havn't seen all of the input symbols yet, we
-                don't know whether we'll actually need a dynamic relocation
-                entry for this reloc.  So make a record of it.  Once we
-                find out if this thing needs dynamic relocation we'll
-                expand the relocation sections by the appropriate amount.  */
+      if (info->flags & DF_TEXTREL)
+       {
+         if (!add_dynamic_entry (DT_TEXTREL, 0))
+           return FALSE;
+       }
+    }
+#undef add_dynamic_entry

 
 

-             struct alpha_elf_reloc_entry *rent;
+  return TRUE;
+}
+\f
+/* These functions do relaxation for Alpha ELF.

 
 

-             for (rent = h->reloc_entries; rent; rent = rent->next)
-               if (rent->rtype == r_type && rent->srel == sreloc)
-                 break;
+   Currently I'm only handling what I can do with existing compiler
+   and assembler support, which means no instructions are removed,
+   though some may be nopped.  At this time GCC does not emit enough
+   information to do all of the relaxing that is possible.  It will
+   take some not small amount of work for that to happen.

 
 

-             if (!rent)
-               {
-                 amt = sizeof (struct alpha_elf_reloc_entry);
-                 rent = (struct alpha_elf_reloc_entry *) bfd_alloc (abfd, amt);
-                 if (!rent)
-                   return FALSE;
+   There are a couple of interesting papers that I once read on this
+   subject, that I cannot find references to at the moment, that
+   related to Alpha in particular.  They are by David Wall, then of
+   DEC WRL.  */

 
 

-                 rent->srel = sreloc;
-                 rent->rtype = r_type;
-                 rent->count = 1;
-                 rent->reltext = ((sec->flags & (SEC_READONLY | SEC_ALLOC))
-                                  == (SEC_READONLY | SEC_ALLOC));
+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;
+  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;
+};

 
 

-                 rent->next = h->reloc_entries;
-                 h->reloc_entries = rent;
-               }
-             else
-               rent->count++;
-           }
-         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->size += sizeof (Elf64_External_Rela);
-             if ((sec->flags & (SEC_READONLY | SEC_ALLOC))
-                 == (SEC_READONLY | SEC_ALLOC))
-               info->flags |= DF_TEXTREL;
-           }
-       }
+static Elf_Internal_Rela *
+elf64_alpha_find_reloc_at_ofs (Elf_Internal_Rela *rel,
+                              Elf_Internal_Rela *relend,
+                              bfd_vma offset, int type)
+{
+  while (rel < relend)
+    {
+      if (rel->r_offset == offset
+         && ELF64_R_TYPE (rel->r_info) == (unsigned int) type)
+       return rel;
+      ++rel;

     }
     }

-
-  return TRUE;
+  return NULL;

 }
 
 }
 

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

 static bfd_boolean
 static bfd_boolean

-elf64_alpha_adjust_dynamic_symbol (info, h)
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
+elf64_alpha_relax_got_load (struct alpha_relax_info *info, bfd_vma symval,
+                           Elf_Internal_Rela *irel, unsigned long r_type)

 {
 {

-  bfd *dynobj;
-  asection *s;
-  struct alpha_elf_link_hash_entry *ah;
+  unsigned int insn;
+  bfd_signed_vma disp;

 
 

-  dynobj = elf_hash_table(info)->dynobj;
-  ah = (struct alpha_elf_link_hash_entry *)h;
+  /* Get the instruction.  */
+  insn = bfd_get_32 (info->abfd, info->contents + irel->r_offset);

 
 

-  /* Now that we've seen all of the input symbols, finalize our decision
-     about whether this symbol should get a .plt entry.  */
-
-  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)))
-      /* 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
-        somewhere later.  But for now don't bother.  */
-      && ah->got_entries)
+  if (insn >> 26 != OP_LDQ)

     {
     {

-      h->needs_plt = 1;
-
-      s = bfd_get_section_by_name(dynobj, ".plt");
-      if (!s && !elf64_alpha_create_dynamic_sections (dynobj, info))
-       return FALSE;
+      reloc_howto_type *howto = elf64_alpha_howto_table + r_type;
+      ((*_bfd_error_handler)
+       ("%B: %A+0x%lx: warning: %s relocation against unexpected insn",
+       info->abfd, info->sec,
+       (unsigned long) irel->r_offset, howto->name));
+      return TRUE;
+    }

 
 

-      /* The first bit of the .plt is reserved.  */
-      if (s->size == 0)
-       s->size = PLT_HEADER_SIZE;
+  /* Can't relax dynamic symbols.  */
+  if (alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info))
+    return TRUE;

 
 

-      h->plt.offset = s->size;
-      s->size += PLT_ENTRY_SIZE;
+  /* Can't use local-exec relocations in shared libraries.  */
+  if (r_type == R_ALPHA_GOTTPREL
+      && bfd_link_dll (info->link_info))
+    return TRUE;

 
 

-      /* If this symbol is not defined in a regular file, and we are not
-        generating a shared library, then set the symbol to the location
-        in the .plt.  This is required to make function pointers compare
-        equal between the normal executable and the shared library.  */
-      if (! info->shared
-         && h->root.type != bfd_link_hash_defweak)
+  if (r_type == R_ALPHA_LITERAL)
+    {
+      /* Look for nice constant addresses.  This includes the not-uncommon
+        special case of 0 for undefweak symbols.  */
+      if ((info->h && info->h->root.root.type == bfd_link_hash_undefweak)
+         || (!bfd_link_pic (info->link_info)
+             && (symval >= (bfd_vma)-0x8000 || symval < 0x8000)))

        {
        {

-         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;
+         disp = 0;
+         insn = (OP_LDA << 26) | (insn & (31 << 21)) | (31 << 16);
+         insn |= (symval & 0xffff);
+         r_type = R_ALPHA_NONE;

        }
        }

+      else
+       {
+         /* We may only create GPREL relocs during the second pass.  */
+         if (info->link_info->relax_pass == 0)
+           return TRUE;

 
 

-      /* We also need a JMP_SLOT entry in the .rela.plt section.  */
-      s = bfd_get_section_by_name (dynobj, ".rela.plt");
-      BFD_ASSERT (s != NULL);
-      s->size += sizeof (Elf64_External_Rela);
-
-      return TRUE;
+         disp = symval - info->gp;
+         insn = (OP_LDA << 26) | (insn & 0x03ff0000);
+         r_type = R_ALPHA_GPREL16;
+       }

     }
   else
     }
   else

-    h->needs_plt = 0;
+    {
+      bfd_vma dtp_base, tp_base;

 
 

-  /* If this is a weak symbol, and there is a real definition, the
-     processor independent code will have arranged for us to see the
-     real definition first, and we can just use the same value.  */
-  if (h->u.weakdef != NULL)
+      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 & (31 << 21)) | (31 << 16);
+
+      switch (r_type)
+       {
+       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;
+       }
+    }
+
+  if (disp < -0x8000 || disp >= 0x8000)
+    return TRUE;
+
+  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.  */
+  if (--info->gotent->use_count == 0)

     {
     {

-      BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined
-                 || h->u.weakdef->root.type == bfd_link_hash_defweak);
-      h->root.u.def.section = h->u.weakdef->root.u.def.section;
-      h->root.u.def.value = h->u.weakdef->root.u.def.value;
-      return TRUE;
+      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;

     }
 
     }
 

-  /* This is a reference to a symbol defined by a dynamic object which
-     is not a function.  The Alpha, since it uses .got entries for all
-     symbols even in regular objects, does not need the hackery of a
-     .dynbss section and COPY dynamic relocations.  */
+  /* Smash the existing GOT relocation for its 16-bit immediate pair.  */
+  irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info), r_type);
+  info->changed_relocs = TRUE;

 
 

-  return TRUE;
-}
+  /* ??? Search forward through this basic block looking for insns
+     that use the target register.  Stop after an insn modifying the
+     register is seen, or after a branch or call.

 
 

-/* 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.  */
+     Any such memory load insn may be substituted by a load directly
+     off the GP.  This allows the memory load insn to be issued before
+     the calculated GP register would otherwise be ready.

 
 

-static bfd_boolean
-elf64_alpha_merge_ind_symbols (hi, dummy)
-     struct alpha_elf_link_hash_entry *hi;
-     PTR dummy ATTRIBUTE_UNUSED;
-{
-  struct alpha_elf_link_hash_entry *hs;
+     Any such jsr insn can be replaced by a bsr if it is in range.

 
 

-  if (hi->root.root.type != bfd_link_hash_indirect)
-    return TRUE;
-  hs = hi;
-  do {
-    hs = (struct alpha_elf_link_hash_entry *)hs->root.root.u.i.link;
-  } while (hs->root.root.type == bfd_link_hash_indirect);
+     This would mean that we'd have to _add_ relocations, the pain of
+     which gives one pause.  */

 
 

-  /* Merge the flags.  Whee.  */
+  return TRUE;
+}

 
 

-  hs->flags |= hi->flags;
+static bfd_vma
+elf64_alpha_relax_opt_call (struct alpha_relax_info *info, bfd_vma symval)
+{
+  /* If the function has the same gp, and we can identify that the
+     function does not use its function pointer, we can eliminate the
+     address load.  */

 
 

-  /* Merge the .got entries.  Cannibalize the old symbol's list in
-     doing so, since we don't need it anymore.  */
+  /* If the symbol is marked NOPV, we are being told the function never
+     needs its procedure value.  */
+  if ((info->other & STO_ALPHA_STD_GPLOAD) == STO_ALPHA_NOPV)
+    return symval;

 
 

-  if (hs->got_entries == NULL)
-    hs->got_entries = hi->got_entries;
+  /* If the symbol is marked STD_GP, we are being told the function does
+     a normal ldgp in the first two words.  */
+  else if ((info->other & STO_ALPHA_STD_GPLOAD) == STO_ALPHA_STD_GPLOAD)
+    ;
+
+  /* Otherwise, we may be able to identify a GP load in the first two
+     words, which we can then skip.  */

   else
     {
   else
     {

-      struct alpha_elf_got_entry *gi, *gs, *gin, *gsh;
+      Elf_Internal_Rela *tsec_relocs, *tsec_relend, *tsec_free, *gpdisp;
+      bfd_vma ofs;

 
 

-      gsh = hs->got_entries;
-      for (gi = hi->got_entries; gi ; gi = gin)
+      /* Load the relocations from the section that the target symbol is in.  */
+      if (info->sec == info->tsec)

        {
        {

-         gin = gi->next;
-         for (gs = gsh; gs ; gs = gs->next)
-           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:;
+         tsec_relocs = info->relocs;
+         tsec_relend = info->relend;
+         tsec_free = NULL;
+       }
+      else
+       {
+         tsec_relocs = (_bfd_elf_link_read_relocs
+                        (info->abfd, info->tsec, NULL,
+                        (Elf_Internal_Rela *) NULL,
+                        info->link_info->keep_memory));
+         if (tsec_relocs == NULL)
+           return 0;
+         tsec_relend = tsec_relocs + info->tsec->reloc_count;
+         tsec_free = (info->link_info->keep_memory ? NULL : tsec_relocs);

        }
        }

-    }
-  hi->got_entries = NULL;

 
 

-  /* And similar for the reloc entries.  */
+      /* Recover the symbol's offset within the section.  */
+      ofs = (symval - info->tsec->output_section->vma
+            - info->tsec->output_offset);

 
 

-  if (hs->reloc_entries == NULL)
-    hs->reloc_entries = hi->reloc_entries;
-  else
-    {
-      struct alpha_elf_reloc_entry *ri, *rs, *rin, *rsh;
+      /* Look for a GPDISP reloc.  */
+      gpdisp = (elf64_alpha_find_reloc_at_ofs
+               (tsec_relocs, tsec_relend, ofs, R_ALPHA_GPDISP));

 
 

-      rsh = hs->reloc_entries;
-      for (ri = hi->reloc_entries; ri ; ri = rin)
+      if (!gpdisp || gpdisp->r_addend != 4)

        {
        {

-         rin = ri->next;
-         for (rs = rsh; rs ; rs = rs->next)
-           if (ri->rtype == rs->rtype && ri->srel == rs->srel)
-             {
-               rs->count += ri->count;
-               goto found_reloc;
-             }
-         ri->next = hs->reloc_entries;
-         hs->reloc_entries = ri;
-       found_reloc:;
+         if (tsec_free)
+           free (tsec_free);
+         return 0;

        }
        }

+      if (tsec_free)
+        free (tsec_free);

     }
     }

-  hi->reloc_entries = NULL;

 
 

-  return TRUE;
-}
+  /* We've now determined that we can skip an initial gp load.  Verify
+     that the call and the target use the same gp.   */
+  if (info->link_info->output_bfd->xvec != info->tsec->owner->xvec
+      || info->gotobj != alpha_elf_tdata (info->tsec->owner)->gotobj)
+    return 0;

 
 

-/* Is it possible to merge two object file's .got tables?  */
+  return symval + 8;
+}

 
 static bfd_boolean
 
 static bfd_boolean

-elf64_alpha_can_merge_gots (a, b)
-     bfd *a, *b;
+elf64_alpha_relax_with_lituse (struct alpha_relax_info *info,
+                              bfd_vma symval, Elf_Internal_Rela *irel)

 {
 {

-  int total = alpha_elf_tdata (a)->total_got_size;
-  bfd *bsub;
-
-  /* Trivial quick fallout test.  */
-  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)->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
-     we don't have to store undo information in case we fail.  */
-  for (bsub = b; bsub ; bsub = alpha_elf_tdata (bsub)->in_got_link_next)
-    {
-      struct alpha_elf_link_hash_entry **hashes = alpha_elf_sym_hashes (bsub);
-      Elf_Internal_Shdr *symtab_hdr = &elf_tdata (bsub)->symtab_hdr;
-      int i, n;
-
-      n = NUM_SHDR_ENTRIES (symtab_hdr) - symtab_hdr->sh_info;
-      for (i = 0; i < n; ++i)
-       {
-         struct alpha_elf_got_entry *ae, *be;
-         struct alpha_elf_link_hash_entry *h;
-
-         h = hashes[i];
-         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;
-
-         for (be = h->got_entries; be ; be = be->next)
-           {
-             if (be->use_count == 0)
-               continue;
-             if (be->gotobj != b)
-               continue;
-
-             for (ae = h->got_entries; ae ; ae = ae->next)
-               if (ae->gotobj == a
-                   && ae->reloc_type == be->reloc_type
-                   && ae->addend == be->addend)
-                 goto global_found;
+  Elf_Internal_Rela *urel, *erel, *irelend = info->relend;
+  int flags;
+  bfd_signed_vma disp;
+  bfd_boolean fits16;
+  bfd_boolean fits32;
+  bfd_boolean lit_reused = FALSE;
+  bfd_boolean all_optimized = TRUE;
+  bfd_boolean changed_contents;
+  bfd_boolean changed_relocs;
+  bfd_byte *contents = info->contents;
+  bfd *abfd = info->abfd;
+  bfd_vma sec_output_vma;
+  unsigned int lit_insn;
+  int relax_pass;

 
 

-             total += alpha_got_entry_size (be->reloc_type);
-             if (total > MAX_GOT_SIZE)
-               return FALSE;
-           global_found:;
-           }
-       }
+  lit_insn = bfd_get_32 (abfd, contents + irel->r_offset);
+  if (lit_insn >> 26 != OP_LDQ)
+    {
+      ((*_bfd_error_handler)
+       ("%B: %A+0x%lx: warning: LITERAL relocation against unexpected insn",
+       abfd, info->sec,
+       (unsigned long) irel->r_offset));
+      return TRUE;

     }
 
     }
 

-  return TRUE;
-}
+  /* Can't relax dynamic symbols.  */
+  if (alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info))
+    return TRUE;

 
 

-/* Actually merge two .got tables.  */
+  changed_contents = info->changed_contents;
+  changed_relocs = info->changed_relocs;
+  sec_output_vma = info->sec->output_section->vma + info->sec->output_offset;
+  relax_pass = info->link_info->relax_pass;

 
 

-static void
-elf64_alpha_merge_gots (a, b)
-     bfd *a, *b;
-{
-  int total = alpha_elf_tdata (a)->total_got_size;
-  bfd *bsub;
+  /* Summarize how this particular LITERAL is used.  */
+  for (erel = irel+1, flags = 0; erel < irelend; ++erel)
+    {
+      if (ELF64_R_TYPE (erel->r_info) != R_ALPHA_LITUSE)
+       break;
+      if (erel->r_addend <= 6)
+       flags |= 1 << erel->r_addend;
+    }

 
 

-  /* Remember local expansion.  */
-  {
-    int e = alpha_elf_tdata (b)->local_got_size;
-    total += e;
-    alpha_elf_tdata (a)->local_got_size += e;
-  }
+  /* A little preparation for the loop...  */
+  disp = symval - info->gp;

 
 

-  for (bsub = b; bsub ; bsub = alpha_elf_tdata (bsub)->in_got_link_next)
+  for (urel = irel+1; urel < erel; ++urel)

     {
     {

-      struct alpha_elf_got_entry **local_got_entries;
-      struct alpha_elf_link_hash_entry **hashes;
-      Elf_Internal_Shdr *symtab_hdr;
-      int i, n;
+      bfd_vma urel_r_offset = urel->r_offset;
+      unsigned int insn;
+      int insn_disp;
+      bfd_signed_vma xdisp;
+      Elf_Internal_Rela nrel;

 
 

-      /* Let the local .got entries know they are part of a new subsegment.  */
-      local_got_entries = alpha_elf_tdata (bsub)->local_got_entries;
-      if (local_got_entries)
-        {
-         n = elf_tdata (bsub)->symtab_hdr.sh_info;
-         for (i = 0; i < n; ++i)
+      insn = bfd_get_32 (abfd, contents + urel_r_offset);
+
+      switch (urel->r_addend)
+       {
+       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;
+         break;
+
+       case LITUSE_ALPHA_BASE:
+         /* We may only create GPREL relocs during the second pass.  */
+         if (relax_pass == 0)

            {
            {

-             struct alpha_elf_got_entry *ent;
-             for (ent = local_got_entries[i]; ent; ent = ent->next)
-               ent->gotobj = a;
+             all_optimized = FALSE;
+             break;

            }
            }

-        }

 
 

-      /* Merge the global .got entries.  */
-      hashes = alpha_elf_sym_hashes (bsub);
-      symtab_hdr = &elf_tdata (bsub)->symtab_hdr;
+         /* We can always optimize 16-bit displacements.  */

 
 

-      n = NUM_SHDR_ENTRIES (symtab_hdr) - symtab_hdr->sh_info;
-      for (i = 0; i < n; ++i)
-        {
-         struct alpha_elf_got_entry *ae, *be, **pbe, **start;
-         struct alpha_elf_link_hash_entry *h;
+         /* 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 & 0xffff) ^ 0x8000) - 0x8000;

 
 

-         h = hashes[i];
-         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;
+         xdisp = disp + insn_disp;
+         fits16 = (xdisp >= - (bfd_signed_vma) 0x8000 && xdisp < 0x8000);
+         fits32 = (xdisp >= - (bfd_signed_vma) 0x80000000
+                   && xdisp < 0x7fff8000);

 
 

-         start = &h->got_entries;
-         for (pbe = start, be = *start; be ; pbe = &be->next, be = be->next)
+         if (fits16)

            {
            {

-             if (be->use_count == 0)
-               {
-                 *pbe = be->next;
-                 continue;
-               }
-             if (be->gotobj != b)
-               continue;
-
-             for (ae = *start; ae ; ae = ae->next)
-               if (ae->gotobj == a
-                   && ae->reloc_type == be->reloc_type
-                   && ae->addend == be->addend)
-                 {
-                   ae->flags |= be->flags;
-                   ae->use_count += be->use_count;
-                   *pbe = be->next;
-                   goto global_found;
-                 }
-             be->gotobj = a;
-             total += alpha_got_entry_size (be->reloc_type);
-
-           global_found:;
+             /* Take the op code and dest from this insn, take the base
+                register from the literal insn.  Leave the offset alone.  */
+             insn = (insn & 0xffe0ffff) | (lit_insn & 0x001f0000);
+             bfd_put_32 (abfd, (bfd_vma) insn, contents + urel_r_offset);
+             changed_contents = TRUE;
+
+             nrel = *urel;
+             nrel.r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
+                                         R_ALPHA_GPREL16);
+             nrel.r_addend = irel->r_addend;
+
+             /* As we adjust, move the reloc to the end so that we don't
+                break the LITERAL+LITUSE chain.  */
+             if (urel < --erel)
+               *urel-- = *erel;
+             *erel = nrel;
+             changed_relocs = TRUE;

            }
            }

-        }
-
-      alpha_elf_tdata (bsub)->gotobj = a;
-    }
-  alpha_elf_tdata (a)->total_got_size = total;
-
-  /* Merge the two in_got chains.  */
-  {
-    bfd *next;

 
 

-    bsub = a;
-    while ((next = alpha_elf_tdata (bsub)->in_got_link_next) != NULL)
-      bsub = next;
+         /* If all mem+byte, we can optimize 32-bit mem displacements.  */
+         else if (fits32 && !(flags & ~6))
+           {
+             /* FIXME: sanity check that lit insn Ra is mem insn Rb.  */

 
 

-    alpha_elf_tdata (bsub)->in_got_link_next = b;
-  }
-}
+             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 (abfd, (bfd_vma) lit_insn, contents + irel->r_offset);
+             lit_reused = TRUE;
+             changed_contents = TRUE;

 
 

-/* Calculate the offsets for the got entries.  */
+              /* Since all relocs must be optimized, don't bother swapping
+                this relocation to the end.  */
+             urel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
+                                          R_ALPHA_GPRELLOW);
+             urel->r_addend = irel->r_addend;
+             changed_relocs = TRUE;
+           }
+         else
+           all_optimized = FALSE;
+         break;

 
 

-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;
+       case LITUSE_ALPHA_BYTOFF:
+         /* We can always optimize byte instructions.  */

 
 

-  if (h->root.root.type == bfd_link_hash_warning)
-    h = (struct alpha_elf_link_hash_entry *) h->root.root.u.i.link;
+         /* FIXME: sanity check the insn for byte op.  Check that the
+            literal dest reg is indeed Rb in the byte insn.  */

 
 

-  for (gotent = h->got_entries; gotent; gotent = gotent->next)
-    if (gotent->use_count > 0)
-      {
-       struct alpha_elf_obj_tdata *td;
-       bfd_size_type *plge;
+         insn &= ~ (unsigned) 0x001ff000;
+         insn |= ((symval & 7) << 13) | 0x1000;
+         bfd_put_32 (abfd, (bfd_vma) insn, contents + urel_r_offset);
+         changed_contents = TRUE;
+
+         nrel = *urel;
+         nrel.r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+         nrel.r_addend = 0;
+
+         /* As we adjust, move the reloc to the end so that we don't
+            break the LITERAL+LITUSE chain.  */
+         if (urel < --erel)
+           *urel-- = *erel;
+         *erel = nrel;
+         changed_relocs = TRUE;
+         break;

 
 

-       td = alpha_elf_tdata (gotent->gotobj);
-       if (td == NULL)
+       case LITUSE_ALPHA_JSR:
+       case LITUSE_ALPHA_TLSGD:
+       case LITUSE_ALPHA_TLSLDM:
+       case LITUSE_ALPHA_JSRDIRECT:

          {
          {

-           _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->size;
-       gotent->got_offset = *plge;
-       *plge += alpha_got_entry_size (gotent->reloc_type);
-      }
-
-  return result;
-}
-
-static void
-elf64_alpha_calc_got_offsets (info)
-     struct bfd_link_info *info;
-{
-  bfd *i, *got_list = alpha_elf_hash_table(info)->got_list;
-
-  /* First, zero out the .got sizes, as we may be recalculating the
-     .got after optimizing it.  */
-  for (i = got_list; i ; i = alpha_elf_tdata(i)->got_link_next)
-    alpha_elf_tdata(i)->got->size = 0;
-
-  /* Next, fill in the offsets for all the global entries.  */
-  alpha_elf_link_hash_traverse (alpha_elf_hash_table (info),
-                               elf64_alpha_calc_got_offsets_for_symbol,
-                               NULL);
-
-  /* Finally, fill in the offsets for the local entries.  */
-  for (i = got_list; i ; i = alpha_elf_tdata(i)->got_link_next)
-    {
-      bfd_size_type got_offset = alpha_elf_tdata(i)->got->size;
-      bfd *j;
-
-      for (j = i; j ; j = alpha_elf_tdata(j)->in_got_link_next)
-       {
-         struct alpha_elf_got_entry **local_got_entries, *gotent;
-         int k, n;
+           bfd_vma optdest, org;
+           bfd_signed_vma odisp;

 
 

-         local_got_entries = alpha_elf_tdata(j)->local_got_entries;
-         if (!local_got_entries)
-           continue;
+           /* For undefined weak symbols, we're mostly interested in getting
+              rid of the got entry whenever possible, so optimize this to a
+              use of the zero register.  */
+           if (info->h && info->h->root.root.type == bfd_link_hash_undefweak)
+             {
+               insn |= 31 << 16;
+               bfd_put_32 (abfd, (bfd_vma) insn, contents + urel_r_offset);

 
 

-         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)
-               {
-                 gotent->got_offset = got_offset;
-                 got_offset += alpha_got_entry_size (gotent->reloc_type);
-               }
-       }
+               changed_contents = TRUE;
+               break;
+             }

 
 

-      alpha_elf_tdata(i)->got->size = got_offset;
-    }
-}
+           /* If not zero, place to jump without needing pv.  */
+           optdest = elf64_alpha_relax_opt_call (info, symval);
+           org = sec_output_vma + urel_r_offset + 4;
+           odisp = (optdest ? optdest : symval) - org;

 
 

-/* Constructs the gots.  */
+           if (odisp >= -0x400000 && odisp < 0x400000)
+             {
+               Elf_Internal_Rela *xrel;

 
 

-static bfd_boolean
-elf64_alpha_size_got_sections (info)
-     struct bfd_link_info *info;
-{
-  bfd *i, *got_list, *cur_got_obj = NULL;
-  int something_changed = 0;
+               /* Preserve branch prediction call stack when possible.  */
+               if ((insn & INSN_JSR_MASK) == INSN_JSR)
+                 insn = (OP_BSR << 26) | (insn & 0x03e00000);
+               else
+                 insn = (OP_BR << 26) | (insn & 0x03e00000);
+               bfd_put_32 (abfd, (bfd_vma) insn, contents + urel_r_offset);
+               changed_contents = TRUE;

 
 

-  got_list = alpha_elf_hash_table (info)->got_list;
+               nrel = *urel;
+               nrel.r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
+                                           R_ALPHA_BRADDR);
+               nrel.r_addend = irel->r_addend;

 
 

-  /* On the first time through, pretend we have an existing got list
-     consisting of all of the input files.  */
-  if (got_list == NULL)
-    {
-      for (i = info->input_bfds; i ; i = i->link_next)
-       {
-         bfd *this_got = alpha_elf_tdata (i)->gotobj;
-         if (this_got == NULL)
-           continue;
+               if (optdest)
+                 nrel.r_addend += optdest - symval;
+               else
+                 all_optimized = FALSE;

 
 

-         /* We are assuming no merging has yet occurred.  */
-         BFD_ASSERT (this_got == i);
+               /* Kill any HINT reloc that might exist for this insn.  */
+               xrel = (elf64_alpha_find_reloc_at_ofs
+                       (info->relocs, info->relend, urel_r_offset,
+                        R_ALPHA_HINT));
+               if (xrel)
+                 xrel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);

 
 

-          if (alpha_elf_tdata (this_got)->total_got_size > MAX_GOT_SIZE)
-           {
-             /* Yikes! A single object file has too many entries.  */
-             (*_bfd_error_handler)
-               (_("%B: .got subsegment exceeds 64K (size %d)"),
-                i, alpha_elf_tdata (this_got)->total_got_size);
-             return FALSE;
-           }
+               /* As we adjust, move the reloc to the end so that we don't
+                  break the LITERAL+LITUSE chain.  */
+               if (urel < --erel)
+                 *urel-- = *erel;
+               *erel = nrel;

 
 

-         if (got_list == NULL)
-           got_list = this_got;
-         else
-           alpha_elf_tdata(cur_got_obj)->got_link_next = this_got;
-         cur_got_obj = this_got;
-       }
+               info->changed_relocs = TRUE;
+             }
+           else
+             all_optimized = FALSE;

 
 

-      /* Strange degenerate case of no got references.  */
-      if (got_list == NULL)
-       return TRUE;
+           /* Even if the target is not in range for a direct branch,
+              if we share a GP, we can eliminate the gp reload.  */
+           if (optdest)
+             {
+               Elf_Internal_Rela *gpdisp
+                 = (elf64_alpha_find_reloc_at_ofs
+                    (info->relocs, irelend, urel_r_offset + 4,
+                     R_ALPHA_GPDISP));
+               if (gpdisp)
+                 {
+                   bfd_byte *p_ldah = contents + gpdisp->r_offset;
+                   bfd_byte *p_lda = p_ldah + gpdisp->r_addend;
+                   unsigned int ldah = bfd_get_32 (abfd, p_ldah);
+                   unsigned int lda = bfd_get_32 (abfd, p_lda);

 
 

-      alpha_elf_hash_table (info)->got_list = got_list;
+                   /* Verify that the instruction is "ldah $29,0($26)".
+                      Consider a function that ends in a noreturn call,
+                      and that the next function begins with an ldgp,
+                      and that by accident there is no padding between.
+                      In that case the insn would use $27 as the base.  */
+                   if (ldah == 0x27ba0000 && lda == 0x23bd0000)
+                     {
+                       bfd_put_32 (abfd, (bfd_vma) INSN_UNOP, p_ldah);
+                       bfd_put_32 (abfd, (bfd_vma) INSN_UNOP, p_lda);

 
 

-      /* Force got offsets to be recalculated.  */
-      something_changed = 1;
+                       gpdisp->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+                       changed_contents = TRUE;
+                       changed_relocs = TRUE;
+                     }
+                 }
+             }
+         }
+         break;
+       }

     }
 
     }
 

-  cur_got_obj = got_list;
-  i = alpha_elf_tdata(cur_got_obj)->got_link_next;
-  while (i != NULL)
+  /* If we reused the literal instruction, we must have optimized all.  */
+  BFD_ASSERT(!lit_reused || all_optimized);
+
+  /* If all cases were optimized, we can reduce the use count on this
+     got entry by one, possibly eliminating it.  */
+  if (all_optimized)

     {
     {

-      if (elf64_alpha_can_merge_gots (cur_got_obj, i))
+      if (--info->gotent->use_count == 0)

        {
        {

-         elf64_alpha_merge_gots (cur_got_obj, i);
-         i = alpha_elf_tdata(i)->got_link_next;
-         alpha_elf_tdata(cur_got_obj)->got_link_next = i;
-         something_changed = 1;
+         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;

        }
        }

-      else
+
+      /* 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,
+        so just nop it out.  */
+      if (!lit_reused)

        {
        {

-         cur_got_obj = i;
-         i = alpha_elf_tdata(i)->got_link_next;
+         irel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+         changed_relocs = TRUE;
+
+         bfd_put_32 (abfd, (bfd_vma) INSN_UNOP, contents + irel->r_offset);
+         changed_contents = TRUE;

        }
     }
 
        }
     }
 

-  /* Once the gots have been merged, fill in the got offsets for
-     everything therein.  */
-  if (1 || something_changed)
-    elf64_alpha_calc_got_offsets (info);
+  info->changed_contents = changed_contents;
+  info->changed_relocs = changed_relocs;

 
 

-  return TRUE;
+  if (all_optimized || relax_pass == 0)
+    return TRUE;
+  return elf64_alpha_relax_got_load (info, symval, irel, R_ALPHA_LITERAL);

 }
 
 }
 

-/* Called from relax_section to rebuild the PLT in light of
-   potential changes in the function's status.  */
-

 static bfd_boolean
 static bfd_boolean

-elf64_alpha_size_plt_section (info)
-     struct bfd_link_info *info;
+elf64_alpha_relax_tls_get_addr (struct alpha_relax_info *info, bfd_vma symval,
+                               Elf_Internal_Rela *irel, bfd_boolean is_gd)

 {
 {

-  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;
+  bfd_byte *pos[5];
+  unsigned int insn, tlsgd_reg;
+  Elf_Internal_Rela *gpdisp, *hint;
+  bfd_boolean dynamic, use_gottprel;
+  unsigned long new_symndx;

 
 

-  splt->size = 0;
+  dynamic = alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info);

 
 

-  alpha_elf_link_hash_traverse (alpha_elf_hash_table (info),
-                               elf64_alpha_size_plt_section_1, splt);
+  /* 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))
+    ;

 
 

-  /* Every plt entry requires a JMP_SLOT relocation.  */
-  spltrel = bfd_get_section_by_name (dynobj, ".rela.plt");
-  if (splt->size)
-    entries = (splt->size - PLT_HEADER_SIZE) / PLT_ENTRY_SIZE;
-  else
-    entries = 0;
-  spltrel->size = entries * sizeof (Elf64_External_Rela);
+  /* If the symbol is local, and we've already committed to DF_STATIC_TLS,
+     then we might as well relax to IE.  */
+  else if (bfd_link_pic (info->link_info) && !dynamic
+          && (info->link_info->flags & DF_STATIC_TLS))
+    ;

 
 

-  return TRUE;
-}
+  /* Otherwise we must be building an executable to do anything.  */
+  else if (bfd_link_pic (info->link_info))
+    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;
+  /* 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;

 
 

-  /* If we didn't need an entry before, we still don't.  */
-  if (!h->root.needs_plt)
+  /* 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;
 
     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;
+  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;
+
+  /* Beware of the compiler hoisting part of the sequence out a loop
+     and adjusting the destination register for the TLSGD insn.  If this
+     happens, there will be a move into $16 before the JSR insn, so only
+     transformations of the first insn pair should use this register.  */
+  tlsgd_reg = bfd_get_32 (info->abfd, pos[0]);
+  tlsgd_reg = (tlsgd_reg >> 21) & 31;

 
 

-  /* If there is, reset the PLT offset.  If not, there's no longer
-     a need for the PLT entry.  */
-  if (gotent)
+  /* 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])

     {
     {

-      if (splt->size == 0)
-       splt->size = PLT_HEADER_SIZE;
-      h->root.plt.offset = splt->size;
-      splt->size += PLT_ENTRY_SIZE;
+      bfd_byte *tmp = pos[0];
+      pos[0] = pos[1];
+      pos[1] = tmp;

     }
     }

-  else
-    {
-      h->root.needs_plt = 0;
-      h->root.plt.offset = -1;
+  if (pos[1] >= pos[2] || pos[2] >= pos[3])
+    return TRUE;

 
 

-      /* 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;
-       }
-    }
+  /* 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;

 
 

-  return TRUE;
-}
+    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];

 
 

-static bfd_boolean
-elf64_alpha_always_size_sections (output_bfd, info)
-     bfd *output_bfd ATTRIBUTE_UNUSED;
-     struct bfd_link_info *info;
-{
-  bfd *i;
+    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;

 
 

-  if (info->relocatable)
-    return TRUE;
+    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);

 
 

-  /* 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 (--lit_gotent->use_count == 0)
+      {
+       int sz = alpha_got_entry_size (R_ALPHA_LITERAL);
+       alpha_elf_tdata (info->gotobj)->total_got_size -= sz;
+      }
+  }

 
 

-  if (!elf64_alpha_size_got_sections (info))
-    return FALSE;
+  /* Change

 
 

-  /* Allocate space for all of the .got subsections.  */
-  i = alpha_elf_hash_table (info)->got_list;
-  for ( ; i ; i = alpha_elf_tdata(i)->got_link_next)
-    {
-      asection *s = alpha_elf_tdata(i)->got;
-      if (s->size > 0)
-       {
-         s->contents = (bfd_byte *) bfd_zalloc (i, s->size);
-         if (s->contents == NULL)
-           return FALSE;
-       }
-    }
+       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

 
 

-  return TRUE;
-}
+     as appropriate.  */

 
 

-/* The number of dynamic relocations required by a static relocation.  */
+  use_gottprel = FALSE;
+  new_symndx = is_gd ? ELF64_R_SYM (irel->r_info) : STN_UNDEF;

 
 

-static int
-alpha_dynamic_entries_for_reloc (r_type, dynamic, shared)
-     int r_type, dynamic, shared;
-{
-  switch (r_type)
+  /* Some compilers warn about a Boolean-looking expression being
+     used in a switch.  The explicit cast silences them.  */
+  switch ((int) (!dynamic && !bfd_link_pic (info->link_info)))

     {
     {

-    /* 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;
+    case 1:
+      {
+       bfd_vma tp_base;
+       bfd_signed_vma disp;

 
 

-    /* May appear in data sections.  */
-    case R_ALPHA_REFLONG:
-    case R_ALPHA_REFQUAD:
-    case R_ALPHA_TPREL64:
-      return dynamic || shared;
+       BFD_ASSERT (elf_hash_table (info->link_info)->tls_sec != NULL);
+       tp_base = alpha_get_tprel_base (info->link_info);
+       disp = symval - tp_base;

 
 

-    /* Everything else is illegal.  We'll issue an error during
-       relocate_section.  */
-    default:
-      return 0;
-    }
-}
+       if (disp >= -0x8000 && disp < 0x8000)
+         {
+           insn = (OP_LDA << 26) | (tlsgd_reg << 21) | (31 << 16);
+           bfd_put_32 (info->abfd, (bfd_vma) insn, pos[0]);
+           bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos[1]);

 
 

-/* Work out the sizes of the dynamic relocation entries.  */
+           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
+                && pos[0] + 4 == pos[1])
+         {
+           insn = (OP_LDAH << 26) | (tlsgd_reg << 21) | (31 << 16);
+           bfd_put_32 (info->abfd, (bfd_vma) insn, pos[0]);
+           insn = (OP_LDA << 26) | (tlsgd_reg << 21) | (tlsgd_reg << 16);
+           bfd_put_32 (info->abfd, (bfd_vma) insn, pos[1]);

 
 

-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;
+           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 */

 
 

-  if (h->root.root.type == bfd_link_hash_warning)
-    h = (struct alpha_elf_link_hash_entry *) h->root.root.u.i.link;
+    default:
+      use_gottprel = TRUE;

 
 

-  /* 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
-     section but the ELF_LINK_HASH_DEF_REGULAR flag will not have been
-     set.  This is done for dynamic symbols in
-     elf_adjust_dynamic_symbol but this is not done for non-dynamic
-     symbols, somehow.  */
-  if (!h->root.def_regular
-      && h->root.ref_regular
-      && !h->root.def_dynamic
-      && (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.def_regular = 1;
+      insn = (OP_LDQ << 26) | (tlsgd_reg << 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;
+    }

 
 

-  /* 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.  */
+  bfd_put_32 (info->abfd, (bfd_vma) INSN_RDUNIQ, pos[2]);

 
 

-  dynamic = alpha_elf_dynamic_symbol_p (&h->root, info);
+  insn = INSN_ADDQ | (16 << 21) | (0 << 16) | (0 << 0);
+  bfd_put_32 (info->abfd, (bfd_vma) insn, pos[3]);

 
 

-  for (relent = h->reloc_entries; relent; relent = relent->next)
-    {
-      entries = alpha_dynamic_entries_for_reloc (relent->rtype, dynamic,
-                                                info->shared);
-      if (entries)
-       {
-         relent->srel->size +=
-           entries * sizeof (Elf64_External_Rela) * relent->count;
-         if (relent->reltext)
-           info->flags |= DT_TEXTREL;
-       }
-    }
+  bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos[4]);

 
 

-  return TRUE;
-}
+  irel[2].r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+  gpdisp->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);

 
 

-/* Set the sizes of the dynamic relocation sections.  */
+  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);

 
 

-static bfd_boolean
-elf64_alpha_size_rela_got_section (info)
-     struct bfd_link_info *info;
-{
-  unsigned long entries;
-  bfd *i, *dynobj;
-  asection *srel;
+  info->changed_contents = TRUE;
+  info->changed_relocs = TRUE;

 
 

-  /* Shared libraries often require RELATIVE relocs, and some relocs
-     require attention for the main application as well.  */
+  /* 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;
+    }

 
 

-  entries = 0;
-  for (i = alpha_elf_hash_table(info)->got_list;
-       i ; i = alpha_elf_tdata(i)->got_link_next)
+  /* If we've switched to a GOTTPREL relocation, increment the reference
+     count on that got entry.  */
+  if (use_gottprel)

     {
     {

-      bfd *j;
+      struct alpha_elf_got_entry *tprel_gotent;

 
 

-      for (j = i; j ; j = alpha_elf_tdata(j)->in_got_link_next)
+      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

        {
        {

-         struct alpha_elf_got_entry **local_got_entries, *gotent;
-         int k, n;
+         if (info->gotent->use_count == 0)
+           tprel_gotent = info->gotent;
+         else
+           {
+             tprel_gotent = (struct alpha_elf_got_entry *)
+               bfd_alloc (info->abfd, sizeof (struct alpha_elf_got_entry));
+             if (!tprel_gotent)
+               return FALSE;

 
 

-         local_got_entries = alpha_elf_tdata(j)->local_got_entries;
-         if (!local_got_entries)
-           continue;
+             tprel_gotent->next = *info->first_gotent;
+             *info->first_gotent = tprel_gotent;

 
 

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

 
 

-  dynobj = elf_hash_table(info)->dynobj;
-  srel = bfd_get_section_by_name (dynobj, ".rela.got");
-  if (!srel)
-    {
-      BFD_ASSERT (entries == 0);
-      return TRUE;
+         tprel_gotent->use_count = 1;
+         tprel_gotent->reloc_type = R_ALPHA_GOTTPREL;
+       }

     }
     }

-  srel->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);

 
   return TRUE;
 }
 
 
   return TRUE;
 }
 

-/* Subroutine of elf64_alpha_size_rela_got_section for doing the
-   global symbols.  */
-

 static bfd_boolean
 static bfd_boolean

-elf64_alpha_size_rela_got_1 (h, info)
-     struct alpha_elf_link_hash_entry *h;
-     struct bfd_link_info *info;
+elf64_alpha_relax_section (bfd *abfd, asection *sec,
+                          struct bfd_link_info *link_info, bfd_boolean *again)

 {
 {

-  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;
+  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;
+  struct alpha_elf_link_hash_table * htab;
+  int relax_pass;

 
 

-  /* 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.  */
+  htab = alpha_elf_hash_table (link_info);
+  if (htab == NULL)
+    return FALSE;

 
 

-  dynamic = alpha_elf_dynamic_symbol_p (&h->root, info);
+  /* There's nothing to change, yet.  */
+  *again = FALSE;

 
 

-  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 (bfd_link_relocatable (link_info)
+      || ((sec->flags & (SEC_CODE | SEC_RELOC | SEC_ALLOC))
+         != (SEC_CODE | SEC_RELOC | SEC_ALLOC))
+      || sec->reloc_count == 0)
+    return TRUE;

 
 

-  /* 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--;
+  BFD_ASSERT (is_alpha_elf (abfd));
+  relax_pass = link_info->relax_pass;

 
 

-  if (entries > 0)
+  /* Make sure our GOT and PLT tables are up-to-date.  */
+  if (htab->relax_trip != link_info->relax_trip)

     {
     {

-      bfd *dynobj = elf_hash_table(info)->dynobj;
-      asection *srel = bfd_get_section_by_name (dynobj, ".rela.got");
-      BFD_ASSERT (srel != NULL);
-      srel->size += sizeof (Elf64_External_Rela) * entries;
+      htab->relax_trip = link_info->relax_trip;
+
+      /* This should never fail after the initial round, since the only error
+         is GOT overflow, and relaxation only shrinks the table.  However, we
+        may only merge got sections during the first pass.  If we merge
+        sections after we've created GPREL relocs, the GP for the merged
+        section backs up which may put the relocs out of range.  */
+      if (!elf64_alpha_size_got_sections (link_info, relax_pass == 0))
+       abort ();
+      if (elf_hash_table (link_info)->dynamic_sections_created)
+       {
+         elf64_alpha_size_plt_section (link_info);
+         elf64_alpha_size_rela_got_section (link_info);
+       }

     }
 
     }
 

-  return TRUE;
-}
+  symtab_hdr = &elf_symtab_hdr (abfd);
+  local_got_entries = alpha_elf_tdata(abfd)->local_got_entries;

 
 

-/* Set the sizes of the dynamic sections.  */
+  /* Load the relocations for this section.  */
+  internal_relocs = (_bfd_elf_link_read_relocs
+                    (abfd, sec, NULL, (Elf_Internal_Rela *) NULL,
+                     link_info->keep_memory));
+  if (internal_relocs == NULL)
+    return FALSE;

 
 

-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;
-  bfd_boolean relplt;
+  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;

 
 

-  dynobj = elf_hash_table(info)->dynobj;
-  BFD_ASSERT(dynobj != NULL);
+  /* 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);
+    }

 
 

-  if (elf_hash_table (info)->dynamic_sections_created)
+  /* Get the section contents.  */
+  if (elf_section_data (sec)->this_hdr.contents != NULL)
+    info.contents = elf_section_data (sec)->this_hdr.contents;
+  else

     {
     {

-      /* Set the contents of the .interp section to the interpreter.  */
-      if (info->executable)
+      if (!bfd_malloc_and_get_section (abfd, sec, &info.contents))
+       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.  */
+      if (r_type != R_ALPHA_LITERAL)
+        {
+          /* We complete everything except LITERAL in the first pass.  */
+         if (relax_pass != 0)
+           continue;
+         if (r_type == R_ALPHA_TLSLDM)
+           {
+             /* The symbol for a TLSLDM reloc is ignored.  Collapse the
+                 reloc to the STN_UNDEF (0) symbol so that they all match.  */
+             r_symndx = STN_UNDEF;
+           }
+         else if (r_type != R_ALPHA_GOTDTPREL
+                  && r_type != R_ALPHA_GOTTPREL
+                  && r_type != R_ALPHA_TLSGD)
+           continue;
+       }
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (r_symndx < symtab_hdr->sh_info)

        {
        {

-         s = bfd_get_section_by_name (dynobj, ".interp");
-         BFD_ASSERT (s != NULL);
-         s->size = sizeof ELF_DYNAMIC_INTERPRETER;
-         s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
+         /* A local symbol.  */
+         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
+           {
+             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;
+         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;

 
 

-      /* Now that we've seen all of the input files, we can decide which
-        symbols need dynamic relocation entries and which don't.  We've
-        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);
+         indx = r_symndx - symtab_hdr->sh_info;
+         h = alpha_elf_sym_hashes (abfd)[indx];
+         BFD_ASSERT (h != NULL);

 
 

-      elf64_alpha_size_rela_got_section (info);
-    }
-  /* else we're not dynamic and by definition we don't need such things.  */
+         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;

 
 

-  /* The check_relocs and adjust_dynamic_symbol entry points have
-     determined the sizes of the various dynamic sections.  Allocate
-     memory for them.  */
-  relplt = FALSE;
-  for (s = dynobj->sections; s != NULL; s = s->next)
-    {
-      const char *name;
-      bfd_boolean strip;
+         /* If the symbol is undefined, we can't do anything with it.  */
+         if (h->root.root.type == bfd_link_hash_undefined)
+           continue;

 
 

-      if (!(s->flags & SEC_LINKER_CREATED))
-       continue;
+         /* If the symbol isn't defined in the current module,
+            again we can't do anything.  */
+         if (h->root.root.type == bfd_link_hash_undefweak)
+           {
+             info.tsec = bfd_abs_section_ptr;
+             symval = 0;
+           }
+         else if (!h->root.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;
+           }

 
 

-      /* It's OK to base decisions on the section name, because none
-        of the dynobj section names depend upon the input files.  */
-      name = bfd_get_section_name (dynobj, s);
+         info.h = h;
+         info.other = h->root.other;
+         info.first_gotent = &h->got_entries;
+       }

 
 

-      /* If we don't need this section, strip it from the output file.
-        This is to handle .rela.bss and .rela.plt.  We must create it
-        in create_dynamic_sections, because it must be created before
-        the linker maps input sections to output sections.  The
-        linker does that before adjust_dynamic_symbol is called, and
-        it is that function which decides whether anything needs to
-        go into these sections.  */
+      /* Search for the got entry to be used by this relocation.  */
+      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;

 
 

-      strip = FALSE;
+      symval += info.tsec->output_section->vma + info.tsec->output_offset;
+      symval += irel->r_addend;

 
 

-      if (strncmp (name, ".rela", 5) == 0)
+      switch (r_type)

        {
        {

-         strip = (s->size == 0);
+       case R_ALPHA_LITERAL:
+         BFD_ASSERT(info.gotent != NULL);

 
 

-         if (!strip)
+         /* 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 (strcmp(name, ".rela.plt") == 0)
-               relplt = TRUE;
-
-             /* We use the reloc_count field as a counter if we need
-                to copy relocs into the output file.  */
-             s->reloc_count = 0;
+             if (!elf64_alpha_relax_with_lituse (&info, symval, irel))
+               goto error_return;

            }
            }

-       }
-      else if (strcmp (name, ".plt") != 0)
-       {
-         /* It's not one of our dynamic sections, so don't allocate space.  */
-         continue;
-       }
+         else
+           {
+             if (!elf64_alpha_relax_got_load (&info, symval, irel, r_type))
+               goto error_return;
+           }
+         break;

 
 

-      if (strip)
-       s->flags |= SEC_EXCLUDE;
-      else
-       {
-         /* Allocate memory for the section contents.  */
-         s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size);
-         if (s->contents == NULL && s->size != 0)
-           return FALSE;
+       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 (elf_hash_table (info)->dynamic_sections_created)
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)

     {
     {

-      /* 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 (!link_info->keep_memory)
+       free (isymbuf);
+      else

        {
        {

-         if (!add_dynamic_entry (DT_DEBUG, 0))
-           return FALSE;
+         /* Cache the symbols for elf_link_input_bfd.  */
+         symtab_hdr->contents = (unsigned char *) isymbuf;

        }
        }

+    }

 
 

-      if (relplt)
+  if (info.contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != info.contents)
+    {
+      if (!info.changed_contents && !link_info->keep_memory)
+       free (info.contents);
+      else

        {
        {

-         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;
+         /* Cache the section contents for elf_link_input_bfd.  */
+         elf_section_data (sec)->this_hdr.contents = info.contents;

        }
        }

+    }

 
 

-      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;
-       }
+  if (elf_section_data (sec)->relocs != internal_relocs)
+    {
+      if (!info.changed_relocs)
+       free (internal_relocs);
+      else
+       elf_section_data (sec)->relocs = internal_relocs;

     }
     }

-#undef add_dynamic_entry
+
+  *again = info.changed_contents || info.changed_relocs;

 
   return TRUE;
 
   return TRUE;

-}

 
 

+ error_return:
+  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

 /* Emit a dynamic relocation for (DYNINDX, RTYPE, ADDEND) at (SEC, OFFSET)
    into the next available slot in SREL.  */
 
 static void
 /* 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;
+elf64_alpha_emit_dynrel (bfd *abfd, struct bfd_link_info *info,
+                        asection *sec, asection *srel, bfd_vma offset,
+                        long dynindx, long rtype, bfd_vma addend)

 {
   Elf_Internal_Rela outrel;
   bfd_byte *loc;
 {
   Elf_Internal_Rela outrel;
   bfd_byte *loc;


@@ -4147,23 +4122,22 @@ elf64_alpha_emit_dynrel (abfd, info, sec, srel, offset, dynindx, rtype, addend)
    symbol winds up in the output section.  */
 
 static bfd_boolean
    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;
+elf64_alpha_relocate_section_r (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;
 {
   unsigned long symtab_hdr_sh_info;
   Elf_Internal_Rela *rel;
   Elf_Internal_Rela *relend;

+  struct elf_link_hash_entry **sym_hashes;

   bfd_boolean ret_val = TRUE;
 
   bfd_boolean ret_val = TRUE;
 

-  symtab_hdr_sh_info = elf_tdata (input_bfd)->symtab_hdr.sh_info;
+  symtab_hdr_sh_info = elf_symtab_hdr (input_bfd).sh_info;
+  sym_hashes = elf_sym_hashes (input_bfd);

 
   relend = relocs + input_section->reloc_count;
   for (rel = relocs; rel < relend; rel++)
 
   relend = relocs + input_section->reloc_count;
   for (rel = relocs; rel < relend; rel++)


@@ -4173,7 +4147,7 @@ elf64_alpha_relocate_section_r (output_bfd, info, input_bfd, input_section,
       asection *sec;
       unsigned long r_type;
 
       asection *sec;
       unsigned long r_type;
 

-      r_type = ELF64_R_TYPE(rel->r_info);
+      r_type = ELF64_R_TYPE (rel->r_info);

       if (r_type >= R_ALPHA_max)
        {
          (*_bfd_error_handler)
       if (r_type >= R_ALPHA_max)
        {
          (*_bfd_error_handler)


@@ -4184,22 +4158,43 @@ elf64_alpha_relocate_section_r (output_bfd, info, input_bfd, input_section,
          continue;
        }
 
          continue;
        }
 

-      r_symndx = ELF64_R_SYM(rel->r_info);
-

       /* 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 associated with GPDISP and LITUSE is
         immaterial.  Only the addend is significant.  */
       if (r_type == R_ALPHA_GPDISP || r_type == R_ALPHA_LITUSE)
        continue;
 

+      r_symndx = ELF64_R_SYM (rel->r_info);

       if (r_symndx < symtab_hdr_sh_info)
        {
          sym = local_syms + r_symndx;
       if (r_symndx < symtab_hdr_sh_info)
        {
          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;
-           }
+         sec = local_sections[r_symndx];
+       }
+      else
+       {
+         struct elf_link_hash_entry *h;
+
+         h = sym_hashes[r_symndx - symtab_hdr_sh_info];
+
+         while (h->root.type == bfd_link_hash_indirect
+                || h->root.type == bfd_link_hash_warning)
+           h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+         if (h->root.type != bfd_link_hash_defined
+             && h->root.type != bfd_link_hash_defweak)
+           continue;
+
+         sym = NULL;
+         sec = h->root.u.def.section;

        }
        }

+
+      if (sec != NULL && discarded_section (sec))
+       RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+                                        rel, 1, relend,
+                                        elf64_alpha_howto_table + r_type, 0,
+                                        contents);
+
+      if (sym != NULL && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+       rel->r_addend += sec->output_offset;

     }
 
   return ret_val;
     }
 
   return ret_val;


@@ -4208,16 +4203,11 @@ elf64_alpha_relocate_section_r (output_bfd, info, input_bfd, input_section,
 /* Relocate an Alpha ELF section.  */
 
 static bfd_boolean
 /* Relocate an Alpha ELF section.  */
 
 static bfd_boolean

-elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
-                             contents, relocs, local_syms, local_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     Elf_Internal_Rela *relocs;
-     Elf_Internal_Sym *local_syms;
-     asection **local_sections;
+elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
+                             bfd *input_bfd, asection *input_section,
+                             bfd_byte *contents, Elf_Internal_Rela *relocs,
+                             Elf_Internal_Sym *local_syms,
+                             asection **local_sections)

 {
   Elf_Internal_Shdr *symtab_hdr;
   Elf_Internal_Rela *rel;
 {
   Elf_Internal_Shdr *symtab_hdr;
   Elf_Internal_Rela *rel;


@@ -4227,10 +4217,11 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
   bfd_vma gp, tp_base, dtp_base;
   struct alpha_elf_got_entry **local_got_entries;
   bfd_boolean ret_val;
   bfd_vma gp, tp_base, dtp_base;
   struct alpha_elf_got_entry **local_got_entries;
   bfd_boolean ret_val;

-  const char *section_name;
+
+  BFD_ASSERT (is_alpha_elf (input_bfd));

 
   /* Handle relocatable links with a smaller loop.  */
 
   /* Handle relocatable links with a smaller loop.  */

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

     return elf64_alpha_relocate_section_r (output_bfd, info, input_bfd,
                                           input_section, contents, relocs,
                                           local_syms, local_sections);
     return elf64_alpha_relocate_section_r (output_bfd, info, input_bfd,
                                           input_section, contents, relocs,
                                           local_syms, local_sections);


@@ -4239,19 +4230,25 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 
   ret_val = TRUE;
 
 
   ret_val = TRUE;
 

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

 
   dynobj = elf_hash_table (info)->dynobj;
   if (dynobj)
 
   dynobj = elf_hash_table (info)->dynobj;
   if (dynobj)

-    srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
+    srelgot = bfd_get_linker_section (dynobj, ".rela.got");

   else
     srelgot = NULL;
 
   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);
+  if (input_section->flags & SEC_ALLOC)
+    {
+      const char *section_name;
+      section_name = (bfd_elf_string_from_elf_section
+                     (input_bfd, elf_elfheader(input_bfd)->e_shstrndx,
+                      _bfd_elf_single_rel_hdr (input_section)->sh_name));
+      BFD_ASSERT(section_name != NULL);
+      srel = bfd_get_linker_section (dynobj, section_name);
+    }
+  else
+    srel = NULL;

 
   /* Find the gp value for this input bfd.  */
   gotobj = alpha_elf_tdata (input_bfd)->gotobj;
 
   /* Find the gp value for this input bfd.  */
   gotobj = alpha_elf_tdata (input_bfd)->gotobj;


@@ -4296,6 +4293,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
       bfd_vma value;
       bfd_vma addend;
       bfd_boolean dynamic_symbol_p;
       bfd_vma value;
       bfd_vma addend;
       bfd_boolean dynamic_symbol_p;

+      bfd_boolean unresolved_reloc = FALSE;

       bfd_boolean undef_weak_ref = FALSE;
       unsigned long r_type;
 
       bfd_boolean undef_weak_ref = FALSE;
       unsigned long r_type;
 


@@ -4314,9 +4312,9 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
       r_symndx = ELF64_R_SYM(rel->r_info);
 
       /* The symbol for a TLSLDM reloc is ignored.  Collapse the
       r_symndx = ELF64_R_SYM(rel->r_info);
 
       /* The symbol for a TLSLDM reloc is ignored.  Collapse the

-        reloc to the 0 symbol so that they all match.  */
+        reloc to the STN_UNDEF (0) symbol so that they all match.  */

       if (r_type == R_ALPHA_TLSLDM)
       if (r_type == R_ALPHA_TLSLDM)

-       r_symndx = 0;
+       r_symndx = STN_UNDEF;

 
       if (r_symndx < symtab_hdr->sh_info)
        {
 
       if (r_symndx < symtab_hdr->sh_info)
        {


@@ -4326,17 +4324,17 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
          msec = sec;
          value = _bfd_elf_rela_local_sym (output_bfd, sym, &msec, rel);
 
          msec = sec;
          value = _bfd_elf_rela_local_sym (output_bfd, sym, &msec, rel);
 

-         /* If this is a tp-relative relocation against sym 0,
+         /* If this is a tp-relative relocation against sym STN_UNDEF (0),

             this is hackery from relax_section.  Force the value to
             this is hackery from relax_section.  Force the value to

-            be the tls base.  */
-         if (r_symndx == 0
+            be the tls module base.  */
+         if (r_symndx == STN_UNDEF

              && (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))
              && (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;
+           value = dtp_base;

 
          if (local_got_entries)
            gotent = local_got_entries[r_symndx];
 
          if (local_got_entries)
            gotent = local_got_entries[r_symndx];


@@ -4347,7 +4345,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
             unless it has been done already.  */
          if ((sec->flags & SEC_MERGE)
              && ELF_ST_TYPE (sym->st_info) == STT_SECTION
             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
+             && sec->sec_info_type == SEC_INFO_TYPE_MERGE

              && gotent
              && !gotent->reloc_xlated)
            {
              && gotent
              && !gotent->reloc_xlated)
            {


@@ -4376,15 +4374,14 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
        }
       else
        {
        }
       else
        {

-         bfd_boolean warned;
-         bfd_boolean unresolved_reloc;
+         bfd_boolean warned, ignored;

          struct elf_link_hash_entry *hh;
          struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
 
          RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
                                   r_symndx, symtab_hdr, sym_hashes,
                                   hh, sec, value,
          struct elf_link_hash_entry *hh;
          struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
 
          RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
                                   r_symndx, symtab_hdr, sym_hashes,
                                   hh, sec, value,

-                                  unresolved_reloc, warned);
+                                  unresolved_reloc, warned, ignored);

 
          if (warned)
            continue;
 
          if (warned)
            continue;


@@ -4399,6 +4396,10 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
          gotent = h->got_entries;
        }
 
          gotent = h->got_entries;
        }
 

+      if (sec != NULL && discarded_section (sec))
+       RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+                                        rel, 1, relend, howto, 0, contents);
+

       addend = rel->r_addend;
       value += addend;
 
       addend = rel->r_addend;
       value += addend;
 


@@ -4445,7 +4446,9 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
              /* If the symbol has been forced local, output a
                 RELATIVE reloc, otherwise it will be handled in
                 finish_dynamic_symbol.  */
              /* 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)
+             if (bfd_link_pic (info)
+                 && !dynamic_symbol_p
+                 && !undef_weak_ref)

                elf64_alpha_emit_dynrel (output_bfd, info, sgot, srelgot,
                                         gotent->got_offset, 0,
                                         R_ALPHA_RELATIVE, value);
                elf64_alpha_emit_dynrel (output_bfd, info, sgot, srelgot,
                                         gotent->got_offset, 0,
                                         R_ALPHA_RELATIVE, value);


@@ -4458,18 +4461,6 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
          goto default_reloc;
 
        case R_ALPHA_GPREL32:
          goto default_reloc;
 
        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 (dynamic_symbol_p)
        case R_ALPHA_GPREL16:
        case R_ALPHA_GPRELLOW:
          if (dynamic_symbol_p)


@@ -4607,7 +4598,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
            else if (r_type == R_ALPHA_TPREL64)
              {
                BFD_ASSERT (elf_hash_table (info)->tls_sec != NULL);
            else if (r_type == R_ALPHA_TPREL64)
              {
                BFD_ASSERT (elf_hash_table (info)->tls_sec != NULL);

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

                  {
                    value -= tp_base;
                    goto default_reloc;
                  {
                    value -= tp_base;
                    goto default_reloc;


@@ -4615,9 +4606,15 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
                dynindx = 0;
                dynaddend = value - dtp_base;
              }
                dynindx = 0;
                dynaddend = value - dtp_base;
              }

-           else if (info->shared
-                    && r_symndx != 0
-                    && (input_section->flags & SEC_ALLOC))
+           else if (bfd_link_pic (info)
+                    && r_symndx != STN_UNDEF
+                    && (input_section->flags & SEC_ALLOC)
+                    && !undef_weak_ref
+                    && !(unresolved_reloc
+                         && (_bfd_elf_section_offset (output_bfd, info,
+                                                      input_section,
+                                                      rel->r_offset)
+                             == (bfd_vma) -1)))

              {
                if (r_type == R_ALPHA_REFLONG)
                  {
              {
                if (r_type == R_ALPHA_REFLONG)
                  {


@@ -4634,9 +4631,10 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
            else
              goto default_reloc;
 
            else
              goto default_reloc;
 

-           elf64_alpha_emit_dynrel (output_bfd, info, input_section,
-                                    srel, rel->r_offset, dynindx,
-                                    dyntype, dynaddend);
+           if (input_section->flags & SEC_ALLOC)
+             elf64_alpha_emit_dynrel (output_bfd, info, input_section,
+                                      srel, rel->r_offset, dynindx,
+                                      dyntype, dynaddend);

          }
          goto default_reloc;
 
          }
          goto default_reloc;
 


@@ -4650,11 +4648,24 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
                  input_bfd, h->root.root.root.string);
               ret_val = FALSE;
             }
                  input_bfd, h->root.root.root.string);
               ret_val = FALSE;
             }

+         else if (bfd_link_pic (info)
+                  && undef_weak_ref)
+            {
+              (*_bfd_error_handler)
+                (_("%B: pc-relative relocation against undefined weak symbol %s"),
+                 input_bfd, h->root.root.root.string);
+              ret_val = FALSE;
+            }
+

 
          /* ??? .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.  */
 
          /* ??? .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)
+         if (r_symndx == STN_UNDEF
+             || (unresolved_reloc
+                 && _bfd_elf_section_offset (output_bfd, info,
+                                             input_section,
+                                             rel->r_offset) == (bfd_vma) -1))

            howto = (elf64_alpha_howto_table
                     + (r_type - R_ALPHA_SREL32 + R_ALPHA_REFLONG));
          goto default_reloc;
            howto = (elf64_alpha_howto_table
                     + (r_type - R_ALPHA_SREL32 + R_ALPHA_REFLONG));
          goto default_reloc;


@@ -4671,13 +4682,14 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
              gotent->reloc_done = 1;
 
              /* Note that the module index for the main program is 1.  */
              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,
+             bfd_put_64 (output_bfd,
+                         !bfd_link_pic (info) && !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.  */
                          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)
+             if (bfd_link_pic (info) && !dynamic_symbol_p)

                elf64_alpha_emit_dynrel (output_bfd, info, sgot, srelgot,
                                         gotent->got_offset, 0,
                                         R_ALPHA_DTPMOD64, 0);
                elf64_alpha_emit_dynrel (output_bfd, info, sgot, srelgot,
                                         gotent->got_offset, 0,
                                         R_ALPHA_DTPMOD64, 0);


@@ -4718,7 +4730,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
        case R_ALPHA_TPRELHI:
        case R_ALPHA_TPRELLO:
        case R_ALPHA_TPREL16:
        case R_ALPHA_TPRELHI:
        case R_ALPHA_TPRELLO:
        case R_ALPHA_TPREL16:

-         if (info->shared)
+         if (bfd_link_dll (info))

            {
              (*_bfd_error_handler)
                (_("%B: TLS local exec code cannot be linked into shared objects"),
            {
              (*_bfd_error_handler)
                (_("%B: TLS local exec code cannot be linked into shared objects"),


@@ -4756,7 +4768,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
                  BFD_ASSERT (elf_hash_table (info)->tls_sec != NULL);
                  if (r_type == R_ALPHA_GOTDTPREL)
                    value -= dtp_base;
                  BFD_ASSERT (elf_hash_table (info)->tls_sec != NULL);
                  if (r_type == R_ALPHA_GOTDTPREL)
                    value -= dtp_base;

-                 else if (!info->shared)
+                 else if (!bfd_link_pic (info))

                    value -= tp_base;
                  else
                    {
                    value -= tp_base;
                  else
                    {


@@ -4799,7 +4811,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
 
            if (r_symndx < symtab_hdr->sh_info
                && sec != NULL && howto->pc_relative
 
            if (r_symndx < symtab_hdr->sh_info
                && sec != NULL && howto->pc_relative

-               && elf_discarded_section (sec))
+               && discarded_section (sec))

              break;
 
            if (h != NULL)
              break;
 
            if (h != NULL)


@@ -4813,11 +4825,9 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
                if (*name == '\0')
                  name = bfd_section_name (input_bfd, sec);
              }
                if (*name == '\0')
                  name = bfd_section_name (input_bfd, sec);
              }

-           if (! ((*info->callbacks->reloc_overflow)
-                  (info, (h ? &h->root.root : NULL), name, howto->name,
-                   (bfd_vma) 0, input_bfd, input_section,
-                   rel->r_offset)))
-             ret_val = FALSE;
+           (*info->callbacks->reloc_overflow)
+             (info, (h ? &h->root.root : NULL), name, howto->name,
+              (bfd_vma) 0, input_bfd, input_section, rel->r_offset);

          }
          break;
 
          }
          break;
 


@@ -4834,15 +4844,14 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
    dynamic sections here.  */
 
 static bfd_boolean
    dynamic sections here.  */
 
 static bfd_boolean

-elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
-     Elf_Internal_Sym *sym;
+elf64_alpha_finish_dynamic_symbol (bfd *output_bfd, struct bfd_link_info *info,
+                                  struct elf_link_hash_entry *h,
+                                  Elf_Internal_Sym *sym)

 {
 {

+  struct alpha_elf_link_hash_entry *ah = (struct alpha_elf_link_hash_entry *)h;

   bfd *dynobj = elf_hash_table(info)->dynobj;
 
   bfd *dynobj = elf_hash_table(info)->dynobj;
 

-  if (h->plt.offset != MINUS_ONE)
+  if (h->needs_plt)

     {
       /* Fill in the .plt entry for this symbol.  */
       asection *splt, *sgot, *srel;
     {
       /* Fill in the .plt entry for this symbol.  */
       asection *splt, *sgot, *srel;


@@ -4854,83 +4863,71 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
 
       BFD_ASSERT (h->dynindx != -1);
 
 
       BFD_ASSERT (h->dynindx != -1);
 

-      /* The first .got entry will be updated by the .plt with the
-        address of the target function.  */
-      gotent = ((struct alpha_elf_link_hash_entry *) h)->got_entries;
-      BFD_ASSERT (gotent && gotent->addend == 0);
-
-      splt = bfd_get_section_by_name (dynobj, ".plt");
+      splt = bfd_get_linker_section (dynobj, ".plt");

       BFD_ASSERT (splt != NULL);
       BFD_ASSERT (splt != NULL);

-      srel = bfd_get_section_by_name (dynobj, ".rela.plt");
+      srel = bfd_get_linker_section (dynobj, ".rela.plt");

       BFD_ASSERT (srel != NULL);
       BFD_ASSERT (srel != NULL);

-      sgot = alpha_elf_tdata (gotent->gotobj)->got;
-      BFD_ASSERT (sgot != NULL);
-
-      got_addr = (sgot->output_section->vma
-                 + sgot->output_offset
-                 + gotent->got_offset);
-      plt_addr = (splt->output_section->vma
-                 + splt->output_offset
-                 + h->plt.offset);

 
 

-      plt_index = (h->plt.offset - PLT_HEADER_SIZE) / PLT_ENTRY_SIZE;
-
-      /* Fill in the entry in the procedure linkage table.  */
-      {
-       bfd_vma insn1, insn2, insn3;
-
-       insn1 = PLT_ENTRY_WORD1 | ((-(h->plt.offset + 4) >> 2) & 0x1fffff);
-       insn2 = PLT_ENTRY_WORD2;
-       insn3 = PLT_ENTRY_WORD3;
-
-       bfd_put_32 (output_bfd, insn1, splt->contents + h->plt.offset);
-       bfd_put_32 (output_bfd, insn2, splt->contents + h->plt.offset + 4);
-       bfd_put_32 (output_bfd, insn3, splt->contents + h->plt.offset + 8);
-      }
+      for (gotent = ah->got_entries; gotent ; gotent = gotent->next)
+       if (gotent->reloc_type == R_ALPHA_LITERAL
+           && gotent->use_count > 0)
+         {
+           unsigned int insn;
+           int disp;

 
 

-      /* Fill in the entry in the .rela.plt section.  */
-      outrel.r_offset = got_addr;
-      outrel.r_info = ELF64_R_INFO(h->dynindx, R_ALPHA_JMP_SLOT);
-      outrel.r_addend = 0;
+           sgot = alpha_elf_tdata (gotent->gotobj)->got;
+           BFD_ASSERT (sgot != NULL);

 
 

-      loc = srel->contents + plt_index * sizeof (Elf64_External_Rela);
-      bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);
+           BFD_ASSERT (gotent->got_offset != -1);
+           BFD_ASSERT (gotent->plt_offset != -1);

 
 

-      if (!h->def_regular)
-       {
-         /* Mark the symbol as undefined, rather than as defined in the
-            .plt section.  Leave the value alone.  */
-         sym->st_shndx = SHN_UNDEF;
-       }
+           got_addr = (sgot->output_section->vma
+                       + sgot->output_offset
+                       + gotent->got_offset);
+           plt_addr = (splt->output_section->vma
+                       + splt->output_offset
+                       + gotent->plt_offset);

 
 

-      /* Fill in the entries in the .got.  */
-      bfd_put_64 (output_bfd, plt_addr, sgot->contents + gotent->got_offset);
+           plt_index = (gotent->plt_offset-PLT_HEADER_SIZE) / PLT_ENTRY_SIZE;

 
 

-      /* Subsequent .got entries will continue to bounce through the .plt.  */
-      if (gotent->next)
-       {
-         srel = bfd_get_section_by_name (dynobj, ".rela.got");
-         BFD_ASSERT (! info->shared || srel != NULL);
+           /* Fill in the entry in the procedure linkage table.  */
+           if (elf64_alpha_use_secureplt)
+             {
+               disp = (PLT_HEADER_SIZE - 4) - (gotent->plt_offset + 4);
+               insn = INSN_AD (INSN_BR, 31, disp);
+               bfd_put_32 (output_bfd, insn,
+                           splt->contents + gotent->plt_offset);

 
 

-         gotent = gotent->next;
-         do
-           {
-             sgot = alpha_elf_tdata(gotent->gotobj)->got;
-             BFD_ASSERT(sgot != NULL);
-             BFD_ASSERT(gotent->addend == 0);
+               plt_index = ((gotent->plt_offset - NEW_PLT_HEADER_SIZE)
+                            / NEW_PLT_ENTRY_SIZE);
+             }
+           else
+             {
+               disp = -(gotent->plt_offset + 4);
+               insn = INSN_AD (INSN_BR, 28, disp);
+               bfd_put_32 (output_bfd, insn,
+                           splt->contents + gotent->plt_offset);
+               bfd_put_32 (output_bfd, INSN_UNOP,
+                           splt->contents + gotent->plt_offset + 4);
+               bfd_put_32 (output_bfd, INSN_UNOP,
+                           splt->contents + gotent->plt_offset + 8);
+
+               plt_index = ((gotent->plt_offset - OLD_PLT_HEADER_SIZE)
+                            / OLD_PLT_ENTRY_SIZE);
+             }

 
 

-             bfd_put_64 (output_bfd, plt_addr,
-                         sgot->contents + gotent->got_offset);
+           /* Fill in the entry in the .rela.plt section.  */
+           outrel.r_offset = got_addr;
+           outrel.r_info = ELF64_R_INFO(h->dynindx, R_ALPHA_JMP_SLOT);
+           outrel.r_addend = 0;

 
 

-             if (info->shared)
-               elf64_alpha_emit_dynrel (output_bfd, info, sgot, srel,
-                                        gotent->got_offset, 0,
-                                        R_ALPHA_RELATIVE, plt_addr);
+           loc = srel->contents + plt_index * sizeof (Elf64_External_Rela);
+           bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc);

 
 

-             gotent = gotent->next;
-           }
-          while (gotent != NULL);
-       }
+           /* Fill in the entry in the .got.  */
+           bfd_put_64 (output_bfd, plt_addr,
+                       sgot->contents + gotent->got_offset);
+         }

     }
   else if (alpha_elf_dynamic_symbol_p (h, info))
     {
     }
   else if (alpha_elf_dynamic_symbol_p (h, info))
     {


@@ -4938,7 +4935,7 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
       asection *srel;
       struct alpha_elf_got_entry *gotent;
 
       asection *srel;
       struct alpha_elf_got_entry *gotent;
 

-      srel = bfd_get_section_by_name (dynobj, ".rela.got");
+      srel = bfd_get_linker_section (dynobj, ".rela.got");

       BFD_ASSERT (srel != NULL);
 
       for (gotent = ((struct alpha_elf_link_hash_entry *) h)->got_entries;
       BFD_ASSERT (srel != NULL);
 
       for (gotent = ((struct alpha_elf_link_hash_entry *) h)->got_entries;


@@ -4973,21 +4970,21 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
              abort ();
            }
 
              abort ();
            }
 

-         elf64_alpha_emit_dynrel (output_bfd, info, sgot, srel, 
+         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)
                                   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, 
+           elf64_alpha_emit_dynrel (output_bfd, info, sgot, srel,

                                     gotent->got_offset + 8, h->dynindx,
                                     R_ALPHA_DTPREL64, gotent->addend);
        }
     }
 
   /* Mark some specially defined symbols as absolute.  */
                                     gotent->got_offset + 8, h->dynindx,
                                     R_ALPHA_DTPREL64, gotent->addend);
        }
     }
 
   /* Mark some specially defined symbols as absolute.  */

-  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
-      || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0
-      || strcmp (h->root.root.string, "_PROCEDURE_LINKAGE_TABLE_") == 0)
+  if (h == elf_hash_table (info)->hdynamic
+      || h == elf_hash_table (info)->hgot
+      || h == elf_hash_table (info)->hplt)

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


@@ -4996,45 +4993,57 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
 /* Finish up the dynamic sections.  */
 
 static bfd_boolean
 /* Finish up the dynamic sections.  */
 
 static bfd_boolean

-elf64_alpha_finish_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
+elf64_alpha_finish_dynamic_sections (bfd *output_bfd,
+                                    struct bfd_link_info *info)

 {
   bfd *dynobj;
   asection *sdyn;
 
   dynobj = elf_hash_table (info)->dynobj;
 {
   bfd *dynobj;
   asection *sdyn;
 
   dynobj = elf_hash_table (info)->dynobj;

-  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+  sdyn = bfd_get_linker_section (dynobj, ".dynamic");

 
   if (elf_hash_table (info)->dynamic_sections_created)
     {
 
   if (elf_hash_table (info)->dynamic_sections_created)
     {

-      asection *splt;
+      asection *splt, *sgotplt, *srelaplt;

       Elf64_External_Dyn *dyncon, *dynconend;
       Elf64_External_Dyn *dyncon, *dynconend;

+      bfd_vma plt_vma, gotplt_vma;

 
 

-      splt = bfd_get_section_by_name (dynobj, ".plt");
+      splt = bfd_get_linker_section (dynobj, ".plt");
+      srelaplt = bfd_get_linker_section (dynobj, ".rela.plt");

       BFD_ASSERT (splt != NULL && sdyn != NULL);
 
       BFD_ASSERT (splt != NULL && sdyn != NULL);
 

+      plt_vma = splt->output_section->vma + splt->output_offset;
+
+      gotplt_vma = 0;
+      if (elf64_alpha_use_secureplt)
+       {
+         sgotplt = bfd_get_linker_section (dynobj, ".got.plt");
+         BFD_ASSERT (sgotplt != NULL);
+         if (sgotplt->size > 0)
+           gotplt_vma = sgotplt->output_section->vma + sgotplt->output_offset;
+       }
+

       dyncon = (Elf64_External_Dyn *) sdyn->contents;
       dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->size);
       for (; dyncon < dynconend; dyncon++)
        {
          Elf_Internal_Dyn dyn;
       dyncon = (Elf64_External_Dyn *) sdyn->contents;
       dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->size);
       for (; dyncon < dynconend; dyncon++)
        {
          Elf_Internal_Dyn dyn;

-         const char *name;
-         asection *s;

 
          bfd_elf64_swap_dyn_in (dynobj, dyncon, &dyn);
 
          switch (dyn.d_tag)
            {
            case DT_PLTGOT:
 
          bfd_elf64_swap_dyn_in (dynobj, dyncon, &dyn);
 
          switch (dyn.d_tag)
            {
            case DT_PLTGOT:

-             name = ".plt";
-             goto get_vma;
+             dyn.d_un.d_ptr
+               = elf64_alpha_use_secureplt ? gotplt_vma : plt_vma;
+             break;

            case DT_PLTRELSZ:
            case DT_PLTRELSZ:

-             name = ".rela.plt";
-             goto get_size;
+             dyn.d_un.d_val = srelaplt ? srelaplt->size : 0;
+             break;

            case DT_JMPREL:
            case DT_JMPREL:

-             name = ".rela.plt";
-             goto get_vma;
+             dyn.d_un.d_ptr = srelaplt ? (srelaplt->output_section->vma
+                                          + srelaplt->output_offset) : 0;
+             break;

 
            case DT_RELASZ:
              /* My interpretation of the TIS v1.1 ELF document indicates
 
            case DT_RELASZ:
              /* My interpretation of the TIS v1.1 ELF document indicates


@@ -5042,36 +5051,69 @@ elf64_alpha_finish_dynamic_sections (output_bfd, info)
                 the rest of the BFD does.  It is, however, what the
                 glibc ld.so wants.  Do this fixup here until we found
                 out who is right.  */
                 the rest of the BFD does.  It is, however, what the
                 glibc ld.so wants.  Do this fixup here until we found
                 out who is right.  */

-             s = bfd_get_section_by_name (output_bfd, ".rela.plt");
-             if (s)
-               dyn.d_un.d_val -= s->size;
-             break;
-
-           get_vma:
-             s = bfd_get_section_by_name (output_bfd, name);
-             dyn.d_un.d_ptr = (s ? s->vma : 0);
-             break;
-
-           get_size:
-             s = bfd_get_section_by_name (output_bfd, name);
-             dyn.d_un.d_val = s->size;
+             if (srelaplt)
+               dyn.d_un.d_val -= srelaplt->size;

              break;
            }
 
          bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
        }
 
              break;
            }
 
          bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
        }
 

-      /* Initialize the PLT0 entry.  */
+      /* Initialize the plt header.  */

       if (splt->size > 0)
        {
       if (splt->size > 0)
        {

-         bfd_put_32 (output_bfd, PLT_HEADER_WORD1, splt->contents);
-         bfd_put_32 (output_bfd, PLT_HEADER_WORD2, splt->contents + 4);
-         bfd_put_32 (output_bfd, PLT_HEADER_WORD3, splt->contents + 8);
-         bfd_put_32 (output_bfd, PLT_HEADER_WORD4, splt->contents + 12);
+         unsigned int insn;
+         int ofs;
+
+         if (elf64_alpha_use_secureplt)
+           {
+             ofs = gotplt_vma - (plt_vma + PLT_HEADER_SIZE);
+
+             insn = INSN_ABC (INSN_SUBQ, 27, 28, 25);
+             bfd_put_32 (output_bfd, insn, splt->contents);
+
+             insn = INSN_ABO (INSN_LDAH, 28, 28, (ofs + 0x8000) >> 16);
+             bfd_put_32 (output_bfd, insn, splt->contents + 4);
+
+             insn = INSN_ABC (INSN_S4SUBQ, 25, 25, 25);
+             bfd_put_32 (output_bfd, insn, splt->contents + 8);
+
+             insn = INSN_ABO (INSN_LDA, 28, 28, ofs);
+             bfd_put_32 (output_bfd, insn, splt->contents + 12);
+
+             insn = INSN_ABO (INSN_LDQ, 27, 28, 0);
+             bfd_put_32 (output_bfd, insn, splt->contents + 16);
+
+             insn = INSN_ABC (INSN_ADDQ, 25, 25, 25);
+             bfd_put_32 (output_bfd, insn, splt->contents + 20);
+
+             insn = INSN_ABO (INSN_LDQ, 28, 28, 8);
+             bfd_put_32 (output_bfd, insn, splt->contents + 24);

 
 

-         /* The next two words will be filled in by ld.so */
-         bfd_put_64 (output_bfd, (bfd_vma) 0, splt->contents + 16);
-         bfd_put_64 (output_bfd, (bfd_vma) 0, splt->contents + 24);
+             insn = INSN_AB (INSN_JMP, 31, 27);
+             bfd_put_32 (output_bfd, insn, splt->contents + 28);
+
+             insn = INSN_AD (INSN_BR, 28, -PLT_HEADER_SIZE);
+             bfd_put_32 (output_bfd, insn, splt->contents + 32);
+           }
+         else
+           {
+             insn = INSN_AD (INSN_BR, 27, 0);  /* br $27, .+4 */
+             bfd_put_32 (output_bfd, insn, splt->contents);
+
+             insn = INSN_ABO (INSN_LDQ, 27, 27, 12);
+             bfd_put_32 (output_bfd, insn, splt->contents + 4);
+
+             insn = INSN_UNOP;
+             bfd_put_32 (output_bfd, insn, splt->contents + 8);
+
+             insn = INSN_AB (INSN_JMP, 27, 27);
+             bfd_put_32 (output_bfd, insn, 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);
+           }

 
          elf_section_data (splt->output_section)->this_hdr.sh_entsize = 0;
        }
 
          elf_section_data (splt->output_section)->this_hdr.sh_entsize = 0;
        }


@@ -5085,9 +5127,7 @@ elf64_alpha_finish_dynamic_sections (output_bfd, info)
    them all out sequentially.  */
 
 static bfd_boolean
    them all out sequentially.  */
 
 static bfd_boolean

-elf64_alpha_final_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
+elf64_alpha_final_link (bfd *abfd, struct bfd_link_info *info)

 {
   asection *o;
   struct bfd_link_order *p;
 {
   asection *o;
   struct bfd_link_order *p;


@@ -5096,7 +5136,12 @@ elf64_alpha_final_link (abfd, info)
   const struct ecoff_debug_swap *swap
     = get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
   HDRR *symhdr = &debug.symbolic_header;
   const struct ecoff_debug_swap *swap
     = get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
   HDRR *symhdr = &debug.symbolic_header;

-  PTR mdebug_handle = NULL;
+  void * mdebug_handle = NULL;
+  struct alpha_elf_link_hash_table * htab;
+
+  htab = alpha_elf_hash_table (info);
+  if (htab == NULL)
+    return FALSE;

 
   /* Go through the sections and collect the mdebug information.  */
   mdebug_sec = NULL;
 
   /* Go through the sections and collect the mdebug information.  */
   mdebug_sec = NULL;


@@ -5140,7 +5185,7 @@ elf64_alpha_final_link (abfd, info)
          debug.external_ext = debug.external_ext_end = NULL;
 
          mdebug_handle = bfd_ecoff_debug_init (abfd, &debug, swap, info);
          debug.external_ext = debug.external_ext_end = NULL;
 
          mdebug_handle = bfd_ecoff_debug_init (abfd, &debug, swap, info);

-         if (mdebug_handle == (PTR) NULL)
+         if (mdebug_handle == NULL)

            return FALSE;
 
          if (1)
            return FALSE;
 
          if (1)


@@ -5205,15 +5250,11 @@ elf64_alpha_final_link (abfd, info)
              input_section = p->u.indirect.section;
              input_bfd = input_section->owner;
 
              input_section = p->u.indirect.section;
              input_bfd = input_section->owner;
 

-             if (bfd_get_flavour (input_bfd) != bfd_target_elf_flavour
-                 || (get_elf_backend_data (input_bfd)
-                     ->elf_backend_ecoff_debug_swap) == NULL)
-               {
-                 /* I don't know what a non ALPHA ELF bfd would be
-                    doing with a .mdebug section, but I don't really
-                    want to deal with it.  */
-                 continue;
-               }
+             if (! is_alpha_elf (input_bfd))
+               /* I don't know what a non ALPHA ELF bfd would be
+                  doing with a .mdebug section, but I don't really
+                  want to deal with it.  */
+               continue;

 
              input_swap = (get_elf_backend_data (input_bfd)
                            ->elf_backend_ecoff_debug_swap);
 
              input_swap = (get_elf_backend_data (input_bfd)
                            ->elf_backend_ecoff_debug_swap);


@@ -5236,7 +5277,7 @@ elf64_alpha_final_link (abfd, info)
                 interesting information, try to find the symbol in
                 the linker global hash table and save the information
                 for the output external symbols.  */
                 interesting information, try to find the symbol in
                 the linker global hash table and save the information
                 for the output external symbols.  */

-             eraw_src = input_debug.external_ext;
+             eraw_src = (char *) input_debug.external_ext;

              eraw_end = (eraw_src
                          + (input_debug.symbolic_header.iextMax
                             * input_swap->external_ext_size));
              eraw_end = (eraw_src
                          + (input_debug.symbolic_header.iextMax
                             * input_swap->external_ext_size));


@@ -5248,15 +5289,14 @@ elf64_alpha_final_link (abfd, info)
                  const char *name;
                  struct alpha_elf_link_hash_entry *h;
 
                  const char *name;
                  struct alpha_elf_link_hash_entry *h;
 

-                 (*input_swap->swap_ext_in) (input_bfd, (PTR) eraw_src, &ext);
+                 (*input_swap->swap_ext_in) (input_bfd, eraw_src, &ext);

                  if (ext.asym.sc == scNil
                      || ext.asym.sc == scUndefined
                      || ext.asym.sc == scSUndefined)
                    continue;
 
                  name = input_debug.ssext + ext.asym.iss;
                  if (ext.asym.sc == scNil
                      || ext.asym.sc == scUndefined
                      || ext.asym.sc == scSUndefined)
                    continue;
 
                  name = input_debug.ssext + ext.asym.iss;

-                 h = alpha_elf_link_hash_lookup (alpha_elf_hash_table (info),
-                                                 name, FALSE, FALSE, TRUE);
+                 h = alpha_elf_link_hash_lookup (htab, name, FALSE, FALSE, TRUE);

                  if (h == NULL || h->esym.ifd != -2)
                    continue;
 
                  if (h == NULL || h->esym.ifd != -2)
                    continue;
 


@@ -5296,7 +5336,7 @@ elf64_alpha_final_link (abfd, info)
          einfo.failed = FALSE;
          elf_link_hash_traverse (elf_hash_table (info),
                                  elf64_alpha_output_extsym,
          einfo.failed = FALSE;
          elf_link_hash_traverse (elf_hash_table (info),
                                  elf64_alpha_output_extsym,

-                                 (PTR) &einfo);
+                                 &einfo);

          if (einfo.failed)
            return FALSE;
 
          if (einfo.failed)
            return FALSE;
 


@@ -5320,7 +5360,7 @@ elf64_alpha_final_link (abfd, info)
   /* The .got subsections...  */
   {
     bfd *i, *dynobj = elf_hash_table(info)->dynobj;
   /* The .got subsections...  */
   {
     bfd *i, *dynobj = elf_hash_table(info)->dynobj;

-    for (i = alpha_elf_hash_table(info)->got_list;
+    for (i = htab->got_list;

         i != NULL;
         i = alpha_elf_tdata(i)->got_link_next)
       {
         i != NULL;
         i = alpha_elf_tdata(i)->got_link_next)
       {


@@ -5354,8 +5394,9 @@ elf64_alpha_final_link (abfd, info)
 }
 
 static enum elf_reloc_type_class
 }
 
 static enum elf_reloc_type_class

-elf64_alpha_reloc_type_class (rela)
-     const Elf_Internal_Rela *rela;
+elf64_alpha_reloc_type_class (const struct bfd_link_info *info ATTRIBUTE_UNUSED,
+                             const asection *rel_sec ATTRIBUTE_UNUSED,
+                             const Elf_Internal_Rela *rela)

 {
   switch ((int) ELF64_R_TYPE (rela->r_info))
     {
 {
   switch ((int) ELF64_R_TYPE (rela->r_info))
     {


@@ -5370,11 +5411,11 @@ elf64_alpha_reloc_type_class (rela)
     }
 }
 \f
     }
 }
 \f

-static struct bfd_elf_special_section const elf64_alpha_special_sections[]=
+static const struct bfd_elf_special_section 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 }
+  { STRING_COMMA_LEN (".sbss"),  -2, SHT_NOBITS,   SHF_ALLOC + SHF_WRITE + SHF_ALPHA_GPREL },
+  { STRING_COMMA_LEN (".sdata"), -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_ALPHA_GPREL },
+  { NULL,                     0,  0, 0,            0 }

 };
 
 /* ECOFF swapping routines.  These are used when dealing with the
 };
 
 /* ECOFF swapping routines.  These are used when dealing with the


@@ -5440,6 +5481,7 @@ static const struct elf_size_info alpha_elf_size_info =
   ELFCLASS64, EV_CURRENT,
   bfd_elf64_write_out_phdrs,
   bfd_elf64_write_shdrs_and_ehdr,
   ELFCLASS64, EV_CURRENT,
   bfd_elf64_write_out_phdrs,
   bfd_elf64_write_shdrs_and_ehdr,

+  bfd_elf64_checksum_contents,

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


@@ -5453,17 +5495,21 @@ static const struct elf_size_info alpha_elf_size_info =
   bfd_elf64_swap_reloca_out
 };
 
   bfd_elf64_swap_reloca_out
 };
 

-#define TARGET_LITTLE_SYM      bfd_elf64_alpha_vec
+#define TARGET_LITTLE_SYM      alpha_elf64_vec

 #define TARGET_LITTLE_NAME     "elf64-alpha"
 #define ELF_ARCH               bfd_arch_alpha
 #define TARGET_LITTLE_NAME     "elf64-alpha"
 #define ELF_ARCH               bfd_arch_alpha

+#define ELF_TARGET_ID          ALPHA_ELF_DATA

 #define ELF_MACHINE_CODE       EM_ALPHA
 #define ELF_MAXPAGESIZE        0x10000
 #define ELF_MACHINE_CODE       EM_ALPHA
 #define ELF_MAXPAGESIZE        0x10000

+#define ELF_COMMONPAGESIZE     0x2000

 
 #define bfd_elf64_bfd_link_hash_table_create \
   elf64_alpha_bfd_link_hash_table_create
 
 #define bfd_elf64_bfd_reloc_type_lookup \
   elf64_alpha_bfd_reloc_type_lookup
 
 #define bfd_elf64_bfd_link_hash_table_create \
   elf64_alpha_bfd_link_hash_table_create
 
 #define bfd_elf64_bfd_reloc_type_lookup \
   elf64_alpha_bfd_reloc_type_lookup

+#define bfd_elf64_bfd_reloc_name_lookup \
+  elf64_alpha_bfd_reloc_name_lookup

 #define elf_info_to_howto \
   elf64_alpha_info_to_howto
 
 #define elf_info_to_howto \
   elf64_alpha_info_to_howto
 


@@ -5488,16 +5534,26 @@ static const struct elf_size_info alpha_elf_size_info =
 
 #define elf_backend_add_symbol_hook \
   elf64_alpha_add_symbol_hook
 
 #define elf_backend_add_symbol_hook \
   elf64_alpha_add_symbol_hook

+#define elf_backend_relocs_compatible \
+  _bfd_elf_relocs_compatible
+#define elf_backend_sort_relocs_p \
+  elf64_alpha_sort_relocs_p

 #define elf_backend_check_relocs \
   elf64_alpha_check_relocs
 #define elf_backend_create_dynamic_sections \
   elf64_alpha_create_dynamic_sections
 #define elf_backend_adjust_dynamic_symbol \
   elf64_alpha_adjust_dynamic_symbol
 #define elf_backend_check_relocs \
   elf64_alpha_check_relocs
 #define elf_backend_create_dynamic_sections \
   elf64_alpha_create_dynamic_sections
 #define elf_backend_adjust_dynamic_symbol \
   elf64_alpha_adjust_dynamic_symbol

+#define elf_backend_merge_symbol_attribute \
+  elf64_alpha_merge_symbol_attribute
+#define elf_backend_copy_indirect_symbol \
+  elf64_alpha_copy_indirect_symbol

 #define elf_backend_always_size_sections \
   elf64_alpha_always_size_sections
 #define elf_backend_size_dynamic_sections \
   elf64_alpha_size_dynamic_sections
 #define elf_backend_always_size_sections \
   elf64_alpha_always_size_sections
 #define elf_backend_size_dynamic_sections \
   elf64_alpha_size_dynamic_sections

+#define elf_backend_omit_section_dynsym \
+  ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true)

 #define elf_backend_relocate_section \
   elf64_alpha_relocate_section
 #define elf_backend_finish_dynamic_symbol \
 #define elf_backend_relocate_section \
   elf64_alpha_relocate_section
 #define elf_backend_finish_dynamic_symbol \


@@ -5509,6 +5565,10 @@ static const struct elf_size_info alpha_elf_size_info =
 #define elf_backend_reloc_type_class \
   elf64_alpha_reloc_type_class
 
 #define elf_backend_reloc_type_class \
   elf64_alpha_reloc_type_class
 

+#define elf_backend_can_gc_sections    1
+#define elf_backend_gc_mark_hook       elf64_alpha_gc_mark_hook
+#define elf_backend_gc_sweep_hook      elf64_alpha_gc_sweep_hook
+

 #define elf_backend_ecoff_debug_swap \
   &elf64_alpha_ecoff_debug_swap
 
 #define elf_backend_ecoff_debug_swap \
   &elf64_alpha_ecoff_debug_swap
 


@@ -5529,28 +5589,26 @@ static const struct elf_size_info alpha_elf_size_info =
 /* FreeBSD support.  */
 
 #undef TARGET_LITTLE_SYM
 /* FreeBSD support.  */
 
 #undef TARGET_LITTLE_SYM

-#define TARGET_LITTLE_SYM      bfd_elf64_alpha_freebsd_vec
+#define TARGET_LITTLE_SYM      alpha_elf64_fbsd_vec

 #undef TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME     "elf64-alpha-freebsd"
 #undef TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME     "elf64-alpha-freebsd"

+#undef ELF_OSABI
+#define        ELF_OSABI               ELFOSABI_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.  */
 
 
 /* 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
 static void

-elf64_alpha_fbsd_post_process_headers (abfd, link_info)
-     bfd * abfd;
-     struct bfd_link_info * link_info ATTRIBUTE_UNUSED;
+elf64_alpha_fbsd_post_process_headers (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.  */
 {
   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;
+  i_ehdrp->e_ident[EI_OSABI] = get_elf_backend_data (abfd)->elf_osabi;

 #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);
 #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);