X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fcoff-mcore.c;h=002c908a0b5674cd7c6853e54b871dbeaeb886d8;hb=3b63d2cee1e6b894981cab59183480ac0972146a;hp=1d6174885819564e1c3fc67d62bacf1189dea502;hpb=b1657152098cd6a327e6d308bae00573b8c33daf;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/coff-mcore.c b/bfd/coff-mcore.c index 1d61748858..002c908a0b 100644 --- a/bfd/coff-mcore.c +++ b/bfd/coff-mcore.c @@ -1,6 +1,5 @@ /* BFD back-end for Motorola MCore COFF/PE - Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007 - Free Software Foundation, Inc. + Copyright (C) 1999-2016 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -39,19 +38,10 @@ /* This file is compiled more than once, but we only compile the final_link routine once. */ extern bfd_boolean mcore_bfd_coff_final_link - PARAMS ((bfd *, struct bfd_link_info *)); + (bfd *, struct bfd_link_info *); static bfd_reloc_status_type mcore_coff_unsupported_reloc - PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); -static bfd_boolean coff_mcore_relocate_section - PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, - struct internal_reloc *, struct internal_syment *, asection **)); -static reloc_howto_type *mcore_coff_reloc_type_lookup - PARAMS ((bfd *, bfd_reloc_code_real_type)); -static reloc_howto_type *coff_mcore_rtype_to_howto - PARAMS ((bfd *, asection *, struct internal_reloc *, - struct coff_link_hash_entry *, struct internal_syment *, - bfd_vma *)); -static bfd_boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *)); + (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); + /* The NT loader points the toc register to &toc + 32768, in order to use the complete range of a 16-bit displacement. We have to adjust @@ -241,15 +231,13 @@ mcore_emit_base_file_entry (struct bfd_link_info *info, } static bfd_reloc_status_type -mcore_coff_unsupported_reloc (abfd, reloc_entry, symbol, data, input_section, - output_bfd, error_message) - bfd * abfd; - arelent * reloc_entry; - asymbol * symbol ATTRIBUTE_UNUSED; - PTR data ATTRIBUTE_UNUSED; - asection * input_section ATTRIBUTE_UNUSED; - bfd * output_bfd ATTRIBUTE_UNUSED; - char ** error_message ATTRIBUTE_UNUSED; +mcore_coff_unsupported_reloc (bfd * abfd, + arelent * reloc_entry, + asymbol * symbol ATTRIBUTE_UNUSED, + void * data ATTRIBUTE_UNUSED, + asection * input_section ATTRIBUTE_UNUSED, + bfd * output_bfd ATTRIBUTE_UNUSED, + char ** error_message ATTRIBUTE_UNUSED) { BFD_ASSERT (reloc_entry->howto != (reloc_howto_type *)0); @@ -266,9 +254,8 @@ mcore_coff_unsupported_reloc (abfd, reloc_entry, symbol, data, input_section, case bfd_rtype: return & mcore_coff_howto_table [mcore_rtype] static reloc_howto_type * -mcore_coff_reloc_type_lookup (abfd, code) - bfd * abfd ATTRIBUTE_UNUSED; - bfd_reloc_code_real_type code; +mcore_coff_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED, + bfd_reloc_code_real_type code) { switch (code) { @@ -286,16 +273,15 @@ mcore_coff_reloc_type_lookup (abfd, code) } #undef HOW2MAP +#define NUM_HOWTOS NUM_ELEM (mcore_coff_howto_table) + static reloc_howto_type * mcore_coff_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, const char *r_name) { unsigned int i; - for (i = 0; - i < (sizeof (mcore_coff_howto_table) - / sizeof (mcore_coff_howto_table[0])); - i++) + for (i = 0; i < NUM_HOWTOS; i++) if (mcore_coff_howto_table[i].name != NULL && strcasecmp (mcore_coff_howto_table[i].name, r_name) == 0) return &mcore_coff_howto_table[i]; @@ -303,21 +289,23 @@ mcore_coff_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, return NULL; } -#define RTYPE2HOWTO(cache_ptr, dst) \ - (cache_ptr)->howto = mcore_coff_howto_table + (dst)->r_type; +#define RTYPE2HOWTO(cache_ptr, dst) \ + ((cache_ptr)->howto = \ + ((dst)->r_type < NUM_HOWTOS \ + ? mcore_coff_howto_table + (dst)->r_type \ + : NULL)) static reloc_howto_type * -coff_mcore_rtype_to_howto (abfd, sec, rel, h, sym, addendp) - bfd * abfd ATTRIBUTE_UNUSED; - asection * sec; - struct internal_reloc * rel; - struct coff_link_hash_entry * h ATTRIBUTE_UNUSED; - struct internal_syment * sym; - bfd_vma * addendp; +coff_mcore_rtype_to_howto (bfd * abfd ATTRIBUTE_UNUSED, + asection * sec, + struct internal_reloc * rel, + struct coff_link_hash_entry * h ATTRIBUTE_UNUSED, + struct internal_syment * sym, + bfd_vma * addendp) { reloc_howto_type * howto; - if (rel->r_type >= NUM_ELEM (mcore_coff_howto_table)) + if (rel->r_type >= NUM_HOWTOS) return NULL; howto = mcore_coff_howto_table + rel->r_type; @@ -348,38 +336,32 @@ coff_mcore_rtype_to_howto (abfd, sec, rel, h, sym, addendp) This function is referenced in pe_mkobject in peicode.h. */ static bfd_boolean -in_reloc_p (abfd, howto) - bfd * abfd ATTRIBUTE_UNUSED; - reloc_howto_type * howto; +in_reloc_p (bfd * abfd ATTRIBUTE_UNUSED, reloc_howto_type * howto) { return ! howto->pc_relative && howto->type != IMAGE_REL_MCORE_RVA; } /* The reloc processing routine for the optimized COFF linker. */ static bfd_boolean -coff_mcore_relocate_section (output_bfd, info, input_bfd, input_section, - contents, relocs, syms, sections) - bfd * output_bfd; - struct bfd_link_info * info; - bfd * input_bfd; - asection * input_section; - bfd_byte * contents; - struct internal_reloc * relocs; - struct internal_syment * syms; - asection ** sections; +coff_mcore_relocate_section (bfd * output_bfd, + struct bfd_link_info * info, + bfd * input_bfd, + asection * input_section, + bfd_byte * contents, + struct internal_reloc * relocs, + struct internal_syment * syms, + asection ** sections) { struct internal_reloc * rel; struct internal_reloc * relend; - bfd_boolean hihalf; - bfd_vma hihalf_val; /* If we are performing a relocatable link, we don't need to do a thing. The caller will take care of adjusting the reloc addresses and symbol indices. */ - if (info->relocatable) + if (bfd_link_relocatable (info)) return TRUE; - /* Check if we have the same endianess */ + /* Check if we have the same endianness */ if ( input_bfd->xvec->byteorder != output_bfd->xvec->byteorder && output_bfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN) { @@ -393,9 +375,6 @@ coff_mcore_relocate_section (output_bfd, info, input_bfd, input_section, return FALSE; } - hihalf = FALSE; - hihalf_val = 0; - rel = relocs; relend = rel + input_section->reloc_count; @@ -475,12 +454,9 @@ coff_mcore_relocate_section (output_bfd, info, input_bfd, input_section, + sec->output_offset); } else - { - if (! ((*info->callbacks->undefined_symbol) - (info, h->root.root.string, input_bfd, input_section, - rel->r_vaddr - input_section->vma, TRUE))) - return FALSE; - } + (*info->callbacks->undefined_symbol) + (info, h->root.root.string, input_bfd, input_section, + rel->r_vaddr - input_section->vma, TRUE); my_name = h->root.root.string; } @@ -540,11 +516,10 @@ coff_mcore_relocate_section (output_bfd, info, input_bfd, input_section, break; case bfd_reloc_overflow: - if (! ((*info->callbacks->reloc_overflow) - (info, (h ? &h->root : NULL), my_name, howto->name, - (bfd_vma) 0, input_bfd, - input_section, rel->r_vaddr - input_section->vma))) - return FALSE; + (*info->callbacks->reloc_overflow) + (info, (h ? &h->root : NULL), my_name, howto->name, + (bfd_vma) 0, input_bfd, + input_section, rel->r_vaddr - input_section->vma); } }