Support arbitrary length fill patterns.
[deliverable/binutils-gdb.git] / bfd / elf64-alpha.c
index cb8a5b815fcaff237fc56b66ee23aad6c94d9c44..6df126a4d13c9237744dc57654069fdb6b0b5ede 100644 (file)
@@ -1,5 +1,6 @@
 /* Alpha specific support for 64-bit ELF
-   Copyright 1996, 1997 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+   Free Software Foundation, Inc.
    Contributed by Richard Henderson <rth@tamu.edu>.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -34,7 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define NO_COFF_SYMBOLS
 #define NO_COFF_LINENOS
 
-/* Get the ECOFF swapping routines.  Needed for the debug information. */
+/* Get the ECOFF swapping routines.  Needed for the debug information.  */
 #include "coff/internal.h"
 #include "coff/sym.h"
 #include "coff/symconst.h"
@@ -46,7 +47,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define ECOFF_64
 #include "ecoffswap.h"
 
-static boolean elf64_alpha_mkobject PARAMS ((bfd *));
+static int 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
@@ -66,14 +68,16 @@ static reloc_howto_type * elf64_alpha_bfd_reloc_type_lookup
 static void elf64_alpha_info_to_howto
   PARAMS((bfd *, arelent *, Elf64_Internal_Rela *));
 
+static boolean elf64_alpha_mkobject
+  PARAMS((bfd *));
 static boolean elf64_alpha_object_p
   PARAMS((bfd *));
 static boolean elf64_alpha_section_from_shdr
   PARAMS((bfd *, Elf64_Internal_Shdr *, char *));
+static boolean elf64_alpha_section_flags
+  PARAMS((flagword *, Elf64_Internal_Shdr *));
 static boolean elf64_alpha_fake_sections
   PARAMS((bfd *, Elf64_Internal_Shdr *, asection *));
-static int elf64_alpha_additional_program_headers
-  PARAMS((bfd *));
 static boolean elf64_alpha_create_got_section
   PARAMS((bfd *, struct bfd_link_info *));
 static boolean elf64_alpha_create_dynamic_sections
@@ -101,11 +105,15 @@ static void elf64_alpha_merge_gots
 static 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 void elf64_alpha_strip_section_from_output PARAMS ((asection *));
+static boolean elf64_alpha_size_got_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
 static boolean elf64_alpha_always_size_sections
   PARAMS ((bfd *, struct bfd_link_info *));
 static boolean elf64_alpha_calc_dynrel_sizes
   PARAMS ((struct alpha_elf_link_hash_entry *, struct bfd_link_info *));
+static boolean elf64_alpha_add_symbol_hook
+  PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
+          const char **, flagword *, asection **, bfd_vma *));
 static boolean elf64_alpha_check_relocs
   PARAMS((bfd *, struct bfd_link_info *, asection *sec,
          const Elf_Internal_Rela *));
@@ -113,8 +121,6 @@ static boolean elf64_alpha_adjust_dynamic_symbol
   PARAMS((struct bfd_link_info *, struct elf_link_hash_entry *));
 static boolean elf64_alpha_size_dynamic_sections
   PARAMS((bfd *, struct bfd_link_info *));
-static boolean elf64_alpha_adjust_dynindx
-  PARAMS((struct elf_link_hash_entry *, PTR));
 static boolean elf64_alpha_relocate_section
   PARAMS((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
          Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
@@ -125,7 +131,12 @@ static boolean elf64_alpha_finish_dynamic_sections
   PARAMS((bfd *, struct bfd_link_info *));
 static boolean elf64_alpha_final_link
   PARAMS((bfd *, struct bfd_link_info *));
-
+static boolean elf64_alpha_merge_ind_symbols
+  PARAMS((struct alpha_elf_link_hash_entry *, PTR));
+static 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 *));
 \f
 struct alpha_elf_link_hash_entry
 {
@@ -159,8 +170,11 @@ struct alpha_elf_link_hash_entry
 
     int flags;
 
-    /* An additional flag.  */
+    /* Additional flags.  */
 #define ALPHA_ELF_GOT_ENTRY_RELOCS_DONE 0x10
+#define ALPHA_ELF_GOT_ENTRY_RELOCS_XLATED 0x20
+
+    int use_count;
   } *got_entries;
 
   /* used to count non-got, non-plt relocations for delayed sizing
@@ -173,7 +187,10 @@ struct alpha_elf_link_hash_entry
     asection *srel;
 
     /* what kind of relocation? */
-    unsigned long rtype;
+    unsigned int rtype;
+
+    /* is this against read-only section? */
+    unsigned int reltext : 1;
 
     /* how many did we find?  */
     unsigned long count;
@@ -218,11 +235,46 @@ struct alpha_elf_link_hash_table
 
 /* Should we do dynamic things to this symbol?  */
 
-#define alpha_elf_dynamic_symbol_p(h, info)                            \
-  (((info)->shared && !(info)->symbolic && (h)->dynindx != -1)         \
-   || (((h)->elf_link_hash_flags                                       \
-       & (ELF_LINK_HASH_DEF_DYNAMIC | ELF_LINK_HASH_REF_REGULAR))      \
-       == (ELF_LINK_HASH_DEF_DYNAMIC | ELF_LINK_HASH_REF_REGULAR)))
+static int
+alpha_elf_dynamic_symbol_p (h, info)
+     struct elf_link_hash_entry *h;
+     struct bfd_link_info *info;
+{
+  if (h == NULL)
+    return false;
+
+  while (h->root.type == bfd_link_hash_indirect
+        || h->root.type == bfd_link_hash_warning)
+    h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+  if (h->dynindx == -1)
+    return false;
+
+  if (h->root.type == bfd_link_hash_undefweak
+      || h->root.type == bfd_link_hash_defweak)
+    return true;
+
+  switch (ELF_ST_VISIBILITY (h->other))
+    {
+    case STV_DEFAULT:
+      break;
+    case STV_HIDDEN:
+    case STV_INTERNAL:
+      return false;
+    case STV_PROTECTED:
+      if (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)
+        return false;
+      break;
+    }
+
+  if ((info->shared && !info->symbolic)
+      || ((h->elf_link_hash_flags
+          & (ELF_LINK_HASH_DEF_DYNAMIC | ELF_LINK_HASH_REF_REGULAR))
+         == (ELF_LINK_HASH_DEF_DYNAMIC | ELF_LINK_HASH_REF_REGULAR)))
+    return true;
+
+  return false;
+}
 
 /* Create an entry in a Alpha ELF linker hash table.  */
 
