X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Felf32-mt.c;h=18366300a34e11ab9adafe30a98ef1503c95b562;hb=67dd2c2073b194f68b10f9d53c70132fc385d437;hp=9f240bb3442dfb322a684a9ffeaa8ff41b721a9b;hpb=d031aafbfe54750209d9100477ce17193d8b0175;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf32-mt.c b/bfd/elf32-mt.c index 9f240bb344..18366300a3 100644 --- a/bfd/elf32-mt.c +++ b/bfd/elf32-mt.c @@ -1,12 +1,11 @@ /* Morpho Technologies MT specific support for 32-bit ELF - Copyright 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -16,16 +15,17 @@ 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., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" #include "elf-bfd.h" #include "elf/mt.h" /* Prototypes. */ -static reloc_howto_type * mt_reloc_type_lookup +static reloc_howto_type * mt_reloc_type_lookup (bfd *, bfd_reloc_code_real_type); static void mt_info_to_howto_rela @@ -35,11 +35,11 @@ static bfd_reloc_status_type mt_elf_relocate_hi16 (bfd *, Elf_Internal_Rela *, bfd_byte *, bfd_vma); static bfd_reloc_status_type mt_final_link_relocate - (reloc_howto_type *, bfd *, asection *, bfd_byte *, + (reloc_howto_type *, bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, bfd_vma); static bfd_boolean mt_elf_relocate_section - (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, + (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *, asection **); /* Relocation tables. */ @@ -47,77 +47,77 @@ static reloc_howto_type mt_elf_howto_table [] = { /* This reloc does nothing. */ HOWTO (R_MT_NONE, /* type */ - 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ - 32, /* bitsize */ - FALSE, /* pc_relative */ - 0, /* bitpos */ - complain_overflow_dont, /* complain_on_overflow */ - bfd_elf_generic_reloc, /* special_function */ - "R_MT_NONE", /* name */ - FALSE, /* partial_inplace */ - 0 , /* src_mask */ - 0, /* dst_mask */ + 0, /* rightshift */ + 3, /* size (0 = byte, 1 = short, 2 = long) */ + 0, /* bitsize */ + FALSE, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_dont, /* complain_on_overflow */ + bfd_elf_generic_reloc, /* special_function */ + "R_MT_NONE", /* name */ + FALSE, /* partial_inplace */ + 0 , /* src_mask */ + 0, /* dst_mask */ FALSE), /* pcrel_offset */ /* A 16 bit absolute relocation. */ HOWTO (R_MT_16, /* type */ - 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ + 0, /* rightshift */ + 2, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - FALSE, /* pc_relative */ - 0, /* bitpos */ - complain_overflow_dont, /* complain_on_overflow */ - bfd_elf_generic_reloc, /* special_function */ - "R_MT_16", /* name */ - FALSE, /* partial_inplace */ - 0 , /* src_mask */ - 0xffff, /* dst_mask */ + FALSE, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_dont, /* complain_on_overflow */ + bfd_elf_generic_reloc, /* special_function */ + "R_MT_16", /* name */ + FALSE, /* partial_inplace */ + 0 , /* src_mask */ + 0xffff, /* dst_mask */ FALSE), /* pcrel_offset */ /* A 32 bit absolute relocation. */ HOWTO (R_MT_32, /* type */ - 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ + 0, /* rightshift */ + 2, /* size (0 = byte, 1 = short, 2 = long) */ 32, /* bitsize */ - FALSE, /* pc_relative */ - 0, /* bitpos */ - complain_overflow_dont, /* complain_on_overflow */ - bfd_elf_generic_reloc, /* special_function */ - "R_MT_32", /* name */ - FALSE, /* partial_inplace */ - 0 , /* src_mask */ - 0xffffffff, /* dst_mask */ + FALSE, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_dont, /* complain_on_overflow */ + bfd_elf_generic_reloc, /* special_function */ + "R_MT_32", /* name */ + FALSE, /* partial_inplace */ + 0 , /* src_mask */ + 0xffffffff, /* dst_mask */ FALSE), /* pcrel_offset */ /* A 32 bit pc-relative relocation. */ HOWTO (R_MT_32_PCREL, /* type */ - 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ + 0, /* rightshift */ + 2, /* size (0 = byte, 1 = short, 2 = long) */ 32, /* bitsize */ - TRUE, /* pc_relative */ - 0, /* bitpos */ - complain_overflow_dont, /* complain_on_overflow */ - bfd_elf_generic_reloc, /* special_function */ - "R_MT_32_PCREL", /* name */ - FALSE, /* partial_inplace */ - 0 , /* src_mask */ - 0xffffffff, /* dst_mask */ + TRUE, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_dont, /* complain_on_overflow */ + bfd_elf_generic_reloc, /* special_function */ + "R_MT_32_PCREL", /* name */ + FALSE, /* partial_inplace */ + 0 , /* src_mask */ + 0xffffffff, /* dst_mask */ TRUE), /* pcrel_offset */ /* A 16 bit pc-relative relocation. */ HOWTO (R_MT_PC16, /* type */ - 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ + 0, /* rightshift */ + 2, /* size (0 = byte, 1 = short, 2 = long) */ 16, /* bitsize */ - TRUE, /* pc_relative */ - 0, /* bitpos */ - complain_overflow_signed, /* complain_on_overflow */ - bfd_elf_generic_reloc, /* special_function */ - "R_MT_PC16", /* name */ - FALSE, /* partial_inplace */ - 0, /* src_mask */ - 0xffff, /* dst_mask */ + TRUE, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_signed, /* complain_on_overflow */ + bfd_elf_generic_reloc, /* special_function */ + "R_MT_PC16", /* name */ + FALSE, /* partial_inplace */ + 0, /* src_mask */ + 0xffff, /* dst_mask */ TRUE), /* pcrel_offset */ /* high 16 bits of symbol value. */ @@ -187,6 +187,22 @@ mt_reloc_type_lookup return NULL; } +static reloc_howto_type * +mt_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, + const char *r_name) +{ + unsigned int i; + + for (i = 0; + i < sizeof (mt_elf_howto_table) / sizeof (mt_elf_howto_table[0]); + i++) + if (mt_elf_howto_table[i].name != NULL + && strcasecmp (mt_elf_howto_table[i].name, r_name) == 0) + return &mt_elf_howto_table[i]; + + return NULL; +} + bfd_reloc_status_type mt_elf_relocate_hi16 (bfd * input_bfd, @@ -220,6 +236,11 @@ mt_info_to_howto_rela unsigned int r_type; r_type = ELF32_R_TYPE (dst->r_info); + if (r_type >= (unsigned int) R_MT_max) + { + _bfd_error_handler (_("%B: invalid MT reloc number: %d"), abfd, r_type); + r_type = 0; + } cache_ptr->howto = & mt_elf_howto_table [r_type]; } @@ -304,23 +325,22 @@ mt_elf_relocate_section bfd_reloc_status_type r; const char * name = NULL; int r_type; - + r_type = ELF32_R_TYPE (rel->r_info); r_symndx = ELF32_R_SYM (rel->r_info); - /* This is a final link. */ howto = mt_elf_howto_table + ELF32_R_TYPE (rel->r_info); h = NULL; sym = NULL; sec = NULL; - + if (r_symndx < symtab_hdr->sh_info) { sym = local_syms + r_symndx; sec = local_sections [r_symndx]; relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel); - + name = bfd_elf_string_from_elf_section (input_bfd, symtab_hdr->sh_link, sym->st_name); name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name; @@ -328,16 +348,22 @@ mt_elf_relocate_section else { bfd_boolean unresolved_reloc; - bfd_boolean warned; + bfd_boolean warned, ignored; RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel, r_symndx, symtab_hdr, sym_hashes, h, sec, relocation, - unresolved_reloc, warned); + unresolved_reloc, warned, ignored); name = h->root.root.string; } + if (sec != NULL && discarded_section (sec)) + RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section, + rel, 1, relend, howto, 0, contents); + + if (bfd_link_relocatable (info)) + continue; /* Finally, the sole MT-specific part. */ switch (r_type) @@ -363,12 +389,12 @@ mt_elf_relocate_section (info, (h ? &h->root : NULL), name, howto->name, (bfd_vma) 0, input_bfd, input_section, rel->r_offset); break; - + case bfd_reloc_undefined: r = info->callbacks->undefined_symbol (info, name, input_bfd, input_section, rel->r_offset, TRUE); break; - + case bfd_reloc_outofrange: msg = _("internal error: out of range error"); break; @@ -394,61 +420,10 @@ mt_elf_relocate_section return TRUE; } -/* Return the section that should be marked against GC for a given - relocation. */ - -static asection * -mt_elf_gc_mark_hook - (asection * sec, - struct bfd_link_info * info ATTRIBUTE_UNUSED, - Elf_Internal_Rela * rel ATTRIBUTE_UNUSED, - struct elf_link_hash_entry * h, - Elf_Internal_Sym * sym) -{ - if (h != NULL) - { - switch (h->root.type) - { - case bfd_link_hash_defined: - case bfd_link_hash_defweak: - return h->root.u.def.section; - - case bfd_link_hash_common: - return h->root.u.c.p->section; - - default: - break; - } - } - else - { - if (!(elf_bad_symtab (sec->owner) - && ELF_ST_BIND (sym->st_info) != STB_LOCAL) - && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE) - && sym->st_shndx != SHN_COMMON)) - return bfd_section_from_elf_index (sec->owner, sym->st_shndx); - } - - return NULL; -} - -/* Update the got entry reference counts for the section being - removed. */ - -static bfd_boolean -mt_elf_gc_sweep_hook - (bfd * abfd ATTRIBUTE_UNUSED, - struct bfd_link_info * info ATTRIBUTE_UNUSED, - asection * sec ATTRIBUTE_UNUSED, - const Elf_Internal_Rela * relocs ATTRIBUTE_UNUSED) -{ - return TRUE; -} - /* Look through the relocs for a section during the first phase. Since we don't do .gots or .plts, we just need to consider the virtual table relocs for gc. */ - + static bfd_boolean mt_elf_check_relocs (bfd * abfd, @@ -458,25 +433,21 @@ mt_elf_check_relocs { Elf_Internal_Shdr * symtab_hdr; struct elf_link_hash_entry ** sym_hashes; - struct elf_link_hash_entry ** sym_hashes_end; const Elf_Internal_Rela * rel; const Elf_Internal_Rela * rel_end; - - if (info->relocatable) + + if (bfd_link_relocatable (info)) return TRUE; - + symtab_hdr = &elf_tdata (abfd)->symtab_hdr; sym_hashes = elf_sym_hashes (abfd); - sym_hashes_end = sym_hashes + symtab_hdr->sh_size / sizeof (Elf32_External_Sym); - if (!elf_bad_symtab (abfd)) - sym_hashes_end -= symtab_hdr->sh_info; - + rel_end = relocs + sec->reloc_count; for (rel = relocs; rel < rel_end; rel++) { struct elf_link_hash_entry *h; unsigned long r_symndx; - + r_symndx = ELF32_R_SYM (rel->r_info); if (r_symndx < symtab_hdr->sh_info) h = NULL; @@ -486,6 +457,10 @@ mt_elf_check_relocs 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; + + /* PR15323, ref flags aren't set for references in the same + object. */ + h->root.non_ir_ref = 1; } } @@ -526,21 +501,6 @@ mt_elf_set_private_flags (bfd * abfd, return TRUE; } -static bfd_boolean -mt_elf_copy_private_bfd_data (bfd * ibfd, bfd * obfd) -{ - if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour - || bfd_get_flavour (obfd) != bfd_target_elf_flavour) - return TRUE; - - BFD_ASSERT (!elf_flags_init (obfd) - || elf_elfheader (obfd)->e_flags == elf_elfheader (ibfd)->e_flags); - - elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags; - elf_flags_init (obfd) = TRUE; - return TRUE; -} - /* Merge backend specific data from an object file to the output object file when linking. */ @@ -548,9 +508,9 @@ static bfd_boolean mt_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd) { flagword old_flags, new_flags; - bfd_boolean error = FALSE; + bfd_boolean ok = TRUE; - /* Check if we have the same endianess. */ + /* Check if we have the same endianness. */ if (_bfd_generic_verify_endian_match (ibfd, obfd) == FALSE) return FALSE; @@ -578,23 +538,16 @@ mt_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd) { /* CPU has changed. This is invalid, because MRISC, MRISC2 and MS2 are not subsets of each other. */ - error = 1; - - /* FIXME:However, until the compiler is multilibbed, preventing - mixing breaks the build. So we allow merging and use the - greater CPU value. This is of course unsafe. */ - error = 0; - if ((new_flags & EF_MT_CPU_MASK) > (old_flags & EF_MT_CPU_MASK)) - old_flags = ((old_flags & ~EF_MT_CPU_MASK) - | (new_flags & EF_MT_CPU_MASK)); + ok = FALSE; } - if (!error) + + if (ok) { obfd->arch_info = ibfd->arch_info; elf_elfheader (obfd)->e_flags = old_flags; } - return !error; + return ok; } static bfd_boolean @@ -604,12 +557,12 @@ mt_elf_print_private_bfd_data (bfd * abfd, void * ptr) flagword flags; BFD_ASSERT (abfd != NULL && ptr != NULL); - + /* Print normal ELF private data. */ _bfd_elf_print_private_bfd_data (abfd, ptr); flags = elf_elfheader (abfd)->e_flags; - fprintf (file, _("private flags = 0x%lx:"), (long)flags); + fprintf (file, _("private flags = 0x%lx:"), (unsigned long) flags); switch (flags & EF_MT_CPU_MASK) { @@ -625,7 +578,7 @@ mt_elf_print_private_bfd_data (bfd * abfd, void * ptr) } -#define TARGET_BIG_SYM bfd_elf32_mt_vec +#define TARGET_BIG_SYM mt_elf32_vec #define TARGET_BIG_NAME "elf32-mt" #define ELF_ARCH bfd_arch_mt @@ -638,9 +591,8 @@ mt_elf_print_private_bfd_data (bfd * abfd, void * ptr) #define elf_backend_relocate_section mt_elf_relocate_section #define bfd_elf32_bfd_reloc_type_lookup mt_reloc_type_lookup +#define bfd_elf32_bfd_reloc_name_lookup mt_reloc_name_lookup -#define elf_backend_gc_mark_hook mt_elf_gc_mark_hook -#define elf_backend_gc_sweep_hook mt_elf_gc_sweep_hook #define elf_backend_check_relocs mt_elf_check_relocs #define elf_backend_object_p mt_elf_object_p #define elf_backend_rela_normal 1 @@ -648,7 +600,6 @@ mt_elf_print_private_bfd_data (bfd * abfd, void * ptr) #define elf_backend_can_gc_sections 1 #define bfd_elf32_bfd_set_private_flags mt_elf_set_private_flags -#define bfd_elf32_bfd_copy_private_bfd_data mt_elf_copy_private_bfd_data #define bfd_elf32_bfd_merge_private_bfd_data mt_elf_merge_private_bfd_data #define bfd_elf32_bfd_print_private_bfd_data mt_elf_print_private_bfd_data