diff options
Diffstat (limited to 'contrib/binutils/bfd/elf64-alpha.c')
| -rw-r--r-- | contrib/binutils/bfd/elf64-alpha.c | 3885 |
1 files changed, 1851 insertions, 2034 deletions
diff --git a/contrib/binutils/bfd/elf64-alpha.c b/contrib/binutils/bfd/elf64-alpha.c index 2d4715b..3d4350d 100644 --- a/contrib/binutils/bfd/elf64-alpha.c +++ b/contrib/binutils/bfd/elf64-alpha.c @@ -1,6 +1,6 @@ /* Alpha specific support for 64-bit ELF - Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 - Free Software Foundation, Inc. + Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2006, 2007 Free Software Foundation, Inc. Contributed by Richard Henderson <rth@tamu.edu>. This file is part of BFD, the Binary File Descriptor library. @@ -17,13 +17,13 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ /* We need a published ABI spec for this. Until one comes out, don't assume this'll remain unchanged forever. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" #include "elf-bfd.h" @@ -47,116 +47,59 @@ #define ECOFF_64 #include "ecoffswap.h" -static bfd_boolean alpha_elf_dynamic_symbol_p - PARAMS ((struct elf_link_hash_entry *, struct bfd_link_info *)); -static struct bfd_hash_entry * elf64_alpha_link_hash_newfunc - PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *)); -static struct bfd_link_hash_table * elf64_alpha_bfd_link_hash_table_create - PARAMS ((bfd *)); - -static bfd_reloc_status_type elf64_alpha_reloc_nil - PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); -static bfd_reloc_status_type elf64_alpha_reloc_bad - PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); -static bfd_reloc_status_type elf64_alpha_do_reloc_gpdisp - PARAMS ((bfd *, bfd_vma, bfd_byte *, bfd_byte *)); -static bfd_reloc_status_type elf64_alpha_reloc_gpdisp - PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); - -static reloc_howto_type * elf64_alpha_bfd_reloc_type_lookup - PARAMS ((bfd *, bfd_reloc_code_real_type)); -static void elf64_alpha_info_to_howto - PARAMS ((bfd *, arelent *, Elf_Internal_Rela *)); - -static bfd_boolean elf64_alpha_mkobject - PARAMS ((bfd *)); -static bfd_boolean elf64_alpha_object_p - PARAMS ((bfd *)); -static bfd_boolean elf64_alpha_section_from_shdr - PARAMS ((bfd *, Elf_Internal_Shdr *, const char *)); -static bfd_boolean elf64_alpha_section_flags - PARAMS ((flagword *, Elf_Internal_Shdr *)); -static bfd_boolean elf64_alpha_fake_sections - PARAMS ((bfd *, Elf_Internal_Shdr *, asection *)); -static bfd_boolean elf64_alpha_create_got_section - PARAMS ((bfd *, struct bfd_link_info *)); -static bfd_boolean elf64_alpha_create_dynamic_sections - PARAMS ((bfd *, struct bfd_link_info *)); - -static bfd_boolean elf64_alpha_read_ecoff_info - PARAMS ((bfd *, asection *, struct ecoff_debug_info *)); -static bfd_boolean elf64_alpha_is_local_label_name - PARAMS ((bfd *, const char *)); -static bfd_boolean elf64_alpha_find_nearest_line - PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **, - const char **, unsigned int *)); - -#if defined(__STDC__) || defined(ALMOST_STDC) -struct alpha_elf_link_hash_entry; + +/* Instruction data for plt generation and relaxation. */ + +#define OP_LDA 0x08 +#define OP_LDAH 0x09 +#define OP_LDQ 0x29 +#define OP_BR 0x30 +#define OP_BSR 0x34 + +#define INSN_LDA (OP_LDA << 26) +#define INSN_LDAH (OP_LDAH << 26) +#define INSN_LDQ (OP_LDQ << 26) +#define INSN_BR (OP_BR << 26) + +#define INSN_ADDQ 0x40000400 +#define INSN_RDUNIQ 0x0000009e +#define INSN_SUBQ 0x40000520 +#define INSN_S4SUBQ 0x40000560 +#define INSN_UNOP 0x2ffe0000 + +#define INSN_JSR 0x68004000 +#define INSN_JMP 0x68000000 +#define INSN_JSR_MASK 0xfc00c000 + +#define INSN_A(I,A) (I | (A << 21)) +#define INSN_AB(I,A,B) (I | (A << 21) | (B << 16)) +#define INSN_ABC(I,A,B,C) (I | (A << 21) | (B << 16) | C) +#define INSN_ABO(I,A,B,O) (I | (A << 21) | (B << 16) | ((O) & 0xffff)) +#define INSN_AD(I,A,D) (I | (A << 21) | (((D) >> 2) & 0x1fffff)) + +/* PLT/GOT Stuff */ + +/* Set by ld emulation. Putting this into the link_info or hash structure + is simply working too hard. */ +#ifdef USE_SECUREPLT +bfd_boolean elf64_alpha_use_secureplt = TRUE; +#else +bfd_boolean elf64_alpha_use_secureplt = FALSE; #endif -static bfd_boolean elf64_alpha_output_extsym - PARAMS ((struct alpha_elf_link_hash_entry *, PTR)); - -static bfd_boolean elf64_alpha_can_merge_gots - PARAMS ((bfd *, bfd *)); -static void elf64_alpha_merge_gots - PARAMS ((bfd *, bfd *)); -static bfd_boolean elf64_alpha_calc_got_offsets_for_symbol - PARAMS ((struct alpha_elf_link_hash_entry *, PTR)); -static void elf64_alpha_calc_got_offsets - PARAMS ((struct bfd_link_info *)); -static bfd_boolean elf64_alpha_size_got_sections - PARAMS ((struct bfd_link_info *)); -static bfd_boolean elf64_alpha_size_plt_section - PARAMS ((struct bfd_link_info *)); -static bfd_boolean elf64_alpha_size_plt_section_1 - PARAMS ((struct alpha_elf_link_hash_entry *, PTR)); -static bfd_boolean elf64_alpha_always_size_sections - PARAMS ((bfd *, struct bfd_link_info *)); -static int alpha_dynamic_entries_for_reloc - PARAMS ((int, int, int)); -static bfd_boolean elf64_alpha_calc_dynrel_sizes - PARAMS ((struct alpha_elf_link_hash_entry *, struct bfd_link_info *)); -static bfd_boolean elf64_alpha_size_rela_got_section - PARAMS ((struct bfd_link_info *)); -static bfd_boolean elf64_alpha_size_rela_got_1 - PARAMS ((struct alpha_elf_link_hash_entry *, struct bfd_link_info *)); -static bfd_boolean elf64_alpha_add_symbol_hook - PARAMS ((bfd *, struct bfd_link_info *, Elf_Internal_Sym *, - const char **, flagword *, asection **, bfd_vma *)); -static struct alpha_elf_got_entry *get_got_entry - PARAMS ((bfd *, struct alpha_elf_link_hash_entry *, unsigned long, - unsigned long, bfd_vma)); -static bfd_boolean elf64_alpha_check_relocs - PARAMS ((bfd *, struct bfd_link_info *, asection *sec, - const Elf_Internal_Rela *)); -static bfd_boolean elf64_alpha_adjust_dynamic_symbol - PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *)); -static bfd_boolean elf64_alpha_size_dynamic_sections - PARAMS ((bfd *, struct bfd_link_info *)); -static void elf64_alpha_emit_dynrel - PARAMS ((bfd *, struct bfd_link_info *, asection *, asection *, - bfd_vma, long, long, bfd_vma)); -static bfd_boolean elf64_alpha_relocate_section_r - PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, - Elf_Internal_Rela *, Elf_Internal_Sym *, asection **)); -static bfd_boolean elf64_alpha_relocate_section - PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, - Elf_Internal_Rela *, Elf_Internal_Sym *, asection **)); -static bfd_boolean elf64_alpha_finish_dynamic_symbol - PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *, - Elf_Internal_Sym *)); -static bfd_boolean elf64_alpha_finish_dynamic_sections - PARAMS ((bfd *, struct bfd_link_info *)); -static bfd_boolean elf64_alpha_final_link - PARAMS ((bfd *, struct bfd_link_info *)); -static bfd_boolean elf64_alpha_merge_ind_symbols - PARAMS ((struct alpha_elf_link_hash_entry *, PTR)); -static Elf_Internal_Rela * elf64_alpha_find_reloc_at_ofs - PARAMS ((Elf_Internal_Rela *, Elf_Internal_Rela *, bfd_vma, int)); -static enum elf_reloc_type_class elf64_alpha_reloc_type_class - PARAMS ((const Elf_Internal_Rela *)); +#define OLD_PLT_HEADER_SIZE 32 +#define OLD_PLT_ENTRY_SIZE 12 +#define NEW_PLT_HEADER_SIZE 36 +#define NEW_PLT_ENTRY_SIZE 4 + +#define PLT_HEADER_SIZE \ + (elf64_alpha_use_secureplt ? NEW_PLT_HEADER_SIZE : OLD_PLT_HEADER_SIZE) +#define PLT_ENTRY_SIZE \ + (elf64_alpha_use_secureplt ? NEW_PLT_ENTRY_SIZE : OLD_PLT_ENTRY_SIZE) + +#define MAX_GOT_SIZE (64*1024) + +#define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so" struct alpha_elf_link_hash_entry { @@ -169,19 +112,15 @@ struct alpha_elf_link_hash_entry int flags; /* Contexts in which a literal was referenced. */ -#define ALPHA_ELF_LINK_HASH_LU_ADDR 0x01 -#define ALPHA_ELF_LINK_HASH_LU_MEM 0x02 -#define ALPHA_ELF_LINK_HASH_LU_BYTE 0x04 -#define ALPHA_ELF_LINK_HASH_LU_JSR 0x08 -#define ALPHA_ELF_LINK_HASH_LU_TLSGD 0x10 -#define ALPHA_ELF_LINK_HASH_LU_TLSLDM 0x20 -#define ALPHA_ELF_LINK_HASH_LU_FUNC 0x38 -#define ALPHA_ELF_LINK_HASH_TLS_IE 0x40 -#define ALPHA_ELF_LINK_HASH_PLT_LOC 0x80 - - /* Used to undo the localization of a plt symbol. */ - asection *plt_old_section; - bfd_vma plt_old_value; +#define ALPHA_ELF_LINK_HASH_LU_ADDR 0x01 +#define ALPHA_ELF_LINK_HASH_LU_MEM 0x02 +#define ALPHA_ELF_LINK_HASH_LU_BYTE 0x04 +#define ALPHA_ELF_LINK_HASH_LU_JSR 0x08 +#define ALPHA_ELF_LINK_HASH_LU_TLSGD 0x10 +#define ALPHA_ELF_LINK_HASH_LU_TLSLDM 0x20 +#define ALPHA_ELF_LINK_HASH_LU_JSRDIRECT 0x40 +#define ALPHA_ELF_LINK_HASH_LU_PLT 0x38 +#define ALPHA_ELF_LINK_HASH_TLS_IE 0x80 /* Used to implement multiple .got subsections. */ struct alpha_elf_got_entry @@ -197,6 +136,9 @@ struct alpha_elf_link_hash_entry /* The .got offset for this entry. */ int got_offset; + /* The .plt offset for this entry. */ + int plt_offset; + /* How many references to this entry? */ int use_count; @@ -242,6 +184,10 @@ struct alpha_elf_link_hash_table /* The head of a list of .got subsections linked through alpha_elf_tdata(abfd)->got_link_next. */ bfd *got_list; + + /* The most recent relax pass that we've seen. The GOTs + should be regenerated if this doesn't match. */ + int relax_trip; }; /* Look up an entry in a Alpha ELF linker hash table. */ @@ -256,7 +202,7 @@ struct alpha_elf_link_hash_table #define alpha_elf_link_hash_traverse(table, func, info) \ (elf_link_hash_traverse \ (&(table)->root, \ - (bfd_boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func), \ + (bfd_boolean (*) (struct elf_link_hash_entry *, PTR)) (func), \ (info))) /* Get the Alpha ELF linker hash table from a link_info structure. */ @@ -275,9 +221,8 @@ struct alpha_elf_link_hash_table address is ever taken. */ static inline bfd_boolean -alpha_elf_dynamic_symbol_p (h, info) - struct elf_link_hash_entry *h; - struct bfd_link_info *info; +alpha_elf_dynamic_symbol_p (struct elf_link_hash_entry *h, + struct bfd_link_info *info) { return _bfd_elf_dynamic_symbol_p (h, info, 0); } @@ -285,10 +230,9 @@ alpha_elf_dynamic_symbol_p (h, info) /* Create an entry in a Alpha ELF linker hash table. */ static struct bfd_hash_entry * -elf64_alpha_link_hash_newfunc (entry, table, string) - struct bfd_hash_entry *entry; - struct bfd_hash_table *table; - const char *string; +elf64_alpha_link_hash_newfunc (struct bfd_hash_entry *entry, + struct bfd_hash_table *table, + const char *string) { struct alpha_elf_link_hash_entry *ret = (struct alpha_elf_link_hash_entry *) entry; @@ -324,8 +268,7 @@ elf64_alpha_link_hash_newfunc (entry, table, string) /* Create a Alpha ELF linker hash table. */ static struct bfd_link_hash_table * -elf64_alpha_bfd_link_hash_table_create (abfd) - bfd *abfd; +elf64_alpha_bfd_link_hash_table_create (bfd *abfd) { struct alpha_elf_link_hash_table *ret; bfd_size_type amt = sizeof (struct alpha_elf_link_hash_table); @@ -334,8 +277,9 @@ elf64_alpha_bfd_link_hash_table_create (abfd) if (ret == (struct alpha_elf_link_hash_table *) NULL) return NULL; - if (! _bfd_elf_link_hash_table_init (&ret->root, abfd, - elf64_alpha_link_hash_newfunc)) + if (!_bfd_elf_link_hash_table_init (&ret->root, abfd, + elf64_alpha_link_hash_newfunc, + sizeof (struct alpha_elf_link_hash_entry))) { free (ret); return NULL; @@ -379,24 +323,136 @@ struct alpha_elf_obj_tdata ((struct alpha_elf_obj_tdata *) (abfd)->tdata.any) static bfd_boolean -elf64_alpha_mkobject (abfd) - bfd *abfd; +elf64_alpha_mkobject (bfd *abfd) { - bfd_size_type amt = sizeof (struct alpha_elf_obj_tdata); - abfd->tdata.any = bfd_zalloc (abfd, amt); if (abfd->tdata.any == NULL) - return FALSE; - return TRUE; + { + 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 bfd_elf_mkobject (abfd); } static bfd_boolean -elf64_alpha_object_p (abfd) - bfd *abfd; +elf64_alpha_object_p (bfd *abfd) { /* Set the right machine number for an Alpha ELF file. */ return bfd_default_set_arch_mach (abfd, bfd_arch_alpha, 0); } +/* A relocation function which doesn't do anything. */ + +static bfd_reloc_status_type +elf64_alpha_reloc_nil (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc, + asymbol *sym ATTRIBUTE_UNUSED, + PTR data ATTRIBUTE_UNUSED, asection *sec, + bfd *output_bfd, char **error_message ATTRIBUTE_UNUSED) +{ + if (output_bfd) + reloc->address += sec->output_offset; + return bfd_reloc_ok; +} + +/* A relocation function used for an unsupported reloc. */ + +static bfd_reloc_status_type +elf64_alpha_reloc_bad (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc, + asymbol *sym ATTRIBUTE_UNUSED, + PTR data ATTRIBUTE_UNUSED, asection *sec, + bfd *output_bfd, char **error_message ATTRIBUTE_UNUSED) +{ + if (output_bfd) + reloc->address += sec->output_offset; + return bfd_reloc_notsupported; +} + +/* Do the work of the GPDISP relocation. */ + +static bfd_reloc_status_type +elf64_alpha_do_reloc_gpdisp (bfd *abfd, bfd_vma gpdisp, bfd_byte *p_ldah, + bfd_byte *p_lda) +{ + bfd_reloc_status_type ret = bfd_reloc_ok; + bfd_vma addend; + unsigned long i_ldah, i_lda; + + i_ldah = bfd_get_32 (abfd, p_ldah); + i_lda = bfd_get_32 (abfd, p_lda); + + /* Complain if the instructions are not correct. */ + if (((i_ldah >> 26) & 0x3f) != 0x09 + || ((i_lda >> 26) & 0x3f) != 0x08) + ret = bfd_reloc_dangerous; + + /* Extract the user-supplied offset, mirroring the sign extensions + that the instructions perform. */ + addend = ((i_ldah & 0xffff) << 16) | (i_lda & 0xffff); + addend = (addend ^ 0x80008000) - 0x80008000; + + gpdisp += addend; + + if ((bfd_signed_vma) gpdisp < -(bfd_signed_vma) 0x80000000 + || (bfd_signed_vma) gpdisp >= (bfd_signed_vma) 0x7fff8000) + ret = bfd_reloc_overflow; + + /* compensate for the sign extension again. */ + i_ldah = ((i_ldah & 0xffff0000) + | (((gpdisp >> 16) + ((gpdisp >> 15) & 1)) & 0xffff)); + i_lda = (i_lda & 0xffff0000) | (gpdisp & 0xffff); + + bfd_put_32 (abfd, (bfd_vma) i_ldah, p_ldah); + bfd_put_32 (abfd, (bfd_vma) i_lda, p_lda); + + return ret; +} + +/* The special function for the GPDISP reloc. */ + +static bfd_reloc_status_type +elf64_alpha_reloc_gpdisp (bfd *abfd, arelent *reloc_entry, + asymbol *sym ATTRIBUTE_UNUSED, PTR data, + asection *input_section, bfd *output_bfd, + char **err_msg) +{ + bfd_reloc_status_type ret; + bfd_vma gp, relocation; + bfd_vma high_address; + bfd_byte *p_ldah, *p_lda; + + /* Don't do anything if we're not doing a final link. */ + if (output_bfd) + { + reloc_entry->address += input_section->output_offset; + return bfd_reloc_ok; + } + + high_address = bfd_get_section_limit (abfd, input_section); + if (reloc_entry->address > high_address + || reloc_entry->address + reloc_entry->addend > high_address) + return bfd_reloc_outofrange; + + /* The gp used in the portion of the output object to which this + input object belongs is cached on the input bfd. */ + gp = _bfd_get_gp_value (abfd); + + relocation = (input_section->output_section->vma + + input_section->output_offset + + reloc_entry->address); + + p_ldah = (bfd_byte *) data + reloc_entry->address; + p_lda = p_ldah + reloc_entry->addend; + + ret = elf64_alpha_do_reloc_gpdisp (abfd, gp - relocation, p_ldah, p_lda); + + /* Complain if the instructions are not correct. */ + if (ret == bfd_reloc_dangerous) + *err_msg = _("GPDISP relocation did not find ldah and lda instructions"); + + return ret; +} + /* In case we're on a 32-bit machine, construct a 64-bit "-1" value from smaller values. Start with zero, widen, *then* decrement. */ #define MINUS_ONE (((bfd_vma)0) - 1) @@ -944,131 +1000,6 @@ static reloc_howto_type elf64_alpha_howto_table[] = FALSE), /* 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 ATTRIBUTE_UNUSED; - arelent *reloc; - asymbol *sym ATTRIBUTE_UNUSED; - PTR data ATTRIBUTE_UNUSED; - asection *sec; - bfd *output_bfd; - char **error_message ATTRIBUTE_UNUSED; -{ - if (output_bfd) - reloc->address += sec->output_offset; - return bfd_reloc_ok; -} - -/* A relocation function used for an unsupported reloc. */ - -static bfd_reloc_status_type -elf64_alpha_reloc_bad (abfd, reloc, sym, data, sec, output_bfd, error_message) - bfd *abfd ATTRIBUTE_UNUSED; - arelent *reloc; - asymbol *sym ATTRIBUTE_UNUSED; - PTR data ATTRIBUTE_UNUSED; - asection *sec; - bfd *output_bfd; - char **error_message ATTRIBUTE_UNUSED; -{ - if (output_bfd) - reloc->address += sec->output_offset; - return bfd_reloc_notsupported; -} - -/* Do the work of the GPDISP relocation. */ - -static bfd_reloc_status_type -elf64_alpha_do_reloc_gpdisp (abfd, gpdisp, p_ldah, p_lda) - bfd *abfd; - bfd_vma gpdisp; - bfd_byte *p_ldah; - bfd_byte *p_lda; -{ - bfd_reloc_status_type ret = bfd_reloc_ok; - bfd_vma addend; - unsigned long i_ldah, i_lda; - - i_ldah = bfd_get_32 (abfd, p_ldah); - i_lda = bfd_get_32 (abfd, p_lda); - - /* Complain if the instructions are not correct. */ - if (((i_ldah >> 26) & 0x3f) != 0x09 - || ((i_lda >> 26) & 0x3f) != 0x08) - ret = bfd_reloc_dangerous; - - /* Extract the user-supplied offset, mirroring the sign extensions - that the instructions perform. */ - addend = ((i_ldah & 0xffff) << 16) | (i_lda & 0xffff); - addend = (addend ^ 0x80008000) - 0x80008000; - - gpdisp += addend; - - if ((bfd_signed_vma) gpdisp < -(bfd_signed_vma) 0x80000000 - || (bfd_signed_vma) gpdisp >= (bfd_signed_vma) 0x7fff8000) - ret = bfd_reloc_overflow; - - /* compensate for the sign extension again. */ - i_ldah = ((i_ldah & 0xffff0000) - | (((gpdisp >> 16) + ((gpdisp >> 15) & 1)) & 0xffff)); - i_lda = (i_lda & 0xffff0000) | (gpdisp & 0xffff); - - bfd_put_32 (abfd, (bfd_vma) i_ldah, p_ldah); - bfd_put_32 (abfd, (bfd_vma) i_lda, p_lda); - - return ret; -} - -/* The special function for the GPDISP reloc. */ - -static bfd_reloc_status_type -elf64_alpha_reloc_gpdisp (abfd, reloc_entry, sym, data, input_section, - output_bfd, err_msg) - bfd *abfd; - arelent *reloc_entry; - asymbol *sym ATTRIBUTE_UNUSED; - PTR data; - asection *input_section; - bfd *output_bfd; - char **err_msg; -{ - bfd_reloc_status_type ret; - bfd_vma gp, relocation; - bfd_byte *p_ldah, *p_lda; - - /* Don't do anything if we're not doing a final link. */ - if (output_bfd) - { - reloc_entry->address += input_section->output_offset; - return bfd_reloc_ok; - } - - if (reloc_entry->address > input_section->_cooked_size || - reloc_entry->address + reloc_entry->addend > input_section->_cooked_size) - return bfd_reloc_outofrange; - - /* The gp used in the portion of the output object to which this - input object belongs is cached on the input bfd. */ - gp = _bfd_get_gp_value (abfd); - - relocation = (input_section->output_section->vma - + input_section->output_offset - + reloc_entry->address); - - p_ldah = (bfd_byte *) data + reloc_entry->address; - p_lda = p_ldah + reloc_entry->addend; - - ret = elf64_alpha_do_reloc_gpdisp (abfd, gp - relocation, p_ldah, p_lda); - - /* Complain if the instructions are not correct. */ - if (ret == bfd_reloc_dangerous) - *err_msg = _("GPDISP relocation did not find ldah and lda instructions"); - - return ret; -} - /* A mapping from BFD reloc types to Alpha ELF reloc types. */ struct elf_reloc_map @@ -1114,9 +1045,8 @@ static const struct elf_reloc_map elf64_alpha_reloc_map[] = /* Given a BFD reloc type, return a HOWTO structure. */ static reloc_howto_type * -elf64_alpha_bfd_reloc_type_lookup (abfd, code) - bfd *abfd ATTRIBUTE_UNUSED; - bfd_reloc_code_real_type code; +elf64_alpha_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, + bfd_reloc_code_real_type code) { const struct elf_reloc_map *i, *e; i = e = elf64_alpha_reloc_map; @@ -1129,17 +1059,30 @@ elf64_alpha_bfd_reloc_type_lookup (abfd, code) return 0; } +static reloc_howto_type * +elf64_alpha_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, + const char *r_name) +{ + unsigned int i; + + for (i = 0; + i < (sizeof (elf64_alpha_howto_table) + / sizeof (elf64_alpha_howto_table[0])); + i++) + if (elf64_alpha_howto_table[i].name != NULL + && strcasecmp (elf64_alpha_howto_table[i].name, r_name) == 0) + return &elf64_alpha_howto_table[i]; + + return NULL; +} + /* Given an Alpha ELF reloc type, fill in an arelent structure. */ static void -elf64_alpha_info_to_howto (abfd, cache_ptr, dst) - bfd *abfd ATTRIBUTE_UNUSED; - arelent *cache_ptr; - Elf_Internal_Rela *dst; +elf64_alpha_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr, + Elf_Internal_Rela *dst) { - unsigned r_type; - - r_type = ELF64_R_TYPE(dst->r_info); + unsigned 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]; } @@ -1159,1124 +1102,17 @@ elf64_alpha_info_to_howto (abfd, cache_ptr, dst) - align_power ((bfd_vma) 16, \ elf_hash_table (info)->tls_sec->alignment_power)) -/* These functions do relaxation for Alpha ELF. - - Currently I'm only handling what I can do with existing compiler - and assembler support, which means no instructions are removed, - though some may be nopped. At this time GCC does not emit enough - information to do all of the relaxing that is possible. It will - take some not small amount of work for that to happen. - - There are a couple of interesting papers that I once read on this - subject, that I cannot find references to at the moment, that - related to Alpha in particular. They are by David Wall, then of - DEC WRL. */ - -#define OP_LDA 0x08 -#define OP_LDAH 0x09 -#define INSN_JSR 0x68004000 -#define INSN_JSR_MASK 0xfc00c000 -#define OP_LDQ 0x29 -#define OP_BR 0x30 -#define OP_BSR 0x34 -#define INSN_UNOP 0x2ffe0000 -#define INSN_ADDQ 0x40000400 -#define INSN_RDUNIQ 0x0000009e - -struct alpha_relax_info -{ - bfd *abfd; - asection *sec; - bfd_byte *contents; - Elf_Internal_Shdr *symtab_hdr; - Elf_Internal_Rela *relocs, *relend; - struct bfd_link_info *link_info; - bfd_vma gp; - bfd *gotobj; - asection *tsec; - struct alpha_elf_link_hash_entry *h; - struct alpha_elf_got_entry **first_gotent; - struct alpha_elf_got_entry *gotent; - bfd_boolean changed_contents; - bfd_boolean changed_relocs; - unsigned char other; -}; - -static bfd_boolean elf64_alpha_relax_with_lituse - PARAMS((struct alpha_relax_info *info, bfd_vma symval, - Elf_Internal_Rela *irel)); -static bfd_vma elf64_alpha_relax_opt_call - PARAMS((struct alpha_relax_info *info, bfd_vma symval)); -static bfd_boolean elf64_alpha_relax_got_load - PARAMS((struct alpha_relax_info *info, bfd_vma symval, - Elf_Internal_Rela *irel, unsigned long)); -static bfd_boolean elf64_alpha_relax_gprelhilo - PARAMS((struct alpha_relax_info *info, bfd_vma symval, - Elf_Internal_Rela *irel, bfd_boolean)); -static bfd_boolean elf64_alpha_relax_tls_get_addr - PARAMS((struct alpha_relax_info *info, bfd_vma symval, - Elf_Internal_Rela *irel, bfd_boolean)); -static bfd_boolean elf64_alpha_relax_section - PARAMS((bfd *abfd, asection *sec, struct bfd_link_info *link_info, - bfd_boolean *again)); - -static Elf_Internal_Rela * -elf64_alpha_find_reloc_at_ofs (rel, relend, offset, type) - Elf_Internal_Rela *rel, *relend; - bfd_vma offset; - int type; -{ - while (rel < relend) - { - if (rel->r_offset == offset - && ELF64_R_TYPE (rel->r_info) == (unsigned int) type) - return rel; - ++rel; - } - return NULL; -} - -static bfd_boolean -elf64_alpha_relax_with_lituse (info, symval, irel) - struct alpha_relax_info *info; - bfd_vma symval; - Elf_Internal_Rela *irel; -{ - Elf_Internal_Rela *urel, *irelend = info->relend; - int flags, count, i; - bfd_signed_vma disp; - bfd_boolean fits16; - bfd_boolean fits32; - bfd_boolean lit_reused = FALSE; - bfd_boolean all_optimized = TRUE; - unsigned int lit_insn; - - 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 TRUE; - } - - /* Can't relax dynamic symbols. */ - if (alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info)) - return TRUE; - - /* Summarize how this particular LITERAL is used. */ - for (urel = irel+1, flags = count = 0; urel < irelend; ++urel, ++count) - { - if (ELF64_R_TYPE (urel->r_info) != R_ALPHA_LITUSE) - break; - if (urel->r_addend <= 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) - { - case LITUSE_ALPHA_ADDR: - default: - /* This type is really just a placeholder to note that all - uses cannot be optimized, but to still allow some. */ - all_optimized = FALSE; - break; - - case LITUSE_ALPHA_BASE: - /* We 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 & 0x8000) - insn_disp |= ~0xffff; /* Negative: sign-extend. */ - - xdisp = disp + insn_disp; - fits16 = (xdisp >= - (bfd_signed_vma) 0x8000 && xdisp < 0x8000); - 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 LITUSE_ALPHA_BYTOFF: - /* We can always optimize byte instructions. */ - - /* FIXME: sanity check the insn for byte op. Check that the - literal dest reg is indeed Rb in the byte insn. */ - - insn &= ~ (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 LITUSE_ALPHA_JSR: - case LITUSE_ALPHA_TLSGD: - case LITUSE_ALPHA_TLSLDM: - { - bfd_vma optdest, org; - bfd_signed_vma odisp; - - /* If not zero, place to jump without needing pv. */ - optdest = elf64_alpha_relax_opt_call (info, symval); - org = (info->sec->output_section->vma - + info->sec->output_offset - + urel->r_offset + 4); - odisp = (optdest ? optdest : symval) - org; - - if (odisp >= -0x400000 && odisp < 0x400000) - { - Elf_Internal_Rela *xrel; - - /* 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 - (info->relocs, irelend, urel->r_offset + 4, - R_ALPHA_GPDISP)); - if (gpdisp) - { - bfd_byte *p_ldah = info->contents + gpdisp->r_offset; - bfd_byte *p_lda = p_ldah + gpdisp->r_addend; - unsigned int ldah = bfd_get_32 (info->abfd, p_ldah); - unsigned int lda = bfd_get_32 (info->abfd, p_lda); - - /* 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) - { - if (--info->gotent->use_count == 0) - { - int sz = alpha_got_entry_size (R_ALPHA_LITERAL); - alpha_elf_tdata (info->gotobj)->total_got_size -= sz; - if (!info->h) - alpha_elf_tdata (info->gotobj)->local_got_size -= sz; - } - - /* If the literal instruction is no longer needed (it may have been - reused. We can eliminate it. */ - /* ??? For now, I don't want to deal with compacting the section, - 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 TRUE; -} - -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_elf_link_read_relocs - (info->abfd, info->tsec, (PTR) NULL, - (Elf_Internal_Rela *) NULL, - info->link_info->keep_memory)); - if (tsec_relocs == NULL) - return 0; - tsec_relend = tsec_relocs + info->tsec->reloc_count; - tsec_free = (info->link_info->keep_memory ? NULL : tsec_relocs); - } - - /* 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 bfd_boolean -elf64_alpha_relax_got_load (info, symval, irel, r_type) - struct alpha_relax_info *info; - bfd_vma symval; - Elf_Internal_Rela *irel; - unsigned long r_type; -{ - unsigned int insn; - bfd_signed_vma disp; - - /* Get the instruction. */ - insn = bfd_get_32 (info->abfd, info->contents + irel->r_offset); - - if (insn >> 26 != OP_LDQ) - { - reloc_howto_type *howto = elf64_alpha_howto_table + r_type; - ((*_bfd_error_handler) - ("%s: %s+0x%lx: warning: %s relocation against unexpected insn", - bfd_archive_filename (info->abfd), info->sec->name, - (unsigned long) irel->r_offset, howto->name)); - return TRUE; - } - - /* Can't relax dynamic symbols. */ - if (alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info)) - return TRUE; - - /* Can't use local-exec relocations in shared libraries. */ - if (r_type == R_ALPHA_GOTTPREL && info->link_info->shared) - return TRUE; - - if (r_type == R_ALPHA_LITERAL) - disp = symval - info->gp; - else - { - bfd_vma dtp_base, tp_base; - - BFD_ASSERT (elf_hash_table (info->link_info)->tls_sec != NULL); - dtp_base = alpha_get_dtprel_base (info->link_info); - tp_base = alpha_get_tprel_base (info->link_info); - disp = symval - (r_type == R_ALPHA_GOTDTPREL ? dtp_base : tp_base); - } - - if (disp < -0x8000 || disp >= 0x8000) - return TRUE; - - /* Exchange LDQ for LDA. In the case of the TLS relocs, we're loading - a constant, so force the base register to be $31. */ - if (r_type == R_ALPHA_LITERAL) - insn = (OP_LDA << 26) | (insn & 0x03ff0000); - else - insn = (OP_LDA << 26) | (insn & (31 << 21)) | (31 << 16); - bfd_put_32 (info->abfd, (bfd_vma) insn, info->contents + irel->r_offset); - info->changed_contents = TRUE; - - /* Reduce the use count on this got entry by one, possibly - eliminating it. */ - if (--info->gotent->use_count == 0) - { - int sz = alpha_got_entry_size (r_type); - alpha_elf_tdata (info->gotobj)->total_got_size -= sz; - if (!info->h) - alpha_elf_tdata (info->gotobj)->local_got_size -= sz; - } - - /* Smash the existing GOT relocation for its 16-bit immediate pair. */ - switch (r_type) - { - case R_ALPHA_LITERAL: - r_type = R_ALPHA_GPREL16; - break; - case R_ALPHA_GOTDTPREL: - r_type = R_ALPHA_DTPREL16; - break; - case R_ALPHA_GOTTPREL: - r_type = R_ALPHA_TPREL16; - break; - default: - BFD_ASSERT (0); - return FALSE; - } - - irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info), r_type); - info->changed_relocs = TRUE; - - /* ??? Search forward through this basic block looking for insns - that use the target register. Stop after an insn modifying the - 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 bfd_boolean -elf64_alpha_relax_gprelhilo (info, symval, irel, hi) - struct alpha_relax_info *info; - bfd_vma symval; - Elf_Internal_Rela *irel; - bfd_boolean hi; -{ - unsigned int insn; - bfd_signed_vma disp; - bfd_byte *pos = info->contents + irel->r_offset; - - /* ??? This assumes that the compiler doesn't render - - array[i] - as - ldah t, array(gp) !gprelhigh - s8addl i, t, t - ldq r, array(t) !gprellow - - which would indeed be the most efficient way to implement this. */ - - return TRUE; - - disp = symval - info->gp; - if (disp < -0x8000 || disp >= 0x8000) - return TRUE; - - if (hi) - { - /* Nop out the high instruction. */ - - bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos); - info->changed_contents = TRUE; - - irel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE); - irel->r_addend = 0; - info->changed_relocs = TRUE; - } - else - { - /* Adjust the low instruction to reference GP directly. */ - - insn = bfd_get_32 (info->abfd, pos); - insn = (insn & 0xffe00000) | (29 << 16); - bfd_put_32 (info->abfd, (bfd_vma) insn, pos); - info->changed_contents = TRUE; - - irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info), - R_ALPHA_GPREL16); - info->changed_relocs = TRUE; - } - - return TRUE; -} - -static bfd_boolean -elf64_alpha_relax_tls_get_addr (info, symval, irel, is_gd) - struct alpha_relax_info *info; - bfd_vma symval; - Elf_Internal_Rela *irel; - bfd_boolean is_gd; -{ - bfd_byte *pos[5]; - unsigned int insn; - Elf_Internal_Rela *gpdisp, *hint; - bfd_boolean dynamic, use_gottprel, pos1_unusable; - unsigned long new_symndx; - - dynamic = alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info); - - /* If a TLS symbol is accessed using IE at least once, there is no point - to use dynamic model for it. */ - if (is_gd && info->h && (info->h->flags & ALPHA_ELF_LINK_HASH_TLS_IE)) - ; - - /* If the symbol is local, and we've already committed to DF_STATIC_TLS, - then we might as well relax to IE. */ - else if (info->link_info->shared && !dynamic - && (info->link_info->flags & DF_STATIC_TLS)) - ; - - /* Otherwise we must be building an executable to do anything. */ - else if (info->link_info->shared) - return TRUE; - - /* The TLSGD/TLSLDM relocation must be followed by a LITERAL and - the matching LITUSE_TLS relocations. */ - if (irel + 2 >= info->relend) - return TRUE; - if (ELF64_R_TYPE (irel[1].r_info) != R_ALPHA_LITERAL - || ELF64_R_TYPE (irel[2].r_info) != R_ALPHA_LITUSE - || irel[2].r_addend != (is_gd ? LITUSE_ALPHA_TLSGD : LITUSE_ALPHA_TLSLDM)) - return TRUE; - - /* There must be a GPDISP relocation positioned immediately after the - LITUSE relocation. */ - gpdisp = elf64_alpha_find_reloc_at_ofs (info->relocs, info->relend, - irel[2].r_offset + 4, R_ALPHA_GPDISP); - if (!gpdisp) - return TRUE; - - pos[0] = info->contents + irel[0].r_offset; - pos[1] = info->contents + irel[1].r_offset; - pos[2] = info->contents + irel[2].r_offset; - pos[3] = info->contents + gpdisp->r_offset; - pos[4] = pos[3] + gpdisp->r_addend; - pos1_unusable = FALSE; - - /* Generally, the positions are not allowed to be out of order, lest the - modified insn sequence have different register lifetimes. We can make - an exception when pos 1 is adjacent to pos 0. */ - if (pos[1] + 4 == pos[0]) - { - bfd_byte *tmp = pos[0]; - pos[0] = pos[1]; - pos[1] = tmp; - } - else if (pos[1] < pos[0]) - pos1_unusable = TRUE; - if (pos[1] >= pos[2] || pos[2] >= pos[3]) - return TRUE; - - /* Reduce the use count on the LITERAL relocation. Do this before we - smash the symndx when we adjust the relocations below. */ - { - struct alpha_elf_got_entry *lit_gotent; - struct alpha_elf_link_hash_entry *lit_h; - unsigned long indx; - - BFD_ASSERT (ELF64_R_SYM (irel[1].r_info) >= info->symtab_hdr->sh_info); - indx = ELF64_R_SYM (irel[1].r_info) - info->symtab_hdr->sh_info; - lit_h = alpha_elf_sym_hashes (info->abfd)[indx]; - - while (lit_h->root.root.type == bfd_link_hash_indirect - || lit_h->root.root.type == bfd_link_hash_warning) - lit_h = (struct alpha_elf_link_hash_entry *) lit_h->root.root.u.i.link; - - for (lit_gotent = lit_h->got_entries; lit_gotent ; - lit_gotent = lit_gotent->next) - if (lit_gotent->gotobj == info->gotobj - && lit_gotent->reloc_type == R_ALPHA_LITERAL - && lit_gotent->addend == irel[1].r_addend) - break; - BFD_ASSERT (lit_gotent); - - if (--lit_gotent->use_count == 0) - { - int sz = alpha_got_entry_size (R_ALPHA_LITERAL); - alpha_elf_tdata (info->gotobj)->total_got_size -= sz; - } - } - - /* Change - - lda $16,x($gp) !tlsgd!1 - ldq $27,__tls_get_addr($gp) !literal!1 - jsr $26,($27)__tls_get_addr !lituse_tlsgd!1 - ldah $29,0($26) !gpdisp!2 - lda $29,0($29) !gpdisp!2 - to - ldq $16,x($gp) !gottprel - unop - call_pal rduniq - addq $16,$0,$0 - unop - or the first pair to - lda $16,x($gp) !tprel - unop - or - ldah $16,x($gp) !tprelhi - lda $16,x($16) !tprello - - as appropriate. */ - - use_gottprel = FALSE; - new_symndx = is_gd ? ELF64_R_SYM (irel->r_info) : 0; - switch (!dynamic && !info->link_info->shared) - { - case 1: - { - bfd_vma tp_base; - bfd_signed_vma disp; - - BFD_ASSERT (elf_hash_table (info->link_info)->tls_sec != NULL); - tp_base = alpha_get_tprel_base (info->link_info); - disp = symval - tp_base; - - if (disp >= -0x8000 && disp < 0x8000) - { - insn = (OP_LDA << 26) | (16 << 21) | (31 << 16); - bfd_put_32 (info->abfd, (bfd_vma) insn, pos[0]); - bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos[1]); - - irel[0].r_offset = pos[0] - info->contents; - irel[0].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_TPREL16); - irel[1].r_info = ELF64_R_INFO (0, R_ALPHA_NONE); - break; - } - else if (disp >= -(bfd_signed_vma) 0x80000000 - && disp < (bfd_signed_vma) 0x7fff8000 - && !pos1_unusable) - { - insn = (OP_LDAH << 26) | (16 << 21) | (31 << 16); - bfd_put_32 (info->abfd, (bfd_vma) insn, pos[0]); - insn = (OP_LDA << 26) | (16 << 21) | (16 << 16); - bfd_put_32 (info->abfd, (bfd_vma) insn, pos[1]); - - irel[0].r_offset = pos[0] - info->contents; - irel[0].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_TPRELHI); - irel[1].r_offset = pos[1] - info->contents; - irel[1].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_TPRELLO); - break; - } - } - /* FALLTHRU */ - - default: - use_gottprel = TRUE; - - insn = (OP_LDQ << 26) | (16 << 21) | (29 << 16); - bfd_put_32 (info->abfd, (bfd_vma) insn, pos[0]); - bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos[1]); - - irel[0].r_offset = pos[0] - info->contents; - irel[0].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_GOTTPREL); - irel[1].r_info = ELF64_R_INFO (0, R_ALPHA_NONE); - break; - } - - bfd_put_32 (info->abfd, (bfd_vma) INSN_RDUNIQ, pos[2]); - - insn = INSN_ADDQ | (16 << 21) | (0 << 16) | (0 << 0); - bfd_put_32 (info->abfd, (bfd_vma) insn, pos[3]); - - bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos[4]); - - irel[2].r_info = ELF64_R_INFO (0, R_ALPHA_NONE); - gpdisp->r_info = ELF64_R_INFO (0, R_ALPHA_NONE); - - hint = elf64_alpha_find_reloc_at_ofs (info->relocs, info->relend, - irel[2].r_offset, R_ALPHA_HINT); - if (hint) - hint->r_info = ELF64_R_INFO (0, R_ALPHA_NONE); - - info->changed_contents = TRUE; - info->changed_relocs = TRUE; - - /* Reduce the use count on the TLSGD/TLSLDM relocation. */ - if (--info->gotent->use_count == 0) - { - int sz = alpha_got_entry_size (info->gotent->reloc_type); - alpha_elf_tdata (info->gotobj)->total_got_size -= sz; - if (!info->h) - alpha_elf_tdata (info->gotobj)->local_got_size -= sz; - } - - /* If we've switched to a GOTTPREL relocation, increment the reference - count on that got entry. */ - if (use_gottprel) - { - struct alpha_elf_got_entry *tprel_gotent; - - for (tprel_gotent = *info->first_gotent; tprel_gotent ; - tprel_gotent = tprel_gotent->next) - if (tprel_gotent->gotobj == info->gotobj - && tprel_gotent->reloc_type == R_ALPHA_GOTTPREL - && tprel_gotent->addend == irel->r_addend) - break; - if (tprel_gotent) - tprel_gotent->use_count++; - else - { - if (info->gotent->use_count == 0) - tprel_gotent = info->gotent; - else - { - tprel_gotent = (struct alpha_elf_got_entry *) - bfd_alloc (info->abfd, sizeof (struct alpha_elf_got_entry)); - if (!tprel_gotent) - return FALSE; - - tprel_gotent->next = *info->first_gotent; - *info->first_gotent = tprel_gotent; - - tprel_gotent->gotobj = info->gotobj; - tprel_gotent->addend = irel->r_addend; - tprel_gotent->got_offset = -1; - tprel_gotent->reloc_done = 0; - tprel_gotent->reloc_xlated = 0; - } - - tprel_gotent->use_count = 1; - tprel_gotent->reloc_type = R_ALPHA_GOTTPREL; - } - } - - return TRUE; -} - -static bfd_boolean -elf64_alpha_relax_section (abfd, sec, link_info, again) - bfd *abfd; - asection *sec; - struct bfd_link_info *link_info; - bfd_boolean *again; -{ - Elf_Internal_Shdr *symtab_hdr; - Elf_Internal_Rela *internal_relocs; - Elf_Internal_Rela *irel, *irelend; - Elf_Internal_Sym *isymbuf = NULL; - struct alpha_elf_got_entry **local_got_entries; - struct alpha_relax_info info; - - /* We are not currently changing any sizes, so only one pass. */ - *again = FALSE; - - if (link_info->relocatable - || (sec->flags & SEC_RELOC) == 0 - || sec->reloc_count == 0) - return TRUE; - - /* If this is the first time we have been called for this section, - initialize the cooked size. */ - if (sec->_cooked_size == 0) - sec->_cooked_size = sec->_raw_size; - - symtab_hdr = &elf_tdata (abfd)->symtab_hdr; - local_got_entries = alpha_elf_tdata(abfd)->local_got_entries; - - /* Load the relocations for this section. */ - internal_relocs = (_bfd_elf_link_read_relocs - (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL, - link_info->keep_memory)); - if (internal_relocs == NULL) - return FALSE; - - memset(&info, 0, sizeof (info)); - info.abfd = abfd; - info.sec = sec; - info.link_info = link_info; - info.symtab_hdr = symtab_hdr; - info.relocs = internal_relocs; - info.relend = irelend = internal_relocs + sec->reloc_count; - - /* Find the GP for this object. Do not store the result back via - _bfd_set_gp_value, since this could change again before final. */ - info.gotobj = alpha_elf_tdata (abfd)->gotobj; - if (info.gotobj) - { - asection *sgot = alpha_elf_tdata (info.gotobj)->got; - info.gp = (sgot->output_section->vma - + sgot->output_offset - + 0x8000); - } - - /* Get the section contents. */ - if (elf_section_data (sec)->this_hdr.contents != NULL) - info.contents = elf_section_data (sec)->this_hdr.contents; - else - { - info.contents = (bfd_byte *) bfd_malloc (sec->_raw_size); - if (info.contents == NULL) - goto error_return; - - if (! bfd_get_section_contents (abfd, sec, info.contents, - (file_ptr) 0, sec->_raw_size)) - goto error_return; - } - - for (irel = internal_relocs; irel < irelend; irel++) - { - bfd_vma symval; - struct alpha_elf_got_entry *gotent; - unsigned long r_type = ELF64_R_TYPE (irel->r_info); - unsigned long r_symndx = ELF64_R_SYM (irel->r_info); - - /* Early exit for unhandled or unrelaxable relocations. */ - switch (r_type) - { - case R_ALPHA_LITERAL: - case R_ALPHA_GPRELHIGH: - case R_ALPHA_GPRELLOW: - case R_ALPHA_GOTDTPREL: - case R_ALPHA_GOTTPREL: - case R_ALPHA_TLSGD: - break; - - case R_ALPHA_TLSLDM: - /* The symbol for a TLSLDM reloc is ignored. Collapse the - reloc to the 0 symbol so that they all match. */ - r_symndx = 0; - break; - - default: - continue; - } - - /* Get the value of the symbol referred to by the reloc. */ - if (r_symndx < symtab_hdr->sh_info) - { - /* A local symbol. */ - Elf_Internal_Sym *isym; - - /* Read this BFD's local symbols. */ - if (isymbuf == NULL) - { - isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents; - if (isymbuf == NULL) - isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr, - symtab_hdr->sh_info, 0, - NULL, NULL, NULL); - if (isymbuf == NULL) - goto error_return; - } - - isym = isymbuf + r_symndx; - - /* Given the symbol for a TLSLDM reloc is ignored, this also - means forcing the symbol value to the tp base. */ - if (r_type == R_ALPHA_TLSLDM) - { - info.tsec = bfd_abs_section_ptr; - symval = alpha_get_tprel_base (info.link_info); - } - else - { - symval = isym->st_value; - if (isym->st_shndx == SHN_UNDEF) - continue; - else if (isym->st_shndx == SHN_ABS) - info.tsec = bfd_abs_section_ptr; - else if (isym->st_shndx == SHN_COMMON) - info.tsec = bfd_com_section_ptr; - else - info.tsec = bfd_section_from_elf_index (abfd, isym->st_shndx); - } - - info.h = NULL; - info.other = isym->st_other; - if (local_got_entries) - info.first_gotent = &local_got_entries[r_symndx]; - else - { - info.first_gotent = &info.gotent; - info.gotent = NULL; - } - } - else - { - unsigned long indx; - struct alpha_elf_link_hash_entry *h; - - indx = r_symndx - 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; - - /* If the symbol is undefined, we can't do anything with it. */ - if (h->root.root.type == bfd_link_hash_undefweak - || h->root.root.type == bfd_link_hash_undefined) - continue; - - /* If the symbol isn't defined in the current module, again - we can't do anything. */ - if (!(h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)) - { - /* Except for TLSGD relocs, which can sometimes be - relaxed to GOTTPREL relocs. */ - if (r_type != R_ALPHA_TLSGD) - continue; - info.tsec = bfd_abs_section_ptr; - symval = 0; - } - else - { - info.tsec = h->root.root.u.def.section; - symval = h->root.root.u.def.value; - } - - info.h = h; - info.other = h->root.other; - info.first_gotent = &h->got_entries; - } - - /* Search for the got entry to be used by this relocation. */ - for (gotent = *info.first_gotent; gotent ; gotent = gotent->next) - if (gotent->gotobj == info.gotobj - && gotent->reloc_type == r_type - && gotent->addend == irel->r_addend) - break; - info.gotent = gotent; - - symval += info.tsec->output_section->vma + info.tsec->output_offset; - symval += irel->r_addend; - - switch (r_type) - { - case R_ALPHA_LITERAL: - BFD_ASSERT(info.gotent != NULL); - - /* If there exist LITUSE relocations immediately following, this - opens up all sorts of interesting optimizations, because we - now know every location that this address load is used. */ - if (irel+1 < irelend - && ELF64_R_TYPE (irel[1].r_info) == R_ALPHA_LITUSE) - { - if (!elf64_alpha_relax_with_lituse (&info, symval, irel)) - goto error_return; - } - else - { - if (!elf64_alpha_relax_got_load (&info, symval, irel, r_type)) - goto error_return; - } - break; - - case R_ALPHA_GPRELHIGH: - case R_ALPHA_GPRELLOW: - if (!elf64_alpha_relax_gprelhilo (&info, symval, irel, - r_type == R_ALPHA_GPRELHIGH)) - goto error_return; - break; - - case R_ALPHA_GOTDTPREL: - case R_ALPHA_GOTTPREL: - BFD_ASSERT(info.gotent != NULL); - if (!elf64_alpha_relax_got_load (&info, symval, irel, r_type)) - goto error_return; - break; - - case R_ALPHA_TLSGD: - case R_ALPHA_TLSLDM: - BFD_ASSERT(info.gotent != NULL); - if (!elf64_alpha_relax_tls_get_addr (&info, symval, irel, - r_type == R_ALPHA_TLSGD)) - goto error_return; - break; - } - } - - if (!elf64_alpha_size_plt_section (link_info)) - return FALSE; - if (!elf64_alpha_size_got_sections (link_info)) - return FALSE; - if (!elf64_alpha_size_rela_got_section (link_info)) - return FALSE; - - if (isymbuf != NULL - && symtab_hdr->contents != (unsigned char *) isymbuf) - { - if (!link_info->keep_memory) - free (isymbuf); - else - { - /* Cache the symbols for elf_link_input_bfd. */ - symtab_hdr->contents = (unsigned char *) isymbuf; - } - } - - if (info.contents != NULL - && elf_section_data (sec)->this_hdr.contents != info.contents) - { - if (!info.changed_contents && !link_info->keep_memory) - free (info.contents); - else - { - /* Cache the section contents for elf_link_input_bfd. */ - elf_section_data (sec)->this_hdr.contents = info.contents; - } - } - - if (elf_section_data (sec)->relocs != internal_relocs) - { - if (!info.changed_relocs) - free (internal_relocs); - else - elf_section_data (sec)->relocs = internal_relocs; - } - - *again = info.changed_contents || info.changed_relocs; - - return TRUE; - - error_return: - if (isymbuf != NULL - && symtab_hdr->contents != (unsigned char *) isymbuf) - free (isymbuf); - if (info.contents != NULL - && elf_section_data (sec)->this_hdr.contents != info.contents) - free (info.contents); - if (internal_relocs != NULL - && elf_section_data (sec)->relocs != internal_relocs) - free (internal_relocs); - return FALSE; -} - -/* PLT/GOT Stuff */ -#define PLT_HEADER_SIZE 32 -#define PLT_HEADER_WORD1 (bfd_vma) 0xc3600000 /* br $27,.+4 */ -#define PLT_HEADER_WORD2 (bfd_vma) 0xa77b000c /* ldq $27,12($27) */ -#define PLT_HEADER_WORD3 (bfd_vma) 0x47ff041f /* nop */ -#define PLT_HEADER_WORD4 (bfd_vma) 0x6b7b0000 /* jmp $27,($27) */ - -#define PLT_ENTRY_SIZE 12 -#define PLT_ENTRY_WORD1 0xc3800000 /* br $28, plt0 */ -#define PLT_ENTRY_WORD2 0 -#define PLT_ENTRY_WORD3 0 - -#define MAX_GOT_SIZE (64*1024) - -#define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so" - /* Handle an Alpha specific section when reading an object file. This - is called when elfcode.h finds a section with an unknown type. + is called when bfd_section_from_shdr finds a section with an unknown + type. FIXME: We need to handle the SHF_ALPHA_GPREL flag, but I'm not sure how to. */ static bfd_boolean -elf64_alpha_section_from_shdr (abfd, hdr, name) - bfd *abfd; - Elf_Internal_Shdr *hdr; - const char *name; +elf64_alpha_section_from_shdr (bfd *abfd, + Elf_Internal_Shdr *hdr, + const char *name, + int shindex) { asection *newsect; @@ -2295,7 +1131,7 @@ elf64_alpha_section_from_shdr (abfd, hdr, name) return FALSE; } - if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name)) + if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex)) return FALSE; newsect = hdr->bfd_section; @@ -2313,9 +1149,7 @@ elf64_alpha_section_from_shdr (abfd, hdr, name) /* Convert Alpha specific section flags to bfd internal section flags. */ static bfd_boolean -elf64_alpha_section_flags (flags, hdr) - flagword *flags; - Elf_Internal_Shdr *hdr; +elf64_alpha_section_flags (flagword *flags, const Elf_Internal_Shdr *hdr) { if (hdr->sh_flags & SHF_ALPHA_GPREL) *flags |= SEC_SMALL_DATA; @@ -2327,10 +1161,7 @@ elf64_alpha_section_flags (flags, hdr) section name, which is a hack, but ought to work. */ static bfd_boolean -elf64_alpha_fake_sections (abfd, hdr, sec) - bfd *abfd; - Elf_Internal_Shdr *hdr; - asection *sec; +elf64_alpha_fake_sections (bfd *abfd, Elf_Internal_Shdr *hdr, asection *sec) { register const char *name; @@ -2360,14 +1191,11 @@ elf64_alpha_fake_sections (abfd, hdr, sec) file. We use it to put .comm items in .sbss, and not .bss. */ static bfd_boolean -elf64_alpha_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp) - bfd *abfd; - struct bfd_link_info *info; - Elf_Internal_Sym *sym; - const char **namep ATTRIBUTE_UNUSED; - flagword *flagsp ATTRIBUTE_UNUSED; - asection **secp; - bfd_vma *valp; +elf64_alpha_add_symbol_hook (bfd *abfd, struct bfd_link_info *info, + Elf_Internal_Sym *sym, + const char **namep ATTRIBUTE_UNUSED, + flagword *flagsp ATTRIBUTE_UNUSED, + asection **secp, bfd_vma *valp) { if (sym->st_shndx == SHN_COMMON && !info->relocatable @@ -2380,11 +1208,11 @@ elf64_alpha_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp) 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))) + scomm = bfd_make_section_with_flags (abfd, ".scommon", + (SEC_ALLOC + | SEC_IS_COMMON + | SEC_LINKER_CREATED)); + if (scomm == NULL) return FALSE; } @@ -2398,96 +1226,82 @@ elf64_alpha_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp) /* Create the .got section. */ static bfd_boolean -elf64_alpha_create_got_section(abfd, info) - bfd *abfd; - struct bfd_link_info *info ATTRIBUTE_UNUSED; +elf64_alpha_create_got_section (bfd *abfd, + struct bfd_link_info *info ATTRIBUTE_UNUSED) { + flagword flags; asection *s; - if ((s = bfd_get_section_by_name (abfd, ".got"))) - { - /* Check for a non-linker created .got? */ - if (alpha_elf_tdata (abfd)->got == NULL) - alpha_elf_tdata (abfd)->got = s; - return TRUE; - } - - s = bfd_make_section (abfd, ".got"); + flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY + | SEC_LINKER_CREATED); + s = bfd_make_section_anyway_with_flags (abfd, ".got", flags); if (s == NULL - || !bfd_set_section_flags (abfd, s, (SEC_ALLOC | SEC_LOAD - | SEC_HAS_CONTENTS - | SEC_IN_MEMORY - | SEC_LINKER_CREATED)) || !bfd_set_section_alignment (abfd, s, 3)) return FALSE; alpha_elf_tdata (abfd)->got = s; + /* Make sure the object's gotobj is set to itself so that we default + to every object with its own .got. We'll merge .gots later once + we've collected each object's info. */ + alpha_elf_tdata (abfd)->gotobj = abfd; + return TRUE; } /* Create all the dynamic sections. */ static bfd_boolean -elf64_alpha_create_dynamic_sections (abfd, info) - bfd *abfd; - struct bfd_link_info *info; +elf64_alpha_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info) { asection *s; + flagword flags; struct elf_link_hash_entry *h; - struct bfd_link_hash_entry *bh; /* We need to create .plt, .rela.plt, .got, and .rela.got sections. */ - s = bfd_make_section (abfd, ".plt"); - if (s == NULL - || ! bfd_set_section_flags (abfd, s, (SEC_ALLOC | SEC_LOAD - | SEC_HAS_CONTENTS - | SEC_IN_MEMORY - | SEC_LINKER_CREATED - | SEC_CODE)) - || ! bfd_set_section_alignment (abfd, s, 3)) + flags = (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS | SEC_IN_MEMORY + | SEC_LINKER_CREATED + | (elf64_alpha_use_secureplt ? SEC_READONLY : 0)); + s = bfd_make_section_anyway_with_flags (abfd, ".plt", flags); + if (s == NULL || ! bfd_set_section_alignment (abfd, s, 4)) return FALSE; /* Define the symbol _PROCEDURE_LINKAGE_TABLE_ at the start of the .plt section. */ - bh = NULL; - if (! (_bfd_generic_link_add_one_symbol - (info, abfd, "_PROCEDURE_LINKAGE_TABLE_", BSF_GLOBAL, s, - (bfd_vma) 0, (const char *) NULL, FALSE, - get_elf_backend_data (abfd)->collect, &bh))) + h = _bfd_elf_define_linkage_sym (abfd, info, s, + "_PROCEDURE_LINKAGE_TABLE_"); + elf_hash_table (info)->hplt = h; + if (h == NULL) return FALSE; - h = (struct elf_link_hash_entry *) bh; - h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR; - h->type = STT_OBJECT; - if (info->shared - && ! bfd_elf_link_record_dynamic_symbol (info, h)) + flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY + | SEC_LINKER_CREATED | SEC_READONLY); + s = bfd_make_section_anyway_with_flags (abfd, ".rela.plt", flags); + if (s == NULL || ! bfd_set_section_alignment (abfd, s, 3)) return FALSE; - s = bfd_make_section (abfd, ".rela.plt"); - if (s == NULL - || !bfd_set_section_flags (abfd, s, (SEC_ALLOC | SEC_LOAD - | SEC_HAS_CONTENTS - | SEC_IN_MEMORY - | SEC_LINKER_CREATED - | SEC_READONLY)) - || ! bfd_set_section_alignment (abfd, s, 3)) - return FALSE; + if (elf64_alpha_use_secureplt) + { + flags = SEC_ALLOC | SEC_LINKER_CREATED; + s = bfd_make_section_anyway_with_flags (abfd, ".got.plt", flags); + if (s == NULL || ! bfd_set_section_alignment (abfd, s, 3)) + return FALSE; + } /* We may or may not have created a .got section for this object, but we definitely havn't done the rest of the work. */ - if (!elf64_alpha_create_got_section (abfd, info)) - return FALSE; + if (alpha_elf_tdata(abfd)->gotobj == NULL) + { + if (!elf64_alpha_create_got_section (abfd, info)) + return FALSE; + } - s = bfd_make_section(abfd, ".rela.got"); + flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY + | SEC_LINKER_CREATED | SEC_READONLY); + s = bfd_make_section_anyway_with_flags (abfd, ".rela.got", flags); if (s == NULL - || !bfd_set_section_flags (abfd, s, (SEC_ALLOC | SEC_LOAD - | SEC_HAS_CONTENTS - | SEC_IN_MEMORY - | SEC_LINKER_CREATED - | SEC_READONLY)) || !bfd_set_section_alignment (abfd, s, 3)) return FALSE; @@ -2495,21 +1309,11 @@ elf64_alpha_create_dynamic_sections (abfd, info) dynobj's .got section. We don't do this in the linker script because we don't want to define the symbol if we are not creating a global offset table. */ - bh = NULL; - if (!(_bfd_generic_link_add_one_symbol - (info, abfd, "_GLOBAL_OFFSET_TABLE_", BSF_GLOBAL, - alpha_elf_tdata(abfd)->got, (bfd_vma) 0, (const char *) NULL, - FALSE, get_elf_backend_data (abfd)->collect, &bh))) - return FALSE; - h = (struct elf_link_hash_entry *) bh; - h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR; - h->type = STT_OBJECT; - - if (info->shared - && ! bfd_elf_link_record_dynamic_symbol (info, h)) - return FALSE; - + h = _bfd_elf_define_linkage_sym (abfd, info, alpha_elf_tdata(abfd)->got, + "_GLOBAL_OFFSET_TABLE_"); elf_hash_table (info)->hgot = h; + if (h == NULL) + return FALSE; return TRUE; } @@ -2518,10 +1322,8 @@ elf64_alpha_create_dynamic_sections (abfd, info) ecoff_debug_info structure. */ static bfd_boolean -elf64_alpha_read_ecoff_info (abfd, section, debug) - bfd *abfd; - asection *section; - struct ecoff_debug_info *debug; +elf64_alpha_read_ecoff_info (bfd *abfd, asection *section, + struct ecoff_debug_info *debug) { HDRR *symhdr; const struct ecoff_debug_swap *swap; @@ -2572,7 +1374,6 @@ elf64_alpha_read_ecoff_info (abfd, section, debug) #undef READ debug->fdr = NULL; - debug->adjust = NULL; return TRUE; @@ -2607,9 +1408,7 @@ elf64_alpha_read_ecoff_info (abfd, section, debug) /* Alpha ELF local labels start with '$'. */ static bfd_boolean -elf64_alpha_is_local_label_name (abfd, name) - bfd *abfd ATTRIBUTE_UNUSED; - const char *name; +elf64_alpha_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED, const char *name) { return name[0] == '$'; } @@ -2626,15 +1425,10 @@ struct mips_elf_find_line }; static bfd_boolean -elf64_alpha_find_nearest_line (abfd, section, symbols, offset, filename_ptr, - functionname_ptr, line_ptr) - bfd *abfd; - asection *section; - asymbol **symbols; - bfd_vma offset; - const char **filename_ptr; - const char **functionname_ptr; - unsigned int *line_ptr; +elf64_alpha_find_nearest_line (bfd *abfd, asection *section, asymbol **symbols, + bfd_vma offset, const char **filename_ptr, + const char **functionname_ptr, + unsigned int *line_ptr) { asection *msec; @@ -2737,9 +1531,7 @@ struct extsym_info }; static bfd_boolean -elf64_alpha_output_extsym (h, data) - struct alpha_elf_link_hash_entry *h; - PTR data; +elf64_alpha_output_extsym (struct alpha_elf_link_hash_entry *h, PTR data) { struct extsym_info *einfo = (struct extsym_info *) data; bfd_boolean strip; @@ -2750,10 +1542,11 @@ elf64_alpha_output_extsym (h, data) if (h->root.indx == -2) strip = FALSE; - else if (((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0 - || (h->root.elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) != 0) - && (h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0 - && (h->root.elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR) == 0) + else if ((h->root.def_dynamic + || h->root.ref_dynamic + || h->root.root.type == bfd_link_hash_new) + && !h->root.def_regular + && !h->root.ref_regular) strip = TRUE; else if (einfo->info->strip == strip_all || (einfo->info->strip == strip_some @@ -2840,24 +1633,6 @@ elf64_alpha_output_extsym (h, data) else h->esym.asym.value = 0; } - else if ((h->root.elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0) - { - /* Set type and value for a symbol with a function stub. */ - h->esym.asym.st = stProc; - sec = bfd_get_section_by_name (einfo->abfd, ".plt"); - if (sec == NULL) - h->esym.asym.value = 0; - else - { - output_section = sec->output_section; - if (output_section != NULL) - h->esym.asym.value = (h->root.plt.offset - + sec->output_offset - + output_section->vma); - else - h->esym.asym.value = 0; - } - } if (! bfd_ecoff_debug_one_external (einfo->abfd, einfo->debug, einfo->swap, h->root.root.root.string, @@ -2873,11 +1648,9 @@ elf64_alpha_output_extsym (h, data) /* Search for and possibly create a got entry. */ static struct alpha_elf_got_entry * -get_got_entry (abfd, h, r_type, r_symndx, r_addend) - bfd *abfd; - struct alpha_elf_link_hash_entry *h; - unsigned long r_type, r_symndx; - bfd_vma r_addend; +get_got_entry (bfd *abfd, struct alpha_elf_link_hash_entry *h, + unsigned long r_type, unsigned long r_symndx, + bfd_vma r_addend) { struct alpha_elf_got_entry *gotent; struct alpha_elf_got_entry **slot; @@ -2930,6 +1703,7 @@ get_got_entry (abfd, h, r_type, r_symndx, r_addend) gotent->gotobj = abfd; gotent->addend = r_addend; gotent->got_offset = -1; + gotent->plt_offset = -1; gotent->use_count = 1; gotent->reloc_type = r_type; gotent->reloc_done = 0; @@ -2949,14 +1723,21 @@ get_got_entry (abfd, h, r_type, r_symndx, r_addend) return gotent; } +static bfd_boolean +elf64_alpha_want_plt (struct alpha_elf_link_hash_entry *ah) +{ + return ((ah->root.type == STT_FUNC + || ah->root.root.type == bfd_link_hash_undefweak + || ah->root.root.type == bfd_link_hash_undefined) + && (ah->flags & ALPHA_ELF_LINK_HASH_LU_PLT) != 0 + && (ah->flags & ~ALPHA_ELF_LINK_HASH_LU_PLT) == 0); +} + /* Handle dynamic relocations when doing an Alpha ELF link. */ static bfd_boolean -elf64_alpha_check_relocs (abfd, info, sec, relocs) - bfd *abfd; - struct bfd_link_info *info; - asection *sec; - const Elf_Internal_Rela *relocs; +elf64_alpha_check_relocs (bfd *abfd, struct bfd_link_info *info, + asection *sec, const Elf_Internal_Rela *relocs) { bfd *dynobj; asection *sreloc; @@ -2964,12 +1745,20 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs) Elf_Internal_Shdr *symtab_hdr; struct alpha_elf_link_hash_entry **sym_hashes; const Elf_Internal_Rela *rel, *relend; - bfd_boolean got_created; bfd_size_type amt; if (info->relocatable) return TRUE; + /* Don't do anything special with non-loaded, non-alloced sections. + In particular, any relocs in such sections should not affect GOT + and PLT reference counting (ie. we don't allow them to create GOT + or PLT entries), there's no possibility or desire to optimize TLS + relocs, and there's not much point in propagating relocs to shared + libs that the dynamic linker won't relocate. */ + if ((sec->flags & SEC_ALLOC) == 0) + return TRUE; + dynobj = elf_hash_table(info)->dynobj; if (dynobj == NULL) elf_hash_table(info)->dynobj = dynobj = abfd; @@ -2978,7 +1767,6 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs) rel_sec_name = NULL; symtab_hdr = &elf_tdata(abfd)->symtab_hdr; sym_hashes = alpha_elf_sym_hashes(abfd); - got_created = FALSE; relend = relocs + sec->reloc_count; for (rel = relocs; rel < relend; ++rel) @@ -3007,7 +1795,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs) || 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; + h->root.ref_regular = 1; } /* We can only get preliminary data on whether a symbol is @@ -3016,8 +1804,9 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs) this may help reduce memory usage and processing time later. */ maybe_dynamic = FALSE; if (h && ((info->shared - && (!info->symbolic || info->unresolved_syms_in_shared_libs == RM_IGNORE)) - || ! (h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) + && (!info->symbolic + || info->unresolved_syms_in_shared_libs == RM_IGNORE)) + || !h->root.def_regular || h->root.root.type == bfd_link_hash_defweak)) maybe_dynamic = TRUE; @@ -3035,7 +1824,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs) This will be important when it comes to decide if we can create a .plt entry for a function symbol. */ while (++rel < relend && ELF64_R_TYPE (rel->r_info) == R_ALPHA_LITUSE) - if (rel->r_addend >= 1 && rel->r_addend <= 5) + if (rel->r_addend >= 1 && rel->r_addend <= 6) gotent_flags |= 1 << rel->r_addend; --rel; @@ -3055,7 +1844,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs) case R_ALPHA_REFLONG: case R_ALPHA_REFQUAD: - if ((info->shared && (sec->flags & SEC_ALLOC)) || maybe_dynamic) + if (info->shared || maybe_dynamic) need = NEED_DYNREL; break; @@ -3089,18 +1878,10 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs) if (need & NEED_GOT) { - if (!got_created) + if (alpha_elf_tdata(abfd)->gotobj == NULL) { if (!elf64_alpha_create_got_section (abfd, info)) return FALSE; - - /* Make sure the object's gotobj is set to itself so - that we default to every object with its own .got. - We'll merge .gots later once we've collected each - object's info. */ - alpha_elf_tdata(abfd)->gotobj = abfd; - - got_created = 1; } } @@ -3121,12 +1902,13 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs) h->flags = gotent_flags; /* Make a guess as to whether a .plt entry is needed. */ - if ((gotent_flags & ALPHA_ELF_LINK_HASH_LU_FUNC) - && !(gotent_flags & ~ALPHA_ELF_LINK_HASH_LU_FUNC)) - h->root.elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT; - else - h->root.elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT; - } + /* ??? It appears that we won't make it into + adjust_dynamic_symbol for symbols that remain + totally undefined. Copying this check here means + we can create a plt entry for them too. */ + h->root.needs_plt + = (maybe_dynamic && elf64_alpha_want_plt (h)); + } } } @@ -3140,7 +1922,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs) if (rel_sec_name == NULL) return FALSE; - BFD_ASSERT (strncmp (rel_sec_name, ".rela", 5) == 0 + BFD_ASSERT (CONST_STRNEQ (rel_sec_name, ".rela") && strcmp (bfd_get_section_name (abfd, sec), rel_sec_name+5) == 0); } @@ -3156,13 +1938,14 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs) { 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; + sreloc = bfd_make_section_with_flags (dynobj, + rel_sec_name, + flags); if (sreloc == NULL - || !bfd_set_section_flags (dynobj, sreloc, flags) || !bfd_set_section_alignment (dynobj, sreloc, 3)) return FALSE; } @@ -3192,8 +1975,7 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs) rent->srel = sreloc; rent->rtype = r_type; rent->count = 1; - rent->reltext = ((sec->flags & (SEC_READONLY | SEC_ALLOC)) - == (SEC_READONLY | SEC_ALLOC)); + rent->reltext = (sec->flags & SEC_READONLY) != 0; rent->next = h->reloc_entries; h->reloc_entries = rent; @@ -3205,9 +1987,8 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs) { /* 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 | SEC_ALLOC)) - == (SEC_READONLY | SEC_ALLOC)) + sreloc->size += sizeof (Elf64_External_Rela); + if (sec->flags & SEC_READONLY) info->flags |= DF_TEXTREL; } } @@ -3223,9 +2004,8 @@ elf64_alpha_check_relocs (abfd, info, sec, relocs) understand. */ static bfd_boolean -elf64_alpha_adjust_dynamic_symbol (info, h) - struct bfd_link_info *info; - struct elf_link_hash_entry *h; +elf64_alpha_adjust_dynamic_symbol (struct bfd_link_info *info, + struct elf_link_hash_entry *h) { bfd *dynobj; asection *s; @@ -3235,66 +2015,36 @@ elf64_alpha_adjust_dynamic_symbol (info, h) ah = (struct alpha_elf_link_hash_entry *)h; /* Now that we've seen all of the input symbols, finalize our decision - about whether this symbol should get a .plt entry. */ - - if (alpha_elf_dynamic_symbol_p (h, info) - && ((h->type == STT_FUNC - && !(ah->flags & ALPHA_ELF_LINK_HASH_LU_ADDR)) - || (h->type == STT_NOTYPE - && (ah->flags & ALPHA_ELF_LINK_HASH_LU_FUNC) - && !(ah->flags & ~ALPHA_ELF_LINK_HASH_LU_FUNC))) - /* Don't prevent otherwise valid programs from linking by attempting - to create a new .got entry somewhere. A Correct Solution would be - to add a new .got section to a new object file and let it be merged - somewhere later. But for now don't bother. */ - && ah->got_entries) + about whether this symbol should get a .plt entry. Irritatingly, it + is common for folk to leave undefined symbols in shared libraries, + and they still expect lazy binding; accept undefined symbols in lieu + of STT_FUNC. */ + if (alpha_elf_dynamic_symbol_p (h, info) && elf64_alpha_want_plt (ah)) { - h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT; + h->needs_plt = TRUE; s = bfd_get_section_by_name(dynobj, ".plt"); if (!s && !elf64_alpha_create_dynamic_sections (dynobj, info)) return FALSE; - /* The first bit of the .plt is reserved. */ - if (s->_raw_size == 0) - s->_raw_size = PLT_HEADER_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 - && h->root.type != bfd_link_hash_defweak) - { - ah->plt_old_section = h->root.u.def.section; - ah->plt_old_value = h->root.u.def.value; - ah->flags |= ALPHA_ELF_LINK_HASH_PLT_LOC; - h->root.u.def.section = s; - h->root.u.def.value = h->plt.offset; - } - - /* We also need a JMP_SLOT entry in the .rela.plt section. */ - s = bfd_get_section_by_name (dynobj, ".rela.plt"); - BFD_ASSERT (s != NULL); - s->_raw_size += sizeof (Elf64_External_Rela); + /* We need one plt entry per got subsection. Delay allocation of + the actual plt entries until size_plt_section, called from + size_dynamic_sections or during relaxation. */ return TRUE; } else - h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT; + h->needs_plt = FALSE; /* If this is a weak symbol, and there is a real definition, the processor independent code will have arranged for us to see the real definition first, and we can just use the same value. */ - if (h->weakdef != NULL) + if (h->u.weakdef != NULL) { - BFD_ASSERT (h->weakdef->root.type == bfd_link_hash_defined - || h->weakdef->root.type == bfd_link_hash_defweak); - h->root.u.def.section = h->weakdef->root.u.def.section; - h->root.u.def.value = h->weakdef->root.u.def.value; + BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined + || h->u.weakdef->root.type == bfd_link_hash_defweak); + h->root.u.def.section = h->u.weakdef->root.u.def.section; + h->root.u.def.value = h->u.weakdef->root.u.def.value; return TRUE; } @@ -3306,14 +2056,26 @@ elf64_alpha_adjust_dynamic_symbol (info, h) return TRUE; } +/* Record STO_ALPHA_NOPV and STO_ALPHA_STD_GPLOAD. */ + +static void +elf64_alpha_merge_symbol_attribute (struct elf_link_hash_entry *h, + const Elf_Internal_Sym *isym, + bfd_boolean definition, + bfd_boolean dynamic) +{ + if (!dynamic && definition) + h->other = ((h->other & ELF_ST_VISIBILITY (-1)) + | (isym->st_other & ~ELF_ST_VISIBILITY (-1))); +} + /* Symbol versioning can create new symbols, and make our old symbols indirect to the new ones. Consolidate the got and reloc information in these situations. */ static bfd_boolean -elf64_alpha_merge_ind_symbols (hi, dummy) - struct alpha_elf_link_hash_entry *hi; - PTR dummy ATTRIBUTE_UNUSED; +elf64_alpha_merge_ind_symbols (struct alpha_elf_link_hash_entry *hi, + PTR dummy ATTRIBUTE_UNUSED) { struct alpha_elf_link_hash_entry *hs; @@ -3387,8 +2149,7 @@ elf64_alpha_merge_ind_symbols (hi, dummy) /* Is it possible to merge two object file's .got tables? */ static bfd_boolean -elf64_alpha_can_merge_gots (a, b) - bfd *a, *b; +elf64_alpha_can_merge_gots (bfd *a, bfd *b) { int total = alpha_elf_tdata (a)->total_got_size; bfd *bsub; @@ -3448,8 +2209,7 @@ elf64_alpha_can_merge_gots (a, b) /* Actually merge two .got tables. */ static void -elf64_alpha_merge_gots (a, b) - bfd *a, *b; +elf64_alpha_merge_gots (bfd *a, bfd *b) { int total = alpha_elf_tdata (a)->total_got_size; bfd *bsub; @@ -3496,16 +2256,17 @@ elf64_alpha_merge_gots (a, b) || h->root.root.type == bfd_link_hash_warning) h = (struct alpha_elf_link_hash_entry *)h->root.root.u.i.link; - start = &h->got_entries; - for (pbe = start, be = *start; be ; pbe = &be->next, be = be->next) + pbe = start = &h->got_entries; + while ((be = *pbe) != NULL) { if (be->use_count == 0) { *pbe = be->next; - continue; + memset (be, 0xa5, sizeof (*be)); + goto kill; } if (be->gotobj != b) - continue; + goto next; for (ae = *start; ae ; ae = ae->next) if (ae->gotobj == a @@ -3515,12 +2276,15 @@ elf64_alpha_merge_gots (a, b) ae->flags |= be->flags; ae->use_count += be->use_count; *pbe = be->next; - goto global_found; + memset (be, 0xa5, sizeof (*be)); + goto kill; } be->gotobj = a; total += alpha_got_entry_size (be->reloc_type); - global_found:; + next:; + pbe = &be->next; + kill:; } } @@ -3543,11 +2307,9 @@ elf64_alpha_merge_gots (a, b) /* Calculate the offsets for the got entries. */ static bfd_boolean -elf64_alpha_calc_got_offsets_for_symbol (h, arg) - struct alpha_elf_link_hash_entry *h; - PTR arg ATTRIBUTE_UNUSED; +elf64_alpha_calc_got_offsets_for_symbol (struct alpha_elf_link_hash_entry *h, + PTR arg ATTRIBUTE_UNUSED) { - bfd_boolean result = TRUE; struct alpha_elf_got_entry *gotent; if (h->root.root.type == bfd_link_hash_warning) @@ -3560,31 +2322,23 @@ elf64_alpha_calc_got_offsets_for_symbol (h, arg) bfd_size_type *plge; td = alpha_elf_tdata (gotent->gotobj); - if (td == NULL) - { - _bfd_error_handler (_("Symbol %s has no GOT subsection for offset 0x%x"), - h->root.root.root.string, gotent->got_offset); - result = FALSE; - continue; - } - plge = &td->got->_raw_size; + plge = &td->got->size; gotent->got_offset = *plge; *plge += alpha_got_entry_size (gotent->reloc_type); } - return result; + return TRUE; } static void -elf64_alpha_calc_got_offsets (info) - struct bfd_link_info *info; +elf64_alpha_calc_got_offsets (struct bfd_link_info *info) { bfd *i, *got_list = alpha_elf_hash_table(info)->got_list; /* First, zero out the .got sizes, as we may be recalculating the .got after optimizing it. */ for (i = got_list; i ; i = alpha_elf_tdata(i)->got_link_next) - alpha_elf_tdata(i)->got->_raw_size = 0; + alpha_elf_tdata(i)->got->size = 0; /* Next, fill in the offsets for all the global entries. */ alpha_elf_link_hash_traverse (alpha_elf_hash_table (info), @@ -3594,7 +2348,7 @@ elf64_alpha_calc_got_offsets (info) /* Finally, fill in the offsets for the local entries. */ for (i = got_list; i ; i = alpha_elf_tdata(i)->got_link_next) { - bfd_size_type got_offset = alpha_elf_tdata(i)->got->_raw_size; + bfd_size_type got_offset = alpha_elf_tdata(i)->got->size; bfd *j; for (j = i; j ; j = alpha_elf_tdata(j)->in_got_link_next) @@ -3615,19 +2369,16 @@ elf64_alpha_calc_got_offsets (info) } } - alpha_elf_tdata(i)->got->_raw_size = got_offset; - alpha_elf_tdata(i)->got->_cooked_size = got_offset; + alpha_elf_tdata(i)->got->size = got_offset; } } /* Constructs the gots. */ static bfd_boolean -elf64_alpha_size_got_sections (info) - struct bfd_link_info *info; +elf64_alpha_size_got_sections (struct bfd_link_info *info) { bfd *i, *got_list, *cur_got_obj = NULL; - int something_changed = 0; got_list = alpha_elf_hash_table (info)->got_list; @@ -3648,9 +2399,8 @@ elf64_alpha_size_got_sections (info) { /* 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_size); + (_("%B: .got subsegment exceeds 64K (size %d)"), + i, alpha_elf_tdata (this_got)->total_got_size); return FALSE; } @@ -3666,9 +2416,6 @@ elf64_alpha_size_got_sections (info) 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; @@ -3678,9 +2425,10 @@ elf64_alpha_size_got_sections (info) if (elf64_alpha_can_merge_gots (cur_got_obj, i)) { elf64_alpha_merge_gots (cur_got_obj, i); + + alpha_elf_tdata(i)->got->size = 0; i = alpha_elf_tdata(i)->got_link_next; alpha_elf_tdata(cur_got_obj)->got_link_next = i; - something_changed = 1; } else { @@ -3691,95 +2439,86 @@ elf64_alpha_size_got_sections (info) /* Once the gots have been merged, fill in the got offsets for everything therein. */ - if (1 || something_changed) - elf64_alpha_calc_got_offsets (info); + elf64_alpha_calc_got_offsets (info); return TRUE; } -/* Called from relax_section to rebuild the PLT in light of - potential changes in the function's status. */ - static bfd_boolean -elf64_alpha_size_plt_section (info) - struct bfd_link_info *info; +elf64_alpha_size_plt_section_1 (struct alpha_elf_link_hash_entry *h, PTR data) { - asection *splt, *spltrel; - unsigned long entries; - bfd *dynobj; + asection *splt = (asection *) data; + struct alpha_elf_got_entry *gotent; + bfd_boolean saw_one = FALSE; - dynobj = elf_hash_table(info)->dynobj; - splt = bfd_get_section_by_name(dynobj, ".plt"); - if (splt == NULL) + /* If we didn't need an entry before, we still don't. */ + if (!h->root.needs_plt) return TRUE; - splt->_raw_size = 0; - - alpha_elf_link_hash_traverse (alpha_elf_hash_table (info), - elf64_alpha_size_plt_section_1, splt); - - splt->_cooked_size = splt->_raw_size; + /* For each LITERAL got entry still in use, allocate a plt entry. */ + for (gotent = h->got_entries; gotent ; gotent = gotent->next) + if (gotent->reloc_type == R_ALPHA_LITERAL + && gotent->use_count > 0) + { + if (splt->size == 0) + splt->size = PLT_HEADER_SIZE; + gotent->plt_offset = splt->size; + splt->size += PLT_ENTRY_SIZE; + saw_one = TRUE; + } - /* Every plt entry requires a JMP_SLOT relocation. */ - spltrel = bfd_get_section_by_name (dynobj, ".rela.plt"); - if (splt->_raw_size) - entries = (splt->_raw_size - PLT_HEADER_SIZE) / PLT_ENTRY_SIZE; - else - entries = 0; - spltrel->_raw_size = entries * sizeof (Elf64_External_Rela); - spltrel->_cooked_size = spltrel->_raw_size; + /* If there weren't any, there's no longer a need for the PLT entry. */ + if (!saw_one) + h->root.needs_plt = FALSE; return TRUE; } -static bfd_boolean -elf64_alpha_size_plt_section_1 (h, data) - struct alpha_elf_link_hash_entry *h; - PTR data; +/* Called from relax_section to rebuild the PLT in light of potential changes + in the function's status. */ + +static void +elf64_alpha_size_plt_section (struct bfd_link_info *info) { - asection *splt = (asection *) data; - struct alpha_elf_got_entry *gotent; + asection *splt, *spltrel, *sgotplt; + unsigned long entries; + bfd *dynobj; - /* If we didn't need an entry before, we still don't. */ - if (!(h->root.elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT)) - return TRUE; + dynobj = elf_hash_table(info)->dynobj; + splt = bfd_get_section_by_name (dynobj, ".plt"); + if (splt == NULL) + return; - /* There must still be a LITERAL got entry for the function. */ - for (gotent = h->got_entries; gotent ; gotent = gotent->next) - if (gotent->reloc_type == R_ALPHA_LITERAL - && gotent->use_count > 0) - break; + splt->size = 0; - /* If there is, reset the PLT offset. If not, there's no longer - a need for the PLT entry. */ - if (gotent) + alpha_elf_link_hash_traverse (alpha_elf_hash_table (info), + elf64_alpha_size_plt_section_1, splt); + + /* Every plt entry requires a JMP_SLOT relocation. */ + spltrel = bfd_get_section_by_name (dynobj, ".rela.plt"); + entries = 0; + if (splt->size) { - if (splt->_raw_size == 0) - splt->_raw_size = PLT_HEADER_SIZE; - h->root.plt.offset = splt->_raw_size; - splt->_raw_size += PLT_ENTRY_SIZE; + if (elf64_alpha_use_secureplt) + entries = (splt->size - NEW_PLT_HEADER_SIZE) / NEW_PLT_ENTRY_SIZE; + else + entries = (splt->size - OLD_PLT_HEADER_SIZE) / OLD_PLT_ENTRY_SIZE; } - else - { - h->root.elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT; - h->root.plt.offset = -1; + spltrel->size = entries * sizeof (Elf64_External_Rela); - /* Undo the definition frobbing begun in adjust_dynamic_symbol. */ - if (h->flags & ALPHA_ELF_LINK_HASH_PLT_LOC) - { - h->root.root.u.def.section = h->plt_old_section; - h->root.root.u.def.value = h->plt_old_value; - h->flags &= ~ALPHA_ELF_LINK_HASH_PLT_LOC; - } + /* When using the secureplt, we need two words somewhere in the data + segment for the dynamic linker to tell us where to go. This is the + entire contents of the .got.plt section. */ + if (elf64_alpha_use_secureplt) + { + sgotplt = bfd_get_section_by_name (dynobj, ".got.plt"); + sgotplt->size = entries ? 16 : 0; } - - return TRUE; } static bfd_boolean -elf64_alpha_always_size_sections (output_bfd, info) - bfd *output_bfd ATTRIBUTE_UNUSED; - struct bfd_link_info *info; +elf64_alpha_always_size_sections (bfd *output_bfd ATTRIBUTE_UNUSED, + struct bfd_link_info *info) { bfd *i; @@ -3799,9 +2538,9 @@ elf64_alpha_always_size_sections (output_bfd, info) for ( ; i ; i = alpha_elf_tdata(i)->got_link_next) { asection *s = alpha_elf_tdata(i)->got; - if (s->_raw_size > 0) + if (s->size > 0) { - s->contents = (bfd_byte *) bfd_zalloc (i, s->_raw_size); + s->contents = (bfd_byte *) bfd_zalloc (i, s->size); if (s->contents == NULL) return FALSE; } @@ -3813,8 +2552,7 @@ elf64_alpha_always_size_sections (output_bfd, info) /* The number of dynamic relocations required by a static relocation. */ static int -alpha_dynamic_entries_for_reloc (r_type, dynamic, shared) - int r_type, dynamic, shared; +alpha_dynamic_entries_for_reloc (int r_type, int dynamic, int shared) { switch (r_type) { @@ -3845,9 +2583,8 @@ alpha_dynamic_entries_for_reloc (r_type, dynamic, shared) /* Work out the sizes of the dynamic relocation entries. */ static bfd_boolean -elf64_alpha_calc_dynrel_sizes (h, info) - struct alpha_elf_link_hash_entry *h; - struct bfd_link_info *info; +elf64_alpha_calc_dynrel_sizes (struct alpha_elf_link_hash_entry *h, + struct bfd_link_info *info) { bfd_boolean dynamic; struct alpha_elf_reloc_entry *relent; @@ -3863,29 +2600,32 @@ elf64_alpha_calc_dynrel_sizes (h, info) set. This is done for dynamic symbols in elf_adjust_dynamic_symbol but this is not done for non-dynamic symbols, somehow. */ - if (((h->root.elf_link_hash_flags - & (ELF_LINK_HASH_DEF_REGULAR - | ELF_LINK_HASH_REF_REGULAR - | ELF_LINK_HASH_DEF_DYNAMIC)) - == ELF_LINK_HASH_REF_REGULAR) + if (!h->root.def_regular + && h->root.ref_regular + && !h->root.def_dynamic && (h->root.root.type == bfd_link_hash_defined || h->root.root.type == bfd_link_hash_defweak) && !(h->root.root.u.def.section->owner->flags & DYNAMIC)) - h->root.elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR; + h->root.def_regular = 1; /* If the symbol is dynamic, we'll need all the relocations in their natural form. If this is a shared object, and it has been forced local, we'll need the same number of RELATIVE relocations. */ - dynamic = alpha_elf_dynamic_symbol_p (&h->root, info); + /* If the symbol is a hidden undefined weak, then we never have any + relocations. Avoid the loop which may want to add RELATIVE relocs + based on info->shared. */ + if (h->root.root.type == bfd_link_hash_undefweak && !dynamic) + return TRUE; + for (relent = h->reloc_entries; relent; relent = relent->next) { entries = alpha_dynamic_entries_for_reloc (relent->rtype, dynamic, info->shared); if (entries) { - relent->srel->_raw_size += + relent->srel->size += entries * sizeof (Elf64_External_Rela) * relent->count; if (relent->reltext) info->flags |= DT_TEXTREL; @@ -3895,11 +2635,57 @@ elf64_alpha_calc_dynrel_sizes (h, info) return TRUE; } -/* Set the sizes of the dynamic relocation sections. */ +/* Subroutine of elf64_alpha_size_rela_got_section for doing the + global symbols. */ static bfd_boolean -elf64_alpha_size_rela_got_section (info) - struct bfd_link_info *info; +elf64_alpha_size_rela_got_1 (struct alpha_elf_link_hash_entry *h, + struct bfd_link_info *info) +{ + bfd_boolean dynamic; + struct alpha_elf_got_entry *gotent; + unsigned long entries; + + if (h->root.root.type == bfd_link_hash_warning) + h = (struct alpha_elf_link_hash_entry *) h->root.root.u.i.link; + + /* If we're using a plt for this symbol, then all of its relocations + for its got entries go into .rela.plt. */ + if (h->root.needs_plt) + return TRUE; + + /* If the symbol is dynamic, we'll need all the relocations in their + natural form. If this is a shared object, and it has been forced + local, we'll need the same number of RELATIVE relocations. */ + dynamic = alpha_elf_dynamic_symbol_p (&h->root, info); + + /* If the symbol is a hidden undefined weak, then we never have any + relocations. Avoid the loop which may want to add RELATIVE relocs + based on info->shared. */ + if (h->root.root.type == bfd_link_hash_undefweak && !dynamic) + return TRUE; + + entries = 0; + for (gotent = h->got_entries; gotent ; gotent = gotent->next) + if (gotent->use_count > 0) + entries += alpha_dynamic_entries_for_reloc (gotent->reloc_type, + dynamic, info->shared); + + if (entries > 0) + { + bfd *dynobj = elf_hash_table(info)->dynobj; + asection *srel = bfd_get_section_by_name (dynobj, ".rela.got"); + BFD_ASSERT (srel != NULL); + srel->size += sizeof (Elf64_External_Rela) * entries; + } + + return TRUE; +} + +/* Set the sizes of the dynamic relocation sections. */ + +static void +elf64_alpha_size_rela_got_section (struct bfd_link_info *info) { unsigned long entries; bfd *i, *dynobj; @@ -3937,68 +2723,20 @@ elf64_alpha_size_rela_got_section (info) if (!srel) { BFD_ASSERT (entries == 0); - return TRUE; + return; } - srel->_raw_size = sizeof (Elf64_External_Rela) * entries; + srel->size = sizeof (Elf64_External_Rela) * entries; /* Now do the non-local symbols. */ alpha_elf_link_hash_traverse (alpha_elf_hash_table (info), elf64_alpha_size_rela_got_1, info); - - srel->_cooked_size = srel->_raw_size; - - return TRUE; -} - -/* Subroutine of elf64_alpha_size_rela_got_section for doing the - global symbols. */ - -static bfd_boolean -elf64_alpha_size_rela_got_1 (h, info) - struct alpha_elf_link_hash_entry *h; - struct bfd_link_info *info; -{ - bfd_boolean dynamic; - struct alpha_elf_got_entry *gotent; - unsigned long entries; - - if (h->root.root.type == bfd_link_hash_warning) - h = (struct alpha_elf_link_hash_entry *) h->root.root.u.i.link; - - /* If the symbol is dynamic, we'll need all the relocations in their - natural form. If this is a shared object, and it has been forced - local, we'll need the same number of RELATIVE relocations. */ - - dynamic = alpha_elf_dynamic_symbol_p (&h->root, info); - - entries = 0; - for (gotent = h->got_entries; gotent ; gotent = gotent->next) - if (gotent->use_count > 0) - entries += alpha_dynamic_entries_for_reloc (gotent->reloc_type, - dynamic, info->shared); - - /* If we are using a .plt entry, subtract one, as the first - reference uses a .rela.plt entry instead. */ - if (h->root.plt.offset != MINUS_ONE) - entries--; - - if (entries > 0) - { - bfd *dynobj = elf_hash_table(info)->dynobj; - asection *srel = bfd_get_section_by_name (dynobj, ".rela.got"); - BFD_ASSERT (srel != NULL); - srel->_raw_size += sizeof (Elf64_External_Rela) * entries; - } - - return TRUE; } /* Set the sizes of the dynamic sections. */ static bfd_boolean -elf64_alpha_size_dynamic_sections (output_bfd, info) - bfd *output_bfd ATTRIBUTE_UNUSED; - struct bfd_link_info *info; +elf64_alpha_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, + struct bfd_link_info *info) { bfd *dynobj; asection *s; @@ -4014,7 +2752,7 @@ elf64_alpha_size_dynamic_sections (output_bfd, info) { s = bfd_get_section_by_name (dynobj, ".interp"); BFD_ASSERT (s != NULL); - s->_raw_size = sizeof ELF_DYNAMIC_INTERPRETER; + s->size = sizeof ELF_DYNAMIC_INTERPRETER; s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER; } @@ -4026,6 +2764,7 @@ elf64_alpha_size_dynamic_sections (output_bfd, info) elf64_alpha_calc_dynrel_sizes, info); elf64_alpha_size_rela_got_section (info); + elf64_alpha_size_plt_section (info); } /* else we're not dynamic and by definition we don't need such things. */ @@ -4036,7 +2775,6 @@ elf64_alpha_size_dynamic_sections (output_bfd, info) for (s = dynobj->sections; s != NULL; s = s->next) { const char *name; - bfd_boolean strip; if (!(s->flags & SEC_LINKER_CREATED)) continue; @@ -4045,23 +2783,11 @@ elf64_alpha_size_dynamic_sections (output_bfd, info) of the dynobj section names depend upon the input files. */ name = bfd_get_section_name (dynobj, s); - /* If we don't need this section, strip it from the output file. - This is to handle .rela.bss and .rela.plt. We must create it - in create_dynamic_sections, because it must be created before - the linker maps input sections to output sections. The - linker does that before adjust_dynamic_symbol is called, and - it is that function which decides whether anything needs to - go into these sections. */ - - strip = FALSE; - - if (strncmp (name, ".rela", 5) == 0) + if (CONST_STRNEQ (name, ".rela")) { - strip = (s->_raw_size == 0); - - if (!strip) + if (s->size != 0) { - if (strcmp(name, ".rela.plt") == 0) + if (strcmp (name, ".rela.plt") == 0) relplt = TRUE; /* We use the reloc_count field as a counter if we need @@ -4069,19 +2795,30 @@ elf64_alpha_size_dynamic_sections (output_bfd, info) s->reloc_count = 0; } } - else if (strcmp (name, ".plt") != 0) + else if (! CONST_STRNEQ (name, ".got") + && strcmp (name, ".plt") != 0 + && strcmp (name, ".dynbss") != 0) { /* It's not one of our dynamic sections, so don't allocate space. */ continue; } - if (strip) - _bfd_strip_section_from_output (info, s); - else + if (s->size == 0) + { + /* If we don't need this section, strip it from the output file. + This is to handle .rela.bss and .rela.plt. We must create it + in create_dynamic_sections, because it must be created before + the linker maps input sections to output sections. The + linker does that before adjust_dynamic_symbol is called, and + it is that function which decides whether anything needs to + go into these sections. */ + s->flags |= SEC_EXCLUDE; + } + else if ((s->flags & SEC_HAS_CONTENTS) != 0) { /* Allocate memory for the section contents. */ - s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size); - if (s->contents == NULL && s->_raw_size != 0) + s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->size); + if (s->contents == NULL) return FALSE; } } @@ -4109,6 +2846,10 @@ elf64_alpha_size_dynamic_sections (output_bfd, info) || !add_dynamic_entry (DT_PLTREL, DT_RELA) || !add_dynamic_entry (DT_JMPREL, 0)) return FALSE; + + if (elf64_alpha_use_secureplt + && !add_dynamic_entry (DT_ALPHA_PLTRO, 1)) + return FALSE; } if (!add_dynamic_entry (DT_RELA, 0) @@ -4126,17 +2867,1030 @@ elf64_alpha_size_dynamic_sections (output_bfd, info) return TRUE; } + +/* 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. */ + +struct alpha_relax_info +{ + bfd *abfd; + asection *sec; + bfd_byte *contents; + Elf_Internal_Shdr *symtab_hdr; + Elf_Internal_Rela *relocs, *relend; + struct bfd_link_info *link_info; + bfd_vma gp; + bfd *gotobj; + asection *tsec; + struct alpha_elf_link_hash_entry *h; + struct alpha_elf_got_entry **first_gotent; + struct alpha_elf_got_entry *gotent; + bfd_boolean changed_contents; + bfd_boolean changed_relocs; + unsigned char other; +}; + +static Elf_Internal_Rela * +elf64_alpha_find_reloc_at_ofs (Elf_Internal_Rela *rel, + Elf_Internal_Rela *relend, + bfd_vma offset, int type) +{ + while (rel < relend) + { + if (rel->r_offset == offset + && ELF64_R_TYPE (rel->r_info) == (unsigned int) type) + return rel; + ++rel; + } + return NULL; +} + +static bfd_boolean +elf64_alpha_relax_got_load (struct alpha_relax_info *info, bfd_vma symval, + Elf_Internal_Rela *irel, unsigned long r_type) +{ + unsigned int insn; + bfd_signed_vma disp; + + /* Get the instruction. */ + insn = bfd_get_32 (info->abfd, info->contents + irel->r_offset); + + if (insn >> 26 != OP_LDQ) + { + reloc_howto_type *howto = elf64_alpha_howto_table + r_type; + ((*_bfd_error_handler) + ("%B: %A+0x%lx: warning: %s relocation against unexpected insn", + info->abfd, info->sec, + (unsigned long) irel->r_offset, howto->name)); + return TRUE; + } + + /* Can't relax dynamic symbols. */ + if (alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info)) + return TRUE; + + /* Can't use local-exec relocations in shared libraries. */ + if (r_type == R_ALPHA_GOTTPREL && info->link_info->shared) + return TRUE; + + if (r_type == R_ALPHA_LITERAL) + { + /* Look for nice constant addresses. This includes the not-uncommon + special case of 0 for undefweak symbols. */ + if ((info->h && info->h->root.root.type == bfd_link_hash_undefweak) + || (!info->link_info->shared + && (symval >= (bfd_vma)-0x8000 || symval < 0x8000))) + { + disp = 0; + insn = (OP_LDA << 26) | (insn & (31 << 21)) | (31 << 16); + insn |= (symval & 0xffff); + r_type = R_ALPHA_NONE; + } + else + { + disp = symval - info->gp; + insn = (OP_LDA << 26) | (insn & 0x03ff0000); + r_type = R_ALPHA_GPREL16; + } + } + else + { + bfd_vma dtp_base, tp_base; + + BFD_ASSERT (elf_hash_table (info->link_info)->tls_sec != NULL); + dtp_base = alpha_get_dtprel_base (info->link_info); + tp_base = alpha_get_tprel_base (info->link_info); + disp = symval - (r_type == R_ALPHA_GOTDTPREL ? dtp_base : tp_base); + + insn = (OP_LDA << 26) | (insn & (31 << 21)) | (31 << 16); + + switch (r_type) + { + case R_ALPHA_GOTDTPREL: + r_type = R_ALPHA_DTPREL16; + break; + case R_ALPHA_GOTTPREL: + r_type = R_ALPHA_TPREL16; + break; + default: + BFD_ASSERT (0); + return FALSE; + } + } + + if (disp < -0x8000 || disp >= 0x8000) + return TRUE; + + bfd_put_32 (info->abfd, (bfd_vma) insn, info->contents + irel->r_offset); + info->changed_contents = TRUE; + + /* Reduce the use count on this got entry by one, possibly + eliminating it. */ + if (--info->gotent->use_count == 0) + { + int sz = alpha_got_entry_size (r_type); + alpha_elf_tdata (info->gotobj)->total_got_size -= sz; + if (!info->h) + alpha_elf_tdata (info->gotobj)->local_got_size -= sz; + } + + /* Smash the existing GOT relocation for its 16-bit immediate pair. */ + irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info), r_type); + info->changed_relocs = TRUE; + + /* ??? Search forward through this basic block looking for insns + that use the target register. Stop after an insn modifying the + 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 bfd_vma +elf64_alpha_relax_opt_call (struct alpha_relax_info *info, bfd_vma symval) +{ + /* If the function has the same gp, and we can identify that the + function does not use its function pointer, we can eliminate the + address load. */ + + /* 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_elf_link_read_relocs + (info->abfd, info->tsec, (PTR) NULL, + (Elf_Internal_Rela *) NULL, + info->link_info->keep_memory)); + if (tsec_relocs == NULL) + return 0; + tsec_relend = tsec_relocs + info->tsec->reloc_count; + tsec_free = (info->link_info->keep_memory ? NULL : tsec_relocs); + } + + /* 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 bfd_boolean +elf64_alpha_relax_with_lituse (struct alpha_relax_info *info, + bfd_vma symval, Elf_Internal_Rela *irel) +{ + Elf_Internal_Rela *urel, *irelend = info->relend; + int flags, count, i; + bfd_signed_vma disp; + bfd_boolean fits16; + bfd_boolean fits32; + bfd_boolean lit_reused = FALSE; + bfd_boolean all_optimized = TRUE; + unsigned int lit_insn; + + lit_insn = bfd_get_32 (info->abfd, info->contents + irel->r_offset); + if (lit_insn >> 26 != OP_LDQ) + { + ((*_bfd_error_handler) + ("%B: %A+0x%lx: warning: LITERAL relocation against unexpected insn", + info->abfd, info->sec, + (unsigned long) irel->r_offset)); + return TRUE; + } + + /* Can't relax dynamic symbols. */ + if (alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info)) + return TRUE; + + /* Summarize how this particular LITERAL is used. */ + for (urel = irel+1, flags = count = 0; urel < irelend; ++urel, ++count) + { + if (ELF64_R_TYPE (urel->r_info) != R_ALPHA_LITUSE) + break; + if (urel->r_addend <= 6) + 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) + { + case LITUSE_ALPHA_ADDR: + default: + /* This type is really just a placeholder to note that all + uses cannot be optimized, but to still allow some. */ + all_optimized = FALSE; + break; + + case LITUSE_ALPHA_BASE: + /* We 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 & 0xffff) ^ 0x8000) - 0x8000; + + xdisp = disp + insn_disp; + fits16 = (xdisp >= - (bfd_signed_vma) 0x8000 && xdisp < 0x8000); + 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 LITUSE_ALPHA_BYTOFF: + /* We can always optimize byte instructions. */ + + /* FIXME: sanity check the insn for byte op. Check that the + literal dest reg is indeed Rb in the byte insn. */ + + insn &= ~ (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 LITUSE_ALPHA_JSR: + case LITUSE_ALPHA_TLSGD: + case LITUSE_ALPHA_TLSLDM: + case LITUSE_ALPHA_JSRDIRECT: + { + bfd_vma optdest, org; + bfd_signed_vma odisp; + + /* For undefined weak symbols, we're mostly interested in getting + rid of the got entry whenever possible, so optimize this to a + use of the zero register. */ + if (info->h && info->h->root.root.type == bfd_link_hash_undefweak) + { + insn |= 31 << 16; + bfd_put_32 (info->abfd, (bfd_vma) insn, + info->contents + urel->r_offset); + + info->changed_contents = TRUE; + break; + } + + /* If not zero, place to jump without needing pv. */ + optdest = elf64_alpha_relax_opt_call (info, symval); + org = (info->sec->output_section->vma + + info->sec->output_offset + + urel->r_offset + 4); + odisp = (optdest ? optdest : symval) - org; + + if (odisp >= -0x400000 && odisp < 0x400000) + { + Elf_Internal_Rela *xrel; + + /* 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 + (info->relocs, irelend, urel->r_offset + 4, + R_ALPHA_GPDISP)); + if (gpdisp) + { + bfd_byte *p_ldah = info->contents + gpdisp->r_offset; + bfd_byte *p_lda = p_ldah + gpdisp->r_addend; + unsigned int ldah = bfd_get_32 (info->abfd, p_ldah); + unsigned int lda = bfd_get_32 (info->abfd, p_lda); + + /* 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) + { + if (--info->gotent->use_count == 0) + { + int sz = alpha_got_entry_size (R_ALPHA_LITERAL); + alpha_elf_tdata (info->gotobj)->total_got_size -= sz; + if (!info->h) + alpha_elf_tdata (info->gotobj)->local_got_size -= sz; + } + + /* If the literal instruction is no longer needed (it may have been + reused. We can eliminate it. */ + /* ??? For now, I don't want to deal with compacting the section, + 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 TRUE; + } + else + return elf64_alpha_relax_got_load (info, symval, irel, R_ALPHA_LITERAL); +} + +static bfd_boolean +elf64_alpha_relax_tls_get_addr (struct alpha_relax_info *info, bfd_vma symval, + Elf_Internal_Rela *irel, bfd_boolean is_gd) +{ + bfd_byte *pos[5]; + unsigned int insn; + Elf_Internal_Rela *gpdisp, *hint; + bfd_boolean dynamic, use_gottprel, pos1_unusable; + unsigned long new_symndx; + + dynamic = alpha_elf_dynamic_symbol_p (&info->h->root, info->link_info); + + /* If a TLS symbol is accessed using IE at least once, there is no point + to use dynamic model for it. */ + if (is_gd && info->h && (info->h->flags & ALPHA_ELF_LINK_HASH_TLS_IE)) + ; + + /* If the symbol is local, and we've already committed to DF_STATIC_TLS, + then we might as well relax to IE. */ + else if (info->link_info->shared && !dynamic + && (info->link_info->flags & DF_STATIC_TLS)) + ; + + /* Otherwise we must be building an executable to do anything. */ + else if (info->link_info->shared) + return TRUE; + + /* The TLSGD/TLSLDM relocation must be followed by a LITERAL and + the matching LITUSE_TLS relocations. */ + if (irel + 2 >= info->relend) + return TRUE; + if (ELF64_R_TYPE (irel[1].r_info) != R_ALPHA_LITERAL + || ELF64_R_TYPE (irel[2].r_info) != R_ALPHA_LITUSE + || irel[2].r_addend != (is_gd ? LITUSE_ALPHA_TLSGD : LITUSE_ALPHA_TLSLDM)) + return TRUE; + + /* There must be a GPDISP relocation positioned immediately after the + LITUSE relocation. */ + gpdisp = elf64_alpha_find_reloc_at_ofs (info->relocs, info->relend, + irel[2].r_offset + 4, R_ALPHA_GPDISP); + if (!gpdisp) + return TRUE; + + pos[0] = info->contents + irel[0].r_offset; + pos[1] = info->contents + irel[1].r_offset; + pos[2] = info->contents + irel[2].r_offset; + pos[3] = info->contents + gpdisp->r_offset; + pos[4] = pos[3] + gpdisp->r_addend; + pos1_unusable = FALSE; + + /* Generally, the positions are not allowed to be out of order, lest the + modified insn sequence have different register lifetimes. We can make + an exception when pos 1 is adjacent to pos 0. */ + if (pos[1] + 4 == pos[0]) + { + bfd_byte *tmp = pos[0]; + pos[0] = pos[1]; + pos[1] = tmp; + } + else if (pos[1] < pos[0]) + pos1_unusable = TRUE; + if (pos[1] >= pos[2] || pos[2] >= pos[3]) + return TRUE; + + /* Reduce the use count on the LITERAL relocation. Do this before we + smash the symndx when we adjust the relocations below. */ + { + struct alpha_elf_got_entry *lit_gotent; + struct alpha_elf_link_hash_entry *lit_h; + unsigned long indx; + + BFD_ASSERT (ELF64_R_SYM (irel[1].r_info) >= info->symtab_hdr->sh_info); + indx = ELF64_R_SYM (irel[1].r_info) - info->symtab_hdr->sh_info; + lit_h = alpha_elf_sym_hashes (info->abfd)[indx]; + + while (lit_h->root.root.type == bfd_link_hash_indirect + || lit_h->root.root.type == bfd_link_hash_warning) + lit_h = (struct alpha_elf_link_hash_entry *) lit_h->root.root.u.i.link; + + for (lit_gotent = lit_h->got_entries; lit_gotent ; + lit_gotent = lit_gotent->next) + if (lit_gotent->gotobj == info->gotobj + && lit_gotent->reloc_type == R_ALPHA_LITERAL + && lit_gotent->addend == irel[1].r_addend) + break; + BFD_ASSERT (lit_gotent); + + if (--lit_gotent->use_count == 0) + { + int sz = alpha_got_entry_size (R_ALPHA_LITERAL); + alpha_elf_tdata (info->gotobj)->total_got_size -= sz; + } + } + + /* Change + + lda $16,x($gp) !tlsgd!1 + ldq $27,__tls_get_addr($gp) !literal!1 + jsr $26,($27),__tls_get_addr !lituse_tlsgd!1 + ldah $29,0($26) !gpdisp!2 + lda $29,0($29) !gpdisp!2 + to + ldq $16,x($gp) !gottprel + unop + call_pal rduniq + addq $16,$0,$0 + unop + or the first pair to + lda $16,x($gp) !tprel + unop + or + ldah $16,x($gp) !tprelhi + lda $16,x($16) !tprello + + as appropriate. */ + + use_gottprel = FALSE; + new_symndx = is_gd ? ELF64_R_SYM (irel->r_info) : 0; + switch (!dynamic && !info->link_info->shared) + { + case 1: + { + bfd_vma tp_base; + bfd_signed_vma disp; + + BFD_ASSERT (elf_hash_table (info->link_info)->tls_sec != NULL); + tp_base = alpha_get_tprel_base (info->link_info); + disp = symval - tp_base; + + if (disp >= -0x8000 && disp < 0x8000) + { + insn = (OP_LDA << 26) | (16 << 21) | (31 << 16); + bfd_put_32 (info->abfd, (bfd_vma) insn, pos[0]); + bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos[1]); + + irel[0].r_offset = pos[0] - info->contents; + irel[0].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_TPREL16); + irel[1].r_info = ELF64_R_INFO (0, R_ALPHA_NONE); + break; + } + else if (disp >= -(bfd_signed_vma) 0x80000000 + && disp < (bfd_signed_vma) 0x7fff8000 + && !pos1_unusable) + { + insn = (OP_LDAH << 26) | (16 << 21) | (31 << 16); + bfd_put_32 (info->abfd, (bfd_vma) insn, pos[0]); + insn = (OP_LDA << 26) | (16 << 21) | (16 << 16); + bfd_put_32 (info->abfd, (bfd_vma) insn, pos[1]); + + irel[0].r_offset = pos[0] - info->contents; + irel[0].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_TPRELHI); + irel[1].r_offset = pos[1] - info->contents; + irel[1].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_TPRELLO); + break; + } + } + /* FALLTHRU */ + + default: + use_gottprel = TRUE; + + insn = (OP_LDQ << 26) | (16 << 21) | (29 << 16); + bfd_put_32 (info->abfd, (bfd_vma) insn, pos[0]); + bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos[1]); + + irel[0].r_offset = pos[0] - info->contents; + irel[0].r_info = ELF64_R_INFO (new_symndx, R_ALPHA_GOTTPREL); + irel[1].r_info = ELF64_R_INFO (0, R_ALPHA_NONE); + break; + } + + bfd_put_32 (info->abfd, (bfd_vma) INSN_RDUNIQ, pos[2]); + + insn = INSN_ADDQ | (16 << 21) | (0 << 16) | (0 << 0); + bfd_put_32 (info->abfd, (bfd_vma) insn, pos[3]); + + bfd_put_32 (info->abfd, (bfd_vma) INSN_UNOP, pos[4]); + + irel[2].r_info = ELF64_R_INFO (0, R_ALPHA_NONE); + gpdisp->r_info = ELF64_R_INFO (0, R_ALPHA_NONE); + + hint = elf64_alpha_find_reloc_at_ofs (info->relocs, info->relend, + irel[2].r_offset, R_ALPHA_HINT); + if (hint) + hint->r_info = ELF64_R_INFO (0, R_ALPHA_NONE); + + info->changed_contents = TRUE; + info->changed_relocs = TRUE; + + /* Reduce the use count on the TLSGD/TLSLDM relocation. */ + if (--info->gotent->use_count == 0) + { + int sz = alpha_got_entry_size (info->gotent->reloc_type); + alpha_elf_tdata (info->gotobj)->total_got_size -= sz; + if (!info->h) + alpha_elf_tdata (info->gotobj)->local_got_size -= sz; + } + + /* If we've switched to a GOTTPREL relocation, increment the reference + count on that got entry. */ + if (use_gottprel) + { + struct alpha_elf_got_entry *tprel_gotent; + + for (tprel_gotent = *info->first_gotent; tprel_gotent ; + tprel_gotent = tprel_gotent->next) + if (tprel_gotent->gotobj == info->gotobj + && tprel_gotent->reloc_type == R_ALPHA_GOTTPREL + && tprel_gotent->addend == irel->r_addend) + break; + if (tprel_gotent) + tprel_gotent->use_count++; + else + { + if (info->gotent->use_count == 0) + tprel_gotent = info->gotent; + else + { + tprel_gotent = (struct alpha_elf_got_entry *) + bfd_alloc (info->abfd, sizeof (struct alpha_elf_got_entry)); + if (!tprel_gotent) + return FALSE; + + tprel_gotent->next = *info->first_gotent; + *info->first_gotent = tprel_gotent; + + tprel_gotent->gotobj = info->gotobj; + tprel_gotent->addend = irel->r_addend; + tprel_gotent->got_offset = -1; + tprel_gotent->reloc_done = 0; + tprel_gotent->reloc_xlated = 0; + } + + tprel_gotent->use_count = 1; + tprel_gotent->reloc_type = R_ALPHA_GOTTPREL; + } + } + + return TRUE; +} + +static bfd_boolean +elf64_alpha_relax_section (bfd *abfd, asection *sec, + struct bfd_link_info *link_info, bfd_boolean *again) +{ + Elf_Internal_Shdr *symtab_hdr; + Elf_Internal_Rela *internal_relocs; + Elf_Internal_Rela *irel, *irelend; + Elf_Internal_Sym *isymbuf = NULL; + struct alpha_elf_got_entry **local_got_entries; + struct alpha_relax_info info; + + /* There's nothing to change, yet. */ + *again = FALSE; + + if (link_info->relocatable + || ((sec->flags & (SEC_CODE | SEC_RELOC | SEC_ALLOC)) + != (SEC_CODE | SEC_RELOC | SEC_ALLOC)) + || sec->reloc_count == 0) + return TRUE; + + /* Make sure our GOT and PLT tables are up-to-date. */ + if (alpha_elf_hash_table(link_info)->relax_trip != link_info->relax_trip) + { + alpha_elf_hash_table(link_info)->relax_trip = link_info->relax_trip; + + /* This should never fail after the initial round, since the only + error is GOT overflow, and relaxation only shrinks the table. */ + if (!elf64_alpha_size_got_sections (link_info)) + abort (); + if (elf_hash_table (link_info)->dynamic_sections_created) + { + elf64_alpha_size_plt_section (link_info); + elf64_alpha_size_rela_got_section (link_info); + } + } + + symtab_hdr = &elf_tdata (abfd)->symtab_hdr; + local_got_entries = alpha_elf_tdata(abfd)->local_got_entries; + + /* Load the relocations for this section. */ + internal_relocs = (_bfd_elf_link_read_relocs + (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL, + link_info->keep_memory)); + if (internal_relocs == NULL) + return FALSE; + + memset(&info, 0, sizeof (info)); + info.abfd = abfd; + info.sec = sec; + info.link_info = link_info; + info.symtab_hdr = symtab_hdr; + info.relocs = internal_relocs; + info.relend = irelend = internal_relocs + sec->reloc_count; + + /* Find the GP for this object. Do not store the result back via + _bfd_set_gp_value, since this could change again before final. */ + info.gotobj = alpha_elf_tdata (abfd)->gotobj; + if (info.gotobj) + { + asection *sgot = alpha_elf_tdata (info.gotobj)->got; + info.gp = (sgot->output_section->vma + + sgot->output_offset + + 0x8000); + } + + /* Get the section contents. */ + if (elf_section_data (sec)->this_hdr.contents != NULL) + info.contents = elf_section_data (sec)->this_hdr.contents; + else + { + if (!bfd_malloc_and_get_section (abfd, sec, &info.contents)) + goto error_return; + } + + for (irel = internal_relocs; irel < irelend; irel++) + { + bfd_vma symval; + struct alpha_elf_got_entry *gotent; + unsigned long r_type = ELF64_R_TYPE (irel->r_info); + unsigned long r_symndx = ELF64_R_SYM (irel->r_info); + + /* Early exit for unhandled or unrelaxable relocations. */ + switch (r_type) + { + case R_ALPHA_LITERAL: + case R_ALPHA_GPRELHIGH: + case R_ALPHA_GPRELLOW: + case R_ALPHA_GOTDTPREL: + case R_ALPHA_GOTTPREL: + case R_ALPHA_TLSGD: + break; + + case R_ALPHA_TLSLDM: + /* The symbol for a TLSLDM reloc is ignored. Collapse the + reloc to the 0 symbol so that they all match. */ + r_symndx = 0; + break; + + default: + continue; + } + + /* Get the value of the symbol referred to by the reloc. */ + if (r_symndx < symtab_hdr->sh_info) + { + /* A local symbol. */ + Elf_Internal_Sym *isym; + + /* Read this BFD's local symbols. */ + if (isymbuf == NULL) + { + isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents; + if (isymbuf == NULL) + isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr, + symtab_hdr->sh_info, 0, + NULL, NULL, NULL); + if (isymbuf == NULL) + goto error_return; + } + + isym = isymbuf + r_symndx; + + /* Given the symbol for a TLSLDM reloc is ignored, this also + means forcing the symbol value to the tp base. */ + if (r_type == R_ALPHA_TLSLDM) + { + info.tsec = bfd_abs_section_ptr; + symval = alpha_get_tprel_base (info.link_info); + } + else + { + symval = isym->st_value; + if (isym->st_shndx == SHN_UNDEF) + continue; + else if (isym->st_shndx == SHN_ABS) + info.tsec = bfd_abs_section_ptr; + else if (isym->st_shndx == SHN_COMMON) + info.tsec = bfd_com_section_ptr; + else + info.tsec = bfd_section_from_elf_index (abfd, isym->st_shndx); + } + + info.h = NULL; + info.other = isym->st_other; + if (local_got_entries) + info.first_gotent = &local_got_entries[r_symndx]; + else + { + info.first_gotent = &info.gotent; + info.gotent = NULL; + } + } + else + { + unsigned long indx; + struct alpha_elf_link_hash_entry *h; + + indx = r_symndx - 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; + + /* If the symbol is undefined, we can't do anything with it. */ + if (h->root.root.type == bfd_link_hash_undefined) + continue; + + /* If the symbol isn't defined in the current module, + again we can't do anything. */ + if (h->root.root.type == bfd_link_hash_undefweak) + { + info.tsec = bfd_abs_section_ptr; + symval = 0; + } + else if (!h->root.def_regular) + { + /* Except for TLSGD relocs, which can sometimes be + relaxed to GOTTPREL relocs. */ + if (r_type != R_ALPHA_TLSGD) + continue; + info.tsec = bfd_abs_section_ptr; + symval = 0; + } + else + { + info.tsec = h->root.root.u.def.section; + symval = h->root.root.u.def.value; + } + + info.h = h; + info.other = h->root.other; + info.first_gotent = &h->got_entries; + } + + /* Search for the got entry to be used by this relocation. */ + for (gotent = *info.first_gotent; gotent ; gotent = gotent->next) + if (gotent->gotobj == info.gotobj + && gotent->reloc_type == r_type + && gotent->addend == irel->r_addend) + break; + info.gotent = gotent; + + symval += info.tsec->output_section->vma + info.tsec->output_offset; + symval += irel->r_addend; + + switch (r_type) + { + case R_ALPHA_LITERAL: + BFD_ASSERT(info.gotent != NULL); + + /* If there exist LITUSE relocations immediately following, this + opens up all sorts of interesting optimizations, because we + now know every location that this address load is used. */ + if (irel+1 < irelend + && ELF64_R_TYPE (irel[1].r_info) == R_ALPHA_LITUSE) + { + if (!elf64_alpha_relax_with_lituse (&info, symval, irel)) + goto error_return; + } + else + { + if (!elf64_alpha_relax_got_load (&info, symval, irel, r_type)) + goto error_return; + } + break; + + case R_ALPHA_GOTDTPREL: + case R_ALPHA_GOTTPREL: + BFD_ASSERT(info.gotent != NULL); + if (!elf64_alpha_relax_got_load (&info, symval, irel, r_type)) + goto error_return; + break; + + case R_ALPHA_TLSGD: + case R_ALPHA_TLSLDM: + BFD_ASSERT(info.gotent != NULL); + if (!elf64_alpha_relax_tls_get_addr (&info, symval, irel, + r_type == R_ALPHA_TLSGD)) + goto error_return; + break; + } + } + if (isymbuf != NULL + && symtab_hdr->contents != (unsigned char *) isymbuf) + { + if (!link_info->keep_memory) + free (isymbuf); + else + { + /* Cache the symbols for elf_link_input_bfd. */ + symtab_hdr->contents = (unsigned char *) isymbuf; + } + } + + if (info.contents != NULL + && elf_section_data (sec)->this_hdr.contents != info.contents) + { + if (!info.changed_contents && !link_info->keep_memory) + free (info.contents); + else + { + /* Cache the section contents for elf_link_input_bfd. */ + elf_section_data (sec)->this_hdr.contents = info.contents; + } + } + + if (elf_section_data (sec)->relocs != internal_relocs) + { + if (!info.changed_relocs) + free (internal_relocs); + else + elf_section_data (sec)->relocs = internal_relocs; + } + + *again = info.changed_contents || info.changed_relocs; + + return TRUE; + + error_return: + if (isymbuf != NULL + && symtab_hdr->contents != (unsigned char *) isymbuf) + free (isymbuf); + if (info.contents != NULL + && elf_section_data (sec)->this_hdr.contents != info.contents) + free (info.contents); + if (internal_relocs != NULL + && elf_section_data (sec)->relocs != internal_relocs) + free (internal_relocs); + return FALSE; +} + /* Emit a dynamic relocation for (DYNINDX, RTYPE, ADDEND) at (SEC, OFFSET) into the next available slot in SREL. */ static void -elf64_alpha_emit_dynrel (abfd, info, sec, srel, offset, dynindx, rtype, addend) - bfd *abfd; - struct bfd_link_info *info; - asection *sec, *srel; - bfd_vma offset, addend; - long dynindx, rtype; +elf64_alpha_emit_dynrel (bfd *abfd, struct bfd_link_info *info, + asection *sec, asection *srel, bfd_vma offset, + long dynindx, long rtype, bfd_vma addend) { Elf_Internal_Rela outrel; bfd_byte *loc; @@ -4155,8 +3909,7 @@ elf64_alpha_emit_dynrel (abfd, info, sec, srel, offset, dynindx, rtype, addend) loc = srel->contents; loc += srel->reloc_count++ * sizeof (Elf64_External_Rela); bfd_elf64_swap_reloca_out (abfd, &outrel, loc); - BFD_ASSERT (sizeof (Elf64_External_Rela) * srel->reloc_count - <= srel->_cooked_size); + BFD_ASSERT (sizeof (Elf64_External_Rela) * srel->reloc_count <= srel->size); } /* Relocate an Alpha ELF section for a relocatable link. @@ -4166,23 +3919,22 @@ elf64_alpha_emit_dynrel (abfd, info, sec, srel, offset, dynindx, rtype, addend) symbol winds up in the output section. */ static bfd_boolean -elf64_alpha_relocate_section_r (output_bfd, info, input_bfd, input_section, - contents, relocs, local_syms, local_sections) - bfd *output_bfd ATTRIBUTE_UNUSED; - struct bfd_link_info *info ATTRIBUTE_UNUSED; - bfd *input_bfd; - asection *input_section; - bfd_byte *contents ATTRIBUTE_UNUSED; - Elf_Internal_Rela *relocs; - Elf_Internal_Sym *local_syms; - asection **local_sections; +elf64_alpha_relocate_section_r (bfd *output_bfd ATTRIBUTE_UNUSED, + struct bfd_link_info *info ATTRIBUTE_UNUSED, + bfd *input_bfd, asection *input_section, + bfd_byte *contents ATTRIBUTE_UNUSED, + Elf_Internal_Rela *relocs, + Elf_Internal_Sym *local_syms, + asection **local_sections) { unsigned long symtab_hdr_sh_info; Elf_Internal_Rela *rel; Elf_Internal_Rela *relend; + struct elf_link_hash_entry **sym_hashes; bfd_boolean ret_val = TRUE; symtab_hdr_sh_info = elf_tdata (input_bfd)->symtab_hdr.sh_info; + sym_hashes = elf_sym_hashes (input_bfd); relend = relocs + input_section->reloc_count; for (rel = relocs; rel < relend; rel++) @@ -4192,33 +3944,60 @@ elf64_alpha_relocate_section_r (output_bfd, info, input_bfd, input_section, asection *sec; unsigned long r_type; - r_type = ELF64_R_TYPE(rel->r_info); + r_type = ELF64_R_TYPE (rel->r_info); if (r_type >= R_ALPHA_max) { (*_bfd_error_handler) - (_("%s: unknown relocation type %d"), - bfd_archive_filename (input_bfd), (int)r_type); + (_("%B: unknown relocation type %d"), + input_bfd, (int) r_type); bfd_set_error (bfd_error_bad_value); ret_val = FALSE; continue; } - r_symndx = ELF64_R_SYM(rel->r_info); - /* The symbol associated with GPDISP and LITUSE is immaterial. Only the addend is significant. */ if (r_type == R_ALPHA_GPDISP || r_type == R_ALPHA_LITUSE) continue; + r_symndx = ELF64_R_SYM (rel->r_info); if (r_symndx < symtab_hdr_sh_info) { sym = local_syms + r_symndx; - if (ELF_ST_TYPE(sym->st_info) == STT_SECTION) - { - sec = local_sections[r_symndx]; - rel->r_addend += sec->output_offset + sym->st_value; - } + sec = local_sections[r_symndx]; } + else + { + struct elf_link_hash_entry *h; + + h = sym_hashes[r_symndx - symtab_hdr_sh_info]; + + while (h->root.type == bfd_link_hash_indirect + || h->root.type == bfd_link_hash_warning) + h = (struct elf_link_hash_entry *) h->root.u.i.link; + + if (h->root.type != bfd_link_hash_defined + && h->root.type != bfd_link_hash_defweak) + continue; + + sym = NULL; + sec = h->root.u.def.section; + } + + if (sec != NULL && elf_discarded_section (sec)) + { + /* For relocs against symbols from removed linkonce sections, + or sections discarded by a linker script, we just want the + section contents zeroed. */ + _bfd_clear_contents (elf64_alpha_howto_table + r_type, + input_bfd, contents + rel->r_offset); + rel->r_info = 0; + rel->r_addend = 0; + continue; + } + + if (sym != NULL && ELF_ST_TYPE (sym->st_info) == STT_SECTION) + rel->r_addend += sec->output_offset; } return ret_val; @@ -4227,16 +4006,11 @@ elf64_alpha_relocate_section_r (output_bfd, info, input_bfd, input_section, /* Relocate an Alpha ELF section. */ static bfd_boolean -elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, - contents, relocs, local_syms, local_sections) - bfd *output_bfd; - struct bfd_link_info *info; - bfd *input_bfd; - asection *input_section; - bfd_byte *contents; - Elf_Internal_Rela *relocs; - Elf_Internal_Sym *local_syms; - asection **local_sections; +elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info, + bfd *input_bfd, asection *input_section, + bfd_byte *contents, Elf_Internal_Rela *relocs, + Elf_Internal_Sym *local_syms, + asection **local_sections) { Elf_Internal_Shdr *symtab_hdr; Elf_Internal_Rela *rel; @@ -4246,7 +4020,6 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, bfd_vma gp, tp_base, dtp_base; struct alpha_elf_got_entry **local_got_entries; bfd_boolean ret_val; - const char *section_name; /* Handle relocatable links with a smaller loop. */ if (info->relocatable) @@ -4266,11 +4039,17 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, else srelgot = NULL; - section_name = (bfd_elf_string_from_elf_section - (input_bfd, elf_elfheader(input_bfd)->e_shstrndx, - elf_section_data(input_section)->rel_hdr.sh_name)); - BFD_ASSERT(section_name != NULL); - srel = bfd_get_section_by_name (dynobj, section_name); + if (input_section->flags & SEC_ALLOC) + { + const char *section_name; + section_name = (bfd_elf_string_from_elf_section + (input_bfd, elf_elfheader(input_bfd)->e_shstrndx, + elf_section_data(input_section)->rel_hdr.sh_name)); + BFD_ASSERT(section_name != NULL); + srel = bfd_get_section_by_name (dynobj, section_name); + } + else + srel = NULL; /* Find the gp value for this input bfd. */ gotobj = alpha_elf_tdata (input_bfd)->gotobj; @@ -4322,8 +4101,8 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, if (r_type >= R_ALPHA_max) { (*_bfd_error_handler) - (_("%s: unknown relocation type %d"), - bfd_archive_filename (input_bfd), (int)r_type); + (_("%B: unknown relocation type %d"), + input_bfd, (int) r_type); bfd_set_error (bfd_error_bad_value); ret_val = FALSE; continue; @@ -4347,7 +4126,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, /* If this is a tp-relative relocation against sym 0, this is hackery from relax_section. Force the value to - be the tls base. */ + be the tls module base. */ if (r_symndx == 0 && (r_type == R_ALPHA_TLSLDM || r_type == R_ALPHA_GOTTPREL @@ -4355,7 +4134,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, || r_type == R_ALPHA_TPRELHI || r_type == R_ALPHA_TPRELLO || r_type == R_ALPHA_TPREL16)) - value = tp_base; + value = dtp_base; if (local_got_entries) gotent = local_got_entries[r_symndx]; @@ -4382,8 +4161,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, _bfd_merged_section_offset (output_bfd, &msec, elf_section_data (sec)-> sec_info, - sym->st_value + ent->addend, - (bfd_vma) 0); + sym->st_value + ent->addend); ent->addend -= sym->st_value; ent->addend += msec->output_section->vma + msec->output_offset @@ -4419,6 +4197,17 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, gotent = h->got_entries; } + if (sec != NULL && elf_discarded_section (sec)) + { + /* For relocs against symbols from removed linkonce sections, + or sections discarded by a linker script, we just want the + section contents zeroed. Avoid any special processing. */ + _bfd_clear_contents (howto, input_bfd, contents + rel->r_offset); + rel->r_info = 0; + rel->r_addend = 0; + continue; + } + addend = rel->r_addend; value += addend; @@ -4465,7 +4254,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, /* If the symbol has been forced local, output a RELATIVE reloc, otherwise it will be handled in finish_dynamic_symbol. */ - if (info->shared && !dynamic_symbol_p) + if (info->shared && !dynamic_symbol_p && !undef_weak_ref) elf64_alpha_emit_dynrel (output_bfd, info, sgot, srelgot, gotent->got_offset, 0, R_ALPHA_RELATIVE, value); @@ -4478,25 +4267,13 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, goto default_reloc; case R_ALPHA_GPREL32: - /* If the target section was a removed linkonce section, - r_symndx will be zero. In this case, assume that the - switch will not be used, so don't fill it in. If we - do nothing here, we'll get relocation truncated messages, - due to the placement of the application above 4GB. */ - if (r_symndx == 0) - { - r = bfd_reloc_ok; - break; - } - /* FALLTHRU */ - case R_ALPHA_GPREL16: case R_ALPHA_GPRELLOW: if (dynamic_symbol_p) { (*_bfd_error_handler) - (_("%s: gp-relative relocation against dynamic symbol %s"), - bfd_archive_filename (input_bfd), h->root.root.root.string); + (_("%B: gp-relative relocation against dynamic symbol %s"), + input_bfd, h->root.root.root.string); ret_val = FALSE; } BFD_ASSERT(gp != 0); @@ -4507,8 +4284,8 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, if (dynamic_symbol_p) { (*_bfd_error_handler) - (_("%s: gp-relative relocation against dynamic symbol %s"), - bfd_archive_filename (input_bfd), h->root.root.root.string); + (_("%B: gp-relative relocation against dynamic symbol %s"), + input_bfd, h->root.root.root.string); ret_val = FALSE; } BFD_ASSERT(gp != 0); @@ -4533,8 +4310,8 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, if (dynamic_symbol_p) { (*_bfd_error_handler) - (_("%s: pc-relative relocation against dynamic symbol %s"), - bfd_archive_filename (input_bfd), h->root.root.root.string); + (_("%B: pc-relative relocation against dynamic symbol %s"), + input_bfd, h->root.root.root.string); ret_val = FALSE; } /* The regular PC-relative stuff measures from the start of @@ -4561,8 +4338,8 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, && gotobj != alpha_elf_tdata (sec->owner)->gotobj) { (*_bfd_error_handler) - (_("%s: change in gp: BRSGP %s"), - bfd_archive_filename (input_bfd), h->root.root.root.string); + (_("%B: change in gp: BRSGP %s"), + input_bfd, h->root.root.root.string); ret_val = FALSE; } @@ -4591,8 +4368,8 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, name = bfd_section_name (input_bfd, sec); } (*_bfd_error_handler) - (_("%s: !samegp reloc against symbol without .prologue: %s"), - bfd_archive_filename (input_bfd), name); + (_("%B: !samegp reloc against symbol without .prologue: %s"), + input_bfd, name); ret_val = FALSE; break; } @@ -4637,13 +4414,14 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, } else if (info->shared && r_symndx != 0 - && (input_section->flags & SEC_ALLOC)) + && (input_section->flags & SEC_ALLOC) + && !undef_weak_ref) { if (r_type == R_ALPHA_REFLONG) { (*_bfd_error_handler) - (_("%s: unhandled dynamic relocation against %s"), - bfd_archive_filename (input_bfd), + (_("%B: unhandled dynamic relocation against %s"), + input_bfd, h->root.root.root.string); ret_val = FALSE; } @@ -4654,9 +4432,10 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, else goto default_reloc; - elf64_alpha_emit_dynrel (output_bfd, info, input_section, - srel, rel->r_offset, dynindx, - dyntype, dynaddend); + if (input_section->flags & SEC_ALLOC) + elf64_alpha_emit_dynrel (output_bfd, info, input_section, + srel, rel->r_offset, dynindx, + dyntype, dynaddend); } goto default_reloc; @@ -4666,11 +4445,19 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, if (dynamic_symbol_p) { (*_bfd_error_handler) - (_("%s: pc-relative relocation against dynamic symbol %s"), - bfd_archive_filename (input_bfd), h->root.root.root.string); + (_("%B: pc-relative relocation against dynamic symbol %s"), + input_bfd, h->root.root.root.string); + ret_val = FALSE; + } + else if ((info->shared || info->pie) && undef_weak_ref) + { + (*_bfd_error_handler) + (_("%B: pc-relative relocation against undefined weak symbol %s"), + input_bfd, h->root.root.root.string); ret_val = FALSE; } + /* ??? .eh_frame references to discarded sections will be smashed to relocations against SHN_UNDEF. The .eh_frame format allows NULL to be encoded as 0 in any format, so this works here. */ @@ -4725,8 +4512,8 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, if (dynamic_symbol_p) { (*_bfd_error_handler) - (_("%s: dtp-relative relocation against dynamic symbol %s"), - bfd_archive_filename (input_bfd), h->root.root.root.string); + (_("%B: dtp-relative relocation against dynamic symbol %s"), + input_bfd, h->root.root.root.string); ret_val = FALSE; } BFD_ASSERT (elf_hash_table (info)->tls_sec != NULL); @@ -4741,15 +4528,15 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, if (info->shared) { (*_bfd_error_handler) - (_("%s: TLS local exec code cannot be linked into shared objects"), - bfd_archive_filename (input_bfd)); + (_("%B: TLS local exec code cannot be linked into shared objects"), + input_bfd); ret_val = FALSE; } else if (dynamic_symbol_p) { (*_bfd_error_handler) - (_("%s: tp-relative relocation against dynamic symbol %s"), - bfd_archive_filename (input_bfd), h->root.root.root.string); + (_("%B: tp-relative relocation against dynamic symbol %s"), + input_bfd, h->root.root.root.string); ret_val = FALSE; } BFD_ASSERT (elf_hash_table (info)->tls_sec != NULL); @@ -4823,7 +4610,7 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, break; if (h != NULL) - name = h->root.root.root.string; + name = NULL; else { name = (bfd_elf_string_from_elf_section @@ -4834,8 +4621,9 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, name = bfd_section_name (input_bfd, sec); } if (! ((*info->callbacks->reloc_overflow) - (info, name, howto->name, (bfd_vma) 0, - input_bfd, input_section, rel->r_offset))) + (info, (h ? &h->root.root : NULL), name, howto->name, + (bfd_vma) 0, input_bfd, input_section, + rel->r_offset))) ret_val = FALSE; } break; @@ -4853,15 +4641,14 @@ elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section, dynamic sections here. */ static bfd_boolean -elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym) - bfd *output_bfd; - struct bfd_link_info *info; - struct elf_link_hash_entry *h; - Elf_Internal_Sym *sym; +elf64_alpha_finish_dynamic_symbol (bfd *output_bfd, struct bfd_link_info *info, + struct elf_link_hash_entry *h, + Elf_Internal_Sym *sym) { + struct alpha_elf_link_hash_entry *ah = (struct alpha_elf_link_hash_entry *)h; bfd *dynobj = elf_hash_table(info)->dynobj; - if (h->plt.offset != MINUS_ONE) + if (h->needs_plt) { /* Fill in the .plt entry for this symbol. */ asection *splt, *sgot, *srel; @@ -4873,83 +4660,71 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym) BFD_ASSERT (h->dynindx != -1); - /* The first .got entry will be updated by the .plt with the - address of the target function. */ - gotent = ((struct alpha_elf_link_hash_entry *) h)->got_entries; - BFD_ASSERT (gotent && gotent->addend == 0); - splt = bfd_get_section_by_name (dynobj, ".plt"); BFD_ASSERT (splt != NULL); srel = bfd_get_section_by_name (dynobj, ".rela.plt"); BFD_ASSERT (srel != NULL); - sgot = alpha_elf_tdata (gotent->gotobj)->got; - BFD_ASSERT (sgot != NULL); - - got_addr = (sgot->output_section->vma - + sgot->output_offset - + gotent->got_offset); - plt_addr = (splt->output_section->vma - + splt->output_offset - + h->plt.offset); - plt_index = (h->plt.offset - PLT_HEADER_SIZE) / PLT_ENTRY_SIZE; - - /* Fill in the entry in the procedure linkage table. */ - { - bfd_vma insn1, insn2, insn3; - - insn1 = PLT_ENTRY_WORD1 | ((-(h->plt.offset + 4) >> 2) & 0x1fffff); - insn2 = PLT_ENTRY_WORD2; - insn3 = PLT_ENTRY_WORD3; - - bfd_put_32 (output_bfd, insn1, splt->contents + h->plt.offset); - bfd_put_32 (output_bfd, insn2, splt->contents + h->plt.offset + 4); - bfd_put_32 (output_bfd, insn3, splt->contents + h->plt.offset + 8); - } + for (gotent = ah->got_entries; gotent ; gotent = gotent->next) + if (gotent->reloc_type == R_ALPHA_LITERAL + && gotent->use_count > 0) + { + unsigned int insn; + int disp; - /* Fill in the entry in the .rela.plt section. */ - outrel.r_offset = got_addr; - outrel.r_info = ELF64_R_INFO(h->dynindx, R_ALPHA_JMP_SLOT); - outrel.r_addend = 0; + sgot = alpha_elf_tdata (gotent->gotobj)->got; + BFD_ASSERT (sgot != NULL); - loc = srel->contents + plt_index * sizeof (Elf64_External_Rela); - bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc); + BFD_ASSERT (gotent->got_offset != -1); + BFD_ASSERT (gotent->plt_offset != -1); - if (!(h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)) - { - /* Mark the symbol as undefined, rather than as defined in the - .plt section. Leave the value alone. */ - sym->st_shndx = SHN_UNDEF; - } + got_addr = (sgot->output_section->vma + + sgot->output_offset + + gotent->got_offset); + plt_addr = (splt->output_section->vma + + splt->output_offset + + gotent->plt_offset); - /* Fill in the entries in the .got. */ - bfd_put_64 (output_bfd, plt_addr, sgot->contents + gotent->got_offset); + plt_index = (gotent->plt_offset-PLT_HEADER_SIZE) / PLT_ENTRY_SIZE; - /* Subsequent .got entries will continue to bounce through the .plt. */ - if (gotent->next) - { - srel = bfd_get_section_by_name (dynobj, ".rela.got"); - BFD_ASSERT (! info->shared || srel != NULL); + /* Fill in the entry in the procedure linkage table. */ + if (elf64_alpha_use_secureplt) + { + disp = (PLT_HEADER_SIZE - 4) - (gotent->plt_offset + 4); + insn = INSN_AD (INSN_BR, 31, disp); + bfd_put_32 (output_bfd, insn, + splt->contents + gotent->plt_offset); - gotent = gotent->next; - do - { - sgot = alpha_elf_tdata(gotent->gotobj)->got; - BFD_ASSERT(sgot != NULL); - BFD_ASSERT(gotent->addend == 0); + plt_index = ((gotent->plt_offset - NEW_PLT_HEADER_SIZE) + / NEW_PLT_ENTRY_SIZE); + } + else + { + disp = -(gotent->plt_offset + 4); + insn = INSN_AD (INSN_BR, 28, disp); + bfd_put_32 (output_bfd, insn, + splt->contents + gotent->plt_offset); + bfd_put_32 (output_bfd, INSN_UNOP, + splt->contents + gotent->plt_offset + 4); + bfd_put_32 (output_bfd, INSN_UNOP, + splt->contents + gotent->plt_offset + 8); + + plt_index = ((gotent->plt_offset - OLD_PLT_HEADER_SIZE) + / OLD_PLT_ENTRY_SIZE); + } - bfd_put_64 (output_bfd, plt_addr, - sgot->contents + gotent->got_offset); + /* Fill in the entry in the .rela.plt section. */ + outrel.r_offset = got_addr; + outrel.r_info = ELF64_R_INFO(h->dynindx, R_ALPHA_JMP_SLOT); + outrel.r_addend = 0; - if (info->shared) - elf64_alpha_emit_dynrel (output_bfd, info, sgot, srel, - gotent->got_offset, 0, - R_ALPHA_RELATIVE, plt_addr); + loc = srel->contents + plt_index * sizeof (Elf64_External_Rela); + bfd_elf64_swap_reloca_out (output_bfd, &outrel, loc); - gotent = gotent->next; - } - while (gotent != NULL); - } + /* Fill in the entry in the .got. */ + bfd_put_64 (output_bfd, plt_addr, + sgot->contents + gotent->got_offset); + } } else if (alpha_elf_dynamic_symbol_p (h, info)) { @@ -5005,8 +4780,8 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym) /* Mark some specially defined symbols as absolute. */ if (strcmp (h->root.root.string, "_DYNAMIC") == 0 - || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0 - || strcmp (h->root.root.string, "_PROCEDURE_LINKAGE_TABLE_") == 0) + || h == elf_hash_table (info)->hgot + || h == elf_hash_table (info)->hplt) sym->st_shndx = SHN_ABS; return TRUE; @@ -5015,9 +4790,8 @@ elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym) /* Finish up the dynamic sections. */ static bfd_boolean -elf64_alpha_finish_dynamic_sections (output_bfd, info) - bfd *output_bfd; - struct bfd_link_info *info; +elf64_alpha_finish_dynamic_sections (bfd *output_bfd, + struct bfd_link_info *info) { bfd *dynobj; asection *sdyn; @@ -5027,33 +4801,45 @@ elf64_alpha_finish_dynamic_sections (output_bfd, info) if (elf_hash_table (info)->dynamic_sections_created) { - asection *splt; + asection *splt, *sgotplt, *srelaplt; Elf64_External_Dyn *dyncon, *dynconend; + bfd_vma plt_vma, gotplt_vma; splt = bfd_get_section_by_name (dynobj, ".plt"); + srelaplt = bfd_get_section_by_name (output_bfd, ".rela.plt"); BFD_ASSERT (splt != NULL && sdyn != NULL); + plt_vma = splt->output_section->vma + splt->output_offset; + + gotplt_vma = 0; + if (elf64_alpha_use_secureplt) + { + sgotplt = bfd_get_section_by_name (dynobj, ".got.plt"); + BFD_ASSERT (sgotplt != NULL); + if (sgotplt->size > 0) + gotplt_vma = sgotplt->output_section->vma + sgotplt->output_offset; + } + dyncon = (Elf64_External_Dyn *) sdyn->contents; - dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->_raw_size); + dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->size); for (; dyncon < dynconend; dyncon++) { Elf_Internal_Dyn dyn; - const char *name; - asection *s; bfd_elf64_swap_dyn_in (dynobj, dyncon, &dyn); switch (dyn.d_tag) { case DT_PLTGOT: - name = ".plt"; - goto get_vma; + dyn.d_un.d_ptr + = elf64_alpha_use_secureplt ? gotplt_vma : plt_vma; + break; case DT_PLTRELSZ: - name = ".rela.plt"; - goto get_size; + dyn.d_un.d_val = srelaplt ? srelaplt->size : 0; + break; case DT_JMPREL: - name = ".rela.plt"; - goto get_vma; + dyn.d_un.d_ptr = srelaplt ? srelaplt->vma : 0; + break; case DT_RELASZ: /* My interpretation of the TIS v1.1 ELF document indicates @@ -5061,40 +4847,69 @@ elf64_alpha_finish_dynamic_sections (output_bfd, info) the rest of the BFD does. It is, however, what the glibc ld.so wants. Do this fixup here until we found out who is right. */ - s = bfd_get_section_by_name (output_bfd, ".rela.plt"); - if (s) - { - dyn.d_un.d_val -= - (s->_cooked_size ? s->_cooked_size : s->_raw_size); - } - break; - - get_vma: - s = bfd_get_section_by_name (output_bfd, name); - dyn.d_un.d_ptr = (s ? s->vma : 0); - break; - - get_size: - s = bfd_get_section_by_name (output_bfd, name); - dyn.d_un.d_val = - (s->_cooked_size ? s->_cooked_size : s->_raw_size); + if (srelaplt) + dyn.d_un.d_val -= srelaplt->size; break; } bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon); } - /* Initialize the PLT0 entry. */ - if (splt->_raw_size > 0) + /* Initialize the plt header. */ + if (splt->size > 0) { - bfd_put_32 (output_bfd, PLT_HEADER_WORD1, splt->contents); - bfd_put_32 (output_bfd, PLT_HEADER_WORD2, splt->contents + 4); - bfd_put_32 (output_bfd, PLT_HEADER_WORD3, splt->contents + 8); - bfd_put_32 (output_bfd, PLT_HEADER_WORD4, splt->contents + 12); + unsigned int insn; + int ofs; - /* The next two words will be filled in by ld.so */ - bfd_put_64 (output_bfd, (bfd_vma) 0, splt->contents + 16); - bfd_put_64 (output_bfd, (bfd_vma) 0, splt->contents + 24); + if (elf64_alpha_use_secureplt) + { + ofs = gotplt_vma - (plt_vma + PLT_HEADER_SIZE); + + insn = INSN_ABC (INSN_SUBQ, 27, 28, 25); + bfd_put_32 (output_bfd, insn, splt->contents); + + insn = INSN_ABO (INSN_LDAH, 28, 28, (ofs + 0x8000) >> 16); + bfd_put_32 (output_bfd, insn, splt->contents + 4); + + insn = INSN_ABC (INSN_S4SUBQ, 25, 25, 25); + bfd_put_32 (output_bfd, insn, splt->contents + 8); + + insn = INSN_ABO (INSN_LDA, 28, 28, ofs); + bfd_put_32 (output_bfd, insn, splt->contents + 12); + + insn = INSN_ABO (INSN_LDQ, 27, 28, 0); + bfd_put_32 (output_bfd, insn, splt->contents + 16); + + insn = INSN_ABC (INSN_ADDQ, 25, 25, 25); + bfd_put_32 (output_bfd, insn, splt->contents + 20); + + insn = INSN_ABO (INSN_LDQ, 28, 28, 8); + bfd_put_32 (output_bfd, insn, splt->contents + 24); + + insn = INSN_AB (INSN_JMP, 31, 27); + bfd_put_32 (output_bfd, insn, splt->contents + 28); + + insn = INSN_AD (INSN_BR, 28, -PLT_HEADER_SIZE); + bfd_put_32 (output_bfd, insn, splt->contents + 32); + } + else + { + insn = INSN_AD (INSN_BR, 27, 0); /* br $27, .+4 */ + bfd_put_32 (output_bfd, insn, splt->contents); + + insn = INSN_ABO (INSN_LDQ, 27, 27, 12); + bfd_put_32 (output_bfd, insn, splt->contents + 4); + + insn = INSN_UNOP; + bfd_put_32 (output_bfd, insn, splt->contents + 8); + + insn = INSN_AB (INSN_JMP, 27, 27); + bfd_put_32 (output_bfd, insn, splt->contents + 12); + + /* The next two words will be filled in by ld.so. */ + bfd_put_64 (output_bfd, 0, splt->contents + 16); + bfd_put_64 (output_bfd, 0, splt->contents + 24); + } elf_section_data (splt->output_section)->this_hdr.sh_entsize = 0; } @@ -5108,9 +4923,7 @@ elf64_alpha_finish_dynamic_sections (output_bfd, info) them all out sequentially. */ static bfd_boolean -elf64_alpha_final_link (abfd, info) - bfd *abfd; - struct bfd_link_info *info; +elf64_alpha_final_link (bfd *abfd, struct bfd_link_info *info) { asection *o; struct bfd_link_order *p; @@ -5196,7 +5009,7 @@ elf64_alpha_final_link (abfd, info) if (s != NULL) { esym.asym.value = s->vma; - last = s->vma + s->_raw_size; + last = s->vma + s->size; } else esym.asym.value = last; @@ -5207,7 +5020,7 @@ elf64_alpha_final_link (abfd, info) } } - for (p = o->link_order_head; + for (p = o->map_head.link_order; p != (struct bfd_link_order *) NULL; p = p->next) { @@ -5241,7 +5054,7 @@ elf64_alpha_final_link (abfd, info) input_swap = (get_elf_backend_data (input_bfd) ->elf_backend_ecoff_debug_swap); - BFD_ASSERT (p->size == input_section->_raw_size); + BFD_ASSERT (p->size == input_section->size); /* The ECOFF linking code expects that we have already read in the debugging information and set up an @@ -5324,11 +5137,11 @@ elf64_alpha_final_link (abfd, info) return FALSE; /* Set the size of the .mdebug section. */ - o->_raw_size = bfd_ecoff_debug_size (abfd, &debug, swap); + o->size = bfd_ecoff_debug_size (abfd, &debug, swap); /* 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; + o->map_head.link_order = (struct bfd_link_order *) NULL; mdebug_sec = o; } @@ -5357,7 +5170,7 @@ elf64_alpha_final_link (abfd, info) if (! bfd_set_section_contents (abfd, sgot->output_section, sgot->contents, (file_ptr) sgot->output_offset, - sgot->_raw_size)) + sgot->size)) return FALSE; } } @@ -5377,8 +5190,7 @@ elf64_alpha_final_link (abfd, info) } static enum elf_reloc_type_class -elf64_alpha_reloc_type_class (rela) - const Elf_Internal_Rela *rela; +elf64_alpha_reloc_type_class (const Elf_Internal_Rela *rela) { switch ((int) ELF64_R_TYPE (rela->r_info)) { @@ -5393,11 +5205,11 @@ elf64_alpha_reloc_type_class (rela) } } -static struct bfd_elf_special_section const elf64_alpha_special_sections[]= +static const struct bfd_elf_special_section elf64_alpha_special_sections[] = { - { ".sdata", 6, -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_ALPHA_GPREL }, - { ".sbss", 5, -2, SHT_NOBITS, SHF_ALLOC + SHF_WRITE + SHF_ALPHA_GPREL }, - { NULL, 0, 0, 0, 0 } + { STRING_COMMA_LEN (".sbss"), -2, SHT_NOBITS, SHF_ALLOC + SHF_WRITE + SHF_ALPHA_GPREL }, + { STRING_COMMA_LEN (".sdata"), -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE + SHF_ALPHA_GPREL }, + { NULL, 0, 0, 0, 0 } }; /* ECOFF swapping routines. These are used when dealing with the @@ -5481,12 +5293,15 @@ static const struct elf_size_info alpha_elf_size_info = #define ELF_ARCH bfd_arch_alpha #define ELF_MACHINE_CODE EM_ALPHA #define ELF_MAXPAGESIZE 0x10000 +#define ELF_COMMONPAGESIZE 0x2000 #define bfd_elf64_bfd_link_hash_table_create \ elf64_alpha_bfd_link_hash_table_create #define bfd_elf64_bfd_reloc_type_lookup \ elf64_alpha_bfd_reloc_type_lookup +#define bfd_elf64_bfd_reloc_name_lookup \ + elf64_alpha_bfd_reloc_name_lookup #define elf_info_to_howto \ elf64_alpha_info_to_howto @@ -5517,10 +5332,14 @@ static const struct elf_size_info alpha_elf_size_info = elf64_alpha_create_dynamic_sections #define elf_backend_adjust_dynamic_symbol \ elf64_alpha_adjust_dynamic_symbol +#define elf_backend_merge_symbol_attribute \ + elf64_alpha_merge_symbol_attribute #define elf_backend_always_size_sections \ elf64_alpha_always_size_sections #define elf_backend_size_dynamic_sections \ elf64_alpha_size_dynamic_sections +#define elf_backend_omit_section_dynsym \ + ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true) #define elf_backend_relocate_section \ elf64_alpha_relocate_section #define elf_backend_finish_dynamic_symbol \ @@ -5555,25 +5374,23 @@ static const struct elf_size_info alpha_elf_size_info = #define TARGET_LITTLE_SYM bfd_elf64_alpha_freebsd_vec #undef TARGET_LITTLE_NAME #define TARGET_LITTLE_NAME "elf64-alpha-freebsd" +#undef ELF_OSABI +#define ELF_OSABI ELFOSABI_FREEBSD /* The kernel recognizes executables as valid only if they carry a "FreeBSD" label in the ELF header. So we put this label on all executables and (for simplicity) also all other object files. */ -static void elf64_alpha_fbsd_post_process_headers - PARAMS ((bfd *, struct bfd_link_info *)); - static void -elf64_alpha_fbsd_post_process_headers (abfd, link_info) - bfd * abfd; - struct bfd_link_info * link_info ATTRIBUTE_UNUSED; +elf64_alpha_fbsd_post_process_headers (bfd * abfd, + struct bfd_link_info * link_info ATTRIBUTE_UNUSED) { Elf_Internal_Ehdr * i_ehdrp; /* ELF file header, internal form. */ i_ehdrp = elf_elfheader (abfd); /* Put an ABI label supported by FreeBSD >= 4.1. */ - i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_FREEBSD; + i_ehdrp->e_ident[EI_OSABI] = get_elf_backend_data (abfd)->elf_osabi; #ifdef OLD_FREEBSD_ABI_LABEL /* The ABI label supported by FreeBSD <= 4.0 is quite nonstandard. */ memcpy (&i_ehdrp->e_ident[EI_ABIVERSION], "FreeBSD", 8); |