@@ -270,9 +322,9 @@ elf64_alpha_bfd_link_hash_table_create (abfd)
      bfd *abfd;
 {
   struct alpha_elf_link_hash_table *ret;
+  bfd_size_type amt = sizeof (struct alpha_elf_link_hash_table);
 
-  ret = ((struct alpha_elf_link_hash_table *)
-        bfd_zalloc (abfd, sizeof (struct alpha_elf_link_hash_table)));
+  ret = (struct alpha_elf_link_hash_table *) bfd_zalloc (abfd, amt);
   if (ret == (struct alpha_elf_link_hash_table *) NULL)
     return NULL;
 
@@ -324,7 +376,8 @@ static boolean
 elf64_alpha_mkobject (abfd)
      bfd *abfd;
 {
-  abfd->tdata.any = bfd_zalloc (abfd, sizeof (struct alpha_elf_obj_tdata));
+  bfd_size_type amt = sizeof (struct alpha_elf_obj_tdata);
+  abfd->tdata.any = bfd_zalloc (abfd, amt);
   if (abfd->tdata.any == NULL)
     return false;
   return true;
@@ -336,7 +389,8 @@ elf64_alpha_object_p (abfd)
 {
   /* Allocate our special target data.  */
   struct alpha_elf_obj_tdata *new_tdata;
-  new_tdata = bfd_zalloc (abfd, sizeof (struct alpha_elf_obj_tdata));
+  bfd_size_type amt = sizeof (struct alpha_elf_obj_tdata);
+  new_tdata = bfd_zalloc (abfd, amt);
   if (new_tdata == NULL)
     return false;
   new_tdata->root = *abfd->tdata.elf_obj_data;
@@ -350,6 +404,9 @@ elf64_alpha_object_p (abfd)
    from smaller values.  Start with zero, widen, *then* decrement.  */
 #define MINUS_ONE      (((bfd_vma)0) - 1)
 
+#define SKIP_HOWTO(N) \
+  HOWTO(N, 0, 0, 0, 0, 0, 0, elf64_alpha_reloc_bad, 0, 0, 0, 0, 0)
+
 static reloc_howto_type elf64_alpha_howto_table[] =
 {
   HOWTO (R_ALPHA_NONE,         /* type */
@@ -416,7 +473,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
   /* Used for an instruction that refers to memory off the GP register.  */
   HOWTO (R_ALPHA_LITERAL,      /* type */
         0,                     /* rightshift */
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
         16,                    /* bitsize */
         false,                 /* pc_relative */
         0,                     /* bitpos */
@@ -437,7 +494,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
      This does not actually do any relocation.  */
   HOWTO (R_ALPHA_LITUSE,       /* type */
         0,                     /* rightshift */
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
         32,                    /* bitsize */
         false,                 /* pc_relative */
         0,                     /* bitpos */
@@ -497,7 +554,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
   /* A hint for a jump to a register.  */
   HOWTO (R_ALPHA_HINT,         /* type */
         2,                     /* rightshift */
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
         14,                    /* bitsize */
         true,                  /* pc_relative */
         0,                     /* bitpos */
@@ -522,7 +579,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         false,                 /* partial_inplace */
         0xffff,                /* src_mask */
         0xffff,                /* dst_mask */
-        false),                /* pcrel_offset */
+        true),                 /* pcrel_offset */
 
   /* 32 bit PC relative offset.  */
   HOWTO (R_ALPHA_SREL32,       /* type */
@@ -537,7 +594,7 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         false,                 /* partial_inplace */
         0xffffffff,            /* src_mask */
         0xffffffff,            /* dst_mask */
-        false),                /* pcrel_offset */
+        true),                 /* pcrel_offset */
 
   /* A 64 bit PC relative offset.  */
   HOWTO (R_ALPHA_SREL64,       /* type */
@@ -552,210 +609,67 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         false,                 /* partial_inplace */
         MINUS_ONE,             /* src_mask */
         MINUS_ONE,             /* dst_mask */
-        false),                /* pcrel_offset */
-
-  /* Push a value on the reloc evaluation stack.  */
-  /* Not implemented -- it's dumb.  */
-  HOWTO (R_ALPHA_OP_PUSH,      /* type */
-        0,                     /* rightshift */
-        0,                     /* size (0 = byte, 1 = short, 2 = long) */
-        0,                     /* bitsize */
-        false,                 /* pc_relative */
-        0,                     /* bitpos */
-        complain_overflow_dont, /* complain_on_overflow */
-        elf64_alpha_reloc_bad, /* special_function */
-        "OP_PUSH",             /* name */
-        false,                 /* partial_inplace */
-        0,                     /* src_mask */
-        0,                     /* dst_mask */
-        false),                /* pcrel_offset */
-
-  /* Store the value from the stack at the given address.  Store it in
-     a bitfield of size r_size starting at bit position r_offset.  */
-  /* Not implemented -- it's dumb.  */
-  HOWTO (R_ALPHA_OP_STORE,     /* type */
-        0,                     /* rightshift */
-        4,                     /* size (0 = byte, 1 = short, 2 = long) */
-        64,                    /* bitsize */
-        false,                 /* pc_relative */
-        0,                     /* bitpos */
-        complain_overflow_dont, /* complain_on_overflow */
-        elf64_alpha_reloc_bad, /* special_function */
-        "OP_STORE",            /* name */
-        false,                 /* partial_inplace */
-        0,                     /* src_mask */
-        MINUS_ONE,             /* dst_mask */
-        false),                /* pcrel_offset */
-
-  /* Subtract the reloc address from the value on the top of the
-     relocation stack.  */
-  /* Not implemented -- it's dumb.  */
-  HOWTO (R_ALPHA_OP_PSUB,      /* type */
-        0,                     /* rightshift */
-        0,                     /* size (0 = byte, 1 = short, 2 = long) */
-        0,                     /* bitsize */
-        false,                 /* pc_relative */
-        0,                     /* bitpos */
-        complain_overflow_dont, /* complain_on_overflow */
-        elf64_alpha_reloc_bad, /* special_function */
-        "OP_PSUB",             /* name */
-        false,                 /* partial_inplace */
-        0,                     /* src_mask */
-        0,                     /* dst_mask */
-        false),                /* pcrel_offset */
-
-  /* Shift the value on the top of the relocation stack right by the
-     given value.  */
-  /* Not implemented -- it's dumb.  */
-  HOWTO (R_ALPHA_OP_PRSHIFT,   /* type */
-        0,                     /* rightshift */
-        0,                     /* size (0 = byte, 1 = short, 2 = long) */
-        0,                     /* bitsize */
-        false,                 /* pc_relative */
-        0,                     /* bitpos */
-        complain_overflow_dont, /* complain_on_overflow */
-        elf64_alpha_reloc_bad, /* special_function */
-        "OP_PRSHIFT",          /* name */
-        false,                 /* partial_inplace */
-        0,                     /* src_mask */
-        0,                     /* dst_mask */
-        false),                /* pcrel_offset */
+        true),                 /* pcrel_offset */
 
-  /* Change the value of GP used by +r_addend until the next GPVALUE or the
-     end of the input bfd.  */
-  /* Not implemented -- it's dumb.  */
-  HOWTO (R_ALPHA_GPVALUE,
-        0,                     /* rightshift */
-        0,                     /* size (0 = byte, 1 = short, 2 = long) */
-        0,                     /* bitsize */
-        false,                 /* pc_relative */
-        0,                     /* bitpos */
-        complain_overflow_dont, /* complain_on_overflow */
-        elf64_alpha_reloc_bad, /* special_function */
-        "GPVALUE",             /* name */
-        false,                 /* partial_inplace */
-        0,                     /* src_mask */
-        0,                     /* dst_mask */
-        false),                /* pcrel_offset */
+  /* Skip 12 - 16; deprecated ECOFF relocs.  */
+  SKIP_HOWTO (12),
+  SKIP_HOWTO (13),
+  SKIP_HOWTO (14),
+  SKIP_HOWTO (15),
+  SKIP_HOWTO (16),
 
   /* The high 16 bits of the displacement from GP to the target.  */
-  /* XXX: Not implemented.  */
   HOWTO (R_ALPHA_GPRELHIGH,
         0,                     /* rightshift */
-        0,                     /* size (0 = byte, 1 = short, 2 = long) */
-        0,                     /* bitsize */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
         false,                 /* pc_relative */
         0,                     /* bitpos */
-        complain_overflow_dont, /* complain_on_overflow */
-        elf64_alpha_reloc_bad, /* special_function */
+        complain_overflow_signed, /* complain_on_overflow */
+        0,                     /* special_function */
         "GPRELHIGH",           /* name */
         false,                 /* partial_inplace */
-        0,                     /* src_mask */
-        0,                     /* dst_mask */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
         false),                /* pcrel_offset */
 
   /* The low 16 bits of the displacement from GP to the target.  */
-  /* XXX: Not implemented.  */
   HOWTO (R_ALPHA_GPRELLOW,
         0,                     /* rightshift */
-        0,                     /* size (0 = byte, 1 = short, 2 = long) */
-        0,                     /* bitsize */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
         false,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */
-        elf64_alpha_reloc_bad, /* special_function */
+        0,                     /* special_function */
         "GPRELLOW",            /* name */
         false,                 /* partial_inplace */
-        0,                     /* src_mask */
-        0,                     /* dst_mask */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
         false),                /* pcrel_offset */
 
   /* A 16-bit displacement from the GP to the target.  */
-  /* XXX: Not implemented.  */
-  HOWTO (R_ALPHA_IMMED_GP_16,
-        0,                     /* rightshift */
-        0,                     /* size (0 = byte, 1 = short, 2 = long) */
-        0,                     /* bitsize */
-        false,                 /* pc_relative */
-        0,                     /* bitpos */
-        complain_overflow_dont, /* complain_on_overflow */
-        elf64_alpha_reloc_bad, /* special_function */
-        "IMMED_GP_16",         /* name */
-        false,                 /* partial_inplace */
-        0,                     /* src_mask */
-        0,                     /* dst_mask */
-        false),                /* pcrel_offset */
-
-  /* The high bits of a 32-bit displacement from the GP to the target; the
-     low bits are supplied in the subsequent R_ALPHA_IMMED_LO32 relocs.  */
-  /* XXX: Not implemented.  */
-  HOWTO (R_ALPHA_IMMED_GP_HI32,
-        0,                     /* rightshift */
-        0,                     /* size (0 = byte, 1 = short, 2 = long) */
-        0,                     /* bitsize */
-        false,                 /* pc_relative */
-        0,                     /* bitpos */
-        complain_overflow_dont, /* complain_on_overflow */
-        elf64_alpha_reloc_bad, /* special_function */
-        "IMMED_GP_HI32",               /* name */
-        false,                 /* partial_inplace */
-        0,                     /* src_mask */
-        0,                     /* dst_mask */
-        false),                /* pcrel_offset */
-
-  /* The high bits of a 32-bit displacement to the starting address of the
-     current section (the relocation target is ignored); the low bits are 
-     supplied in the subsequent R_ALPHA_IMMED_LO32 relocs.  */
-  /* XXX: Not implemented.  */
-  HOWTO (R_ALPHA_IMMED_SCN_HI32,
-        0,                     /* rightshift */
-        0,                     /* size (0 = byte, 1 = short, 2 = long) */
-        0,                     /* bitsize */
-        false,                 /* pc_relative */
-        0,                     /* bitpos */
-        complain_overflow_dont, /* complain_on_overflow */
-        elf64_alpha_reloc_bad, /* special_function */
-        "IMMED_SCN_HI32",              /* name */
-        false,                 /* partial_inplace */
-        0,                     /* src_mask */
-        0,                     /* dst_mask */
-        false),                /* pcrel_offset */
-
-  /* The high bits of a 32-bit displacement from the previous br, bsr, jsr
-     or jmp insn (as tagged by a BRADDR or HINT reloc) to the target; the
-     low bits are supplied by subsequent R_ALPHA_IMMED_LO32 relocs.  */
-  /* XXX: Not implemented.  */
-  HOWTO (R_ALPHA_IMMED_BR_HI32,
+  HOWTO (R_ALPHA_GPREL16,
         0,                     /* rightshift */
-        0,                     /* size (0 = byte, 1 = short, 2 = long) */
-        0,                     /* bitsize */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
         false,                 /* pc_relative */
         0,                     /* bitpos */
-        complain_overflow_dont, /* complain_on_overflow */
-        elf64_alpha_reloc_bad, /* special_function */
-        "IMMED_BR_HI32",               /* name */
+        complain_overflow_signed, /* complain_on_overflow */
+        0,                     /* special_function */
+        "GPREL16",             /* name */
         false,                 /* partial_inplace */
-        0,                     /* src_mask */
-        0,                     /* dst_mask */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
         false),                /* pcrel_offset */
 
-  /* The low 16 bits of a displacement calculated in a previous HI32 reloc.  */
-  /* XXX: Not implemented.  */
-  HOWTO (R_ALPHA_IMMED_LO32,
-        0,                     /* rightshift */
-        0,                     /* size (0 = byte, 1 = short, 2 = long) */
-        0,                     /* bitsize */
-        false,                 /* pc_relative */
-        0,                     /* bitpos */
-        complain_overflow_dont, /* complain_on_overflow */
-        elf64_alpha_reloc_bad, /* special_function */
-        "IMMED_LO32",          /* name */
-        false,                 /* partial_inplace */
-        0,                     /* src_mask */
-        0,                     /* dst_mask */
-        false),                /* pcrel_offset */
+  /* Skip 20 - 23; deprecated ECOFF relocs.  */
+  SKIP_HOWTO (20),
+  SKIP_HOWTO (21),
+  SKIP_HOWTO (22),
+  SKIP_HOWTO (23),
 
-  /* Misc ELF relocations. */
+  /* Misc ELF relocations.  */
 
   /* A dynamic relocation to copy the target into our .dynbss section.  */
   /* Not generated, as all Alpha objects use PIC, so it is not needed.  It
@@ -818,20 +732,35 @@ static reloc_howto_type elf64_alpha_howto_table[] =
         false,
         0,
         0,
-        true)
+        true),
+
+  /* A 21 bit branch that adjusts for gp loads.  */
+  HOWTO (R_ALPHA_BRSGP,                /* type */
+        2,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        21,                    /* bitsize */
+        true,                  /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_signed, /* complain_on_overflow */
+        0,                     /* special_function */
+        "BRSGP",               /* name */
+        false,                 /* partial_inplace */
+        0x1fffff,              /* src_mask */
+        0x1fffff,              /* dst_mask */
+        true),                 /* pcrel_offset */
 };
 
 /* A relocation function which doesn't do anything.  */
 
 static bfd_reloc_status_type
 elf64_alpha_reloc_nil (abfd, reloc, sym, data, sec, output_bfd, error_message)
-     bfd *abfd;
+     bfd *abfd ATTRIBUTE_UNUSED;
      arelent *reloc;
-     asymbol *sym;
-     PTR data;
+     asymbol *sym ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;
      asection *sec;
      bfd *output_bfd;
-     char **error_message;
+     char **error_message ATTRIBUTE_UNUSED;
 {
   if (output_bfd)
     reloc->address += sec->output_offset;
@@ -842,13 +771,13 @@ elf64_alpha_reloc_nil (abfd, reloc, sym, data, sec, output_bfd, error_message)
 
 static bfd_reloc_status_type
 elf64_alpha_reloc_bad (abfd, reloc, sym, data, sec, output_bfd, error_message)
-     bfd *abfd;
+     bfd *abfd ATTRIBUTE_UNUSED;
      arelent *reloc;
-     asymbol *sym;
-     PTR data;
+     asymbol *sym ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;
      asection *sec;
      bfd *output_bfd;
-     char **error_message;
+     char **error_message ATTRIBUTE_UNUSED;
 {
   if (output_bfd)
     reloc->address += sec->output_offset;
@@ -883,8 +812,8 @@ elf64_alpha_do_reloc_gpdisp (abfd, gpdisp, p_ldah, p_lda)
 
   gpdisp += addend;
 
-  if ((bfd_signed_vma) gpdisp < -(bfd_signed_vma)0x80000000
-      || gpdisp >= 0x7fff8000)
+  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.  */
@@ -892,8 +821,8 @@ elf64_alpha_do_reloc_gpdisp (abfd, gpdisp, p_ldah, p_lda)
            | (((gpdisp >> 16) + ((gpdisp >> 15) & 1)) & 0xffff));
   i_lda = (i_lda & 0xffff0000) | (gpdisp & 0xffff);
 
-  bfd_put_32 (abfd, i_ldah, p_ldah);
-  bfd_put_32 (abfd, i_lda, p_lda);
+  bfd_put_32 (abfd, (bfd_vma) i_ldah, p_ldah);
+  bfd_put_32 (abfd, (bfd_vma) i_lda, p_lda);
 
   return ret;
 }
@@ -905,7 +834,7 @@ elf64_alpha_reloc_gpdisp (abfd, reloc_entry, sym, data, input_section,
                          output_bfd, err_msg)
      bfd *abfd;
      arelent *reloc_entry;
-     asymbol *sym;
+     asymbol *sym ATTRIBUTE_UNUSED;
      PTR data;
      asection *input_section;
      bfd *output_bfd;
@@ -941,7 +870,7 @@ elf64_alpha_reloc_gpdisp (abfd, reloc_entry, sym, data, input_section,
 
   /* Complain if the instructions are not correct.  */
   if (ret == bfd_reloc_dangerous)
-    *err_msg = "GPDISP relocation did not find ldah and lda instructions";
+    *err_msg = _("GPDISP relocation did not find ldah and lda instructions");
 
   return ret;
 }
@@ -956,26 +885,30 @@ struct elf_reloc_map
 
 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_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},
 };
 
 /* Given a BFD reloc type, return a HOWTO structure.  */
 
 static reloc_howto_type *
 elf64_alpha_bfd_reloc_type_lookup (abfd, code)
-     bfd *abfd;
+     bfd *abfd ATTRIBUTE_UNUSED;
      bfd_reloc_code_real_type code;
 {
   const struct elf_reloc_map *i, *e;
@@ -983,33 +916,727 @@ elf64_alpha_bfd_reloc_type_lookup (abfd, code)
   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];
+      if (i->bfd_reloc_val == code)
+       return &elf64_alpha_howto_table[i->elf_reloc_val];
+    }
+  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;
+     Elf64_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];
+}
+\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
+
+struct alpha_relax_info
+{
+  bfd *abfd;
+  asection *sec;
+  bfd_byte *contents;
+  Elf_Internal_Rela *relocs, *relend;
+  struct bfd_link_info *link_info;
+  boolean changed_contents;
+  boolean changed_relocs;
+  bfd_vma gp;
+  bfd *gotobj;
+  asection *tsec;
+  struct alpha_elf_link_hash_entry *h;
+  struct alpha_elf_got_entry *gotent;
+  unsigned char other;
+};
+
+static Elf_Internal_Rela * elf64_alpha_relax_with_lituse
+  PARAMS((struct alpha_relax_info *info, bfd_vma symval,
+          Elf_Internal_Rela *irel, Elf_Internal_Rela *irelend));
+
+static boolean elf64_alpha_relax_without_lituse
+  PARAMS((struct alpha_relax_info *info, bfd_vma symval,
+          Elf_Internal_Rela *irel));
+
+static bfd_vma elf64_alpha_relax_opt_call
+  PARAMS((struct alpha_relax_info *info, bfd_vma symval));
+
+static boolean elf64_alpha_relax_section
+  PARAMS((bfd *abfd, asection *sec, struct bfd_link_info *link_info,
+         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;
+}
+
+static Elf_Internal_Rela *
+elf64_alpha_relax_with_lituse (info, symval, irel, irelend)
+     struct alpha_relax_info *info;
+     bfd_vma symval;
+     Elf_Internal_Rela *irel, *irelend;
+{
+  Elf_Internal_Rela *urel;
+  int flags, count, i;
+  bfd_signed_vma disp;
+  boolean fits16;
+  boolean fits32;
+  boolean lit_reused = false;
+  boolean all_optimized = true;
+  unsigned int lit_insn;
+
+  lit_insn = bfd_get_32 (info->abfd, info->contents + irel->r_offset);
+  if (lit_insn >> 26 != OP_LDQ)
+    {
+      ((*_bfd_error_handler)
+       ("%s: %s+0x%lx: warning: LITERAL relocation against unexpected insn",
+       bfd_archive_filename (info->abfd), info->sec->name,
+       (unsigned long) irel->r_offset));
+      return irel;
+    }
+
+  /* Summarize how this particular LITERAL is used.  */
+  for (urel = irel+1, flags = count = 0; urel < irelend; ++urel, ++count)
+    {
+      if (ELF64_R_TYPE (urel->r_info) != R_ALPHA_LITUSE)
+       break;
+      if (urel->r_addend <= 3)
+       flags |= 1 << urel->r_addend;
+    }
+
+  /* A little preparation for the loop...  */
+  disp = symval - info->gp;
+
+  for (urel = irel+1, i = 0; i < count; ++i, ++urel)
+    {
+      unsigned int insn;
+      int insn_disp;
+      bfd_signed_vma xdisp;
+
+      insn = bfd_get_32 (info->abfd, info->contents + urel->r_offset);
+
+      switch (urel->r_addend)
+       {
+       default: /* 0 = ADDRESS FORMAT */
+         /* 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 1: /* MEM FORMAT */
+         /* We can always optimize 16-bit displacements.  */
+
+         /* Extract the displacement from the instruction, sign-extending
+            it if necessary, then test whether it is within 16 or 32 bits
+            displacement from GP.  */
+         insn_disp = insn & 0x0000ffff;
+         if (insn_disp & 0x00008000)
+           insn_disp |= 0xffff0000;  /* Negative: sign-extend.  */
+
+         xdisp = disp + insn_disp;
+         fits16 = (xdisp >= - (bfd_signed_vma) 0x00008000 && xdisp < 0x00008000);
+         fits32 = (xdisp >= - (bfd_signed_vma) 0x80000000 && xdisp < 0x7fff8000);
+
+         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;
+
+             bfd_put_32 (info->abfd, (bfd_vma) insn,
+                         info->contents + urel->r_offset);
+             info->changed_contents = true;
+           }
+
+         /* If all mem+byte, we can optimize 32-bit mem displacements.  */
+         else if (fits32 && !(flags & ~6))
+           {
+             /* FIXME: sanity check that lit insn Ra is mem insn Rb.  */
+
+             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;
+
+             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;
+
+       case 2: /* BYTE OFFSET FORMAT */
+         /* We can always optimize byte instructions.  */
+
+         /* FIXME: sanity check the insn for byte op.  Check that the
+            literal dest reg is indeed Rb in the byte insn.  */
+
+         insn &= ~ (unsigned) 0x001ff000;
+         insn |= ((symval & 7) << 13) | 0x1000;
+
+         urel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+         urel->r_addend = 0;
+         info->changed_relocs = true;
+
+         bfd_put_32 (info->abfd, (bfd_vma) insn,
+                     info->contents + urel->r_offset);
+         info->changed_contents = true;
+         break;
+
+       case 3: /* CALL FORMAT */
+         {
+           /* If not zero, place to jump without needing pv.  */
+           bfd_vma optdest = elf64_alpha_relax_opt_call (info, symval);
+           bfd_vma org = (info->sec->output_section->vma
+                          + info->sec->output_offset
+                          + urel->r_offset + 4);
+           bfd_signed_vma odisp;
+
+           odisp = (optdest ? optdest : symval) - org;
+           if (odisp >= -0x400000 && odisp < 0x400000)
+             {
+               Elf_Internal_Rela *xrel;
+
+               /* 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);
+
+               urel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
+                                            R_ALPHA_BRADDR);
+               urel->r_addend = irel->r_addend;
+
+               if (optdest)
+                 urel->r_addend += optdest - symval;
+               else
+                 all_optimized = false;
+
+               bfd_put_32 (info->abfd, (bfd_vma) insn,
+                           info->contents + urel->r_offset);
+
+               /* Kill any HINT reloc that might exist for this insn.  */
+               xrel = (elf64_alpha_find_reloc_at_ofs
+                       (info->relocs, info->relend, urel->r_offset,
+                        R_ALPHA_HINT));
+               if (xrel)
+                 xrel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+
+               info->changed_contents = true;
+               info->changed_relocs = true;
+             }
+           else
+             all_optimized = false;
+
+           /* Even if the target is not in range for a direct branch,
+              if we share a GP, we can eliminate the gp reload.  */
+           if (optdest)
+             {
+               Elf_Internal_Rela *gpdisp
+                 = (elf64_alpha_find_reloc_at_ofs
+                    (irel, 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);
+
+                   /* 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);
+
+                       gpdisp->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
+                       info->changed_contents = true;
+                       info->changed_relocs = true;
+                     }
+                 }
+             }
+         }
+         break;
+       }
+    }
+
+  /* If all cases were optimized, we can reduce the use count on this
+     got entry by one, possibly eliminating it.  */
+  if (all_optimized)
+    {
+      info->gotent->use_count -= 1;
+      alpha_elf_tdata (info->gotent->gotobj)->total_got_entries -= 1;
+      if (!info->h)
+       alpha_elf_tdata (info->gotent->gotobj)->n_local_got_entries -= 1;
+
+      /* If 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;
+
+         bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP,
+                     info->contents + irel->r_offset);
+         info->changed_contents = true;
+       }
+    }
+
+  return irel + count;
+}
+
+static bfd_vma
+elf64_alpha_relax_opt_call (info, symval)
+     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.  */
+
+  /* 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 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
+    {
+      Elf_Internal_Rela *tsec_relocs, *tsec_relend, *tsec_free, *gpdisp;
+      bfd_vma ofs;
+
+      /* 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_elf64_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);
+       }
+
+      /* Recover the symbol's offset within the section.  */
+      ofs = (symval - info->tsec->output_section->vma
+            - info->tsec->output_offset);
+
+      /* Look for a GPDISP reloc.  */
+      gpdisp = (elf64_alpha_find_reloc_at_ofs
+               (tsec_relocs, tsec_relend, ofs, R_ALPHA_GPDISP));
+
+      if (!gpdisp || gpdisp->r_addend != 4)
+       {
+         if (tsec_free)
+           free (tsec_free);
+         return 0;
+       }
+      if (tsec_free)
+        free (tsec_free);
+    }
+
+  /* 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 symval + 8;
+}
+
+static boolean
+elf64_alpha_relax_without_lituse (info, symval, irel)
+     struct alpha_relax_info *info;
+     bfd_vma symval;
+     Elf_Internal_Rela *irel;
+{
+  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)
+    {
+      ((*_bfd_error_handler)
+       ("%s: %s+0x%lx: warning: LITERAL relocation against unexpected insn",
+       bfd_archive_filename (info->abfd), info->sec->name,
+       (unsigned long) irel->r_offset));
+      return true;
+    }
+
+  /* So we aren't told much.  Do what we can with the address load and
+     fake the rest.  All of the optimizations here require that the
+     offset from the GP fit in 16 bits.  */
+
+  disp = symval - info->gp;
+  if (disp < -0x8000 || disp >= 0x8000)
+    return true;
+
+  /* On the LITERAL instruction itself, consider exchanging
+     `ldq R,X(gp)' for `lda R,Y(gp)'.  */
+
+  insn = (OP_LDA << 26) | (insn & 0x03ff0000);
+  bfd_put_32 (info->abfd, (bfd_vma) insn, info->contents + irel->r_offset);
+  info->changed_contents = true;
+
+  irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info), R_ALPHA_GPREL16);
+  info->changed_relocs = true;
+
+  /* Reduce the use count on this got entry by one, possibly
+     eliminating it.  */
+  info->gotent->use_count -= 1;
+  alpha_elf_tdata (info->gotent->gotobj)->total_got_entries -= 1;
+  if (!info->h)
+    alpha_elf_tdata (info->gotent->gotobj)->n_local_got_entries -= 1;
+
+  /* ??? 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.
+
+     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.
+
+     Any such jsr insn can be replaced by a bsr if it is in range.
+
+     This would mean that we'd have to _add_ relocations, the pain of
+     which gives one pause.  */
+
+  return true;
+}
+
+static boolean
+elf64_alpha_relax_section (abfd, sec, link_info, again)
+     bfd *abfd;
+     asection *sec;
+     struct bfd_link_info *link_info;
+     boolean *again;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Shdr *shndx_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *free_relocs = NULL;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_byte *free_contents = NULL;
+  Elf64_External_Sym *extsyms = NULL;
+  Elf64_External_Sym *free_extsyms = NULL;
+  Elf_External_Sym_Shndx *shndx_buf = NULL;
+  struct alpha_elf_got_entry **local_got_entries;
+  struct alpha_relax_info info;
+
+  /* We are not currently changing any sizes, so only one pass.  */
+  *again = false;
+
+  if (link_info->relocateable
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0)
+    return true;
+
+  /* If this is the first time we have been called for this section,
+     initialize the cooked size.  */
+  if (sec->_cooked_size == 0)
+    sec->_cooked_size = sec->_raw_size;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  local_got_entries = alpha_elf_tdata(abfd)->local_got_entries;
+
+  /* Load the relocations for this section.  */
+  internal_relocs = (_bfd_elf64_link_read_relocs
+                    (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
+                     link_info->keep_memory));
+  if (internal_relocs == NULL)
+    goto error_return;
+  if (! link_info->keep_memory)
+    free_relocs = internal_relocs;
+
+  memset(&info, 0, sizeof (info));
+  info.abfd = abfd;
+  info.sec = sec;
+  info.link_info = link_info;
+  info.relocs = internal_relocs;
+  info.relend = irelend = internal_relocs + sec->reloc_count;
+
+  /* Find the GP for this object.  */
+  info.gotobj = alpha_elf_tdata (abfd)->gotobj;
+  if (info.gotobj)
+    {
+      asection *sgot = alpha_elf_tdata (info.gotobj)->got;
+      info.gp = _bfd_get_gp_value (info.gotobj);
+      if (info.gp == 0)
+       {
+         info.gp = (sgot->output_section->vma
+                    + sgot->output_offset
+                    + 0x8000);
+         _bfd_set_gp_value (info.gotobj, info.gp);
+       }
+    }
+
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma symval;
+      Elf_Internal_Sym isym;
+      struct alpha_elf_got_entry *gotent;
+
+      if (ELF64_R_TYPE (irel->r_info) != (int) R_ALPHA_LITERAL)
+       continue;
+
+      /* Get the section contents.  */
+      if (info.contents == NULL)
+       {
+         if (elf_section_data (sec)->this_hdr.contents != NULL)
+           info.contents = elf_section_data (sec)->this_hdr.contents;
+         else
+           {
+             info.contents = (bfd_byte *) bfd_malloc (sec->_raw_size);
+             if (info.contents == NULL)
+               goto error_return;
+             free_contents = info.contents;
+
+             if (! bfd_get_section_contents (abfd, sec, info.contents,
+                                             (file_ptr) 0, sec->_raw_size))
+               goto error_return;
+           }
+       }
+
+      /* Read this BFD's symbols if we haven't done so already.  */
+      if (extsyms == NULL)
+       {
+         bfd_size_type amt;
+
+         if (symtab_hdr->contents != NULL)
+           extsyms = (Elf64_External_Sym *) symtab_hdr->contents;
+         else
+           {
+             amt = symtab_hdr->sh_info;
+             amt *= sizeof (Elf64_External_Sym);
+             extsyms = (Elf64_External_Sym *) bfd_malloc (amt);
+             if (extsyms == NULL)
+               goto error_return;
+             free_extsyms = extsyms;
+             if (bfd_seek (abfd, symtab_hdr->sh_offset, SEEK_SET) != 0
+                 || bfd_bread ((PTR) extsyms, amt, abfd) != amt)
+               goto error_return;
+           }
+
+         shndx_hdr = &elf_tdata (abfd)->symtab_shndx_hdr;
+         if (shndx_hdr->sh_size != 0)
+           {
+             amt = symtab_hdr->sh_info;
+             amt *= sizeof (Elf_External_Sym_Shndx);
+             shndx_buf = (Elf_External_Sym_Shndx *) bfd_malloc (amt);
+             if (shndx_buf == NULL)
+               goto error_return;
+             if (bfd_seek (abfd, shndx_hdr->sh_offset, SEEK_SET) != 0
+                 || bfd_bread ((PTR) shndx_buf, amt, abfd) != amt)
+               goto error_return;
+           }
+       }
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (ELF64_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+       {
+         /* A local symbol.  */
+         Elf64_External_Sym *esym;
+         Elf_External_Sym_Shndx *shndx;
+
+         esym = extsyms + ELF64_R_SYM (irel->r_info);
+         shndx = shndx_buf + (shndx_buf ? ELF64_R_SYM (irel->r_info) : 0);
+         bfd_elf64_swap_symbol_in (abfd, esym, shndx, &isym);
+         if (isym.st_shndx == SHN_UNDEF)
+           info.tsec = bfd_und_section_ptr;
+         else if (isym.st_shndx == SHN_ABS)
+           info.tsec = bfd_abs_section_ptr;
+         else if (isym.st_shndx == SHN_COMMON)
+           info.tsec = bfd_com_section_ptr;
+         else
+           info.tsec = bfd_section_from_elf_index (abfd, isym.st_shndx);
+
+         info.h = NULL;
+         info.other = isym.st_other;
+         gotent = local_got_entries[ELF64_R_SYM(irel->r_info)];
+         symval = isym.st_value;
+       }
+      else
+       {
+         unsigned long indx;
+         struct alpha_elf_link_hash_entry *h;
+
+         indx = ELF64_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+         h = alpha_elf_sym_hashes (abfd)[indx];
+         BFD_ASSERT (h != NULL);
+
+         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;
+
+         /* We can't do anthing with undefined or dynamic symbols.  */
+         if (h->root.root.type == bfd_link_hash_undefined
+             || h->root.root.type == bfd_link_hash_undefweak
+             || alpha_elf_dynamic_symbol_p (&h->root, link_info))
+           continue;
+
+         info.h = h;
+         info.tsec = h->root.root.u.def.section;
+         info.other = h->root.other;
+         gotent = h->got_entries;
+         symval = h->root.root.u.def.value;
+       }
+
+      /* Search for the got entry to be used by this relocation.  */
+      while (gotent->gotobj != info.gotobj || gotent->addend != irel->r_addend)
+       gotent = gotent->next;
+      info.gotent = gotent;
+
+      symval += info.tsec->output_section->vma + info.tsec->output_offset;
+      symval += irel->r_addend;
+
+      BFD_ASSERT(info.gotent != NULL);
+
+      /* If there exist LITUSE relocations immediately following, this
+        opens up all sorts of interesting optimizations, because we
+        now know every location that this address load is used.  */
+
+      if (irel+1 < irelend && ELF64_R_TYPE (irel[1].r_info) == R_ALPHA_LITUSE)
+       {
+         irel = elf64_alpha_relax_with_lituse (&info, symval, irel, irelend);
+         if (irel == NULL)
+           goto error_return;
+       }
+      else
+       {
+         if (!elf64_alpha_relax_without_lituse (&info, symval, irel))
+           goto error_return;
+       }
+    }
+
+  if (!elf64_alpha_size_got_sections (abfd, link_info))
+    return false;
+
+  if (info.changed_relocs)
+    {
+      elf_section_data (sec)->relocs = internal_relocs;
+    }
+  else if (free_relocs != NULL)
+    {
+      free (free_relocs);
+    }
+
+  if (info.changed_contents)
+    {
+      elf_section_data (sec)->this_hdr.contents = info.contents;
+    }
+  else if (free_contents != NULL)
+    {
+      if (! link_info->keep_memory)
+       free (free_contents);
+      else
+       {
+         /* Cache the section contents for elf_link_input_bfd.  */
+         elf_section_data (sec)->this_hdr.contents = info.contents;
+       }
+    }
+
+  if (shndx_buf != NULL)
+    free (shndx_buf);
+
+  if (free_extsyms != NULL)
+    {
+      if (! link_info->keep_memory)
+       free (free_extsyms);
+      else
+       {
+         /* Cache the symbols for elf_link_input_bfd.  */
+         symtab_hdr->contents = (unsigned char *) extsyms;
+       }
     }
-  return 0;
-}
 
-/* Given an Alpha ELF reloc type, fill in an arelent structure.  */
+  *again = info.changed_contents || info.changed_relocs;
 
-static void
-elf64_alpha_info_to_howto (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf64_Internal_Rela *dst;
-{
-  unsigned r_type;
+  return true;
 
-  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];
+ error_return:
+  if (free_relocs != NULL)
+    free (free_relocs);
+  if (free_contents != NULL)
+    free (free_contents);
+  if (shndx_buf != NULL)
+    free (shndx_buf);
+  if (free_extsyms != NULL)
+    free (free_extsyms);
+  return false;
 }
 \f
 /* PLT/GOT Stuff */
 #define PLT_HEADER_SIZE 32
-#define PLT_HEADER_WORD1       0xc3600000      /* br   $27,.+4     */
-#define PLT_HEADER_WORD2       0xa77b000c      /* ldq  $27,12($27) */
-#define PLT_HEADER_WORD3       0x47ff041f      /* nop              */
-#define PLT_HEADER_WORD4       0x6b7b0000      /* jmp  $27,($27)   */
+#define PLT_HEADER_WORD1       (bfd_vma) 0xc3600000    /* br   $27,.+4     */
+#define PLT_HEADER_WORD2       (bfd_vma) 0xa77b000c    /* ldq  $27,12($27) */
+#define PLT_HEADER_WORD3       (bfd_vma) 0x47ff041f    /* nop              */
+#define PLT_HEADER_WORD4       (bfd_vma) 0x6b7b0000    /* jmp  $27,($27)   */
 
 #define PLT_ENTRY_SIZE 12
 #define PLT_ENTRY_WORD1                0xc3800000      /* br   $28, plt0   */
@@ -1022,7 +1649,7 @@ elf64_alpha_info_to_howto (abfd, cache_ptr, dst)
 \f
 /* Handle an Alpha specific section when reading an object file.  This
    is called when elfcode.h finds a section with an unknown type.
-   FIXME: We need to handle the SHF_MIPS_GPREL flag, but I'm not sure
+   FIXME: We need to handle the SHF_ALPHA_GPREL flag, but I'm not sure
    how to.  */
 
 static boolean
@@ -1044,13 +1671,6 @@ elf64_alpha_section_from_shdr (abfd, hdr, name)
       if (strcmp (name, ".mdebug") != 0)
        return false;
       break;
-#ifdef ERIC_neverdef
-    case SHT_ALPHA_REGINFO:
-      if (strcmp (name, ".reginfo") != 0
-         || hdr->sh_size != sizeof (Elf64_External_RegInfo))
-       return false;
-      break;
-#endif
     default:
       return false;
     }
@@ -1067,22 +1687,18 @@ elf64_alpha_section_from_shdr (abfd, hdr, name)
        return false;
     }
 
-#ifdef ERIC_neverdef
-  /* For a .reginfo section, set the gp value in the tdata information
-     from the contents of this section.  We need the gp value while
-     processing relocs, so we just get it now.  */
-  if (hdr->sh_type == SHT_ALPHA_REGINFO)
-    {
-      Elf64_External_RegInfo ext;
-      Elf64_RegInfo s;
+  return true;
+}
 
-      if (! bfd_get_section_contents (abfd, newsect, (PTR) &ext,
-                                     (file_ptr) 0, sizeof ext))
-       return false;
-      bfd_alpha_elf64_swap_reginfo_in (abfd, &ext, &s);
-      elf_gp (abfd) = s.ri_gp_value;
-    }
-#endif
+/* Convert Alpha specific section flags to bfd internal section flags.  */
+
+static boolean
+elf64_alpha_section_flags (flags, hdr)
+     flagword *flags;
+     Elf64_Internal_Shdr *hdr;
+{
+  if (hdr->sh_flags & SHF_ALPHA_GPREL)
+    *flags |= SEC_SMALL_DATA;
 
   return true;
 }
