X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=bfd%2Felf32-v850.c;h=687f180a1ceffbe2f2d7b6cee914af56b0683fb1;hb=892339eeebd377e5f6bc58e0f7cbdfc57b718cfe;hp=d3339fb6fbff62fdab9918aa60acbad234f4346c;hpb=db1fa6ab261fd9d5a22b8c8adec16c54dcb4b7ea;p=binutils-gdb.git diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c index d3339fb6fbf..687f180a1ce 100644 --- a/bfd/elf32-v850.c +++ b/bfd/elf32-v850.c @@ -1,5 +1,5 @@ /* V850-specific support for 32-bit ELF - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -17,12 +17,9 @@ 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. */ - - /* XXX FIXME: This code is littered with 32bit int, 16bit short, 8bit char dependencies. As is the gas & simulator code or the v850. */ - #include "bfd.h" #include "sysdep.h" #include "bfdlink.h" @@ -30,24 +27,59 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "elf-bfd.h" #include "elf/v850.h" +/* sign-extend a 24-bit number */ +#define SEXT24(x) ((((x) & 0xffffff) ^ (~ 0x7fffff)) + 0x800000) + static reloc_howto_type *v850_elf_reloc_type_lookup PARAMS ((bfd *abfd, bfd_reloc_code_real_type code)); static void v850_elf_info_to_howto_rel PARAMS ((bfd *, arelent *, Elf32_Internal_Rel *)); +static void v850_elf_info_to_howto_rela + PARAMS ((bfd *, arelent *, Elf32_Internal_Rela *)); static bfd_reloc_status_type v850_elf_reloc PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); -static boolean v850_elf_is_local_label_name PARAMS ((bfd *, const char *)); -static boolean v850_elf_relocate_section PARAMS((bfd *, - struct bfd_link_info *, - bfd *, - asection *, - bfd_byte *, - Elf_Internal_Rela *, - Elf_Internal_Sym *, - asection **)); -/* Try to minimize the amount of space occupied by relocation tables - on the ROM (not that the ROM won't be swamped by other ELF overhead). */ -#define USE_REL +static boolean v850_elf_is_local_label_name + PARAMS ((bfd *, const char *)); +static boolean v850_elf_relocate_section + PARAMS((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, + Elf_Internal_Rela *, Elf_Internal_Sym *, asection **)); +static bfd_reloc_status_type v850_elf_perform_relocation + PARAMS ((bfd *, int, bfd_vma, bfd_byte *)); +static boolean v850_elf_check_relocs + PARAMS ((bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *)); +static void remember_hi16s_reloc + PARAMS ((bfd *, bfd_vma, bfd_byte *)); +static bfd_byte * find_remembered_hi16s_reloc + PARAMS ((bfd_vma, boolean *)); +static bfd_reloc_status_type v850_elf_final_link_relocate + PARAMS ((reloc_howto_type *, bfd *, bfd *, asection *, bfd_byte *, bfd_vma, + bfd_vma, bfd_vma, struct bfd_link_info *, asection *, int)); +static boolean v850_elf_object_p + PARAMS ((bfd *)); +static boolean v850_elf_fake_sections + PARAMS ((bfd *, Elf32_Internal_Shdr *, asection *)); +static void v850_elf_final_write_processing + PARAMS ((bfd *, boolean)); +static boolean v850_elf_set_private_flags + PARAMS ((bfd *, flagword)); +static boolean v850_elf_copy_private_bfd_data + PARAMS ((bfd *, bfd *)); +static boolean v850_elf_merge_private_bfd_data + PARAMS ((bfd *, bfd *)); +static boolean v850_elf_print_private_bfd_data + PARAMS ((bfd *, PTR)); +static boolean v850_elf_section_from_bfd_section + PARAMS ((bfd *, Elf32_Internal_Shdr *, asection *, int *)); +static void v850_elf_symbol_processing + PARAMS ((bfd *, asymbol *)); +static boolean v850_elf_add_symbol_hook + PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *, + const char **, flagword *, asection **, bfd_vma *)); +static boolean v850_elf_link_output_symbol_hook + PARAMS ((bfd *, struct bfd_link_info *, const char *, + Elf_Internal_Sym *, asection *)); +static boolean v850_elf_section_from_shdr + PARAMS ((bfd *, Elf_Internal_Shdr *, char *)); /* Note: It is REQUIRED that the 'type' value of each entry in this array match the index of the entry in the array. */ @@ -68,7 +100,7 @@ static reloc_howto_type v850_elf_howto_table[] = 0, /* dst_mask */ false), /* pcrel_offset */ - /* A PC relative 9 bit branch. */ + /* A PC relative 9 bit branch. */ HOWTO (R_V850_9_PCREL, /* type */ 2, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ @@ -83,7 +115,7 @@ static reloc_howto_type v850_elf_howto_table[] = 0x00ffffff, /* dst_mask */ true), /* pcrel_offset */ - /* A PC relative 22 bit branch. */ + /* A PC relative 22 bit branch. */ HOWTO (R_V850_22_PCREL, /* type */ 2, /* rightshift */ 2, /* size (0 = byte, 1 = short, 2 = long) */ @@ -108,7 +140,7 @@ static reloc_howto_type v850_elf_howto_table[] = complain_overflow_dont, /* complain_on_overflow */ v850_elf_reloc, /* special_function */ "R_V850_HI16_S", /* name */ - true, /* partial_inplace */ + false, /* partial_inplace */ 0xffff, /* src_mask */ 0xffff, /* dst_mask */ false), /* pcrel_offset */ @@ -123,7 +155,7 @@ static reloc_howto_type v850_elf_howto_table[] = complain_overflow_dont, /* complain_on_overflow */ v850_elf_reloc, /* special_function */ "R_V850_HI16", /* name */ - true, /* partial_inplace */ + false, /* partial_inplace */ 0xffff, /* src_mask */ 0xffff, /* dst_mask */ false), /* pcrel_offset */ @@ -138,7 +170,7 @@ static reloc_howto_type v850_elf_howto_table[] = complain_overflow_dont, /* complain_on_overflow */ v850_elf_reloc, /* special_function */ "R_V850_LO16", /* name */ - true, /* partial_inplace */ + false, /* partial_inplace */ 0xffff, /* src_mask */ 0xffff, /* dst_mask */ false), /* pcrel_offset */ @@ -151,9 +183,9 @@ static reloc_howto_type v850_elf_howto_table[] = false, /* pc_relative */ 0, /* bitpos */ complain_overflow_dont, /* complain_on_overflow */ - bfd_elf_generic_reloc, /* special_function */ + v850_elf_reloc, /* special_function */ "R_V850_32", /* name */ - true, /* partial_inplace */ + false, /* partial_inplace */ 0xffffffff, /* src_mask */ 0xffffffff, /* dst_mask */ false), /* pcrel_offset */ @@ -168,7 +200,7 @@ static reloc_howto_type v850_elf_howto_table[] = complain_overflow_dont, /* complain_on_overflow */ bfd_elf_generic_reloc, /* special_function */ "R_V850_16", /* name */ - true, /* partial_inplace */ + false, /* partial_inplace */ 0xffff, /* src_mask */ 0xffff, /* dst_mask */ false), /* pcrel_offset */ @@ -183,7 +215,7 @@ static reloc_howto_type v850_elf_howto_table[] = complain_overflow_dont, /* complain_on_overflow */ bfd_elf_generic_reloc, /* special_function */ "R_V850_8", /* name */ - true, /* partial_inplace */ + false, /* partial_inplace */ 0xff, /* src_mask */ 0xff, /* dst_mask */ false), /* pcrel_offset */ @@ -277,7 +309,7 @@ static reloc_howto_type v850_elf_howto_table[] = 0x7f, /* src_mask */ 0x7f, /* dst_mask */ false), /* pcrel_offset */ - + /* 7 bit offset from the tiny data area pointer. */ HOWTO (R_V850_TDA_7_7_OFFSET, /* type */ 0, /* rightshift */ @@ -308,8 +340,6 @@ static reloc_howto_type v850_elf_howto_table[] = 0xfff, /* dst_mask */ false), /* pcrel_offset */ -/* start-sanitize-v850e */ - /* 5 bit offset from the tiny data area pointer. */ HOWTO (R_V850_TDA_4_5_OFFSET, /* type */ 1, /* rightshift */ @@ -370,14 +400,75 @@ static reloc_howto_type v850_elf_howto_table[] = 0xfffe0020, /* dst_mask */ false), /* pcrel_offset */ -/* end-sanitize-v850e */ + /* 6 bit offset from the call table base pointer. */ + HOWTO (R_V850_CALLT_6_7_OFFSET, /* type */ + 0, /* rightshift */ + 1, /* size (0 = byte, 1 = short, 2 = long) */ + 7, /* bitsize */ + false, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_dont, /* complain_on_overflow */ + v850_elf_reloc, /* special_function */ + "R_V850_CALLT_6_7_OFFSET", /* name */ + false, /* partial_inplace */ + 0x3f, /* src_mask */ + 0x3f, /* dst_mask */ + false), /* pcrel_offset */ + + /* 16 bit offset from the call table base pointer. */ + HOWTO (R_V850_CALLT_16_16_OFFSET, /* type */ + 0, /* rightshift */ + 1, /* size (0 = byte, 1 = short, 2 = long) */ + 16, /* bitsize */ + false, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_dont, /* complain_on_overflow */ + v850_elf_reloc, /* special_function */ + "R_V850_CALLT_16_16_OFFSET", /* name */ + false, /* partial_inplace */ + 0xffff, /* src_mask */ + 0xffff, /* dst_mask */ + false), /* pcrel_offset */ + + /* GNU extension to record C++ vtable hierarchy */ + HOWTO (R_V850_GNU_VTINHERIT, /* type */ + 0, /* rightshift */ + 2, /* size (0 = byte, 1 = short, 2 = long) */ + 0, /* bitsize */ + false, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_dont, /* complain_on_overflow */ + NULL, /* special_function */ + "R_V850_GNU_VTINHERIT", /* name */ + false, /* partial_inplace */ + 0, /* src_mask */ + 0, /* dst_mask */ + false), /* pcrel_offset */ + + /* GNU extension to record C++ vtable member usage */ + HOWTO (R_V850_GNU_VTENTRY, /* type */ + 0, /* rightshift */ + 2, /* size (0 = byte, 1 = short, 2 = long) */ + 0, /* bitsize */ + false, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_dont, /* complain_on_overflow */ + _bfd_elf_rel_vtable_reloc_fn, /* special_function */ + "R_V850_GNU_VTENTRY", /* name */ + false, /* partial_inplace */ + 0, /* src_mask */ + 0, /* dst_mask */ + false), /* pcrel_offset */ + }; /* Map BFD reloc types to V850 ELF reloc types. */ struct v850_elf_reloc_map { - unsigned char bfd_reloc_val; + /* BFD_RELOC_V850_CALLT_16_16_OFFSET is 258, which will not fix in an + unsigned char. */ + bfd_reloc_code_real_type bfd_reloc_val; unsigned char elf_reloc_val; }; @@ -396,24 +487,27 @@ static const struct v850_elf_reloc_map v850_elf_reloc_map[] = { BFD_RELOC_V850_SDA_15_16_OFFSET, R_V850_SDA_15_16_OFFSET }, { BFD_RELOC_V850_ZDA_16_16_OFFSET, R_V850_ZDA_16_16_OFFSET }, { BFD_RELOC_V850_ZDA_15_16_OFFSET, R_V850_ZDA_15_16_OFFSET }, - { BFD_RELOC_V850_TDA_6_8_OFFSET, R_V850_TDA_6_8_OFFSET }, - { BFD_RELOC_V850_TDA_7_8_OFFSET, R_V850_TDA_7_8_OFFSET }, - { BFD_RELOC_V850_TDA_7_7_OFFSET, R_V850_TDA_7_7_OFFSET }, + { BFD_RELOC_V850_TDA_6_8_OFFSET, R_V850_TDA_6_8_OFFSET }, + { BFD_RELOC_V850_TDA_7_8_OFFSET, R_V850_TDA_7_8_OFFSET }, + { BFD_RELOC_V850_TDA_7_7_OFFSET, R_V850_TDA_7_7_OFFSET }, { BFD_RELOC_V850_TDA_16_16_OFFSET, R_V850_TDA_16_16_OFFSET }, -/* start-sanitize-v850e */ - { BFD_RELOC_V850_TDA_4_5_OFFSET, R_V850_TDA_4_5_OFFSET }, - { BFD_RELOC_V850_TDA_4_4_OFFSET, R_V850_TDA_4_4_OFFSET }, + { BFD_RELOC_V850_TDA_4_5_OFFSET, R_V850_TDA_4_5_OFFSET }, + { BFD_RELOC_V850_TDA_4_4_OFFSET, R_V850_TDA_4_4_OFFSET }, { BFD_RELOC_V850_SDA_16_16_SPLIT_OFFSET, R_V850_SDA_16_16_SPLIT_OFFSET }, { BFD_RELOC_V850_ZDA_16_16_SPLIT_OFFSET, R_V850_ZDA_16_16_SPLIT_OFFSET }, -/* end-sanitize-v850e */ + { BFD_RELOC_V850_CALLT_6_7_OFFSET, R_V850_CALLT_6_7_OFFSET }, + { BFD_RELOC_V850_CALLT_16_16_OFFSET, R_V850_CALLT_16_16_OFFSET }, + { BFD_RELOC_VTABLE_INHERIT, R_V850_GNU_VTINHERIT }, + { BFD_RELOC_VTABLE_ENTRY, R_V850_GNU_VTENTRY }, + }; /* Map a bfd relocation into the appropriate howto structure */ static reloc_howto_type * v850_elf_reloc_type_lookup (abfd, code) - bfd *abfd; - bfd_reloc_code_real_type code; + bfd * abfd ATTRIBUTE_UNUSED; + bfd_reloc_code_real_type code; { unsigned int i; @@ -424,7 +518,7 @@ v850_elf_reloc_type_lookup (abfd, code) if (v850_elf_reloc_map[i].bfd_reloc_val == code) { BFD_ASSERT (v850_elf_howto_table[v850_elf_reloc_map[i].elf_reloc_val].type == v850_elf_reloc_map[i].elf_reloc_val); - + return & v850_elf_howto_table[v850_elf_reloc_map[i].elf_reloc_val]; } } @@ -436,9 +530,23 @@ v850_elf_reloc_type_lookup (abfd, code) /* Set the howto pointer for an V850 ELF reloc. */ static void v850_elf_info_to_howto_rel (abfd, cache_ptr, dst) - bfd *abfd; - arelent *cache_ptr; - Elf32_Internal_Rel *dst; + bfd * abfd ATTRIBUTE_UNUSED; + arelent * cache_ptr; + Elf32_Internal_Rel * dst; +{ + unsigned int r_type; + + r_type = ELF32_R_TYPE (dst->r_info); + BFD_ASSERT (r_type < (unsigned int) R_V850_max); + cache_ptr->howto = &v850_elf_howto_table[r_type]; +} + +/* Set the howto pointer for a V850 ELF reloc (type RELA). */ +static void +v850_elf_info_to_howto_rela (abfd, cache_ptr, dst) + bfd * abfd ATTRIBUTE_UNUSED; + arelent * cache_ptr; + Elf32_Internal_Rela *dst; { unsigned int r_type; @@ -454,10 +562,10 @@ v850_elf_info_to_howto_rel (abfd, cache_ptr, dst) static boolean v850_elf_check_relocs (abfd, info, sec, relocs) - bfd *abfd; - struct bfd_link_info *info; - asection *sec; - const Elf_Internal_Rela *relocs; + bfd * abfd; + struct bfd_link_info * info; + asection * sec; + const Elf_Internal_Rela * relocs; { boolean ret = true; bfd *dynobj; @@ -466,7 +574,7 @@ v850_elf_check_relocs (abfd, info, sec, relocs) const Elf_Internal_Rela *rel; const Elf_Internal_Rela *rel_end; asection *sreloc; - enum reloc_type r_type; + enum v850_reloc_type r_type; int other = 0; const char *common = (const char *)0; @@ -496,7 +604,7 @@ v850_elf_check_relocs (abfd, info, sec, relocs) else h = sym_hashes[r_symndx - symtab_hdr->sh_info]; - r_type = (enum reloc_type) ELF32_R_TYPE (rel->r_info); + r_type = (enum v850_reloc_type) ELF32_R_TYPE (rel->r_info); switch (r_type) { default: @@ -509,30 +617,40 @@ v850_elf_check_relocs (abfd, info, sec, relocs) case R_V850_32: case R_V850_16: case R_V850_8: + case R_V850_CALLT_6_7_OFFSET: + case R_V850_CALLT_16_16_OFFSET: break; -/* start-sanitize-v850e */ + /* This relocation describes the C++ object vtable hierarchy. + Reconstruct it for later use during GC. */ + case R_V850_GNU_VTINHERIT: + if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset)) + return false; + break; + + /* This relocation describes which C++ vtable entries are actually + used. Record for later use during GC. */ + case R_V850_GNU_VTENTRY: + if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend)) + return false; + break; + case R_V850_SDA_16_16_SPLIT_OFFSET: -/* end-sanitize-v850e */ case R_V850_SDA_16_16_OFFSET: case R_V850_SDA_15_16_OFFSET: other = V850_OTHER_SDA; common = ".scommon"; goto small_data_common; - -/* start-sanitize-v850e */ + case R_V850_ZDA_16_16_SPLIT_OFFSET: -/* end-sanitize-v850e */ case R_V850_ZDA_16_16_OFFSET: case R_V850_ZDA_15_16_OFFSET: other = V850_OTHER_ZDA; common = ".zcommon"; goto small_data_common; - -/* start-sanitize-v850e */ + case R_V850_TDA_4_5_OFFSET: case R_V850_TDA_4_4_OFFSET: -/* end-sanitize-v850e */ case R_V850_TDA_6_8_OFFSET: case R_V850_TDA_7_8_OFFSET: case R_V850_TDA_7_7_OFFSET: @@ -550,29 +668,31 @@ v850_elf_check_relocs (abfd, info, sec, relocs) if ((h->other & V850_OTHER_MASK) != (other & V850_OTHER_MASK) && (h->other & V850_OTHER_ERROR) == 0) { - const char *msg; + const char * msg; + static char buff[200]; /* XXX */ switch (h->other & V850_OTHER_MASK) { default: - msg = "Variable cannot occupy in multiple small data regions"; + msg = _("Variable `%s' cannot occupy in multiple small data regions"); break; case V850_OTHER_SDA | V850_OTHER_ZDA | V850_OTHER_TDA: - msg = "Variable can only be in one of the small, zero, and tiny data regions"; + msg = _("Variable `%s' can only be in one of the small, zero, and tiny data regions"); break; case V850_OTHER_SDA | V850_OTHER_ZDA: - msg = "Variable cannot be in both small and zero data regions simultaneously"; + msg = _("Variable `%s' cannot be in both small and zero data regions simultaneously"); break; case V850_OTHER_SDA | V850_OTHER_TDA: - msg = "Variable cannot be in both small and tiny data regions simultaneously"; + msg = _("Variable `%s' cannot be in both small and tiny data regions simultaneously"); break; case V850_OTHER_ZDA | V850_OTHER_TDA: - msg = "Variable cannot be in both zero and tiny data regions simultaneously"; + msg = _("Variable `%s' cannot be in both zero and tiny data regions simultaneously"); break; } - (*info->callbacks->warning) (info, msg, h->root.root.string, - abfd, h->root.u.def.section, 0); + sprintf (buff, msg, h->root.root.string); + info->callbacks->warning (info, buff, h->root.root.string, + abfd, h->root.u.def.section, 0); bfd_set_error (bfd_error_bad_value); h->other |= V850_OTHER_ERROR; @@ -601,253 +721,611 @@ v850_elf_check_relocs (abfd, info, sec, relocs) return ret; } - -/* Insert the addend into the instruction. */ -static bfd_reloc_status_type -v850_elf_reloc (abfd, reloc, symbol, data, isection, obfd, err) - bfd * abfd; - arelent * reloc; - asymbol * symbol; - PTR data; - asection * isection; - bfd * obfd; - char ** err; +/* + * In the old version, when an entry was checked out from the table, + * it was deleted. This produced an error if the entry was needed + * more than once, as the second attempted retry failed. + * + * In the current version, the entry is not deleted, instead we set + * the field 'found' to true. If a second lookup matches the same + * entry, then we know that the hi16s reloc has already been updated + * and does not need to be updated a second time. + * + * TODO - TOFIX: If it is possible that we need to restore 2 different + * addresses from the same table entry, where the first generates an + * overflow, whilst the second do not, then this code will fail. + */ + +typedef struct hi16s_location { - long relocation; - long insn; + bfd_vma addend; + bfd_byte * address; + unsigned long counter; + boolean found; + struct hi16s_location * next; +} +hi16s_location; - - /* If there is an output BFD, - and the symbol is not a section name (which is only defined at final link time), - and either we are not putting the addend into the instruction - or the addend is zero, so there is nothing to add into the instruction - then just fixup the address and return. */ - if (obfd != (bfd *) NULL - && (symbol->flags & BSF_SECTION_SYM) == 0 - && (! reloc->howto->partial_inplace - || reloc->addend == 0)) - { - reloc->address += isection->output_offset; - return bfd_reloc_ok; - } -#if 0 - else if (obfd != NULL) +static hi16s_location * previous_hi16s; +static hi16s_location * free_hi16s; +static unsigned long hi16s_counter; + +static void +remember_hi16s_reloc (abfd, addend, address) + bfd * abfd; + bfd_vma addend; + bfd_byte * address; +{ + hi16s_location * entry = NULL; + + /* Find a free structure. */ + if (free_hi16s == NULL) + free_hi16s = (hi16s_location *) bfd_zalloc (abfd, sizeof (* free_hi16s)); + + entry = free_hi16s; + free_hi16s = free_hi16s->next; + + entry->addend = addend; + entry->address = address; + entry->counter = hi16s_counter ++; + entry->found = false; + entry->next = previous_hi16s; + previous_hi16s = entry; + + /* Cope with wrap around of our counter. */ + if (hi16s_counter == 0) { - return bfd_reloc_continue; + /* XXX - Assume that all counter entries differ only in their low 16 bits. */ + for (entry = previous_hi16s; entry != NULL; entry = entry->next) + entry->counter &= 0xffff; + + hi16s_counter = 0x10000; } -#endif - - /* Catch relocs involving undefined symbols. */ - if (bfd_is_und_section (symbol->section) - && (symbol->flags & BSF_WEAK) == 0 - && obfd == NULL) - return bfd_reloc_undefined; - /* We handle final linking of some relocs ourselves. */ + return; +} - /* Is the address of the relocation really within the section? */ - if (reloc->address > isection->_cooked_size) - return bfd_reloc_outofrange; - - /* Work out which section the relocation is targetted at and the - initial relocation command value. */ - - /* Get symbol value. (Common symbols are special.) */ - if (bfd_is_com_section (symbol->section)) - relocation = 0; - else - relocation = symbol->value; - - /* Convert input-section-relative symbol value to absolute + addend. */ - relocation += symbol->section->output_section->vma; - relocation += symbol->section->output_offset; - relocation += reloc->addend; - - if (reloc->howto->pc_relative == true) +static bfd_byte * +find_remembered_hi16s_reloc (addend, already_found) + bfd_vma addend; + boolean * already_found; +{ + hi16s_location * match = NULL; + hi16s_location * entry; + hi16s_location * previous = NULL; + hi16s_location * prev; + bfd_byte * addr; + + /* Search the table. Record the most recent entry that matches. */ + for (entry = previous_hi16s; entry; entry = entry->next) { - /* Here the variable relocation holds the final address of the - symbol we are relocating against, plus any addend. */ - relocation -= isection->output_section->vma + isection->output_offset; - - /* Deal with pcrel_offset */ - relocation -= reloc->address; + if (entry->addend == addend + && (match == NULL || match->counter < entry->counter)) + { + previous = prev; + match = entry; + } + + prev = entry; } - - /* I've got no clue... */ - reloc->addend = 0; - - switch (reloc->howto->type) + + if (match == NULL) + return NULL; + + /* Extract the address. */ + addr = match->address; + + /* Remeber if this entry has already been used before. */ + if (already_found) + * already_found = match->found; + + /* Note that this entry has now been used. */ + match->found = true; + + return addr; +} + +/* FIXME: The code here probably ought to be removed and the code in reloc.c + allowed to do its stuff instead. At least for most of the relocs, anwyay. */ +static bfd_reloc_status_type +v850_elf_perform_relocation (abfd, r_type, addend, address) + bfd * abfd; + int r_type; + bfd_vma addend; + bfd_byte * address; +{ + unsigned long insn; + bfd_signed_vma saddend = (bfd_signed_vma) addend; + + switch (r_type) { default: - /* fprintf (stderr, "reloc type %d not SUPPORTED\n", reloc->howto->type ); */ + /* fprintf (stderr, "reloc type %d not SUPPORTED\n", r_type ); */ return bfd_reloc_notsupported; - + + case R_V850_32: + bfd_put_32 (abfd, addend, address); + return bfd_reloc_ok; + case R_V850_22_PCREL: - if (relocation > 0x1ffff || relocation < -0x200000) + if (saddend > 0x1fffff || saddend < -0x200000) return bfd_reloc_overflow; - - if ((relocation % 2) != 0) + + if ((addend % 2) != 0) return bfd_reloc_dangerous; - - insn = bfd_get_32 (abfd, (bfd_byte *) data + reloc->address); + + insn = bfd_get_32 (abfd, address); insn &= ~0xfffe003f; - insn |= (((relocation & 0xfffe) << 16) - | ((relocation & 0x3f0000) >> 16)); - bfd_put_32 (abfd, insn, (bfd_byte *)data + reloc->address); + insn |= (((addend & 0xfffe) << 16) | ((addend & 0x3f0000) >> 16)); + bfd_put_32 (abfd, insn, address); return bfd_reloc_ok; - + case R_V850_9_PCREL: - if (relocation > 0xff || relocation < -0x100) + if (saddend > 0xff || saddend < -0x100) return bfd_reloc_overflow; - - if ((relocation % 2) != 0) + + if ((addend % 2) != 0) return bfd_reloc_dangerous; - - insn = bfd_get_16 (abfd, (bfd_byte *) data + reloc->address); + + insn = bfd_get_16 (abfd, address); insn &= ~ 0xf870; - insn |= ((relocation & 0x1f0) << 7) | ((relocation & 0x0e) << 3); - bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address); - return bfd_reloc_ok; - - case R_V850_HI16_S: - relocation += bfd_get_16 (abfd, (bfd_byte *) data + reloc->address); - relocation = (relocation >> 16) + ((relocation & 0x8000) != 0); - bfd_put_16 (abfd, relocation, (bfd_byte *)data + reloc->address); - return bfd_reloc_ok; - + insn |= ((addend & 0x1f0) << 7) | ((addend & 0x0e) << 3); + break; + case R_V850_HI16: - relocation += bfd_get_16 (abfd, (bfd_byte *) data + reloc->address); - relocation = (relocation >> 16); - bfd_put_16 (abfd, relocation, (bfd_byte *)data + reloc->address); - return bfd_reloc_ok; - + addend += (bfd_get_16 (abfd, address) << 16); + addend = (addend >> 16); + insn = addend; + break; + + case R_V850_HI16_S: + /* Remember where this relocation took place. */ + remember_hi16s_reloc (abfd, addend, address); + + addend += (bfd_get_16 (abfd, address) << 16); + addend = (addend >> 16) + ((addend & 0x8000) != 0); + + /* This relocation cannot overflow. */ + if (addend > 0x7fff) + addend = 0; + + insn = addend; + break; + case R_V850_LO16: - relocation += (short)bfd_get_16 (abfd, (bfd_byte *) data + reloc->address); - /* Do not complain if value has top bit set, as this has been anticipated. */ - bfd_put_16 (abfd, relocation, (bfd_byte *)data + reloc->address); + /* Calculate the sum of the value stored in the instruction and the + addend and check for overflow from the low 16 bits into the high + 16 bits. The assembler has already done some of this: If the + value stored in the instruction has its 15th bit set, (counting + from zero) then the assembler will have added 1 to the value + stored in the associated HI16S reloc. So for example, these + relocations: + + movhi hi( fred ), r0, r1 + movea lo( fred ), r1, r1 + + will store 0 in the value fields for the MOVHI and MOVEA instructions + and addend will be the address of fred, but for these instructions: + + movhi hi( fred + 0x123456), r0, r1 + movea lo( fred + 0x123456), r1, r1 + + the value stored in the MOVHI instruction will be 0x12 and the value + stored in the MOVEA instruction will be 0x3456. If however the + instructions were: + + movhi hi( fred + 0x10ffff), r0, r1 + movea lo( fred + 0x10ffff), r1, r1 + + then the value stored in the MOVHI instruction would be 0x11 (not + 0x10) and the value stored in the MOVEA instruction would be 0xffff. + Thus (assuming for the moment that the addend is 0), at run time the + MOVHI instruction loads 0x110000 into r1, then the MOVEA instruction + adds 0xffffffff (sign extension!) producing 0x10ffff. Similarly if + the instructions were: + + movhi hi( fred - 1), r0, r1 + movea lo( fred - 1), r1, r1 + + then 0 is stored in the MOVHI instruction and -1 is stored in the + MOVEA instruction. + + Overflow can occur if the addition of the value stored in the + instruction plus the addend sets the 15th bit when before it was clear. + This is because the 15th bit will be sign extended into the high part, + thus reducing its value by one, but since the 15th bit was originally + clear, the assembler will not have added 1 to the previous HI16S reloc + to compensate for this effect. For example: + + movhi hi( fred + 0x123456), r0, r1 + movea lo( fred + 0x123456), r1, r1 + + The value stored in HI16S reloc is 0x12, the value stored in the LO16 + reloc is 0x3456. If we assume that the address of fred is 0x00007000 + then the relocations become: + + HI16S: 0x0012 + (0x00007000 >> 16) = 0x12 + LO16: 0x3456 + (0x00007000 & 0xffff) = 0xa456 + + but when the instructions are executed, the MOVEA instruction's value + is signed extended, so the sum becomes: + + 0x00120000 + + 0xffffa456 + ------------ + 0x0011a456 but 'fred + 0x123456' = 0x0012a456 + + Note that if the 15th bit was set in the value stored in the LO16 + reloc, then we do not have to do anything: + + movhi hi( fred + 0x10ffff), r0, r1 + movea lo( fred + 0x10ffff), r1, r1 + + HI16S: 0x0011 + (0x00007000 >> 16) = 0x11 + LO16: 0xffff + (0x00007000 & 0xffff) = 0x6fff + + 0x00110000 + + 0x00006fff + ------------ + 0x00116fff = fred + 0x10ffff = 0x7000 + 0x10ffff + + Overflow can also occur if the computation carries into the 16th bit + and it also results in the 15th bit having the same value as the 15th + bit of the original value. What happens is that the HI16S reloc + will have already examined the 15th bit of the original value and + added 1 to the high part if the bit is set. This compensates for the + sign extension of 15th bit of the result of the computation. But now + there is a carry into the 16th bit, and this has not been allowed for. + + So, for example if fred is at address 0xf000: + + movhi hi( fred + 0xffff), r0, r1 [bit 15 of the offset is set] + movea lo( fred + 0xffff), r1, r1 + + HI16S: 0x0001 + (0x0000f000 >> 16) = 0x0001 + LO16: 0xffff + (0x0000f000 & 0xffff) = 0xefff (carry into bit 16 is lost) + + 0x00010000 + + 0xffffefff + ------------ + 0x0000efff but 'fred + 0xffff' = 0x0001efff + + Similarly, if the 15th bit remains clear, but overflow occurs into + the 16th bit then (assuming the address of fred is 0xf000): + + movhi hi( fred + 0x7000), r0, r1 [bit 15 of the offset is clear] + movea lo( fred + 0x7000), r1, r1 + + HI16S: 0x0000 + (0x0000f000 >> 16) = 0x0000 + LO16: 0x7000 + (0x0000f000 & 0xffff) = 0x6fff (carry into bit 16 is lost) + + 0x00000000 + + 0x00006fff + ------------ + 0x00006fff but 'fred + 0x7000' = 0x00016fff + + Note - there is no need to change anything if a carry occurs, and the + 15th bit changes its value from being set to being clear, as the HI16S + reloc will have already added in 1 to the high part for us: + + movhi hi( fred + 0xffff), r0, r1 [bit 15 of the offset is set] + movea lo( fred + 0xffff), r1, r1 + + HI16S: 0x0001 + (0x00007000 >> 16) + LO16: 0xffff + (0x00007000 & 0xffff) = 0x6fff (carry into bit 16 is lost) + + 0x00010000 + + 0x00006fff (bit 15 not set, so the top half is zero) + ------------ + 0x00016fff which is right (assuming that fred is at 0x7000) + + but if the 15th bit goes from being clear to being set, then we must + once again handle overflow: + + movhi hi( fred + 0x7000), r0, r1 [bit 15 of the offset is clear] + movea lo( fred + 0x7000), r1, r1 + + HI16S: 0x0000 + (0x0000ffff >> 16) + LO16: 0x7000 + (0x0000ffff & 0xffff) = 0x6fff (carry into bit 16) + + 0x00000000 + + 0x00006fff (bit 15 not set, so the top half is zero) + ------------ + 0x00006fff which is wrong (assuming that fred is at 0xffff) + */ + + { + long result; + + insn = bfd_get_16 (abfd, address); + result = insn + addend; + +#define BIT15_SET(x) ((x) & 0x8000) +#define OVERFLOWS(a,i) ((((a) & 0xffff) + (i)) > 0xffff) + + if ((BIT15_SET (result) && ! BIT15_SET (addend)) + || (OVERFLOWS (addend, insn) + && ((! BIT15_SET (insn)) || (BIT15_SET (addend))))) + { + boolean already_updated; + bfd_byte * hi16s_address = find_remembered_hi16s_reloc + (addend, & already_updated); + + /* Amend the matching HI16_S relocation. */ + if (hi16s_address != NULL) + { + if (! already_updated) + { + insn = bfd_get_16 (abfd, hi16s_address); + insn += 1; + bfd_put_16 (abfd, insn, hi16s_address); + } + } + else + { + fprintf (stderr, _("FAILED to find previous HI16 reloc\n")); + return bfd_reloc_overflow; + } + } + + /* Do not complain if value has top bit set, as this has been anticipated. */ + insn = result & 0xffff; + break; + } + + case R_V850_8: + addend += (char) bfd_get_8 (abfd, address); + + saddend = (bfd_signed_vma) addend; + + if (saddend > 0x7f || saddend < -0x80) + return bfd_reloc_overflow; + + bfd_put_8 (abfd, addend, address); return bfd_reloc_ok; + case R_V850_CALLT_16_16_OFFSET: + addend += bfd_get_16 (abfd, address); + + saddend = (bfd_signed_vma) addend; + + if (saddend > 0xffff || saddend < 0) + return bfd_reloc_overflow; + + insn = addend; + break; + case R_V850_16: - relocation += (short)bfd_get_16 (abfd, (bfd_byte *) data + reloc->address); + /* drop through */ - case R_V850_SDA_16_16_OFFSET: case R_V850_ZDA_16_16_OFFSET: case R_V850_TDA_16_16_OFFSET: - if ((long)relocation > 0x7fff || (long)relocation < -0x8000) + addend += bfd_get_16 (abfd, address); + + saddend = (bfd_signed_vma) addend; + + if (saddend > 0x7fff || saddend < -0x8000) return bfd_reloc_overflow; - bfd_put_16 (abfd, relocation, (bfd_byte *)data + reloc->address); - return bfd_reloc_ok; - + + insn = addend; + break; + case R_V850_SDA_15_16_OFFSET: case R_V850_ZDA_15_16_OFFSET: - if ((long)relocation > 0x7ffe || (long)relocation < -0x8000) + insn = bfd_get_16 (abfd, address); + addend += (insn & 0xfffe); + + saddend = (bfd_signed_vma) addend; + + if (saddend > 0x7ffe || saddend < -0x8000) return bfd_reloc_overflow; - - if (relocation & 1) - return bfd_reloc_dangerous; - - insn = bfd_get_16 (abfd, (bfd_byte *) data + reloc->address); - insn &= 1; - insn |= (relocation >> 1) & ~1; - - bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address); - return bfd_reloc_ok; - + + if (addend & 1) + return bfd_reloc_dangerous; + + insn = (addend & ~1) | (insn & 1); + break; + case R_V850_TDA_6_8_OFFSET: - if ((long) relocation > 0xfc || (long) relocation < 0) + insn = bfd_get_16 (abfd, address); + addend += ((insn & 0x7e) << 1); + + saddend = (bfd_signed_vma) addend; + + if (saddend > 0xfc || saddend < 0) return bfd_reloc_overflow; - - if (relocation & 3) + + if (addend & 3) return bfd_reloc_dangerous; - - insn = bfd_get_16 (abfd, (bfd_byte *) data + reloc->address); + insn &= 0xff81; - insn |= (relocation >> 1); - - bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address); - return bfd_reloc_ok; - + insn |= (addend >> 1); + break; + case R_V850_TDA_7_8_OFFSET: - if ((long) relocation > 0xfe || (long) relocation < 0) + insn = bfd_get_16 (abfd, address); + addend += ((insn & 0x7f) << 1); + + saddend = (bfd_signed_vma) addend; + + if (saddend > 0xfe || saddend < 0) return bfd_reloc_overflow; - - if (relocation & 1) + + if (addend & 1) return bfd_reloc_dangerous; - - insn = bfd_get_16 (abfd, (bfd_byte *) data + reloc->address); + insn &= 0xff80; - insn |= (relocation >> 1); - - bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address); - return bfd_reloc_ok; - + insn |= (addend >> 1); + break; + case R_V850_TDA_7_7_OFFSET: - if ((long) relocation > 0x7f || (long) relocation < 0) + insn = bfd_get_16 (abfd, address); + addend += insn & 0x7f; + + saddend = (bfd_signed_vma) addend; + + if (saddend > 0x7f || saddend < 0) return bfd_reloc_overflow; - - insn = bfd_get_16 (abfd, (bfd_byte *) data + reloc->address); + insn &= 0xff80; - insn |= relocation; - - bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address); - return bfd_reloc_ok; - -/* start-sanitize-v850e */ + insn |= addend; + break; + case R_V850_TDA_4_5_OFFSET: - if ((long) relocation > 0x1e || (long) relocation < 0) + insn = bfd_get_16 (abfd, address); + addend += ((insn & 0xf) << 1); + + saddend = (bfd_signed_vma) addend; + + if (saddend > 0x1e || saddend < 0) return bfd_reloc_overflow; - - if (relocation & 1) + + if (addend & 1) return bfd_reloc_dangerous; - - insn = bfd_get_16 (abfd, (bfd_byte *) data + reloc->address); + insn &= 0xfff0; - insn |= (relocation >> 1); - - bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address); - return bfd_reloc_ok; - + insn |= (addend >> 1); + break; + case R_V850_TDA_4_4_OFFSET: - if ((long) relocation > 0xf || (long) relocation < 0) + insn = bfd_get_16 (abfd, address); + addend += insn & 0xf; + + saddend = (bfd_signed_vma) addend; + + if (saddend > 0xf || saddend < 0) return bfd_reloc_overflow; - - insn = bfd_get_16 (abfd, (bfd_byte *) data + reloc->address); + insn &= 0xfff0; - insn |= relocation; - - bfd_put_16 (abfd, insn, (bfd_byte *)data + reloc->address); - return bfd_reloc_ok; - + insn |= addend; + break; + case R_V850_ZDA_16_16_SPLIT_OFFSET: case R_V850_SDA_16_16_SPLIT_OFFSET: - if ((long) relocation > 0xffff || (long) relocation < 0) + insn = bfd_get_32 (abfd, address); + addend += ((insn & 0xfffe0000) >> 16) + ((insn & 0x20) >> 5); + + saddend = (bfd_signed_vma) addend; + + if (saddend > 0x7fff || saddend < -0x8000) return bfd_reloc_overflow; - - insn = bfd_get_32 (abfd, (bfd_byte *) data + reloc->address); - + insn &= 0x0001ffdf; - insn |= (relocation & 1) << 5; - insn |= (relocation & ~1) << 16; - - bfd_put_32 (abfd, insn, (bfd_byte *)data + reloc->address); + insn |= (addend & 1) << 5; + insn |= (addend & ~1) << 16; + + bfd_put_32 (abfd, insn, address); return bfd_reloc_ok; -/* end-sanitize-v850e */ - } - return bfd_reloc_continue; -} + case R_V850_CALLT_6_7_OFFSET: + insn = bfd_get_16 (abfd, address); + addend += ((insn & 0x3f) << 1); - -/*ARGSUSED*/ -static boolean -v850_elf_is_local_label_name (abfd, name) - bfd *abfd; - const char *name; + saddend = (bfd_signed_vma) addend; + + if (saddend > 0x7e || saddend < 0) + return bfd_reloc_overflow; + + if (addend & 1) + return bfd_reloc_dangerous; + + insn &= 0xff80; + insn |= (addend >> 1); + break; + + case R_V850_GNU_VTINHERIT: + case R_V850_GNU_VTENTRY: + return bfd_reloc_ok; + + } + + bfd_put_16 (abfd, insn, address); + return bfd_reloc_ok; +} + + +/* Insert the addend into the instruction. */ +static bfd_reloc_status_type +v850_elf_reloc (abfd, reloc, symbol, data, isection, obfd, err) + bfd * abfd ATTRIBUTE_UNUSED; + arelent * reloc; + asymbol * symbol; + PTR data ATTRIBUTE_UNUSED; + asection * isection; + bfd * obfd; + char ** err ATTRIBUTE_UNUSED; +{ + long relocation; + + /* If there is an output BFD, + and the symbol is not a section name (which is only defined at final link time), + and either we are not putting the addend into the instruction + or the addend is zero, so there is nothing to add into the instruction + then just fixup the address and return. */ + if (obfd != (bfd *) NULL + && (symbol->flags & BSF_SECTION_SYM) == 0 + && (! reloc->howto->partial_inplace + || reloc->addend == 0)) + { + reloc->address += isection->output_offset; + return bfd_reloc_ok; + } +#if 0 + else if (obfd != NULL) + { + return bfd_reloc_continue; + } +#endif + + /* Catch relocs involving undefined symbols. */ + if (bfd_is_und_section (symbol->section) + && (symbol->flags & BSF_WEAK) == 0 + && obfd == NULL) + return bfd_reloc_undefined; + + /* We handle final linking of some relocs ourselves. */ + + /* Is the address of the relocation really within the section? */ + if (reloc->address > isection->_cooked_size) + return bfd_reloc_outofrange; + + /* Work out which section the relocation is targetted at and the + initial relocation command value. */ + + /* Get symbol value. (Common symbols are special.) */ + if (bfd_is_com_section (symbol->section)) + relocation = 0; + else + relocation = symbol->value; + + /* Convert input-section-relative symbol value to absolute + addend. */ + relocation += symbol->section->output_section->vma; + relocation += symbol->section->output_offset; + relocation += reloc->addend; + + if (reloc->howto->pc_relative == true) + { + /* Here the variable relocation holds the final address of the + symbol we are relocating against, plus any addend. */ + relocation -= isection->output_section->vma + isection->output_offset; + + /* Deal with pcrel_offset */ + relocation -= reloc->address; + } + + reloc->addend = relocation; + return bfd_reloc_ok; +} + + +static boolean +v850_elf_is_local_label_name (abfd, name) + bfd * abfd ATTRIBUTE_UNUSED; + const char * name; { - return ((name[0] == '.' && (name[1] == 'L' || name[1] == '.')) - || (name[0] == '_' && name[1] == '.' && name[2] == 'L' - && name[3] == '_')); + return ( (name[0] == '.' && (name[1] == 'L' || name[1] == '.')) + || (name[0] == '_' && name[1] == '.' && name[2] == 'L' && name[3] == '_')); } @@ -858,7 +1336,7 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd, addend, info, sym_sec, is_local) reloc_howto_type * howto; bfd * input_bfd; - bfd * output_bfd; + bfd * output_bfd ATTRIBUTE_UNUSED; asection * input_section; bfd_byte * contents; bfd_vma offset; @@ -866,165 +1344,58 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd, bfd_vma addend; struct bfd_link_info * info; asection * sym_sec; - int is_local; + int is_local ATTRIBUTE_UNUSED; { - unsigned long insn; unsigned long r_type = howto->type; bfd_byte * hit_data = contents + offset; + /* Adjust the value according to the relocation. */ switch (r_type) { case R_V850_9_PCREL: value -= (input_section->output_section->vma + input_section->output_offset); value -= offset; + break; - if ((long)value > 0xff || (long)value < -0x100) - return bfd_reloc_overflow; - - if ((value % 2) != 0) - return bfd_reloc_dangerous; - - insn = bfd_get_16 (input_bfd, hit_data); - insn &= 0x078f; - insn |= ((value & 0x1f0) << 7) | ((value & 0x0e) << 3); - bfd_put_16 (input_bfd, insn, hit_data); - return bfd_reloc_ok; - case R_V850_22_PCREL: value -= (input_section->output_section->vma - + input_section->output_offset); - value -= offset; - - if ((long)value > 0x1ffff || (long)value < -0x200000) - return bfd_reloc_overflow; - - if ((value % 2) != 0) - return bfd_reloc_dangerous; - - insn = bfd_get_32 (input_bfd, hit_data); - insn &= 0x1ffc0; - insn |= (((value & 0xfffe) << 16) | ((value & 0x3f0000) >> 16)); - bfd_put_32 (input_bfd, insn, hit_data); - return bfd_reloc_ok; - - case R_V850_HI16_S: - value += (short)bfd_get_16 (input_bfd, hit_data); - value = (value >> 16) + ((value & 0x8000) != 0); + + input_section->output_offset + + offset); - if ((long)value > 0x7fff || (long)value < -0x8000) + /* If the sign extension will corrupt the value then we have overflowed. */ + if (((value & 0xff000000) != 0x0) && ((value & 0xff000000) != 0xff000000)) return bfd_reloc_overflow; - bfd_put_16 (input_bfd, value, hit_data); - return bfd_reloc_ok; + value = SEXT24 (value); /* Only the bottom 24 bits of the PC are valid */ + break; + case R_V850_HI16_S: case R_V850_HI16: - value += (short)bfd_get_16 (input_bfd, hit_data); - value >>= 16; - - if ((long)value > 0x7fff || (long)value < -0x8000) - return bfd_reloc_overflow; - - bfd_put_16 (input_bfd, value, hit_data); - return bfd_reloc_ok; - case R_V850_LO16: - value += (short)bfd_get_16 (input_bfd, hit_data); - value &= 0xffff; - - bfd_put_16 (input_bfd, value, hit_data); - return bfd_reloc_ok; - case R_V850_16: - value += (short) bfd_get_16 (input_bfd, hit_data); - - if ((long) value > 0x7fff || (long) value < -0x8000) - return bfd_reloc_overflow; - - bfd_put_16 (input_bfd, value, hit_data); - return bfd_reloc_ok; + case R_V850_32: + case R_V850_8: + break; + case R_V850_ZDA_15_16_OFFSET: case R_V850_ZDA_16_16_OFFSET: + case R_V850_ZDA_16_16_SPLIT_OFFSET: if (sym_sec == NULL) return bfd_reloc_undefined; - - value -= sym_sec->output_section->vma; - value += (short) bfd_get_16 (input_bfd, hit_data); - - if ((long) value > 0x7fff || (long) value < -0x8000) - return bfd_reloc_overflow; - - bfd_put_16 (input_bfd, value, hit_data); - return bfd_reloc_ok; - - case R_V850_ZDA_15_16_OFFSET: - if (sym_sec == NULL) - return bfd_reloc_undefined; - - insn = bfd_get_16 (input_bfd, hit_data); value -= sym_sec->output_section->vma; - value += ((insn & 0xfffe) << 1); - - if ((long) value > 0x7ffe || (long) value < -0x8000) - return bfd_reloc_overflow; - - value &= ~1; - value |= (insn & 1); - - bfd_put_16 (input_bfd, value, hit_data); - return bfd_reloc_ok; - - case R_V850_32: - value += bfd_get_32 (input_bfd, hit_data); - bfd_put_32 (input_bfd, value, hit_data); - return bfd_reloc_ok; - - case R_V850_8: - value += (char)bfd_get_8 (input_bfd, hit_data); - - if ((long)value > 0x7f || (long)value < -0x80) - return bfd_reloc_overflow; - - bfd_put_8 (input_bfd, value, hit_data); - return bfd_reloc_ok; + break; + case R_V850_SDA_15_16_OFFSET: case R_V850_SDA_16_16_OFFSET: - if (sym_sec == NULL) - return bfd_reloc_undefined; - + case R_V850_SDA_16_16_SPLIT_OFFSET: { unsigned long gp; struct bfd_link_hash_entry * h; - /* Get the value of __gp. */ - h = bfd_link_hash_lookup (info->hash, "__gp", false, false, true); - if (h == (struct bfd_link_hash_entry *) NULL - || h->type != bfd_link_hash_defined) - return bfd_reloc_other; - - gp = (h->u.def.value - + h->u.def.section->output_section->vma - + h->u.def.section->output_offset); - - value -= sym_sec->output_section->vma; - value -= (gp - sym_sec->output_section->vma); - value += (short) bfd_get_16 (input_bfd, hit_data); - - if ((long)value > 0x7fff || (long)value < -0x8000) - return bfd_reloc_overflow; - - bfd_put_16 (input_bfd, value, hit_data); - return bfd_reloc_ok; - } - - case R_V850_SDA_15_16_OFFSET: - if (sym_sec == NULL) - return bfd_reloc_undefined; - - { - unsigned long gp; - struct bfd_link_hash_entry * h; + if (sym_sec == NULL) + return bfd_reloc_undefined; /* Get the value of __gp. */ h = bfd_link_hash_lookup (info->hash, "__gp", false, false, true); @@ -1035,266 +1406,88 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd, gp = (h->u.def.value + h->u.def.section->output_section->vma + h->u.def.section->output_offset); - + value -= sym_sec->output_section->vma; value -= (gp - sym_sec->output_section->vma); - - insn = bfd_get_16 (input_bfd, hit_data); - - value += ((insn & 0xfffe) << 1); - - if ((long)value > 0x7ffe || (long)value < -0x8000) - return bfd_reloc_overflow; - - value &= ~1; - value |= (insn & 1); - - bfd_put_16 (input_bfd, value, hit_data); - return bfd_reloc_ok; } + break; + case R_V850_TDA_4_4_OFFSET: + case R_V850_TDA_4_5_OFFSET: + case R_V850_TDA_16_16_OFFSET: + case R_V850_TDA_7_7_OFFSET: + case R_V850_TDA_7_8_OFFSET: case R_V850_TDA_6_8_OFFSET: { unsigned long ep; struct bfd_link_hash_entry * h; - - insn = bfd_get_16 (input_bfd, hit_data); /* Get the value of __ep. */ h = bfd_link_hash_lookup (info->hash, "__ep", false, false, true); if (h == (struct bfd_link_hash_entry *) NULL || h->type != bfd_link_hash_defined) - return bfd_reloc_continue; /* Actually this indicates that __ep could not be found. */ + return bfd_reloc_continue; /* Actually this indicates that __ep could not be found. */ ep = (h->u.def.value + h->u.def.section->output_section->vma + h->u.def.section->output_offset); value -= ep; - value += ((insn & 0x7e) << 2); - - if ((long) value > 0xfc || (long) value < 0) - return bfd_reloc_overflow; - - if ((value % 2) != 0) - return bfd_reloc_dangerous; - - insn &= 0xff81; - insn |= (value >> 1); - - bfd_put_16 (input_bfd, insn, hit_data); - return bfd_reloc_ok; } - - case R_V850_TDA_7_8_OFFSET: - { - unsigned long ep; - struct bfd_link_hash_entry * h; - - insn = bfd_get_16 (input_bfd, hit_data); - - /* Get the value of __ep. */ - h = bfd_link_hash_lookup (info->hash, "__ep", false, false, true); - if (h == (struct bfd_link_hash_entry *) NULL - || h->type != bfd_link_hash_defined) - return bfd_reloc_continue; /* Actually this indicates that __ep could not be found. */ + break; - ep = (h->u.def.value - + h->u.def.section->output_section->vma - + h->u.def.section->output_offset); - - value -= ep; - value += ((insn & 0x7f) << 1); - - if ((long) value > 0xfe || (long) value < 0) - return bfd_reloc_overflow; - - insn &= 0xff80; - insn |= (value >> 1); - - bfd_put_16 (input_bfd, insn, hit_data); - return bfd_reloc_ok; - } - - case R_V850_TDA_7_7_OFFSET: + case R_V850_CALLT_6_7_OFFSET: { - unsigned long ep; + unsigned long ctbp; struct bfd_link_hash_entry * h; - - insn = bfd_get_16 (input_bfd, hit_data); - /* Get the value of __ep. */ - h = bfd_link_hash_lookup (info->hash, "__ep", false, false, true); + /* Get the value of __ctbp. */ + h = bfd_link_hash_lookup (info->hash, "__ctbp", false, false, true); if (h == (struct bfd_link_hash_entry *) NULL || h->type != bfd_link_hash_defined) - return bfd_reloc_continue; /* Actually this indicates that __ep could not be found. */ + return (bfd_reloc_dangerous + 1); /* Actually this indicates that __ctbp could not be found. */ - ep = (h->u.def.value + ctbp = (h->u.def.value + h->u.def.section->output_section->vma + h->u.def.section->output_offset); - value -= ep; - - value += insn & 0x7f; - - if ((long) value > 0x7f || (long) value < 0) - return bfd_reloc_overflow; - - insn &= 0xff80; - insn |= value; - bfd_put_16 (input_bfd, insn, hit_data); - return bfd_reloc_ok; + value -= ctbp; } - - case R_V850_TDA_16_16_OFFSET: - { - unsigned long ep; - struct bfd_link_hash_entry * h; + break; - /* Get the value of __ep. */ - h = bfd_link_hash_lookup (info->hash, "__ep", false, false, true); - if (h == (struct bfd_link_hash_entry *) NULL - || h->type != bfd_link_hash_defined) - return bfd_reloc_other; - - ep = (h->u.def.value - + h->u.def.section->output_section->vma - + h->u.def.section->output_offset); - value -= ep; - - value += (short) bfd_get_16 (input_bfd, hit_data); - - if ((long)value > 0x7fff || (long)value < -0x8000) - return bfd_reloc_overflow; - - bfd_put_16 (input_bfd, value, hit_data); - return bfd_reloc_ok; - } - -/* start-sanitize-v850e */ - case R_V850_TDA_4_5_OFFSET: + case R_V850_CALLT_16_16_OFFSET: { - unsigned long ep; + unsigned long ctbp; struct bfd_link_hash_entry * h; - - /* Get the value of __ep. */ - h = bfd_link_hash_lookup (info->hash, "__ep", false, false, true); - if (h == (struct bfd_link_hash_entry *) NULL - || h->type != bfd_link_hash_defined) - return bfd_reloc_continue; /* Actually this indicates that __ep could not be found. */ - ep = (h->u.def.value - + h->u.def.section->output_section->vma - + h->u.def.section->output_offset); - value -= ep; - - insn = bfd_get_16 (input_bfd, hit_data); - - value += ((insn & 0xf) << 1); - - if ((long) value > 0x1e || (long) value < 0) - return bfd_reloc_overflow; - - insn &= 0xfff0; - insn |= (value >> 1); - bfd_put_16 (input_bfd, insn, hit_data); - return bfd_reloc_ok; - } - - case R_V850_TDA_4_4_OFFSET: - { - unsigned long ep; - struct bfd_link_hash_entry * h; - - /* Get the value of __ep. */ - h = bfd_link_hash_lookup (info->hash, "__ep", false, false, true); - if (h == (struct bfd_link_hash_entry *) NULL - || h->type != bfd_link_hash_defined) - return bfd_reloc_continue; /* Actually this indicates that __ep could not be found. */ - - ep = (h->u.def.value - + h->u.def.section->output_section->vma - + h->u.def.section->output_offset); - value -= ep; - - insn = bfd_get_16 (input_bfd, hit_data); - - value += insn & 0xf; - - if ((long) value > 0xf || (long) value < 0) - return bfd_reloc_overflow; - - insn &= 0xfff0; - insn |= value; - bfd_put_16 (input_bfd, insn, hit_data); - return bfd_reloc_ok; - } - - case R_V850_SDA_16_16_SPLIT_OFFSET: - if (sym_sec == NULL) - return bfd_reloc_undefined; - - { - unsigned long gp; - struct bfd_link_hash_entry * h; + if (sym_sec == NULL) + return bfd_reloc_undefined; - /* Get the value of __gp. */ - h = bfd_link_hash_lookup (info->hash, "__gp", false, false, true); + /* Get the value of __ctbp. */ + h = bfd_link_hash_lookup (info->hash, "__ctbp", false, false, true); if (h == (struct bfd_link_hash_entry *) NULL || h->type != bfd_link_hash_defined) - return bfd_reloc_other; + return (bfd_reloc_dangerous + 1); - gp = (h->u.def.value + ctbp = (h->u.def.value + h->u.def.section->output_section->vma + h->u.def.section->output_offset); - - value -= sym_sec->output_section->vma; - value -= (gp - sym_sec->output_section->vma); - insn = bfd_get_32 (input_bfd, hit_data); - - value += ((insn & 0xfffe0000) >> 16); - value += ((insn & 0x20) >> 5); - - if ((long)value > 0x7fff || (long)value < -0x8000) - return bfd_reloc_overflow; - - insn &= 0x0001ffdf; - insn |= (value & 1) << 5; - insn |= (value & ~1) << 16; - - bfd_put_32 (input_bfd, insn, hit_data); - return bfd_reloc_ok; + value -= sym_sec->output_section->vma; + value -= (ctbp - sym_sec->output_section->vma); } + break; - case R_V850_ZDA_16_16_SPLIT_OFFSET: - if (sym_sec == NULL) - return bfd_reloc_undefined; - - insn = bfd_get_32 (input_bfd, hit_data); - - value -= sym_sec->output_section->vma; - value += ((insn & 0xfffe0000) >> 16); - value += ((insn & 0x20) >> 5); - - if ((long)value > 0x7fff || (long)value < -0x8000) - return bfd_reloc_overflow; - - insn &= 0x0001ffdf; - insn |= (value & 1) << 5; - insn |= (value & ~1) << 16; - - bfd_put_32 (input_bfd, insn, hit_data); - return bfd_reloc_ok; - -/* end-sanitize-v850e */ - - case R_V850_NONE: + case R_V850_GNU_VTINHERIT: + case R_V850_GNU_VTENTRY: return bfd_reloc_ok; default: return bfd_reloc_notsupported; } + + /* Perform the relocation. */ + return v850_elf_perform_relocation (input_bfd, r_type, value + addend, hit_data); } @@ -1319,6 +1512,19 @@ v850_elf_relocate_section (output_bfd, info, input_bfd, input_section, symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr; sym_hashes = elf_sym_hashes (input_bfd); + if (sym_hashes == NULL) + { + info->callbacks->warning + (info, "no hash table available", NULL, input_bfd, input_section, 0); + + return false; + } + + /* Reset the list of remembered HI16S relocs to empty. */ + free_hi16s = previous_hi16s; + previous_hi16s = NULL; + hi16s_counter = 0; + rel = relocs; relend = relocs + input_section->reloc_count; for (; rel < relend; rel++) @@ -1334,7 +1540,12 @@ v850_elf_relocate_section (output_bfd, info, input_bfd, input_section, r_symndx = ELF32_R_SYM (rel->r_info); r_type = ELF32_R_TYPE (rel->r_info); - howto = v850_elf_howto_table + r_type; + + if (r_type == R_V850_GNU_VTENTRY + || r_type == R_V850_GNU_VTINHERIT) + continue; + + howto = v850_elf_howto_table + r_type; if (info->relocateable) { @@ -1371,19 +1582,20 @@ v850_elf_relocate_section (output_bfd, info, input_bfd, input_section, char * name; name = bfd_elf_string_from_elf_section (input_bfd, symtab_hdr->sh_link, sym->st_name); name = (name == NULL) ? "" : name; -fprintf (stderr, "local: sec: %s, sym: %s (%d), value: %x + %x + %x addend %x rel %x\n", sec->name, name, sym->st_name, - sec->output_section->vma, sec->output_offset, sym->st_value, rel->r_addend, rel); +fprintf (stderr, "local: sec: %s, sym: %s (%d), value: %x + %x + %x addend %x\n", + sec->name, name, sym->st_name, + sec->output_section->vma, sec->output_offset, sym->st_value, rel->r_addend); } #endif } else { 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) { @@ -1391,15 +1603,28 @@ fprintf (stderr, "local: sec: %s, sym: %s (%d), value: %x + %x + %x addend %x re relocation = (h->root.u.def.value + sec->output_section->vma + sec->output_offset); +#if 0 +fprintf (stderr, "defined: sec: %s, name: %s, value: %x + %x + %x gives: %x\n", + sec->name, h->root.root.string, h->root.u.def.value, sec->output_section->vma, sec->output_offset, relocation); +#endif } else if (h->root.type == bfd_link_hash_undefweak) - relocation = 0; + { +#if 0 +fprintf (stderr, "undefined: sec: %s, name: %s\n", + sec->name, h->root.root.string); +#endif + relocation = 0; + } else { if (! ((*info->callbacks->undefined_symbol) (info, h->root.root.string, input_bfd, - input_section, rel->r_offset))) + input_section, rel->r_offset, true))) return false; +#if 0 +fprintf (stderr, "unknown: name: %s\n", h->root.root.string); +#endif relocation = 0; } } @@ -1437,35 +1662,38 @@ fprintf (stderr, "local: sec: %s, sym: %s (%d), value: %x + %x + %x addend %x re break; case bfd_reloc_undefined: - fprintf (stderr, "undef2 %s\n", name ); if (! ((*info->callbacks->undefined_symbol) (info, name, input_bfd, input_section, - rel->r_offset))) + rel->r_offset, true))) return false; break; case bfd_reloc_outofrange: - msg = "internal error: out of range error"; + msg = _("internal error: out of range error"); goto common_error; case bfd_reloc_notsupported: - msg = "internal error: unsupported relocation error"; + msg = _("internal error: unsupported relocation error"); goto common_error; case bfd_reloc_dangerous: - msg = "internal error: dangerous relocation"; + msg = _("internal error: dangerous relocation"); goto common_error; case bfd_reloc_other: - msg = "could not locate special linker symbol __gp"; + msg = _("could not locate special linker symbol __gp"); goto common_error; case bfd_reloc_continue: - msg = "could not locate special linker symbol __ep"; + msg = _("could not locate special linker symbol __ep"); + goto common_error; + + case (bfd_reloc_dangerous + 1): + msg = _("could not locate special linker symbol __ctbp"); goto common_error; default: - msg = "internal error: unknown error"; + msg = _("internal error: unknown error"); /* fall through */ common_error: @@ -1481,6 +1709,60 @@ fprintf (stderr, "local: sec: %s, sym: %s (%d), value: %x + %x + %x addend %x re return true; } +static boolean +v850_elf_gc_sweep_hook (abfd, info, sec, relocs) + bfd *abfd ATTRIBUTE_UNUSED; + struct bfd_link_info *info ATTRIBUTE_UNUSED; + asection *sec ATTRIBUTE_UNUSED; + const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED; +{ + /* No got and plt entries for v850-elf */ + return true; +} + +static asection * +v850_elf_gc_mark_hook (abfd, info, rel, h, sym) + bfd *abfd; + struct bfd_link_info *info ATTRIBUTE_UNUSED; + Elf_Internal_Rela *rel; + struct elf_link_hash_entry *h; + Elf_Internal_Sym *sym; +{ + if (h != NULL) + { + switch (ELF32_R_TYPE (rel->r_info)) + { + case R_V850_GNU_VTINHERIT: + case R_V850_GNU_VTENTRY: + break; + + default: + 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 (abfd) + && 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 (abfd, sym->st_shndx); + } + } + return NULL; +} /* Set the right machine number. */ static boolean v850_elf_object_p (abfd) @@ -1490,20 +1772,17 @@ v850_elf_object_p (abfd) { default: case E_V850_ARCH: (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, 0); break; -/* start-sanitize-v850e */ case E_V850E_ARCH: (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850e); break; -/* end-sanitize-v850e */ -/* start-sanitize-v850eq */ - case E_V850EQ_ARCH: (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850eq); break; -/* end-sanitize-v850eq */ + case E_V850EA_ARCH: (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850ea); break; } + return true; } /* Store the machine number in the flags field. */ -void +static void v850_elf_final_write_processing (abfd, linker) bfd * abfd; - boolean linker; + boolean linker ATTRIBUTE_UNUSED; { unsigned long val; @@ -1511,20 +1790,16 @@ v850_elf_final_write_processing (abfd, linker) { default: case 0: val = E_V850_ARCH; break; -/* start-sanitize-v850e */ - case bfd_mach_v850e: val = E_V850E_ARCH; break; -/* end-sanitize-v850e */ -/* start-sanitize-v850eq */ - case bfd_mach_v850eq: val = E_V850EQ_ARCH; break; -/* end-sanitize-v850eq */ + case bfd_mach_v850e: val = E_V850E_ARCH; break; + case bfd_mach_v850ea: val = E_V850EA_ARCH; break; } elf_elfheader (abfd)->e_flags &=~ EF_V850_ARCH; elf_elfheader (abfd)->e_flags |= val; } -/* Function to keep V850 specific file flags. */ -boolean +/* Function to keep V850 specific file flags. */ +static boolean v850_elf_set_private_flags (abfd, flags) bfd * abfd; flagword flags; @@ -1538,7 +1813,7 @@ v850_elf_set_private_flags (abfd, flags) } /* Copy backend specific data from one object module to another */ -boolean +static boolean v850_elf_copy_private_bfd_data (ibfd, obfd) bfd * ibfd; bfd * obfd; @@ -1559,25 +1834,34 @@ v850_elf_copy_private_bfd_data (ibfd, obfd) /* Merge backend specific data from an object file to the output object file when linking. */ -boolean +static boolean v850_elf_merge_private_bfd_data (ibfd, obfd) bfd * ibfd; bfd * obfd; { - flagword old_flags; - flagword new_flags; + flagword out_flags; + flagword in_flags; if ( bfd_get_flavour (ibfd) != bfd_target_elf_flavour || bfd_get_flavour (obfd) != bfd_target_elf_flavour) return true; - new_flags = elf_elfheader (ibfd)->e_flags; - old_flags = elf_elfheader (obfd)->e_flags; + in_flags = elf_elfheader (ibfd)->e_flags; + out_flags = elf_elfheader (obfd)->e_flags; if (! elf_flags_init (obfd)) { + /* If the input is the default architecture then do not + bother setting the flags for the output architecture, + instead allow future merges to do this. If no future + merges ever set these flags then they will retain their + unitialised values, which surprise surprise, correspond + to the default values. */ + if (bfd_get_arch_info (ibfd)->the_default) + return true; + elf_flags_init (obfd) = true; - elf_elfheader (obfd)->e_flags = new_flags; + elf_elfheader (obfd)->e_flags = in_flags; if (bfd_get_arch (obfd) == bfd_get_arch (ibfd) && bfd_get_arch_info (obfd)->the_default) @@ -1589,17 +1873,13 @@ v850_elf_merge_private_bfd_data (ibfd, obfd) } /* Check flag compatibility. */ - - if (new_flags == old_flags) + if (in_flags == out_flags) return true; - if ((new_flags & EF_V850_ARCH) != (old_flags & EF_V850_ARCH)) - { - _bfd_error_handler ("%s: Architecture mismatch with previous modules", - bfd_get_filename (ibfd)); - bfd_set_error (bfd_error_bad_value); - return false; - } + if ((in_flags & EF_V850_ARCH) != (out_flags & EF_V850_ARCH) + && (in_flags & EF_V850_ARCH) != E_V850_ARCH) + _bfd_error_handler (_("%s: Architecture mismatch with previous modules"), + bfd_get_filename (ibfd)); return true; } @@ -1611,40 +1891,330 @@ v850_elf_print_private_bfd_data (abfd, ptr) PTR ptr; { FILE * file = (FILE *) ptr; - - BFD_ASSERT (abfd != NULL && ptr != NULL) - - fprintf (file, "private flags = %x", elf_elfheader (abfd)->e_flags); - + + BFD_ASSERT (abfd != NULL && ptr != NULL); + + _bfd_elf_print_private_bfd_data (abfd, ptr); + + /* xgettext:c-format */ + fprintf (file, _("private flags = %lx: "), elf_elfheader (abfd)->e_flags); + switch (elf_elfheader (abfd)->e_flags & EF_V850_ARCH) { default: - case E_V850_ARCH: fprintf (file, ": v850 architecture"); break; -/* start-sanitize-v850e */ - case E_V850E_ARCH: fprintf (file, ": v850e architecture"); break; -/* end-sanitize-v850e */ -/* start-sanitize-v850eq */ - case E_V850EQ_ARCH: fprintf (file, ": v850eq architecture"); break; -/* end-sanitize-v850eq */ + case E_V850_ARCH: fprintf (file, _("v850 architecture")); break; + case E_V850E_ARCH: fprintf (file, _("v850e architecture")); break; + case E_V850EA_ARCH: fprintf (file, _("v850ea architecture")); break; } - + fputc ('\n', file); - + return true; } + +/* V850 ELF uses four common sections. One is the usual one, and the + others are for (small) objects in one of the special data areas: + small, tiny and zero. All the objects are kept together, and then + referenced via the gp register, the ep register or the r0 register + respectively, which yields smaller, faster assembler code. This + approach is copied from elf32-mips.c. */ + +static asection v850_elf_scom_section; +static asymbol v850_elf_scom_symbol; +static asymbol * v850_elf_scom_symbol_ptr; +static asection v850_elf_tcom_section; +static asymbol v850_elf_tcom_symbol; +static asymbol * v850_elf_tcom_symbol_ptr; +static asection v850_elf_zcom_section; +static asymbol v850_elf_zcom_symbol; +static asymbol * v850_elf_zcom_symbol_ptr; + +/* Given a BFD section, try to locate the corresponding ELF section + index. */ + +static boolean +v850_elf_section_from_bfd_section (abfd, hdr, sec, retval) + bfd * abfd ATTRIBUTE_UNUSED; + Elf32_Internal_Shdr * hdr ATTRIBUTE_UNUSED; + asection * sec; + int * retval; +{ + if (strcmp (bfd_get_section_name (abfd, sec), ".scommon") == 0) + *retval = SHN_V850_SCOMMON; + else if (strcmp (bfd_get_section_name (abfd, sec), ".tcommon") == 0) + *retval = SHN_V850_TCOMMON; + else if (strcmp (bfd_get_section_name (abfd, sec), ".zcommon") == 0) + *retval = SHN_V850_ZCOMMON; + else + return false; + + return true; +} + +/* Handle the special V850 section numbers that a symbol may use. */ + +static void +v850_elf_symbol_processing (abfd, asym) + bfd * abfd; + asymbol * asym; +{ + elf_symbol_type * elfsym = (elf_symbol_type *) asym; + unsigned short index; + + index = elfsym->internal_elf_sym.st_shndx; + + /* If the section index is an "ordinary" index, then it may + refer to a v850 specific section created by the assembler. + Check the section's type and change the index it matches. + + FIXME: Should we alter the st_shndx field as well ? */ + + if (index < elf_elfheader(abfd)[0].e_shnum) + switch (elf_elfsections(abfd)[index]->sh_type) + { + case SHT_V850_SCOMMON: + index = SHN_V850_SCOMMON; + break; + + case SHT_V850_TCOMMON: + index = SHN_V850_TCOMMON; + break; + + case SHT_V850_ZCOMMON: + index = SHN_V850_ZCOMMON; + break; + + default: + break; + } + + switch (index) + { + case SHN_V850_SCOMMON: + if (v850_elf_scom_section.name == NULL) + { + /* Initialize the small common section. */ + v850_elf_scom_section.name = ".scommon"; + v850_elf_scom_section.flags = SEC_IS_COMMON | SEC_ALLOC | SEC_DATA; + v850_elf_scom_section.output_section = & v850_elf_scom_section; + v850_elf_scom_section.symbol = & v850_elf_scom_symbol; + v850_elf_scom_section.symbol_ptr_ptr = & v850_elf_scom_symbol_ptr; + v850_elf_scom_symbol.name = ".scommon"; + v850_elf_scom_symbol.flags = BSF_SECTION_SYM; + v850_elf_scom_symbol.section = & v850_elf_scom_section; + v850_elf_scom_symbol_ptr = & v850_elf_scom_symbol; + } + asym->section = & v850_elf_scom_section; + asym->value = elfsym->internal_elf_sym.st_size; + break; + + case SHN_V850_TCOMMON: + if (v850_elf_tcom_section.name == NULL) + { + /* Initialize the tcommon section. */ + v850_elf_tcom_section.name = ".tcommon"; + v850_elf_tcom_section.flags = SEC_IS_COMMON; + v850_elf_tcom_section.output_section = & v850_elf_tcom_section; + v850_elf_tcom_section.symbol = & v850_elf_tcom_symbol; + v850_elf_tcom_section.symbol_ptr_ptr = & v850_elf_tcom_symbol_ptr; + v850_elf_tcom_symbol.name = ".tcommon"; + v850_elf_tcom_symbol.flags = BSF_SECTION_SYM; + v850_elf_tcom_symbol.section = & v850_elf_tcom_section; + v850_elf_tcom_symbol_ptr = & v850_elf_tcom_symbol; + } + asym->section = & v850_elf_tcom_section; + asym->value = elfsym->internal_elf_sym.st_size; + break; + + case SHN_V850_ZCOMMON: + if (v850_elf_zcom_section.name == NULL) + { + /* Initialize the zcommon section. */ + v850_elf_zcom_section.name = ".zcommon"; + v850_elf_zcom_section.flags = SEC_IS_COMMON; + v850_elf_zcom_section.output_section = & v850_elf_zcom_section; + v850_elf_zcom_section.symbol = & v850_elf_zcom_symbol; + v850_elf_zcom_section.symbol_ptr_ptr = & v850_elf_zcom_symbol_ptr; + v850_elf_zcom_symbol.name = ".zcommon"; + v850_elf_zcom_symbol.flags = BSF_SECTION_SYM; + v850_elf_zcom_symbol.section = & v850_elf_zcom_section; + v850_elf_zcom_symbol_ptr = & v850_elf_zcom_symbol; + } + asym->section = & v850_elf_zcom_section; + asym->value = elfsym->internal_elf_sym.st_size; + break; + } +} + +/* Hook called by the linker routine which adds symbols from an object + file. We must handle the special v850 section numbers here. */ + +static boolean +v850_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp) + bfd * abfd; + struct bfd_link_info * info ATTRIBUTE_UNUSED; + const Elf_Internal_Sym * sym; + const char ** namep ATTRIBUTE_UNUSED; + flagword * flagsp ATTRIBUTE_UNUSED; + asection ** secp; + bfd_vma * valp; +{ + int index = sym->st_shndx; + + /* If the section index is an "ordinary" index, then it may + refer to a v850 specific section created by the assembler. + Check the section's type and change the index it matches. + + FIXME: Should we alter the st_shndx field as well ? */ + + if (index < elf_elfheader(abfd)[0].e_shnum) + switch (elf_elfsections(abfd)[index]->sh_type) + { + case SHT_V850_SCOMMON: + index = SHN_V850_SCOMMON; + break; + + case SHT_V850_TCOMMON: + index = SHN_V850_TCOMMON; + break; + + case SHT_V850_ZCOMMON: + index = SHN_V850_ZCOMMON; + break; + + default: + break; + } + + switch (index) + { + case SHN_V850_SCOMMON: + *secp = bfd_make_section_old_way (abfd, ".scommon"); + (*secp)->flags |= SEC_IS_COMMON; + *valp = sym->st_size; + break; + + case SHN_V850_TCOMMON: + *secp = bfd_make_section_old_way (abfd, ".tcommon"); + (*secp)->flags |= SEC_IS_COMMON; + *valp = sym->st_size; + break; + + case SHN_V850_ZCOMMON: + *secp = bfd_make_section_old_way (abfd, ".zcommon"); + (*secp)->flags |= SEC_IS_COMMON; + *valp = sym->st_size; + break; + } + + return true; +} + +/*ARGSIGNORED*/ +static boolean +v850_elf_link_output_symbol_hook (abfd, info, name, sym, input_sec) + bfd * abfd ATTRIBUTE_UNUSED; + struct bfd_link_info * info ATTRIBUTE_UNUSED; + const char * name ATTRIBUTE_UNUSED; + Elf_Internal_Sym * sym; + asection * input_sec; +{ + /* If we see a common symbol, which implies a relocatable link, then + if a symbol was in a special common section in an input file, mark + it as a special common in the output file. */ + + if (sym->st_shndx == SHN_COMMON) + { + if (strcmp (input_sec->name, ".scommon") == 0) + sym->st_shndx = SHN_V850_SCOMMON; + else if (strcmp (input_sec->name, ".tcommon") == 0) + sym->st_shndx = SHN_V850_TCOMMON; + else if (strcmp (input_sec->name, ".zcommon") == 0) + sym->st_shndx = SHN_V850_ZCOMMON; + } + + return true; +} + +static boolean +v850_elf_section_from_shdr (abfd, hdr, name) + bfd * abfd; + Elf_Internal_Shdr * hdr; + char * name; +{ + /* There ought to be a place to keep ELF backend specific flags, but + at the moment there isn't one. We just keep track of the + sections by their name, instead. */ + + if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name)) + return false; + + switch (hdr->sh_type) + { + case SHT_V850_SCOMMON: + case SHT_V850_TCOMMON: + case SHT_V850_ZCOMMON: + if (! bfd_set_section_flags (abfd, hdr->bfd_section, + (bfd_get_section_flags (abfd, + hdr->bfd_section) + | SEC_IS_COMMON))) + return false; + } + + return true; +} + +/* Set the correct type for a V850 ELF section. We do this by the + section name, which is a hack, but ought to work. */ +static boolean +v850_elf_fake_sections (abfd, hdr, sec) + bfd * abfd ATTRIBUTE_UNUSED; + Elf32_Internal_Shdr * hdr; + asection * sec; +{ + register const char * name; + + name = bfd_get_section_name (abfd, sec); + + if (strcmp (name, ".scommon") == 0) + { + hdr->sh_type = SHT_V850_SCOMMON; + } + else if (strcmp (name, ".tcommon") == 0) + { + hdr->sh_type = SHT_V850_TCOMMON; + } + else if (strcmp (name, ".zcommon") == 0) + hdr->sh_type = SHT_V850_ZCOMMON; + + return true; +} + #define TARGET_LITTLE_SYM bfd_elf32_v850_vec #define TARGET_LITTLE_NAME "elf32-v850" #define ELF_ARCH bfd_arch_v850 #define ELF_MACHINE_CODE EM_CYGNUS_V850 #define ELF_MAXPAGESIZE 0x1000 - -#define elf_info_to_howto 0 + +#define elf_info_to_howto v850_elf_info_to_howto_rela #define elf_info_to_howto_rel v850_elf_info_to_howto_rel + #define elf_backend_check_relocs v850_elf_check_relocs #define elf_backend_relocate_section v850_elf_relocate_section #define elf_backend_object_p v850_elf_object_p #define elf_backend_final_write_processing v850_elf_final_write_processing +#define elf_backend_section_from_bfd_section v850_elf_section_from_bfd_section +#define elf_backend_symbol_processing v850_elf_symbol_processing +#define elf_backend_add_symbol_hook v850_elf_add_symbol_hook +#define elf_backend_link_output_symbol_hook v850_elf_link_output_symbol_hook +#define elf_backend_section_from_shdr v850_elf_section_from_shdr +#define elf_backend_fake_sections v850_elf_fake_sections +#define elf_backend_gc_mark_hook v850_elf_gc_mark_hook +#define elf_backend_gc_sweep_hook v850_elf_gc_sweep_hook + +#define elf_backend_can_gc_sections 1 + #define bfd_elf32_bfd_is_local_label_name v850_elf_is_local_label_name #define bfd_elf32_bfd_reloc_type_lookup v850_elf_reloc_type_lookup #define bfd_elf32_bfd_copy_private_bfd_data v850_elf_copy_private_bfd_data