@@ -1110,31 +1726,8 @@ elf64_alpha_fake_sections (abfd, hdr, sec)
       else
        hdr->sh_entsize = 1;
     }
-#ifdef ERIC_neverdef
-  else if (strcmp (name, ".reginfo") == 0)
-    {
-      hdr->sh_type = SHT_ALPHA_REGINFO;
-      /* In a shared object on Irix 5.3, the .reginfo section has an
-         entsize of 0x18.  FIXME: Does this matter?  */
-      if ((abfd->flags & DYNAMIC) != 0)
-       hdr->sh_entsize = sizeof (Elf64_External_RegInfo);
-      else
-       hdr->sh_entsize = 1;
-
-      /* Force the section size to the correct value, even if the
-        linker thinks it is larger.  The link routine below will only
-        write out this much data for .reginfo.  */
-      hdr->sh_size = sec->_raw_size = sizeof (Elf64_External_RegInfo);
-    }
-  else if (strcmp (name, ".hash") == 0
-          || strcmp (name, ".dynamic") == 0
-          || strcmp (name, ".dynstr") == 0)
-    {
-      hdr->sh_entsize = 0;
-      hdr->sh_info = SIZEOF_ALPHA_DYNSYM_SECNAMES;
-    }
-#endif
-  else if (strcmp (name, ".sdata") == 0
+  else if ((sec->flags & SEC_SMALL_DATA)
+          || strcmp (name, ".sdata") == 0
           || strcmp (name, ".sbss") == 0
           || strcmp (name, ".lit4") == 0
           || strcmp (name, ".lit8") == 0)
@@ -1143,32 +1736,43 @@ elf64_alpha_fake_sections (abfd, hdr, sec)
   return true;
 }
 
-/* Return the number of additional phdrs we will need.  */
+/* Hook called by the linker routine which adds symbols from an object
+   file.  We use it to put .comm items in .sbss, and not .bss.  */
 
-static int
-elf64_alpha_additional_program_headers (abfd)
+static boolean
+elf64_alpha_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
      bfd *abfd;
+     struct bfd_link_info *info;
+     const Elf_Internal_Sym *sym;
+     const char **namep ATTRIBUTE_UNUSED;
+     flagword *flagsp ATTRIBUTE_UNUSED;
+     asection **secp;
+     bfd_vma *valp;
 {
-  asection *s;
-  int ret;
+  if (sym->st_shndx == SHN_COMMON
+      && !info->relocateable
+      && sym->st_size <= elf_gp_size (abfd))
+    {
+      /* Common symbols less than or equal to -G nn bytes are
+        automatically put into .sbss.  */
 
-  ret = 0;
+      asection *scomm = bfd_get_section_by_name (abfd, ".scommon");
 
-  s = bfd_get_section_by_name (abfd, ".reginfo");
-  if (s != NULL && (s->flags & SEC_LOAD) != 0)
-    {
-      /* We need a PT_ALPHA_REGINFO segment.  */
-      ++ret;
-    }
+      if (scomm == NULL)
+       {
+         scomm = bfd_make_section (abfd, ".scommon");
+         if (scomm == NULL
+             || !bfd_set_section_flags (abfd, scomm, (SEC_ALLOC
+                                                      | SEC_IS_COMMON
+                                                      | SEC_LINKER_CREATED)))
+           return false;
+       }
 
-  if (bfd_get_section_by_name (abfd, ".dynamic") != NULL
-      && bfd_get_section_by_name (abfd, ".mdebug") != NULL)
-    {
-      /* We need a PT_ALPHA_RTPROC segment.  */
-      ++ret;
+      *secp = scomm;
+      *valp = sym->st_size;
     }
 
-  return ret;
+  return true;
 }
 
 /* Create the .got section.  */
@@ -1176,7 +1780,7 @@ elf64_alpha_additional_program_headers (abfd)
 static boolean
 elf64_alpha_create_got_section(abfd, info)
      bfd *abfd;
-     struct bfd_link_info *info;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
 {
   asection *s;
 
@@ -1298,8 +1902,9 @@ elf64_alpha_read_ecoff_info (abfd, section, debug)
   char *ext_hdr = NULL;
 
   swap = get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
+  memset (debug, 0, sizeof (*debug));
 
-  ext_hdr = (char *) bfd_malloc ((size_t) swap->external_hdr_size);
+  ext_hdr = (char *) bfd_malloc (swap->external_hdr_size);
   if (ext_hdr == NULL && swap->external_hdr_size != 0)
     goto error_return;
 
@@ -1318,12 +1923,12 @@ elf64_alpha_read_ecoff_info (abfd, section, debug)
     debug->ptr = NULL;                                                 \
   else                                                                 \
     {                                                                  \
-      debug->ptr = (type) bfd_malloc ((size_t) (size * symhdr->count));        \
+      bfd_size_type amt = (bfd_size_type) size * symhdr->count;                \
+      debug->ptr = (type) bfd_malloc (amt);                            \
       if (debug->ptr == NULL)                                          \
        goto error_return;                                              \
       if (bfd_seek (abfd, (file_ptr) symhdr->offset, SEEK_SET) != 0    \
-         || (bfd_read (debug->ptr, size, symhdr->count,                \
-                       abfd) != size * symhdr->count))                 \
+         || bfd_bread (debug->ptr, amt, abfd) != amt)                  \
        goto error_return;                                              \
     }
 
@@ -1378,7 +1983,7 @@ elf64_alpha_read_ecoff_info (abfd, section, debug)
 
 static boolean
 elf64_alpha_is_local_label_name (abfd, name)
-     bfd *abfd;
+     bfd *abfd ATTRIBUTE_UNUSED;
      const char *name;
 {
   return name[0] == '$';
@@ -1408,6 +2013,12 @@ elf64_alpha_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
 {
   asection *msec;
 
+  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;
+
   msec = bfd_get_section_by_name (abfd, ".mdebug");
   if (msec != NULL)
     {
@@ -1430,9 +2041,9 @@ elf64_alpha_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
          char *fraw_src;
          char *fraw_end;
          struct fdr *fdr_ptr;
+         bfd_size_type amt = sizeof (struct mips_elf_find_line);
 
-         fi = ((struct mips_elf_find_line *)
-               bfd_zalloc (abfd, sizeof (struct mips_elf_find_line)));
+         fi = (struct mips_elf_find_line *) bfd_zalloc (abfd, amt);
          if (fi == NULL)
            {
              msec->flags = origflags;
@@ -1446,10 +2057,8 @@ elf64_alpha_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
            }
 
          /* Swap in the FDR information.  */
-         fi->d.fdr = ((struct fdr *)
-                      bfd_alloc (abfd,
-                                 (fi->d.symbolic_header.ifdMax *
-                                  sizeof (struct fdr))));
+         amt = fi->d.symbolic_header.ifdMax * sizeof (struct fdr);
+         fi->d.fdr = (struct fdr *) bfd_alloc (abfd, amt);
          if (fi->d.fdr == NULL)
            {
              msec->flags = origflags;
@@ -1614,15 +2223,12 @@ elf64_alpha_output_extsym (h, data)
        {
          output_section = sec->output_section;
          if (output_section != NULL)
-           h->esym.asym.value = (h->root.plt_offset
+           h->esym.asym.value = (h->root.plt.offset
                                  + sec->output_offset
                                  + output_section->vma);
          else
            h->esym.asym.value = 0;
        }
-#if 0 /* FIXME?  */
-      h->esym.ifd = 0;
-#endif
     }
 
   if (! bfd_ecoff_debug_one_external (einfo->abfd, einfo->debug, einfo->swap,
@@ -1664,6 +2270,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
   struct alpha_elf_got_entry **local_got_entries;
   const Elf_Internal_Rela *rel, *relend;
   int got_created;
+  bfd_size_type amt;
 
   if (info->relocateable)
     return true;
@@ -1691,6 +2298,11 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
       else
        {
          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;
+
          h->root.elf_link_hash_flags |= ELF_LINK_HASH_REF_REGULAR;
        }
       r_type = ELF64_R_TYPE (rel->r_info);
@@ -1712,9 +2324,9 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
 
                if (!gotent)
                  {
+                   amt = sizeof (struct alpha_elf_got_entry);
                    gotent = ((struct alpha_elf_got_entry *)
-                             bfd_alloc (abfd,
-                                        sizeof (struct alpha_elf_got_entry)));
+                             bfd_alloc (abfd, amt));
                    if (!gotent)
                      return false;
 
@@ -1722,28 +2334,31 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
                    gotent->addend = rel->r_addend;
                    gotent->got_offset = -1;
                    gotent->flags = 0;
+                   gotent->use_count = 1;
 
                    gotent->next = h->got_entries;
                    h->got_entries = gotent;
 
                    alpha_elf_tdata (abfd)->total_got_entries++;
                  }
+               else
+                 gotent->use_count += 1;
              }
            else
              {
                /* This is a local .got entry -- record for merge.  */
                if (!local_got_entries)
                  {
-                   size_t size;
-                   size = (symtab_hdr->sh_info
-                           * sizeof (struct alpha_elf_got_entry *));
+                   bfd_size_type size;
+                   size = symtab_hdr->sh_info;
+                   size *= sizeof (struct alpha_elf_got_entry *);
 
                    local_got_entries = ((struct alpha_elf_got_entry **)
                                         bfd_alloc (abfd, size));
                    if (!local_got_entries)
                      return false;
 
-                   memset (local_got_entries, 0, size);
+                   memset (local_got_entries, 0, (size_t) size);
                    alpha_elf_tdata (abfd)->local_got_entries =
                      local_got_entries;
                  }
@@ -1754,9 +2369,9 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
                  continue;
                if (!gotent)
                  {
+                   amt = sizeof (struct alpha_elf_got_entry);
                    gotent = ((struct alpha_elf_got_entry *)
-                             bfd_alloc (abfd,
-                                        sizeof (struct alpha_elf_got_entry)));
+                             bfd_alloc (abfd, amt));
                    if (!gotent)
                      return false;
 
@@ -1764,6 +2379,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
                    gotent->addend = rel->r_addend;
                    gotent->got_offset = -1;
                    gotent->flags = 0;
+                   gotent->use_count = 1;
 
                    gotent->next = local_got_entries[ELF64_R_SYM(rel->r_info)];
                    local_got_entries[ELF64_R_SYM(rel->r_info)] = gotent;
@@ -1771,6 +2387,8 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
                    alpha_elf_tdata(abfd)->total_got_entries++;
                    alpha_elf_tdata(abfd)->n_local_got_entries++;
                  }
+               else
+                 gotent->use_count += 1;
              }
 
            /* Remember how this literal is used from its LITUSEs.
@@ -1808,7 +2426,11 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
          /* FALLTHRU */
 
        case R_ALPHA_GPDISP:
+       case R_ALPHA_GPREL16:
        case R_ALPHA_GPREL32:
+       case R_ALPHA_GPRELHIGH:
+       case R_ALPHA_GPRELLOW:
+       case R_ALPHA_BRSGP:
          /* We don't actually use the .got here, but the sections must
             be created before the linker maps input sections to output
             sections.  */
@@ -1858,14 +2480,15 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
              sreloc = bfd_get_section_by_name (dynobj, rel_sec_name);
              if (sreloc == NULL)
                {
+                 flagword flags;
+
                  sreloc = bfd_make_section (dynobj, rel_sec_name);
+                 flags = (SEC_HAS_CONTENTS | SEC_IN_MEMORY
+                          | SEC_LINKER_CREATED | SEC_READONLY);
+                 if (sec->flags & SEC_ALLOC)
+                   flags |= SEC_ALLOC | SEC_LOAD;
                  if (sreloc == NULL
-                     || !bfd_set_section_flags (dynobj, sreloc,
-                                                (SEC_ALLOC|SEC_LOAD
-                                                 | SEC_HAS_CONTENTS
-                                                 | SEC_IN_MEMORY
-                                                 | SEC_LINKER_CREATED
-                                                 | SEC_READONLY))
+                     || !bfd_set_section_flags (dynobj, sreloc, flags)
                      || !bfd_set_section_alignment (dynobj, sreloc, 3))
                    return false;
                }
@@ -1877,7 +2500,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
                 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. */
+                expand the relocation sections by the appropriate amount.  */
 
              struct alpha_elf_reloc_entry *rent;
 
@@ -1887,15 +2510,16 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
 
              if (!rent)
                {
-                 rent = ((struct alpha_elf_reloc_entry *)
-                         bfd_alloc (abfd,
-                                    sizeof (struct alpha_elf_reloc_entry)));
+                 amt = sizeof (struct alpha_elf_reloc_entry);
+                 rent = (struct alpha_elf_reloc_entry *) bfd_alloc (abfd, amt);
                  if (!rent)
                    return false;
 
                  rent->srel = sreloc;
                  rent->rtype = r_type;
                  rent->count = 1;
+                 rent->reltext = ((sec->flags & (SEC_READONLY | SEC_ALLOC))
+                                  == (SEC_READONLY | SEC_ALLOC));
 
                  rent->next = h->reloc_entries;
                  h->reloc_entries = rent;
@@ -1903,10 +2527,13 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs)
              else
                rent->count++;
            }
-         else if (info->shared)
+         else if (info->shared && (sec->flags & SEC_ALLOC))
            {
-             /* If this is a shared library, we need a RELATIVE reloc.  */
+             /* If this is a shared library, and the section is to be
+                loaded into memory, we need a RELATIVE reloc.  */
              sreloc->_raw_size += sizeof (Elf64_External_Rela);
+             if (sec->flags & SEC_READONLY)
+               info->flags |= DF_TEXTREL;
            }
          break;
        }
@@ -1936,8 +2563,7 @@ elf64_alpha_adjust_dynamic_symbol (info, h)
   /* Now that we've seen all of the input symbols, finalize our decision
      about whether this symbol should get a .plt entry.  */
 
-  if (h->root.type != bfd_link_hash_undefweak
-      && alpha_elf_dynamic_symbol_p (h, info)
+  if (alpha_elf_dynamic_symbol_p (h, info)
       && ((h->type == STT_FUNC
           && !(ah->flags & ALPHA_ELF_LINK_HASH_LU_ADDR))
          || (h->type == STT_NOTYPE
@@ -1958,17 +2584,18 @@ elf64_alpha_adjust_dynamic_symbol (info, h)
       if (s->_raw_size == 0)
        s->_raw_size = PLT_HEADER_SIZE;
 
-      h->plt_offset = s->_raw_size;
+      h->plt.offset = s->_raw_size;
       s->_raw_size += PLT_ENTRY_SIZE;
 
       /* 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)
+      if (! info->shared
+         && h->root.type != bfd_link_hash_defweak)
        {
          h->root.u.def.section = s;
-         h->root.u.def.value = h->plt_offset;
+         h->root.u.def.value = h->plt.offset;
        }
 
       /* We also need a JMP_SLOT entry in the .rela.plt section.  */
@@ -2001,6 +2628,79 @@ elf64_alpha_adjust_dynamic_symbol (info, h)
   return true;
 }
 
+/* Symbol versioning can create new symbols, and make our old symbols
+   indirect to the new ones.  Consolidate the got and reloc information
+   in these situations.  */
+
+static boolean
+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;
+
+  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);
+
+  /* Merge the flags.  Whee.  */
+
+  hs->flags |= hi->flags;
+
+  /* Merge the .got entries.  Cannibalize the old symbol's list in
+     doing so, since we don't need it anymore.  */
+
+  if (hs->got_entries == NULL)
+    hs->got_entries = hi->got_entries;
+  else
+    {
+      struct alpha_elf_got_entry *gi, *gs, *gin, *gsh;
+
+      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->addend == gs->addend)
+             goto got_found;
+         gi->next = hs->got_entries;
+         hs->got_entries = gi;
+       got_found:;
+       }
+    }
+  hi->got_entries = 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)
+       {
+         rin = ri->next;
+         for (rs = rsh; rs ; rs = rs->next)
+           if (ri->rtype == rs->rtype)
+             {
+               rs->count += ri->count;
+               goto found_reloc;
+             }
+         ri->next = hs->reloc_entries;
+         hs->reloc_entries = ri;
+       found_reloc:;
+       }
+    }
+  hi->reloc_entries = NULL;
+
+  return true;
+}
+
 /* Is it possible to merge two object file's .got tables?  */
 
 static boolean
@@ -2008,6 +2708,7 @@ elf64_alpha_can_merge_gots (a, b)
      bfd *a, *b;
 {
   int total = alpha_elf_tdata (a)->total_got_entries;
+  bfd *bsub;
 
   /* Trivial quick fallout test.  */
   if (total + alpha_elf_tdata (b)->total_got_entries <= MAX_GOT_ENTRIES)
@@ -2020,30 +2721,40 @@ elf64_alpha_can_merge_gots (a, b)
   /* 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.  */
-  {
-    struct alpha_elf_link_hash_entry **hashes = alpha_elf_sym_hashes(b);
-    Elf_Internal_Shdr *symtab_hdr = &elf_tdata(b)->symtab_hdr;
-    int i, n;
+  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 = symtab_hdr->sh_size / symtab_hdr->sh_entsize - symtab_hdr->sh_info;
-    for (i = 0; i < n; ++i)
-      {
-       struct alpha_elf_got_entry *ae, *be;
-       for (be = hashes[i]->got_entries; be ; be = be->next)
-         {
-           if (be->gotobj != b)
-             continue;
+      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;
 
-           for (ae = hashes[i]->got_entries; ae ; ae = ae->next)
-             if (ae->gotobj == a && ae->addend == be->addend)
-               goto global_found;
+         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;
 
-           if (++total > MAX_GOT_ENTRIES)
-             return false;
-         global_found:;
-         }
-      }
-  }
+         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->addend == be->addend)
+                 goto global_found;
+
+             if (++total > MAX_GOT_ENTRIES)
+               return false;
+           global_found:;
+           }
+       }
+    }
 
   return true;
 }
@@ -2054,66 +2765,91 @@ static void
 elf64_alpha_merge_gots (a, b)
      bfd *a, *b;
 {
-  int total = alpha_elf_tdata(a)->total_got_entries;
+  int total = alpha_elf_tdata (a)->total_got_entries;
+  bfd *bsub;
 
   /* Remember local expansion.  */
   {
-    int e = alpha_elf_tdata(b)->n_local_got_entries;
+    int e = alpha_elf_tdata (b)->n_local_got_entries;
     total += e;
-    alpha_elf_tdata(a)->n_local_got_entries += e;
+    alpha_elf_tdata (a)->n_local_got_entries += e;
   }
 
-  /* Let the local .got entries know they are part of a new subsegment.  */
-  {
-    struct alpha_elf_got_entry **local_got_entries;
-    local_got_entries = alpha_elf_tdata(b)->local_got_entries;
-    if (local_got_entries)
-      {
-       int i, n;
+  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;
+
+      /* 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;
+           }
+        }
 
-       n = elf_tdata(b)->symtab_hdr.sh_info;
-       for (i = 0; i < n; ++i)
-         {
-           struct alpha_elf_got_entry *gotent;
-           for (gotent = local_got_entries[i]; gotent; gotent = gotent->next)
-             gotent->gotobj = a;
-         }
-      }
-  }
+      /* Merge the global .got entries.  */
+      hashes = alpha_elf_sym_hashes (bsub);
+      symtab_hdr = &elf_tdata (bsub)->symtab_hdr;
 
-  /* Merge the global .got entries.  */
-  {
-    struct alpha_elf_link_hash_entry **hashes = alpha_elf_sym_hashes(b);
-    Elf_Internal_Shdr *symtab_hdr = &elf_tdata(b)->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, **pbe, **start;
+         struct alpha_elf_link_hash_entry *h;
 
-    n = symtab_hdr->sh_size / symtab_hdr->sh_entsize - symtab_hdr->sh_info;
-    for (i = 0; i < n; ++i)
-      {
-       struct alpha_elf_got_entry *ae, *be, **pbe, **start;
-       start = &hashes[i]->got_entries;
-       for (pbe = start, be = *start; be ; pbe = &be->next, be = be->next)
-         {
-           if (be->gotobj != b)
-             continue;
+         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 (ae = *start; ae ; ae = ae->next)
-             if (ae->gotobj == a && ae->addend == be->addend)
-               {
-                 ae->flags |= be->flags;
+         start = &h->got_entries;
+         for (pbe = start, be = *start; be ; pbe = &be->next, be = be->next)
+           {
+             if (be->use_count == 0)
+               {
                  *pbe = be->next;
-                 goto global_found;
-               }
-           be->gotobj = a;
-           total += 1;
+                 continue;
+               }
+             if (be->gotobj != b)
+               continue;
 
-         global_found:;
-         }
-      }
-  }
+             for (ae = *start; ae ; ae = ae->next)
+               if (ae->gotobj == a && ae->addend == be->addend)
+                 {
+                   ae->flags |= be->flags;
+                   ae->use_count += be->use_count;
+                   *pbe = be->next;
+                   goto global_found;
+                 }
+             be->gotobj = a;
+             total += 1;
 
-  alpha_elf_tdata(a)->total_got_entries = total;
-  alpha_elf_tdata(b)->gotobj = a;
+           global_found:;
+           }
+        }
+
+      alpha_elf_tdata (bsub)->gotobj = a;
+    }
+  alpha_elf_tdata (a)->total_got_entries = total;
+
+  /* Merge the two in_got chains.  */
+  {
+    bfd *next;
+
+    bsub = a;
+    while ((next = alpha_elf_tdata (bsub)->in_got_link_next) != NULL)
+      bsub = next;
+
+    alpha_elf_tdata (bsub)->in_got_link_next = b;
+  }
 }
 
 /* Calculate the offsets for the got entries.  */
@@ -2121,16 +2857,19 @@ elf64_alpha_merge_gots (a, b)
 static boolean
 elf64_alpha_calc_got_offsets_for_symbol (h, arg)
      struct alpha_elf_link_hash_entry *h;
-     PTR arg;
+     PTR arg ATTRIBUTE_UNUSED;
 {
   struct alpha_elf_got_entry *gotent;
 
   for (gotent = h->got_entries; gotent; gotent = gotent->next)
-    {
-      bfd_size_type *plge = &alpha_elf_tdata (gotent->gotobj)->got->_raw_size;
-      gotent->got_offset = *plge;
-      *plge += 8;
-    }
+    if (gotent->use_count > 0)
+      {
+       bfd_size_type *plge
+         = &alpha_elf_tdata (gotent->gotobj)->got->_raw_size;
+
+       gotent->got_offset = *plge;
+       *plge += 8;
+      }
 
   return true;
 }
@@ -2168,106 +2907,117 @@ elf64_alpha_calc_got_offsets (info)
 
          for (k = 0, n = elf_tdata(j)->symtab_hdr.sh_info; k < n; ++k)
            for (gotent = local_got_entries[k]; gotent; gotent = gotent->next)
-             {
-               gotent->got_offset = got_offset;
-               got_offset += 8;
-             }
+             if (gotent->use_count > 0)
+               {
+                 gotent->got_offset = got_offset;
+                 got_offset += 8;
+               }
        }
 
       alpha_elf_tdata(i)->got->_raw_size = got_offset;
+      alpha_elf_tdata(i)->got->_cooked_size = got_offset;
     }
 }
 
-/* Remove a section from the output BFD.  */
-
-static void
-elf64_alpha_strip_section_from_output (s)
-     asection *s;
-{
-  asection **spp;
-
-  for (spp = &s->output_section->owner->sections;
-       *spp != s->output_section;
-       spp = &(*spp)->next)
-    continue;
-  *spp = s->output_section->next;
-  --s->output_section->owner->section_count;
-}
-
 /* Constructs the gots.  */
 
 static boolean
-elf64_alpha_always_size_sections (output_bfd, info)
-     bfd *output_bfd;
+elf64_alpha_size_got_sections (output_bfd, info)
+     bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
 {
-  bfd *i, *got_list, *cur_got_obj, **cur_got_tail;
-  int ngots;
+  bfd *i, *got_list, *cur_got_obj = NULL;
+  int something_changed = 0;
 
-  if (info->relocateable)
-    return true;
+  got_list = alpha_elf_hash_table (info)->got_list;
 
-  ngots = 0;
-  got_list = NULL;
-  cur_got_obj = NULL;
-  cur_got_tail = NULL;
-  for (i = info->input_bfds; i ; i = i->link_next)
+  /* On the first time through, pretend we have an existing got list
+     consisting of all of the input files.  */
+  if (got_list == NULL)
     {
-      bfd *this_got = alpha_elf_tdata (i)->gotobj;
-
-      /* Don't play if there is no .got for this input file.  */
-      if (this_got == NULL)
-       continue;
-
-      if (alpha_elf_tdata (this_got)->total_got_entries > MAX_GOT_ENTRIES)
+      for (i = info->input_bfds; i ; i = i->link_next)
        {
-         /* Yikes! A single object file has too many entries.  */
-         (*_bfd_error_handler)
-           ("%s: .got subsegment exceeds 64K (size %d)",
-            bfd_get_filename(i),
-            alpha_elf_tdata(this_got)->total_got_entries * 8);
-         return false;
-       }
+         bfd *this_got = alpha_elf_tdata (i)->gotobj;
+         if (this_got == NULL)
+           continue;
 
-      if (cur_got_obj)
-       {
-         if (elf64_alpha_can_merge_gots (cur_got_obj, i))
+         /* We are assuming no merging has yet ocurred.  */
+         BFD_ASSERT (this_got == i);
+
+          if (alpha_elf_tdata (this_got)->total_got_entries > MAX_GOT_ENTRIES)
            {
-             elf64_alpha_merge_gots (cur_got_obj, i);
-             *cur_got_tail = i;
+             /* Yikes! A single object file has too many entries.  */
+             (*_bfd_error_handler)
+               (_("%s: .got subsegment exceeds 64K (size %d)"),
+                bfd_archive_filename (i),
+                alpha_elf_tdata (this_got)->total_got_entries * 8);
+             return false;
            }
+
+         if (got_list == NULL)
+           got_list = this_got;
          else
-           {
-             if (++ngots == 2)
-               {
-                 (*info->callbacks->warning)
-                   (info, "using multiple gp values", (char *) NULL,
-                    output_bfd, (asection *) NULL, (bfd_vma) 0);
-               }
-             *cur_got_tail = NULL;
-             alpha_elf_tdata(cur_got_obj)->got_link_next = got_list;
-             got_list = cur_got_obj;
-             cur_got_obj = i;
-           }
+           alpha_elf_tdata(cur_got_obj)->got_link_next = this_got;
+         cur_got_obj = this_got;
+       }
+
+      /* Strange degenerate case of no got references.  */
+      if (got_list == NULL)
+       return true;
+
+      alpha_elf_hash_table (info)->got_list = got_list;
+
+      /* Force got offsets to be recalculated.  */
+      something_changed = 1;
+    }
+
+  cur_got_obj = got_list;
+  i = alpha_elf_tdata(cur_got_obj)->got_link_next;
+  while (i != NULL)
+    {
+      if (elf64_alpha_can_merge_gots (cur_got_obj, i))
+       {
+         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;
        }
       else
        {
-         ++ngots;
          cur_got_obj = i;
+         i = alpha_elf_tdata(i)->got_link_next;
        }
-      cur_got_tail = &alpha_elf_tdata(i)->in_got_link_next;
     }
 
-  if (cur_got_obj)
-    alpha_elf_tdata (cur_got_obj)->got_link_next = got_list;
-  alpha_elf_hash_table (info)->got_list = got_list = cur_got_obj;
+  /* Once the gots have been merged, fill in the got offsets for
+     everything therein.  */
+  if (1 || something_changed)
+    elf64_alpha_calc_got_offsets (info);
 
-  /* Once the gots have been merged, fill in the got offsets for everything
-     therein.  */
-  elf64_alpha_calc_got_offsets (info);
+  return true;
+}
+
+static boolean
+elf64_alpha_always_size_sections (output_bfd, info)
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+{
+  bfd *i;
+
+  if (info->relocateable)
+    return true;
+
+  /* First, take care of the indirect symbols created by versioning.  */
+  alpha_elf_link_hash_traverse (alpha_elf_hash_table (info),
+                               elf64_alpha_merge_ind_symbols,
+                               NULL);
+
+  if (!elf64_alpha_size_got_sections (output_bfd, info))
+    return false;
 
   /* Allocate space for all of the .got subsections.  */
-  for (i = got_list; i ; i = alpha_elf_tdata(i)->got_link_next)
+  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->_raw_size > 0)
@@ -2308,50 +3058,44 @@ elf64_alpha_calc_dynrel_sizes (h, info)
     }
 
   /* If the symbol is dynamic, we'll need all the relocations in their
-     natural form.  If it has been forced local, we'll need the same 
-     number of RELATIVE relocations.  */
-  if (alpha_elf_dynamic_symbol_p (&h->root, info) 
-      || (info->shared && h->root.dynindx == -1))
-    {
-      struct alpha_elf_reloc_entry *relent;
-
-      for (relent = h->reloc_entries; relent; relent = relent->next)
-       {
-         relent->srel->_raw_size +=
-           sizeof (Elf64_External_Rela) * relent->count;
-       }
-
-      /* Only add a .rela.got entry if we're not using a .plt entry.  */
-      if (h->root.plt_offset == MINUS_ONE)
-       {
-         bfd *dynobj = elf_hash_table(info)->dynobj;
-         struct alpha_elf_got_entry *gotent;
-         bfd_size_type count = 0;
-         asection *srel;
+     natural form.  If this is a shared object, and it has been forced
+     local, we'll need the same number of RELATIVE relocations.  */
 
-         for (gotent = h->got_entries; gotent ; gotent = gotent->next)
-           count++;
-         if (count > 0)
-           {
-             srel = bfd_get_section_by_name (dynobj, ".rela.got");
-             BFD_ASSERT (srel != NULL);
-             srel->_raw_size += sizeof (Elf64_External_Rela) * count;
-           }
-       }
-    }
-  /* Otherwise, shared objects require RELATIVE relocs for all REFQUAD
-     and REFLONG relocations.  */
-  else if (info->shared)
+  if (alpha_elf_dynamic_symbol_p (&h->root, info) || info->shared)
     {
       struct alpha_elf_reloc_entry *relent;
+      bfd *dynobj;
+      struct alpha_elf_got_entry *gotent;
+      bfd_size_type count;
+      asection *srel;
 
       for (relent = h->reloc_entries; relent; relent = relent->next)
        if (relent->rtype == R_ALPHA_REFLONG
            || relent->rtype == R_ALPHA_REFQUAD)
          {
            relent->srel->_raw_size +=
-             sizeof(Elf64_External_Rela) * relent->count;
+             sizeof (Elf64_External_Rela) * relent->count;
+           if (relent->reltext)
+             info->flags |= DT_TEXTREL;
          }
+
+      dynobj = elf_hash_table(info)->dynobj;
+      count = 0;
+
+      for (gotent = h->got_entries; gotent ; gotent = gotent->next)
+       count++;
+
+      /* If we are using a .plt entry, subtract one, as the first
+        reference uses a .rela.plt entry instead.  */
+      if (h->root.plt.offset != MINUS_ONE)
+       count--;
+
+      if (count > 0)
+       {
+         srel = bfd_get_section_by_name (dynobj, ".rela.got");
+         BFD_ASSERT (srel != NULL);
+         srel->_raw_size += sizeof (Elf64_External_Rela) * count;
+       }
     }
 
   return true;
@@ -2361,12 +3105,11 @@ elf64_alpha_calc_dynrel_sizes (h, info)
 
 static boolean
 elf64_alpha_size_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
+     bfd *output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info;
 {
   bfd *dynobj;
   asection *s;
-  boolean reltext;
   boolean relplt;
 
   dynobj = elf_hash_table(info)->dynobj;
@@ -2407,7 +3150,7 @@ elf64_alpha_size_dynamic_sections (output_bfd, info)
               i = alpha_elf_tdata(i)->got_link_next)
            count += alpha_elf_tdata(i)->n_local_got_entries;
 
-         srel->_raw_size += count * sizeof(Elf64_External_Rela);
+         srel->_raw_size += count * sizeof (Elf64_External_Rela);
        }
     }
   /* else we're not dynamic and by definition we don't need such things.  */
@@ -2415,7 +3158,6 @@ elf64_alpha_size_dynamic_sections (output_bfd, info)
   /* The check_relocs and adjust_dynamic_symbol entry points have
      determined the sizes of the various dynamic sections.  Allocate
      memory for them.  */
-  reltext = false;
   relplt = false;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
@@ -2445,19 +3187,6 @@ elf64_alpha_size_dynamic_sections (output_bfd, info)
 
          if (!strip)
            {
-             const char *outname;
-             asection *target;
-
-             /* If this relocation section applies to a read only
-                section, then we probably need a DT_TEXTREL entry.  */
-             outname = bfd_get_section_name (output_bfd,
-                                             s->output_section);
-             target = bfd_get_section_by_name (output_bfd, outname + 5);
-             if (target != NULL
-                 && (target->flags & SEC_READONLY) != 0
-                 && (target->flags & SEC_ALLOC) != 0)
-               reltext = true;
-
              if (strcmp(name, ".rela.plt") == 0)
                relplt = true;
 
@@ -2473,44 +3202,16 @@ elf64_alpha_size_dynamic_sections (output_bfd, info)
        }
 
       if (strip)
-       elf64_alpha_strip_section_from_output (s);
+       _bfd_strip_section_from_output (info, s);
       else
        {
          /* Allocate memory for the section contents.  */
-         s->contents = (bfd_byte *) bfd_zalloc(dynobj, s->_raw_size);
+         s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
          if (s->contents == NULL && s->_raw_size != 0)
            return false;
        }
     }
 
-  /* If we are generating a shared library, we generate a section
-     symbol for each output section.  These are local symbols, which
-     means that they must come first in the dynamic symbol table.
-     That means we must increment the dynamic symbol index of every
-     other dynamic symbol.  */
-  if (info->shared)
-    {
-      long c[2], i;
-      asection *p;
-
-      c[0] = 0;
-      c[1] = bfd_count_sections (output_bfd);
-
-      elf_hash_table (info)->dynsymcount += c[1];
-      elf_link_hash_traverse (elf_hash_table(info),
-                             elf64_alpha_adjust_dynindx,
-                             (PTR) c);
-
-      for (i = 1, p = output_bfd->sections;
-          p != NULL;
-          p = p->next, i++)
-       {
-         elf_section_data (p)->dynindx = i;
-         /* These symbols will have no names, so we don't need to
-            fiddle with dynstr_index.  */
-       }
-    }
-
   if (elf_hash_table (info)->dynamic_sections_created)
     {
       /* Add some entries to the .dynamic section.  We fill in the
@@ -2518,51 +3219,38 @@ elf64_alpha_size_dynamic_sections (output_bfd, info)
         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_elf64_add_dynamic_entry (info, (bfd_vma) (TAG), (bfd_vma) (VAL))
+
       if (!info->shared)
        {
-         if (!bfd_elf64_add_dynamic_entry (info, DT_DEBUG, 0))
+         if (!add_dynamic_entry (DT_DEBUG, 0))
            return false;
        }
 
-      if (! bfd_elf64_add_dynamic_entry (info, DT_PLTGOT, 0))
+      if (!add_dynamic_entry (DT_PLTGOT, 0))
        return false;
 
       if (relplt)
        {
-         if (! bfd_elf64_add_dynamic_entry (info, DT_PLTRELSZ, 0)
-             || ! bfd_elf64_add_dynamic_entry (info, DT_PLTREL, DT_RELA)
-             || ! bfd_elf64_add_dynamic_entry (info, DT_JMPREL, 0))
+         if (!add_dynamic_entry (DT_PLTRELSZ, 0)
+             || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+             || !add_dynamic_entry (DT_JMPREL, 0))
            return false;
        }
 
-      if (! bfd_elf64_add_dynamic_entry (info, DT_RELA, 0)
-         || ! bfd_elf64_add_dynamic_entry (info, DT_RELASZ, 0)
-         || ! bfd_elf64_add_dynamic_entry (info, DT_RELAENT,
-                                           sizeof(Elf64_External_Rela)))
+      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 (reltext)
-       {
-         if (! bfd_elf64_add_dynamic_entry (info, DT_TEXTREL, 0))
-           return false;
-       }
-    }
-
-  return true;
-}
-
-/* Increment the index of a dynamic symbol by a given amount.  Called
-   via elf_link_hash_traverse.  */
-
-static boolean
-elf64_alpha_adjust_dynindx (h, cparg)
-     struct elf_link_hash_entry *h;
-     PTR cparg;
-{
-  long *cp = (long *)cparg;
-
-  if (h->dynindx >= cp[0])
-    h->dynindx += cp[1];
+      if (info->flags & DF_TEXTREL)
+       {
+         if (!add_dynamic_entry (DT_TEXTREL, 0))
+           return false;
+       }
+    }
+#undef add_dynamic_entry
 
   return true;
 }
@@ -2587,6 +3275,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
   asection *sec, *sgot, *srel, *srelgot;
   bfd *dynobj, *gotobj;
   bfd_vma gp;
+  boolean ret_val = true;
 
   srelgot = srel = NULL;
   symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
@@ -2642,6 +3331,12 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
             anything, unless the reloc is against a section symbol,
             in which case we have to adjust according to where the
             section symbol winds up in the output section.  */
+
+         /* The symbol associated with GPDISP and LITUSE is
+            immaterial.  Only the addend is significant.  */
+         if (r_type == R_ALPHA_GPDISP || r_type == R_ALPHA_LITUSE)
+           continue;
+
          if (r_symndx < symtab_hdr->sh_info)
            {
              sym = local_syms + r_symndx;
@@ -2665,9 +3360,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
        {
          sym = local_syms + r_symndx;
          sec = local_sections[r_symndx];
-         relocation = (sec->output_section->vma
-                       + sec->output_offset
-                       + sym->st_value);
+         relocation = _bfd_elf_rela_local_sym (output_bfd, sym, sec, rel);
        }
       else
        {
@@ -2682,33 +3375,8 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
            {
              sec = h->root.root.u.def.section;
 
-#if rth_notdef
-             if ((r_type == R_ALPHA_LITERAL
-                  && elf_hash_table(info)->dynamic_sections_created
-                  && (!info->shared
-                      || !info->symbolic
-                      || !(h->root.elf_link_hash_flags
-                           & ELF_LINK_HASH_DEF_REGULAR)))
-                 || (info->shared
-                     && (!info->symbolic
-                         || !(h->root.elf_link_hash_flags
-                              & ELF_LINK_HASH_DEF_REGULAR))
-                     && (input_section->flags & SEC_ALLOC)
-                     && (r_type == R_ALPHA_REFLONG
-                         || r_type == R_ALPHA_REFQUAD
-                         || r_type == R_ALPHA_LITERAL)))
-               {
-                 /* In these cases, we don't need the relocation value.
-                    We check specially because in some obscure cases
-                    sec->output_section will be NULL.  */
-                 relocation = 0;
-               }
-#else
-             /* FIXME: Are not these obscure cases simply bugs?  Let's
-                get something working and come back to this.  */
              if (sec->output_section == NULL)
                relocation = 0;
-#endif /* rth_notdef */
              else
                {
                  relocation = (h->root.root.u.def.value
@@ -2718,14 +3386,19 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
            }
          else if (h->root.root.type == bfd_link_hash_undefweak)
            relocation = 0;
-         else if (info->shared && !info->symbolic)
+         else if (info->shared
+                  && (!info->symbolic || info->allow_shlib_undefined)
+                  && !info->no_undefined
+                  && ELF_ST_VISIBILITY (h->root.other) == STV_DEFAULT)
            relocation = 0;
          else
            {
              if (!((*info->callbacks->undefined_symbol)
                    (info, h->root.root.root.string, input_bfd,
-                    input_section, rel->r_offset)))
-               return false;
+                    input_section, rel->r_offset,
+                    (!info->shared || info->no_undefined
+                     || ELF_ST_VISIBILITY (h->root.other)))))
+               ret_val = false;
              relocation = 0;
            }
        }
@@ -2751,16 +3424,10 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
          }
          break;
 
-       case R_ALPHA_OP_PUSH:
-       case R_ALPHA_OP_STORE:
-       case R_ALPHA_OP_PSUB:
-       case R_ALPHA_OP_PRSHIFT:
-         /* We hate these silly beasts.  */
-         abort();
-
        case R_ALPHA_LITERAL:
          {
            struct alpha_elf_got_entry *gotent;
+           boolean dynamic_symbol;
 
            BFD_ASSERT(sgot != NULL);
            BFD_ASSERT(gp != 0);
@@ -2768,106 +3435,85 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
            if (h != NULL)
              {
                gotent = h->got_entries;
-
-               /* We may be looking at a default versioned symbol, which
-                  won't have the got entries we set up earlier.  Go find
-                  the original.  */
-               if (!gotent)
-                 {
-                   struct alpha_elf_link_hash_entry *v;
-                   char *p, *name;
-                   size_t len;
-
-                   p = strchr (h->root.root.root.string, ELF_VER_CHR);
-                   BFD_ASSERT (p != NULL && p[1] == ELF_VER_CHR);
-
-                   len = p - h->root.root.root.string;
-                   name = bfd_malloc (len + 1);
-                   if (name == NULL)
-                     return false;
-                   memcpy (name, h->root.root.root.string, len);
-                   name[len] = '\0';
-
-                   v = alpha_elf_link_hash_lookup (alpha_elf_hash_table (info),
-                                                   name, false, false, false);
-                   BFD_ASSERT (v != NULL);
-                   while (v->got_entries == NULL)
-                     {
-                       BFD_ASSERT (v->root.root.type==bfd_link_hash_indirect);
-                       v = (struct alpha_elf_link_hash_entry *)
-                         v->root.root.u.i.link;
-                     }
-                   gotent = v->got_entries;
-                   free (name);
-                 }
-
-               while (gotent->gotobj != gotobj || gotent->addend != addend)
-                 gotent = gotent->next;
-
-               /* Initialize the .got entry's value.  */
-               if (!(gotent->flags & ALPHA_ELF_GOT_ENTRY_RELOCS_DONE))
-                 {
-                   bfd_put_64 (output_bfd, relocation+addend,
-                               sgot->contents + gotent->got_offset);
-
-                   /* If the symbol has been forced local, output a
-                      RELATIVE reloc, otherwise it will be handled in
-                      finish_dynamic_symbol.  */
-                   if (info->shared && h->root.dynindx == -1)
-                     {
-                       Elf_Internal_Rela outrel;
-
-                       BFD_ASSERT(srelgot != NULL);
-
-                       outrel.r_offset = (sgot->output_section->vma
-                                          + sgot->output_offset
-                                          + gotent->got_offset);
-                       outrel.r_info = ELF64_R_INFO(0, R_ALPHA_RELATIVE);
-                       outrel.r_addend = 0;
-
-                       bfd_elf64_swap_reloca_out (output_bfd, &outrel,
-                                                  ((Elf64_External_Rela *)
-                                                   srelgot->contents)
-                                                  + srelgot->reloc_count++);
-                     }
-
-                   gotent->flags |= ALPHA_ELF_GOT_ENTRY_RELOCS_DONE;
-                 }
+               dynamic_symbol = alpha_elf_dynamic_symbol_p (&h->root, info);
              }
            else
              {
                gotent = (alpha_elf_tdata(input_bfd)->
                          local_got_entries[r_symndx]);
-               while (gotent->addend != addend)
-                 gotent = gotent->next;
-
-               if (!(gotent->flags & ALPHA_ELF_GOT_ENTRY_RELOCS_DONE))
+               dynamic_symbol = false;
+
+               /* Need to adjust local GOT entries' addends for SEC_MERGE
+                  unless it has been done already.  */
+               if ((sec->flags & SEC_MERGE)
+                   && ELF_ST_TYPE (sym->st_info) == STT_SECTION
+                   && (elf_section_data (sec)->sec_info_type
+                       == ELF_INFO_TYPE_MERGE)
+                   && (gotent->flags & ALPHA_ELF_GOT_ENTRY_RELOCS_XLATED) == 0)
                  {
-                   bfd_put_64 (output_bfd, relocation+addend,
-                               sgot->contents + gotent->got_offset);
+                   struct alpha_elf_got_entry *ent;
+                   asection *msec;
 
-                   /* Local got entries need RELATIVE relocs in shared
-                      libraries.  */
-                   if (info->shared)
+                   for (ent = gotent; ent; ent = ent->next)
                      {
-                       Elf_Internal_Rela outrel;
+                       ent->flags |= ALPHA_ELF_GOT_ENTRY_RELOCS_XLATED;
+                       if (ent->use_count == 0)
+                         continue;
+                       msec = sec;
+                       ent->addend =
+                         _bfd_merged_section_offset (output_bfd, &msec,
+                                                     elf_section_data (sec)->
+                                                     sec_info,
+                                                     sym->st_value
+                                                     + ent->addend,
+                                                     (bfd_vma) 0);
+                       ent->addend -= sym->st_value;
+                       ent->addend += msec->output_section->vma
+                                      + msec->output_offset
+                                      - sec->output_section->vma
+                                      - sec->output_offset;
+                     }
+                 }
+             }
 
-                       BFD_ASSERT(srelgot != NULL);
+           BFD_ASSERT(gotent != NULL);
 
-                       outrel.r_offset = (sgot->output_section->vma
-                                          + sgot->output_offset
-                                          + gotent->got_offset);
-                       outrel.r_info = ELF64_R_INFO(0, R_ALPHA_RELATIVE);
-                       outrel.r_addend = 0;
+           while (gotent->gotobj != gotobj || gotent->addend != addend)
+             gotent = gotent->next;
 
-                       bfd_elf64_swap_reloca_out (output_bfd, &outrel,
-                                                  ((Elf64_External_Rela *)
-                                                   srelgot->contents)
-                                                  + srelgot->reloc_count++);
-                     }
+           BFD_ASSERT(gotent->use_count >= 1);
+
+           /* Initialize the .got entry's value.  */
+           if (!(gotent->flags & ALPHA_ELF_GOT_ENTRY_RELOCS_DONE))
+             {
+               bfd_put_64 (output_bfd, relocation + addend,
+                           sgot->contents + gotent->got_offset);
 
-                   gotent->flags |= ALPHA_ELF_GOT_ENTRY_RELOCS_DONE;
+               /* If the symbol has been forced local, output a
+                  RELATIVE reloc, otherwise it will be handled in
+                  finish_dynamic_symbol.  */
+               if (info->shared && !dynamic_symbol)
+                 {
+                   Elf_Internal_Rela outrel;
+
+                   BFD_ASSERT(srelgot != NULL);
+
+                   outrel.r_offset = (sgot->output_section->vma
+                                      + sgot->output_offset
+                                      + gotent->got_offset);
+                   outrel.r_info = ELF64_R_INFO(0, R_ALPHA_RELATIVE);
+                   outrel.r_addend = relocation + addend;
+
+                   bfd_elf64_swap_reloca_out (output_bfd, &outrel,
+                                              ((Elf64_External_Rela *)
+                                               srelgot->contents)
+                                              + srelgot->reloc_count++);
+                   BFD_ASSERT (sizeof (Elf64_External_Rela)
+                               * srelgot->reloc_count
+                               <= srelgot->_cooked_size);
                  }
+
+               gotent->flags |= ALPHA_ELF_GOT_ENTRY_RELOCS_DONE;
              }
 
            /* Figure the gprel relocation.  */
@@ -2880,23 +3526,120 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
          /* overflow handled by _bfd_final_link_relocate */
          goto default_reloc;
 
+       case R_ALPHA_GPREL16:
        case R_ALPHA_GPREL32:
+       case R_ALPHA_GPRELLOW:
+         if (h && alpha_elf_dynamic_symbol_p (&h->root, info))
+            {
+              (*_bfd_error_handler)
+                (_("%s: gp-relative relocation against dynamic symbol %s"),
+                 bfd_archive_filename (input_bfd), h->root.root.root.string);
+              ret_val = false;
+            }
          BFD_ASSERT(gp != 0);
          relocation -= gp;
          goto default_reloc;
 
-       case R_ALPHA_BRADDR:
+       case R_ALPHA_GPRELHIGH:
+         if (h && alpha_elf_dynamic_symbol_p (&h->root, info))
+            {
+              (*_bfd_error_handler)
+                (_("%s: gp-relative relocation against dynamic symbol %s"),
+                 bfd_archive_filename (input_bfd), h->root.root.root.string);
+              ret_val = false;
+            }
+         BFD_ASSERT(gp != 0);
+         relocation -= gp;
+         relocation += addend;
+         addend = 0;
+         relocation = (((bfd_signed_vma) relocation >> 16)
+                       + ((relocation >> 15) & 1));
+         goto default_reloc;
+
        case R_ALPHA_HINT:
+         /* A call to a dynamic symbol is definitely out of range of
+            the 16-bit displacement.  Don't bother writing anything.  */
+         if (h && alpha_elf_dynamic_symbol_p (&h->root, info))
+           {
+             r = bfd_reloc_ok;
+             break;
+           }
+         /* FALLTHRU */
+
+       case R_ALPHA_BRADDR:
          /* The regular PC-relative stuff measures from the start of
             the instruction rather than the end.  */
          addend -= 4;
          goto default_reloc;
 
+       case R_ALPHA_BRSGP:
+         {
+           int other;
+           const char *name;
+
+           /* The regular PC-relative stuff measures from the start of
+              the instruction rather than the end.  */
+           addend -= 4;
+
+           /* The source and destination gp must be the same.  */
+           if (h != NULL
+               && gotobj != alpha_elf_tdata (sec->owner)->gotobj)
+             {
+               if (h != NULL)
+                 name = h->root.root.root.string;
+               else
+                 {
+                   name = (bfd_elf_string_from_elf_section
+                           (input_bfd, symtab_hdr->sh_link, sym->st_name));
+                   if (name == NULL)
+                     name = _("<unknown>");
+                   else if (name[0] == 0)
+                     name = bfd_section_name (input_bfd, sec);
+                 }
+               (*_bfd_error_handler)
+                 (_("%s: change in gp: BRSGP %s"),
+                  bfd_archive_filename (input_bfd), name);
+               ret_val = false;
+             }
+
+           /* The symbol should be marked either NOPV or STD_GPLOAD.  */
+           if (h != NULL)
+             other = h->root.other;
+           else
+             other = sym->st_other;
+           switch (other & STO_ALPHA_STD_GPLOAD)
+             {
+             case STO_ALPHA_NOPV:
+               break;
+             case STO_ALPHA_STD_GPLOAD:
+               addend += 8;
+               break;
+             default:
+               if (h != NULL)
+                 name = h->root.root.root.string;
+               else
+                 {
+                   name = (bfd_elf_string_from_elf_section
+                           (input_bfd, symtab_hdr->sh_link, sym->st_name));
+                   if (name == NULL)
+                     name = _("<unknown>");
+                   else if (name[0] == 0)
+                     name = bfd_section_name (input_bfd, sec);
+                 }
+               (*_bfd_error_handler)
+                 (_("%s: !samegp reloc against symbol without .prologue: %s"),
+                  bfd_archive_filename (input_bfd), name);
+               ret_val = false;
+               break;
+             }
+
+           goto default_reloc;
+         }
+
        case R_ALPHA_REFLONG:
        case R_ALPHA_REFQUAD:
          {
            Elf_Internal_Rela outrel;
-           boolean skip;
 
            /* Careful here to remember RELATIVE relocations for global
               variables for symbolic shared objects.  */
@@ -2908,10 +3651,12 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
                outrel.r_addend = addend;
                addend = 0, relocation = 0;
              }
-           else if (info->shared)
+           else if (info->shared
+                    && r_symndx != 0
+                    && (input_section->flags & SEC_ALLOC))
              {
                outrel.r_info = ELF64_R_INFO(0, R_ALPHA_RELATIVE);
-               outrel.r_addend = 0;
+               outrel.r_addend = relocation + addend;
              }
            else
              goto default_reloc;
@@ -2929,25 +3674,10 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
                BFD_ASSERT(srel != NULL);
              }
 
-           skip = false;
-
-           if (elf_section_data (input_section)->stab_info == NULL)
-             outrel.r_offset = rel->r_offset;
-           else
-             {
-               bfd_vma off;
-
-               off = (_bfd_stab_section_offset
-                      (output_bfd, &elf_hash_table (info)->stab_info,
-                       input_section,
-                       &elf_section_data (input_section)->stab_info,
-                       rel->r_offset));
-               if (off == (bfd_vma) -1)
-                 skip = true;
-               outrel.r_offset = off;
-             }
-
-           if (! skip)
+           outrel.r_offset =
+             _bfd_elf_section_offset (output_bfd, info, input_section,
+                                      rel->r_offset);
+           if (outrel.r_offset != (bfd_vma) -1)
              outrel.r_offset += (input_section->output_section->vma
                                  + input_section->output_offset);
            else
@@ -2957,6 +3687,8 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
                                       ((Elf64_External_Rela *)
                                        srel->contents)
                                       + srel->reloc_count++);
+           BFD_ASSERT (sizeof (Elf64_External_Rela) * srel->reloc_count
+                       <= srel->_cooked_size);
          }
          goto default_reloc;
 
@@ -2977,6 +3709,15 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
          {
            const char *name;
 
+           /* Don't warn if the overflow is due to pc relative reloc
+              against discarded section.  Section optimization code should
+              handle it.  */
+
+           if (r_symndx < symtab_hdr->sh_info
+               && sec != NULL && howto->pc_relative
+               && elf_discarded_section (sec))
+             break;
+
            if (h != NULL)
              name = h->root.root.root.string;
            else
@@ -2991,7 +3732,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
            if (! ((*info->callbacks->reloc_overflow)
                   (info, name, howto->name, (bfd_vma) 0,
                    input_bfd, input_section, rel->r_offset)))
-             return false;
+             ret_val = false;
          }
          break;
 
@@ -3001,7 +3742,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
        }
     }
 
-  return true;
+  return ret_val;
 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
@@ -3016,7 +3757,7 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
 {
   bfd *dynobj = elf_hash_table(info)->dynobj;
 
-  if (h->plt_offset != MINUS_ONE)
+  if (h->plt.offset != MINUS_ONE)
     {
       /* Fill in the .plt entry for this symbol.  */
       asection *splt, *sgot, *srel;
@@ -3044,21 +3785,21 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
                  + gotent->got_offset);
       plt_addr = (splt->output_section->vma
                  + splt->output_offset
-                 + h->plt_offset);
+                 + h->plt.offset);
 
-      plt_index = (h->plt_offset - PLT_HEADER_SIZE) / PLT_ENTRY_SIZE;
+      plt_index = (h->plt.offset - PLT_HEADER_SIZE) / PLT_ENTRY_SIZE;
 
       /* Fill in the entry in the procedure linkage table.  */
       {
-       unsigned insn1, insn2, insn3;
+       bfd_vma insn1, insn2, insn3;
 
-       insn1 = PLT_ENTRY_WORD1 | ((-(h->plt_offset + 4) >> 2) & 0x1fffff);
+       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);
+       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);
       }
 
       /* Fill in the entry in the .rela.plt section.  */
@@ -3081,14 +3822,40 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
       bfd_put_64 (output_bfd, plt_addr, sgot->contents + gotent->got_offset);
 
       /* Subsequent .got entries will continue to bounce through the .plt.  */
-      while ((gotent = gotent->next) != NULL)
+      if (gotent->next)
        {
-         sgot = alpha_elf_tdata(gotent->gotobj)->got;
-         BFD_ASSERT(sgot != NULL);
-         BFD_ASSERT(gotent->addend == 0);
+         srel = bfd_get_section_by_name (dynobj, ".rela.got");
+         BFD_ASSERT (! info->shared || srel != NULL);
+
+         gotent = gotent->next;
+         do
+           {
+             sgot = alpha_elf_tdata(gotent->gotobj)->got;
+             BFD_ASSERT(sgot != NULL);
+             BFD_ASSERT(gotent->addend == 0);
 
-         bfd_put_64 (output_bfd, plt_addr,
-                     sgot->contents + gotent->got_offset);
+             bfd_put_64 (output_bfd, plt_addr,
+                         sgot->contents + gotent->got_offset);
+
+             if (info->shared)
+               {
+                 outrel.r_offset = (sgot->output_section->vma
+                                    + sgot->output_offset
+                                    + gotent->got_offset);
+                 outrel.r_info = ELF64_R_INFO(0, R_ALPHA_RELATIVE);
+                 outrel.r_addend = plt_addr;
+
+                 bfd_elf64_swap_reloca_out (output_bfd, &outrel,
+                                            ((Elf64_External_Rela *)
+                                             srel->contents)
+                                            + srel->reloc_count++);
+                 BFD_ASSERT (sizeof (Elf64_External_Rela) * srel->reloc_count
+                             <= srel->_cooked_size);
+               }
+
+             gotent = gotent->next;
+           }
+          while (gotent != NULL);
        }
     }
   else if (alpha_elf_dynamic_symbol_p (h, info))
@@ -3115,6 +3882,8 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
          bfd_elf64_swap_reloca_out (output_bfd, &outrel,
                                     ((Elf64_External_Rela *)srel->contents
                                      + srel->reloc_count++));
+         BFD_ASSERT (sizeof (Elf64_External_Rela) * srel->reloc_count
+                     <= srel->_cooked_size);
        }
     }
 
@@ -3208,58 +3977,20 @@ elf64_alpha_finish_dynamic_sections (output_bfd, info)
          bfd_put_32 (output_bfd, PLT_HEADER_WORD4, splt->contents + 12);
 
          /* The next two words will be filled in by ld.so */
-         bfd_put_64 (output_bfd, 0, splt->contents + 16);
-         bfd_put_64 (output_bfd, 0, splt->contents + 24);
+         bfd_put_64 (output_bfd, (bfd_vma) 0, splt->contents + 16);
+         bfd_put_64 (output_bfd, (bfd_vma) 0, splt->contents + 24);
 
          elf_section_data (splt->output_section)->this_hdr.sh_entsize =
            PLT_HEADER_SIZE;
        }
     }
 
-  if (info->shared)
-    {
-      asection *sdynsym;
-      asection *s;
-      Elf_Internal_Sym sym;
-
-      /* Set up the section symbols for the output sections.  */
-
-      sdynsym = bfd_get_section_by_name (dynobj, ".dynsym");
-      BFD_ASSERT (sdynsym != NULL);
-
-      sym.st_size = 0;
-      sym.st_name = 0;
-      sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_SECTION);
-      sym.st_other = 0;
-
-      for (s = output_bfd->sections; s != NULL; s = s->next)
-       {
-         int indx;
-
-         sym.st_value = s->vma;
-
-         indx = elf_section_data (s)->this_idx;
-         BFD_ASSERT (indx > 0);
-         sym.st_shndx = indx;
-
-         bfd_elf64_swap_symbol_out (output_bfd, &sym,
-                                    (PTR) (((Elf64_External_Sym *)
-                                            sdynsym->contents)
-                                           + elf_section_data (s)->dynindx));
-       }
-
-      /* Set the sh_info field of the output .dynsym section to the
-         index of the first global symbol.  */
-      elf_section_data (sdynsym->output_section)->this_hdr.sh_info =
-       bfd_count_sections (output_bfd) + 1;
-    }
-
   return true;
 }
 
-/* We need to use a special link routine to handle the .reginfo and
-   the .mdebug sections.  We need to merge all instances of these
-   sections together, not write them all out sequentially.  */
+/* We need to use a special link routine to handle the .mdebug section.
+   We need to merge all instances of these sections together, not write
+   them all out sequentially.  */
 
 static boolean
 elf64_alpha_final_link (abfd, info)
@@ -3268,87 +3999,17 @@ elf64_alpha_final_link (abfd, info)
 {
   asection *o;
   struct bfd_link_order *p;
-  asection *reginfo_sec, *mdebug_sec, *gptab_data_sec, *gptab_bss_sec;
+  asection *mdebug_sec;
   struct ecoff_debug_info debug;
   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;
 
-  /* Go through the sections and collect the .reginfo and .mdebug
-     information.  */
-  reginfo_sec = NULL;
+  /* Go through the sections and collect the mdebug information.  */
   mdebug_sec = NULL;
-  gptab_data_sec = NULL;
-  gptab_bss_sec = NULL;
   for (o = abfd->sections; o != (asection *) NULL; o = o->next)
     {
-#ifdef ERIC_neverdef
-      if (strcmp (o->name, ".reginfo") == 0)
-       {
-         memset (&reginfo, 0, sizeof reginfo);
-
-         /* We have found the .reginfo section in the output file.
-            Look through all the link_orders comprising it and merge
-            the information together.  */
-         for (p = o->link_order_head;
-              p != (struct bfd_link_order *) NULL;
-              p = p->next)
-           {
-             asection *input_section;
-             bfd *input_bfd;
-             Elf64_External_RegInfo ext;
-             Elf64_RegInfo sub;
-
-             if (p->type != bfd_indirect_link_order)
-               {
-                 if (p->type == bfd_fill_link_order)
-                   continue;
-                 abort ();
-               }
-
-             input_section = p->u.indirect.section;
-             input_bfd = input_section->owner;
-
-             /* The linker emulation code has probably clobbered the
-                 size to be zero bytes.  */
-             if (input_section->_raw_size == 0)
-               input_section->_raw_size = sizeof (Elf64_External_RegInfo);
-
-             if (! bfd_get_section_contents (input_bfd, input_section,
-                                             (PTR) &ext,
-                                             (file_ptr) 0,
-                                             sizeof ext))
-               return false;
-
-             bfd_alpha_elf64_swap_reginfo_in (input_bfd, &ext, &sub);
-
-             reginfo.ri_gprmask |= sub.ri_gprmask;
-             reginfo.ri_cprmask[0] |= sub.ri_cprmask[0];
-             reginfo.ri_cprmask[1] |= sub.ri_cprmask[1];
-             reginfo.ri_cprmask[2] |= sub.ri_cprmask[2];
-             reginfo.ri_cprmask[3] |= sub.ri_cprmask[3];
-
-             /* ri_gp_value is set by the function
-                alpha_elf_section_processing when the section is
-                finally written out.  */
-
-             /* Hack: reset the SEC_HAS_CONTENTS flag so that
-                elf_link_input_bfd ignores this section.  */
-             input_section->flags &=~ SEC_HAS_CONTENTS;
-           }
-
-         /* Force the section size to the value we want.  */
-         o->_raw_size = sizeof (Elf64_External_RegInfo);
-
-         /* Skip this section later on (I don't think this currently
-            matters, but someday it might).  */
-         o->link_order_head = (struct bfd_link_order *) NULL;
-
-         reginfo_sec = o;
-       }
-#endif
-
       if (strcmp (o->name, ".mdebug") == 0)
        {
          struct extsym_info einfo;
@@ -3394,7 +4055,7 @@ elf64_alpha_final_link (abfd, info)
            {
              asection *s;
              EXTR esym;
-             bfd_vma last;
+             bfd_vma last = 0;
              unsigned int i;
              static const char * const name[] =
                {
@@ -3535,32 +4196,6 @@ elf64_alpha_final_link (abfd, info)
              input_section->flags &=~ SEC_HAS_CONTENTS;
            }
 
-#ifdef ERIC_neverdef
-         if (info->shared)
-           {
-             /* Create .rtproc section.  */
-             rtproc_sec = bfd_get_section_by_name (abfd, ".rtproc");
-             if (rtproc_sec == NULL)
-               {
-                 flagword flags = (SEC_HAS_CONTENTS
-                                   | SEC_IN_MEMORY
-                                   | SEC_LINKER_CREATED
-                                   | SEC_READONLY);
-
-                 rtproc_sec = bfd_make_section (abfd, ".rtproc");
-                 if (rtproc_sec == NULL
-                     || ! bfd_set_section_flags (abfd, rtproc_sec, flags)
-                     || ! bfd_set_section_alignment (abfd, rtproc_sec, 12))
-                   return false;
-               }
-
-             if (! alpha_elf_create_procedure_table (mdebug_handle, abfd,
-                                                    info, rtproc_sec, &debug))
-               return false;
-           }
-#endif
-
-
          /* Build the external symbol information.  */
          einfo.abfd = abfd;
          einfo.info = info;
@@ -3582,229 +4217,6 @@ elf64_alpha_final_link (abfd, info)
 
          mdebug_sec = o;
        }
-
-#ifdef ERIC_neverdef
-      if (strncmp (o->name, ".gptab.", sizeof ".gptab." - 1) == 0)
-       {
-         const char *subname;
-         unsigned int c;
-         Elf64_gptab *tab;
-         Elf64_External_gptab *ext_tab;
-         unsigned int i;
-
-         /* The .gptab.sdata and .gptab.sbss sections hold
-            information describing how the small data area would
-            change depending upon the -G switch.  These sections
-            not used in executables files.  */
-         if (! info->relocateable)
-           {
-             asection **secpp;
-
-             for (p = o->link_order_head;
-                  p != (struct bfd_link_order *) NULL;
-                  p = p->next)
-               {
-                 asection *input_section;
-
-                 if (p->type != bfd_indirect_link_order)
-                   {
-                     if (p->type == bfd_fill_link_order)
-                       continue;
-                     abort ();
-                   }
-
-                 input_section = p->u.indirect.section;
-
-                 /* Hack: reset the SEC_HAS_CONTENTS flag so that
-                    elf_link_input_bfd ignores this section.  */
-                 input_section->flags &=~ SEC_HAS_CONTENTS;
-               }
-
-             /* Skip this section later on (I don't think this
-                currently matters, but someday it might).  */
-             o->link_order_head = (struct bfd_link_order *) NULL;
-
-             /* Really remove the section.  */
-             for (secpp = &abfd->sections;
-                  *secpp != o;
-                  secpp = &(*secpp)->next)
-               ;
-             *secpp = (*secpp)->next;
-             --abfd->section_count;
-
-             continue;
-           }
-
-         /* There is one gptab for initialized data, and one for
-            uninitialized data.  */
-         if (strcmp (o->name, ".gptab.sdata") == 0)
-           gptab_data_sec = o;
-         else if (strcmp (o->name, ".gptab.sbss") == 0)
-           gptab_bss_sec = o;
-         else
-           {
-             (*_bfd_error_handler)
-               ("%s: illegal section name `%s'",
-                bfd_get_filename (abfd), o->name);
-             bfd_set_error (bfd_error_nonrepresentable_section);
-             return false;
-           }
-
-         /* The linker script always combines .gptab.data and
-            .gptab.sdata into .gptab.sdata, and likewise for
-            .gptab.bss and .gptab.sbss.  It is possible that there is
-            no .sdata or .sbss section in the output file, in which
-            case we must change the name of the output section.  */
-         subname = o->name + sizeof ".gptab" - 1;
-         if (bfd_get_section_by_name (abfd, subname) == NULL)
-           {
-             if (o == gptab_data_sec)
-               o->name = ".gptab.data";
-             else
-               o->name = ".gptab.bss";
-             subname = o->name + sizeof ".gptab" - 1;
-             BFD_ASSERT (bfd_get_section_by_name (abfd, subname) != NULL);
-           }
-
-         /* Set up the first entry.  */
-         c = 1;
-         tab = (Elf64_gptab *) bfd_malloc (c * sizeof (Elf64_gptab));
-         if (tab == NULL)
-           return false;
-         tab[0].gt_header.gt_current_g_value = elf_gp_size (abfd);
-         tab[0].gt_header.gt_unused = 0;
-
-         /* Combine the input sections.  */
-         for (p = o->link_order_head;
-              p != (struct bfd_link_order *) NULL;
-              p = p->next)
-           {
-             asection *input_section;
-             bfd *input_bfd;
-             bfd_size_type size;
-             unsigned long last;
-             bfd_size_type gpentry;
-
-             if (p->type != bfd_indirect_link_order)
-               {
-                 if (p->type == bfd_fill_link_order)
-                   continue;
-                 abort ();
-               }
-
-             input_section = p->u.indirect.section;
-             input_bfd = input_section->owner;
-
-             /* Combine the gptab entries for this input section one
-                by one.  We know that the input gptab entries are
-                sorted by ascending -G value.  */
-             size = bfd_section_size (input_bfd, input_section);
-             last = 0;
-             for (gpentry = sizeof (Elf64_External_gptab);
-                  gpentry < size;
-                  gpentry += sizeof (Elf64_External_gptab))
-               {
-                 Elf64_External_gptab ext_gptab;
-                 Elf64_gptab int_gptab;
-                 unsigned long val;
-                 unsigned long add;
-                 boolean exact;
-                 unsigned int look;
-
-                 if (! (bfd_get_section_contents
-                        (input_bfd, input_section, (PTR) &ext_gptab,
-                         gpentry, sizeof (Elf64_External_gptab))))
-                   {
-                     free (tab);
-                     return false;
-                   }
-
-                 bfd_alpha_elf64_swap_gptab_in (input_bfd, &ext_gptab,
-                                               &int_gptab);
-                 val = int_gptab.gt_entry.gt_g_value;
-                 add = int_gptab.gt_entry.gt_bytes - last;
-
-                 exact = false;
-                 for (look = 1; look < c; look++)
-                   {
-                     if (tab[look].gt_entry.gt_g_value >= val)
-                       tab[look].gt_entry.gt_bytes += add;
-
-                     if (tab[look].gt_entry.gt_g_value == val)
-                       exact = true;
-                   }
-
-                 if (! exact)
-                   {
-                     Elf64_gptab *new_tab;
-                     unsigned int max;
-
-                     /* We need a new table entry.  */
-                     new_tab = ((Elf64_gptab *)
-                                bfd_realloc ((PTR) tab,
-                                             (c + 1) * sizeof (Elf64_gptab)));
-                     if (new_tab == NULL)
-                       {
-                         free (tab);
-                         return false;
-                       }
-                     tab = new_tab;
-                     tab[c].gt_entry.gt_g_value = val;
-                     tab[c].gt_entry.gt_bytes = add;
-
-                     /* Merge in the size for the next smallest -G
-                        value, since that will be implied by this new
-                        value.  */
-                     max = 0;
-                     for (look = 1; look < c; look++)
-                       {
-                         if (tab[look].gt_entry.gt_g_value < val
-                             && (max == 0
-                                 || (tab[look].gt_entry.gt_g_value
-                                     > tab[max].gt_entry.gt_g_value)))
-                           max = look;
-                       }
-                     if (max != 0)
-                       tab[c].gt_entry.gt_bytes +=
-                         tab[max].gt_entry.gt_bytes;
-
-                     ++c;
-                   }
-
-                 last = int_gptab.gt_entry.gt_bytes;
-               }
-
-             /* Hack: reset the SEC_HAS_CONTENTS flag so that
-                elf_link_input_bfd ignores this section.  */
-             input_section->flags &=~ SEC_HAS_CONTENTS;
-           }
-
-         /* The table must be sorted by -G value.  */
-         if (c > 2)
-           qsort (tab + 1, c - 1, sizeof (tab[0]), gptab_compare);
-
-         /* Swap out the table.  */
-         ext_tab = ((Elf64_External_gptab *)
-                    bfd_alloc (abfd, c * sizeof (Elf64_External_gptab)));
-         if (ext_tab == NULL)
-           {
-             free (tab);
-             return false;
-           }
-
-         for (i = 0; i < c; i++)
-           bfd_alpha_elf64_swap_gptab_out (abfd, tab + i, ext_tab + i);
-         free (tab);
-
-         o->_raw_size = c * sizeof (Elf64_External_gptab);
-         o->contents = (bfd_byte *) ext_tab;
-
-         /* Skip this section later on (I don't think this currently
-            matters, but someday it might).  */
-         o->link_order_head = (struct bfd_link_order *) NULL;
-       }
-#endif
-
     }
 
   /* Invoke the regular ELF backend linker to do all the work.  */
@@ -3828,24 +4240,13 @@ elf64_alpha_final_link (abfd, info)
 
        sgot = alpha_elf_tdata(i)->got;
        if (! bfd_set_section_contents (abfd, sgot->output_section,
-                                       sgot->contents, sgot->output_offset,
+                                       sgot->contents,
+                                       (file_ptr) sgot->output_offset,
                                        sgot->_raw_size))
          return false;
       }
   }
 
-#ifdef ERIC_neverdef
-  if (reginfo_sec != (asection *) NULL)
-    {
-      Elf64_External_RegInfo ext;
-
-      bfd_alpha_elf64_swap_reginfo_out (abfd, &reginfo, &ext);
-      if (! bfd_set_section_contents (abfd, reginfo_sec, (PTR) &ext,
-                                     (file_ptr) 0, sizeof ext))
-       return false;
-    }
-#endif
-
   if (mdebug_sec != (asection *) NULL)
     {
       BFD_ASSERT (abfd->output_has_begun);
@@ -3857,30 +4258,29 @@ elf64_alpha_final_link (abfd, info)
       bfd_ecoff_debug_free (mdebug_handle, abfd, &debug, swap, info);
     }
 
-  if (gptab_data_sec != (asection *) NULL)
-    {
-      if (! bfd_set_section_contents (abfd, gptab_data_sec,
-                                     gptab_data_sec->contents,
-                                     (file_ptr) 0,
-                                     gptab_data_sec->_raw_size))
-       return false;
-    }
+  return true;
+}
 
-  if (gptab_bss_sec != (asection *) NULL)
+static enum elf_reloc_type_class
+elf64_alpha_reloc_type_class (rela)
+     const Elf_Internal_Rela *rela;
+{
+  switch ((int) ELF64_R_TYPE (rela->r_info))
     {
-      if (! bfd_set_section_contents (abfd, gptab_bss_sec,
-                                     gptab_bss_sec->contents,
-                                     (file_ptr) 0,
-                                     gptab_bss_sec->_raw_size))
-       return false;
+    case R_ALPHA_RELATIVE:
+      return reloc_class_relative;
+    case R_ALPHA_JMP_SLOT:
+      return reloc_class_plt;
+    case R_ALPHA_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
     }
-
-  return true;
 }
 \f
 /* ECOFF swapping routines.  These are used when dealing with the
    .mdebug section, which is in the ECOFF debugging format.  Copied
-   from elf32-mips.c. */
+   from elf32-mips.c.  */
 static const struct ecoff_debug_swap
 elf64_alpha_ecoff_debug_swap =
 {
@@ -3923,11 +4323,41 @@ elf64_alpha_ecoff_debug_swap =
   elf64_alpha_read_ecoff_info
 };
 \f
+/* Use a non-standard hash bucket size of 8.  */
+
+const struct elf_size_info alpha_elf_size_info =
+{
+  sizeof (Elf64_External_Ehdr),
+  sizeof (Elf64_External_Phdr),
+  sizeof (Elf64_External_Shdr),
+  sizeof (Elf64_External_Rel),
+  sizeof (Elf64_External_Rela),
+  sizeof (Elf64_External_Sym),
+  sizeof (Elf64_External_Dyn),
+  sizeof (Elf_External_Note),
+  8,
+  1,
+  64, 8,
+  ELFCLASS64, EV_CURRENT,
+  bfd_elf64_write_out_phdrs,
+  bfd_elf64_write_shdrs_and_ehdr,
+  bfd_elf64_write_relocs,
+  bfd_elf64_swap_symbol_out,
+  bfd_elf64_slurp_reloc_table,
+  bfd_elf64_slurp_symbol_table,
+  bfd_elf64_swap_dyn_in,
+  bfd_elf64_swap_dyn_out,
+  NULL,
+  NULL,
+  NULL,
+  NULL
+};
+
 #define TARGET_LITTLE_SYM      bfd_elf64_alpha_vec
 #define TARGET_LITTLE_NAME     "elf64-alpha"
 #define ELF_ARCH               bfd_arch_alpha
-#define ELF_MACHINE_CODE       EM_ALPHA
-#define ELF_MAXPAGESIZE        0x100000
+#define ELF_MACHINE_CODE       EM_ALPHA
+#define ELF_MAXPAGESIZE        0x10000
 
 #define bfd_elf64_bfd_link_hash_table_create \
   elf64_alpha_bfd_link_hash_table_create
@@ -3944,16 +4374,20 @@ elf64_alpha_ecoff_debug_swap =
 
 #define elf_backend_section_from_shdr \
   elf64_alpha_section_from_shdr
+#define elf_backend_section_flags \
+  elf64_alpha_section_flags
 #define elf_backend_fake_sections \
   elf64_alpha_fake_sections
-#define elf_backend_additional_program_headers \
-  elf64_alpha_additional_program_headers
 
 #define bfd_elf64_bfd_is_local_label_name \
   elf64_alpha_is_local_label_name
 #define bfd_elf64_find_nearest_line \
   elf64_alpha_find_nearest_line
+#define bfd_elf64_bfd_relax_section \
+  elf64_alpha_relax_section
 
+#define elf_backend_add_symbol_hook \
+  elf64_alpha_add_symbol_hook
 #define elf_backend_check_relocs \
   elf64_alpha_check_relocs
 #define elf_backend_create_dynamic_sections \
@@ -3972,15 +4406,20 @@ elf64_alpha_ecoff_debug_swap =
   elf64_alpha_finish_dynamic_sections
 #define bfd_elf64_bfd_final_link \
   elf64_alpha_final_link
+#define elf_backend_reloc_type_class \
+  elf64_alpha_reloc_type_class
 
 #define elf_backend_ecoff_debug_swap \
   &elf64_alpha_ecoff_debug_swap
 
-/*
- * A few constants that determine how the .plt section is set up.
- */
+#define elf_backend_size_info \
+  alpha_elf_size_info
+
+/* A few constants that determine how the .plt section is set up.  */
 #define elf_backend_want_got_plt 0
 #define elf_backend_plt_readonly 0
 #define elf_backend_want_plt_sym 1
+#define elf_backend_got_header_size 0
+#define elf_backend_plt_header_size PLT_HEADER_SIZE
 
 #include "elf64-target.h"
This page took 0.0666369999999999 seconds and 4 git commands to generate.