X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Felf32-msp430.c;h=eeed0c6fc040f0627e21870e58cd81488f65d814;hb=2ffe5b9c792fe78dbbcbe31b6fea751285df8876;hp=9e6979123f2ebb7900427a7ef5b0af8167eb3f10;hpb=3f3070745b78c25d7b16c913c15496b296802505;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf32-msp430.c b/bfd/elf32-msp430.c index 9e6979123f..eeed0c6fc0 100644 --- a/bfd/elf32-msp430.c +++ b/bfd/elf32-msp430.c @@ -1,5 +1,5 @@ /* MSP430-specific support for 32-bit ELF - Copyright (C) 2002-2015 Free Software Foundation, Inc. + Copyright (C) 2002-2019 Free Software Foundation, Inc. Contributed by Dmitry Diky This file is part of BFD, the Binary File Descriptor library. @@ -26,6 +26,9 @@ #include "elf-bfd.h" #include "elf/msp430.h" +/* All users of this file have bfd_octets_per_byte (abfd, sec) == 1. */ +#define OCTETS_PER_BYTE(ABFD, SEC) 1 + static bfd_reloc_status_type rl78_sym_diff_handler (bfd * abfd, arelent * reloc, @@ -36,7 +39,7 @@ rl78_sym_diff_handler (bfd * abfd, char ** error_message ATTRIBUTE_UNUSED) { bfd_size_type octets; - octets = reloc->address * bfd_octets_per_byte (abfd); + octets = reloc->address * OCTETS_PER_BYTE (abfd, input_sec); /* Catch the case where bfd_install_relocation would return bfd_reloc_outofrange because the SYM_DIFF reloc is being used in a very @@ -215,7 +218,7 @@ static reloc_howto_type elf_msp430_howto_table[] = FALSE, /* partial_inplace */ 0xffffffff, /* src_mask */ 0xffffffff, /* dst_mask */ - FALSE) /* pcrel_offset */ + FALSE) /* pcrel_offset */ }; static reloc_howto_type elf_msp430x_howto_table[] = @@ -470,10 +473,10 @@ static reloc_howto_type elf_msp430x_howto_table[] = FALSE, /* partial_inplace */ 0, /* src_mask */ 0xffff, /* dst_mask */ - TRUE), /* pcrel_offset */ + TRUE), /* pcrel_offset */ EMPTY_HOWTO (R_MSP430_EHTYPE), - + /* A 10 bit PC relative relocation. */ HOWTO (R_MSP430X_10_PCREL, /* type */ 1, /* rightshift */ @@ -487,7 +490,7 @@ static reloc_howto_type elf_msp430x_howto_table[] = FALSE, /* partial_inplace */ 0x3ff, /* src_mask */ 0x3ff, /* dst_mask */ - TRUE), /* pcrel_offset */ + TRUE), /* pcrel_offset */ /* A 10 bit PC relative relocation for complicated polymorphs. */ HOWTO (R_MSP430X_2X_PCREL, /* type */ @@ -518,7 +521,7 @@ static reloc_howto_type elf_msp430x_howto_table[] = FALSE, /* partial_inplace */ 0xffffffff, /* src_mask */ 0xffffffff, /* dst_mask */ - FALSE) /* pcrel_offset */ + FALSE) /* pcrel_offset */ }; /* Map BFD reloc types to MSP430 ELF reloc types. */ @@ -531,27 +534,27 @@ struct msp430_reloc_map static const struct msp430_reloc_map msp430_reloc_map[] = { - {BFD_RELOC_NONE, R_MSP430_NONE}, - {BFD_RELOC_32, R_MSP430_32}, - {BFD_RELOC_MSP430_10_PCREL, R_MSP430_10_PCREL}, - {BFD_RELOC_16, R_MSP430_16_BYTE}, - {BFD_RELOC_MSP430_16_PCREL, R_MSP430_16_PCREL}, - {BFD_RELOC_MSP430_16, R_MSP430_16}, + {BFD_RELOC_NONE, R_MSP430_NONE}, + {BFD_RELOC_32, R_MSP430_32}, + {BFD_RELOC_MSP430_10_PCREL, R_MSP430_10_PCREL}, + {BFD_RELOC_16, R_MSP430_16_BYTE}, + {BFD_RELOC_MSP430_16_PCREL, R_MSP430_16_PCREL}, + {BFD_RELOC_MSP430_16, R_MSP430_16}, {BFD_RELOC_MSP430_16_PCREL_BYTE, R_MSP430_16_PCREL_BYTE}, - {BFD_RELOC_MSP430_16_BYTE, R_MSP430_16_BYTE}, - {BFD_RELOC_MSP430_2X_PCREL, R_MSP430_2X_PCREL}, - {BFD_RELOC_MSP430_RL_PCREL, R_MSP430_RL_PCREL}, - {BFD_RELOC_8, R_MSP430_8}, - {BFD_RELOC_MSP430_SYM_DIFF, R_MSP430_SYM_DIFF} + {BFD_RELOC_MSP430_16_BYTE, R_MSP430_16_BYTE}, + {BFD_RELOC_MSP430_2X_PCREL, R_MSP430_2X_PCREL}, + {BFD_RELOC_MSP430_RL_PCREL, R_MSP430_RL_PCREL}, + {BFD_RELOC_8, R_MSP430_8}, + {BFD_RELOC_MSP430_SYM_DIFF, R_MSP430_SYM_DIFF} }; static const struct msp430_reloc_map msp430x_reloc_map[] = { - {BFD_RELOC_NONE, R_MSP430_NONE}, - {BFD_RELOC_32, R_MSP430_ABS32}, - {BFD_RELOC_16, R_MSP430_ABS16}, - {BFD_RELOC_8, R_MSP430_ABS8}, - {BFD_RELOC_MSP430_ABS8, R_MSP430_ABS8}, + {BFD_RELOC_NONE, R_MSP430_NONE}, + {BFD_RELOC_32, R_MSP430_ABS32}, + {BFD_RELOC_16, R_MSP430_ABS16}, + {BFD_RELOC_8, R_MSP430_ABS8}, + {BFD_RELOC_MSP430_ABS8, R_MSP430_ABS8}, {BFD_RELOC_MSP430X_PCR20_EXT_SRC, R_MSP430X_PCR20_EXT_SRC}, {BFD_RELOC_MSP430X_PCR20_EXT_DST, R_MSP430X_PCR20_EXT_DST}, {BFD_RELOC_MSP430X_PCR20_EXT_ODST, R_MSP430X_PCR20_EXT_ODST}, @@ -560,15 +563,15 @@ static const struct msp430_reloc_map msp430x_reloc_map[] = {BFD_RELOC_MSP430X_ABS20_EXT_ODST, R_MSP430X_ABS20_EXT_ODST}, {BFD_RELOC_MSP430X_ABS20_ADR_SRC, R_MSP430X_ABS20_ADR_SRC}, {BFD_RELOC_MSP430X_ABS20_ADR_DST, R_MSP430X_ABS20_ADR_DST}, - {BFD_RELOC_MSP430X_PCR16, R_MSP430X_PCR16}, + {BFD_RELOC_MSP430X_PCR16, R_MSP430X_PCR16}, {BFD_RELOC_MSP430X_PCR20_CALL, R_MSP430X_PCR20_CALL}, - {BFD_RELOC_MSP430X_ABS16, R_MSP430X_ABS16}, - {BFD_RELOC_MSP430_ABS_HI16, R_MSP430_ABS_HI16}, - {BFD_RELOC_MSP430_PREL31, R_MSP430_PREL31}, - {BFD_RELOC_MSP430_10_PCREL, R_MSP430X_10_PCREL}, - {BFD_RELOC_MSP430_2X_PCREL, R_MSP430X_2X_PCREL}, - {BFD_RELOC_MSP430_RL_PCREL, R_MSP430X_PCR16}, - {BFD_RELOC_MSP430_SYM_DIFF, R_MSP430X_SYM_DIFF} + {BFD_RELOC_MSP430X_ABS16, R_MSP430X_ABS16}, + {BFD_RELOC_MSP430_ABS_HI16, R_MSP430_ABS_HI16}, + {BFD_RELOC_MSP430_PREL31, R_MSP430_PREL31}, + {BFD_RELOC_MSP430_10_PCREL, R_MSP430X_10_PCREL}, + {BFD_RELOC_MSP430_2X_PCREL, R_MSP430X_2X_PCREL}, + {BFD_RELOC_MSP430_RL_PCREL, R_MSP430X_PCR16}, + {BFD_RELOC_MSP430_SYM_DIFF, R_MSP430X_SYM_DIFF} }; static inline bfd_boolean @@ -631,8 +634,8 @@ bfd_elf32_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, /* Set the howto pointer for an MSP430 ELF reloc. */ -static void -msp430_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED, +static bfd_boolean +msp430_info_to_howto_rela (bfd * abfd, arelent * cache_ptr, Elf_Internal_Rela * dst) { @@ -644,19 +647,26 @@ msp430_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED, { if (r_type >= (unsigned int) R_MSP430x_max) { - _bfd_error_handler (_("%B: invalid MSP430X reloc number: %d"), abfd, r_type); - r_type = 0; + /* xgettext:c-format */ + _bfd_error_handler (_("%pB: unsupported relocation type %#x"), + abfd, r_type); + bfd_set_error (bfd_error_bad_value); + return FALSE; } cache_ptr->howto = elf_msp430x_howto_table + r_type; - return; } - - if (r_type >= (unsigned int) R_MSP430_max) + else if (r_type >= (unsigned int) R_MSP430_max) { - _bfd_error_handler (_("%B: invalid MSP430 reloc number: %d"), abfd, r_type); - r_type = 0; + /* xgettext:c-format */ + _bfd_error_handler (_("%pB: unsupported relocation type %#x"), + abfd, r_type); + bfd_set_error (bfd_error_bad_value); + return FALSE; } - cache_ptr->howto = &elf_msp430_howto_table[r_type]; + else + cache_ptr->howto = &elf_msp430_howto_table[r_type]; + + return TRUE; } /* Look through the relocs for a section during the first phase. @@ -672,7 +682,7 @@ elf32_msp430_check_relocs (bfd * abfd, struct bfd_link_info * info, 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; @@ -693,10 +703,6 @@ elf32_msp430_check_relocs (bfd * abfd, struct bfd_link_info * 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; - - /* PR15323, ref flags aren't set for references in the same - object. */ - h->root.non_ir_ref = 1; } } @@ -707,12 +713,12 @@ elf32_msp430_check_relocs (bfd * abfd, struct bfd_link_info * info, routines, but a few relocs, we have to do them ourselves. */ static bfd_reloc_status_type -msp430_final_link_relocate (reloc_howto_type * howto, - bfd * input_bfd, - asection * input_section, - bfd_byte * contents, - Elf_Internal_Rela * rel, - bfd_vma relocation, +msp430_final_link_relocate (reloc_howto_type * howto, + bfd * input_bfd, + asection * input_section, + bfd_byte * contents, + Elf_Internal_Rela * rel, + bfd_vma relocation, struct bfd_link_info * info) { static asection * sym_diff_section; @@ -739,7 +745,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, if (sym_diff_section != NULL) { BFD_ASSERT (sym_diff_section == input_section); - + if (uses_msp430x_relocs (input_bfd)) switch (howto->type) { @@ -778,7 +784,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, default: return bfd_reloc_dangerous; } - + sym_diff_section = NULL; } @@ -831,7 +837,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, { info->callbacks->warning (info, - _("Try enabling relaxation to avoid relocation truncations"), + _("try enabling relaxation to avoid relocation truncations"), NULL, input_bfd, input_section, relocation); warned = TRUE; } @@ -854,7 +860,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, addend = (bfd_get_16 (input_bfd, contents) & 0xf) << 16; addend |= bfd_get_16 (input_bfd, contents + 6); srel += addend; - + } else srel += rel->r_addend; @@ -1050,7 +1056,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, srel += rel->r_addend; x = srel; if (x > 0xffff) - return bfd_reloc_overflow; + return bfd_reloc_overflow; bfd_put_16 (input_bfd, srel & 0xffff, contents); break; @@ -1062,7 +1068,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, srel += rel->r_addend; bfd_put_16 (input_bfd, (srel >> 16) & 0xffff, contents); break; - + case R_MSP430X_PCR20_CALL: /* [0,4]+[16,16] = ---F FFFF*/ contents += rel->r_offset; @@ -1085,7 +1091,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, x = (x & 0xfff0) | (srel & 0xf); bfd_put_16 (input_bfd, x, contents); break; - + case R_MSP430X_PCR16: contents += rel->r_offset; srel = (bfd_signed_vma) relocation; @@ -1098,7 +1104,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, input_section->output_offset); bfd_put_16 (input_bfd, srel & 0xffff, contents); break; - + case R_MSP430_PREL31: contents += rel->r_offset; srel = (bfd_signed_vma) relocation; @@ -1111,7 +1117,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, x = (x & 0x80000000) | ((srel >> 31) & 0x7fffffff); bfd_put_32 (input_bfd, x, contents); break; - + default: r = _bfd_final_link_relocate (howto, input_bfd, input_section, contents, rel->r_offset, @@ -1145,14 +1151,14 @@ msp430_final_link_relocate (reloc_howto_type * howto, { info->callbacks->warning (info, - _("Try enabling relaxation to avoid relocation truncations"), + _("try enabling relaxation to avoid relocation truncations"), NULL, input_bfd, input_section, relocation); warned = TRUE; } } return bfd_reloc_overflow; } - + x = bfd_get_16 (input_bfd, contents); x = (x & 0xfc00) | (srel & 0x3ff); bfd_put_16 (input_bfd, x, contents); @@ -1240,7 +1246,7 @@ msp430_final_link_relocate (reloc_howto_type * howto, bfd_put_8 (input_bfd, srel & 0xff, contents); break; - + case R_MSP430_SYM_DIFF: /* Cache the input section and value. The offset is unreliable, since relaxation may @@ -1311,7 +1317,7 @@ elf32_msp430_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED, name = bfd_elf_string_from_elf_section (input_bfd, symtab_hdr->sh_link, sym->st_name); - name = (name == NULL || * name == 0) ? bfd_section_name (input_bfd, sec) : name; + name = name == NULL || *name == 0 ? bfd_section_name (sec) : name; } else { @@ -1328,7 +1334,7 @@ elf32_msp430_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED, RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section, rel, 1, relend, howto, 0, contents); - if (info->relocatable) + if (bfd_link_relocatable (info)) continue; r = msp430_final_link_relocate (howto, input_bfd, input_section, @@ -1341,15 +1347,14 @@ elf32_msp430_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED, switch (r) { case bfd_reloc_overflow: - r = info->callbacks->reloc_overflow + (*info->callbacks->reloc_overflow) (info, (h ? &h->root : NULL), name, howto->name, - (bfd_vma) 0, input_bfd, input_section, - rel->r_offset); + (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); + (*info->callbacks->undefined_symbol) + (info, name, input_bfd, input_section, rel->r_offset, TRUE); break; case bfd_reloc_outofrange: @@ -1370,11 +1375,8 @@ elf32_msp430_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED, } if (msg) - r = info->callbacks->warning - (info, msg, name, input_bfd, input_section, rel->r_offset); - - if (!r) - return FALSE; + (*info->callbacks->warning) (info, msg, name, input_bfd, + input_section, rel->r_offset); } } @@ -1386,9 +1388,8 @@ elf32_msp430_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED, file. This gets the MSP430 architecture right based on the machine number. */ -static void -bfd_elf_msp430_final_write_processing (bfd * abfd, - bfd_boolean linker ATTRIBUTE_UNUSED) +static bfd_boolean +bfd_elf_msp430_final_write_processing (bfd *abfd) { unsigned long val; @@ -1423,6 +1424,7 @@ bfd_elf_msp430_final_write_processing (bfd * abfd, elf_elfheader (abfd)->e_machine = EM_MSP430; elf_elfheader (abfd)->e_flags &= ~EF_MSP430_MACH; elf_elfheader (abfd)->e_flags |= val; + return _bfd_elf_final_write_processing (abfd); } /* Set the right machine number. */ @@ -1465,7 +1467,7 @@ elf32_msp430_object_p (bfd * abfd) case E_MSP430_MACH_MSP430X: e_set = bfd_mach_msp430x; break; } } - + return bfd_default_set_arch_mach (abfd, bfd_arch_msp430, e_set); } @@ -1487,26 +1489,26 @@ elf32_msp430_object_p (bfd * abfd) 1. 3 words -> 1 word - eq == jeq label jne +4; br lab - ne != jne label jeq +4; br lab - lt < jl label jge +4; br lab - ltu < jlo label lhs +4; br lab - ge >= jge label jl +4; br lab - geu >= jhs label jlo +4; br lab + eq == jeq label jne +4; br lab + ne != jne label jeq +4; br lab + lt < jl label jge +4; br lab + ltu < jlo label lhs +4; br lab + ge >= jge label jl +4; br lab + geu >= jhs label jlo +4; br lab 2. 4 words -> 1 word - ltn < jn jn +2; jmp +4; br lab + ltn < jn jn +2; jmp +4; br lab 3. 4 words -> 2 words - gt > jeq +2; jge label jeq +6; jl +4; br label - gtu > jeq +2; jhs label jeq +6; jlo +4; br label + gt > jeq +2; jge label jeq +6; jl +4; br label + gtu > jeq +2; jhs label jeq +6; jlo +4; br label 4. 4 words -> 2 words and 2 labels - leu <= jeq label; jlo label jeq +2; jhs +4; br label - le <= jeq label; jl label jeq +2; jge +4; br label + leu <= jeq label; jlo label jeq +2; jhs +4; br label + le <= jeq label; jl label jeq +2; jge +4; br label ================================================================= codemap for first cases is (labels masked ): @@ -1544,7 +1546,7 @@ static struct rcodes_s int off; /* Offset from old label for new code. */ int ncl; /* New code length. */ } rcode[] = -{/* lab,cdx,bs,off,ncl */ +{/* lab,cdx,bs,off,ncl */ { 0x0000, 0x0000, 0x3c00, 0x0000, 1, 0, 2, 2, 2}, /* jump */ { 0x0000, 0x2002, 0x2400, 0x0000, 1, 1, 4, 4, 2}, /* eq */ { 0x0000, 0x2402, 0x2000, 0x0000, 1, 1, 4, 4, 2}, /* ne */ @@ -1557,7 +1559,7 @@ static struct rcodes_s { 0x2403, 0x2802, 0x2401, 0x2c00, 2, 2, 4, 6, 4}, /* gtu */ { 0x2401, 0x2c02, 0x2400, 0x2800, 3, 2, 4, 6, 4}, /* leu , 2 labels */ { 0x2401, 0x2c02, 0x2400, 0x2800, 3, 2, 4, 6, 4}, /* le , 2 labels */ - { 0, 0, 0, 0, 0, 0, 0, 0, 0} + { 0, 0, 0, 0, 0, 0, 0, 0, 0} }; /* Return TRUE if a symbol exists at the given address. */ @@ -1633,7 +1635,7 @@ msp430_elf_relax_adjust_locals (bfd * abfd, asection * sec, bfd_vma addr, && lsym->st_shndx == sec_shndx) irel->r_addend -= count; } - + return TRUE; } @@ -1682,7 +1684,7 @@ msp430_elf_relax_delete_bytes (bfd * abfd, asection * sec, bfd_vma addr, for (p = abfd->sections; p != NULL; p = p->next) msp430_elf_relax_adjust_locals (abfd,p,addr,count,sec_shndx,toaddr); - + /* Adjust the local symbols defined in this section. */ symtab_hdr = & elf_tdata (abfd)->symtab_hdr; isym = (Elf_Internal_Sym *) symtab_hdr->contents; @@ -1692,11 +1694,11 @@ msp430_elf_relax_delete_bytes (bfd * abfd, asection * sec, bfd_vma addr, name = bfd_elf_string_from_elf_section (abfd, symtab_hdr->sh_link, isym->st_name); - name = (name == NULL || * name == 0) ? bfd_section_name (abfd, sec) : name; + name = name == NULL || *name == 0 ? bfd_section_name (sec) : name; if (isym->st_shndx != sec_shndx) continue; - + if (isym->st_value > addr && (isym->st_value < toaddr /* We also adjust a symbol at the end of the section if its name is @@ -1784,7 +1786,7 @@ msp430_elf_relax_add_two_words (bfd * abfd, asection * sec, bfd_vma addr, /* Update the section information. */ sec->size += 4; - elf_section_data (sec)->this_hdr.contents = contents; + elf_section_data (sec)->this_hdr.contents = contents; /* Adjust all the relocs. */ irel = elf_section_data (sec)->relocs; @@ -1827,7 +1829,7 @@ msp430_elf_relax_add_two_words (bfd * abfd, asection * sec, bfd_vma addr, return contents; } - + static bfd_boolean msp430_elf_relax_section (bfd * abfd, asection * sec, struct bfd_link_info * link_info, @@ -1837,7 +1839,7 @@ msp430_elf_relax_section (bfd * abfd, asection * sec, Elf_Internal_Rela * internal_relocs; Elf_Internal_Rela * irel; Elf_Internal_Rela * irelend; - bfd_byte * contents = NULL; + bfd_byte * contents = NULL; Elf_Internal_Sym * isymbuf = NULL; /* Assume nothing changes. */ @@ -1846,7 +1848,7 @@ msp430_elf_relax_section (bfd * abfd, asection * sec, /* We don't have to do anything for a relocatable link, if this section does not have relocs, or if this is not a code section. */ - if (link_info->relocatable + if (bfd_link_relocatable (link_info) || (sec->flags & SEC_RELOC) == 0 || sec->reloc_count == 0 || (sec->flags & SEC_CODE) == 0) return TRUE; @@ -1868,12 +1870,12 @@ msp430_elf_relax_section (bfd * abfd, asection * sec, bfd_vma symval; /* If this isn't something that can be relaxed, then ignore - this reloc. */ + this reloc. */ if (uses_msp430x_relocs (abfd) - && ELF32_R_TYPE (irel->r_info) == (int) R_MSP430X_10_PCREL) + && ELF32_R_TYPE (irel->r_info) == (int) R_MSP430X_10_PCREL) ; else if (! uses_msp430x_relocs (abfd) - && ELF32_R_TYPE (irel->r_info) == (int) R_MSP430_10_PCREL) + && ELF32_R_TYPE (irel->r_info) == (int) R_MSP430_10_PCREL) ; else continue; @@ -1942,12 +1944,12 @@ msp430_elf_relax_section (bfd * abfd, asection * sec, } /* For simplicity of coding, we are going to modify the section - contents, the section relocs, and the BFD symbol table. We - must tell the rest of the code not to free up this - information. It would be possible to instead create a table - of changes which have to be made, as is done in coff-mips.c; - that would be more work, but would require less memory when - the linker is run. */ + contents, the section relocs, and the BFD symbol table. We + must tell the rest of the code not to free up this + information. It would be possible to instead create a table + of changes which have to be made, as is done in coff-mips.c; + that would be more work, but would require less memory when + the linker is run. */ bfd_signed_vma value = symval; int opcode; @@ -1967,16 +1969,16 @@ msp430_elf_relax_section (bfd * abfd, asection * sec, /* Get the opcode. */ opcode = bfd_get_16 (abfd, contents + irel->r_offset); - + /* Compute the new opcode. We are going to convert: J label into: J 1f BR[A] #label - 1: */ + 1: */ switch (opcode & 0xfc00) { - case 0x3800: opcode = 0x3402; break; /* Jl -> Jge +2 */ + case 0x3800: opcode = 0x3402; break; /* Jl -> Jge +2 */ case 0x3400: opcode = 0x3802; break; /* Jge -> Jl +2 */ case 0x2c00: opcode = 0x2802; break; /* Jhs -> Jlo +2 */ case 0x2800: opcode = 0x2c02; break; /* Jlo -> Jhs +2 */ @@ -1985,10 +1987,10 @@ msp430_elf_relax_section (bfd * abfd, asection * sec, case 0x3000: /* jn */ /* There is no direct inverse of the Jn insn. FIXME: we could do this as: - Jn 1f - br 2f + Jn 1f + br 2f 1: br label - 2: */ + 2: */ continue; default: /* Not a conditional branch instruction. */ @@ -2007,7 +2009,7 @@ msp430_elf_relax_section (bfd * abfd, asection * sec, /* Insert the new branch instruction. */ if (uses_msp430x_relocs (abfd)) { - /* Insert an absolute branch (aka MOVA) instruction. */ + /* Insert an absolute branch (aka MOVA) instruction. */ contents = msp430_elf_relax_add_two_words (abfd, sec, irel->r_offset + 2, 0x0080, 0x0000); @@ -2114,7 +2116,7 @@ msp430_elf_relax_section (bfd * abfd, asection * sec, /* Try to turn a 16bit pc-relative branch into a 10bit pc-relative branch. */ - /* Paranoia? paranoia... */ + /* Paranoia? paranoia... */ if (! uses_msp430x_relocs (abfd) && ELF32_R_TYPE (irel->r_info) == (int) R_MSP430_RL_PCREL) { @@ -2229,15 +2231,17 @@ msp430_elf_relax_section (bfd * abfd, asection * sec, /* Try to turn a 16-bit absolute branch into a 10-bit pc-relative branch. */ - if (uses_msp430x_relocs (abfd) - && ELF32_R_TYPE (irel->r_info) == R_MSP430X_ABS16) + if ((uses_msp430x_relocs (abfd) + && ELF32_R_TYPE (irel->r_info) == R_MSP430X_ABS16) + || (! uses_msp430x_relocs (abfd) + && ELF32_R_TYPE (irel->r_info) == R_MSP430_16)) { bfd_vma value = symval; value -= (sec->output_section->vma + sec->output_offset); value -= irel->r_offset; value += irel->r_addend; - + /* See if the value will fit in 10 bits, note the high value is 1016 as the target will be two bytes closer if we are able to relax. */ @@ -2352,7 +2356,8 @@ static bfd_boolean elf32_msp430_obj_attrs_handle_unknown (bfd *abfd, int tag) { _bfd_error_handler - (_("Warning: %B: Unknown MSPABI object attribute %d"), + /* xgettext:c-format */ + (_("warning: %pB: unknown MSPABI object attribute %d"), abfd, tag); return TRUE; } @@ -2406,14 +2411,15 @@ data_model (int model) } } -/* Merge MSPABI object attributes from IBFD into OBFD. +/* Merge MSPABI and GNU object attributes from IBFD into OBFD. Raise an error if there are conflicting attributes. */ static bfd_boolean -elf32_msp430_merge_mspabi_attributes (bfd *ibfd, bfd *obfd) +elf32_msp430_merge_msp430_attributes (bfd *ibfd, struct bfd_link_info *info) { - obj_attribute *in_attr; - obj_attribute *out_attr; + bfd *obfd = info->output_bfd; + obj_attribute *in_msp_attr, *in_gnu_attr; + obj_attribute *out_msp_attr, *out_gnu_attr; bfd_boolean result = TRUE; static bfd * first_input_bfd = NULL; @@ -2421,91 +2427,131 @@ elf32_msp430_merge_mspabi_attributes (bfd *ibfd, bfd *obfd) if (ibfd->flags & BFD_LINKER_CREATED) return TRUE; + /* LTO can create temporary files for linking which may not have an attribute + section. */ + if (ibfd->lto_output + && bfd_get_section_by_name (ibfd, ".MSP430.attributes") == NULL) + return TRUE; + /* If this is the first real object just copy the attributes. */ if (!elf_known_obj_attributes_proc (obfd)[0].i) { _bfd_elf_copy_obj_attributes (ibfd, obfd); - out_attr = elf_known_obj_attributes_proc (obfd); + out_msp_attr = elf_known_obj_attributes_proc (obfd); /* Use the Tag_null value to indicate that the attributes have been initialized. */ - out_attr[0].i = 1; + out_msp_attr[0].i = 1; first_input_bfd = ibfd; return TRUE; } - in_attr = elf_known_obj_attributes_proc (ibfd); - out_attr = elf_known_obj_attributes_proc (obfd); + in_msp_attr = elf_known_obj_attributes_proc (ibfd); + out_msp_attr = elf_known_obj_attributes_proc (obfd); + in_gnu_attr = elf_known_obj_attributes (ibfd) [OBJ_ATTR_GNU]; + out_gnu_attr = elf_known_obj_attributes (obfd) [OBJ_ATTR_GNU]; /* The ISAs must be the same. */ - if (in_attr[OFBA_MSPABI_Tag_ISA].i != out_attr[OFBA_MSPABI_Tag_ISA].i) + if (in_msp_attr[OFBA_MSPABI_Tag_ISA].i != out_msp_attr[OFBA_MSPABI_Tag_ISA].i) { _bfd_error_handler - (_("error: %B uses %s instructions but %B uses %s"), - ibfd, first_input_bfd, - isa_type (in_attr[OFBA_MSPABI_Tag_ISA].i), - isa_type (out_attr[OFBA_MSPABI_Tag_ISA].i)); + /* xgettext:c-format */ + (_("error: %pB uses %s instructions but %pB uses %s"), + ibfd, isa_type (in_msp_attr[OFBA_MSPABI_Tag_ISA].i), + first_input_bfd, isa_type (out_msp_attr[OFBA_MSPABI_Tag_ISA].i)); result = FALSE; } /* The code models must be the same. */ - if (in_attr[OFBA_MSPABI_Tag_Code_Model].i != - out_attr[OFBA_MSPABI_Tag_Code_Model].i) + if (in_msp_attr[OFBA_MSPABI_Tag_Code_Model].i + != out_msp_attr[OFBA_MSPABI_Tag_Code_Model].i) { _bfd_error_handler - (_("error: %B uses the %s code model whereas %B uses the %s code model"), - ibfd, first_input_bfd, - code_model (in_attr[OFBA_MSPABI_Tag_Code_Model].i), - code_model (out_attr[OFBA_MSPABI_Tag_Code_Model].i)); + /* xgettext:c-format */ + (_("error: %pB uses the %s code model whereas %pB uses the %s code model"), + ibfd, code_model (in_msp_attr[OFBA_MSPABI_Tag_Code_Model].i), + first_input_bfd, + code_model (out_msp_attr[OFBA_MSPABI_Tag_Code_Model].i)); result = FALSE; } /* The large code model is only supported by the MSP430X. */ - if (in_attr[OFBA_MSPABI_Tag_Code_Model].i == 2 - && out_attr[OFBA_MSPABI_Tag_ISA].i != 2) + if (in_msp_attr[OFBA_MSPABI_Tag_Code_Model].i == 2 + && out_msp_attr[OFBA_MSPABI_Tag_ISA].i != 2) { _bfd_error_handler - (_("error: %B uses the large code model but %B uses MSP430 instructions"), + /* xgettext:c-format */ + (_("error: %pB uses the large code model but %pB uses MSP430 instructions"), ibfd, first_input_bfd); result = FALSE; } /* The data models must be the same. */ - if (in_attr[OFBA_MSPABI_Tag_Data_Model].i != - out_attr[OFBA_MSPABI_Tag_Data_Model].i) + if (in_msp_attr[OFBA_MSPABI_Tag_Data_Model].i + != out_msp_attr[OFBA_MSPABI_Tag_Data_Model].i) { _bfd_error_handler - (_("error: %B uses the %s data model whereas %B uses the %s data model"), - ibfd, first_input_bfd, - data_model (in_attr[OFBA_MSPABI_Tag_Data_Model].i), - data_model (out_attr[OFBA_MSPABI_Tag_Data_Model].i)); + /* xgettext:c-format */ + (_("error: %pB uses the %s data model whereas %pB uses the %s data model"), + ibfd, data_model (in_msp_attr[OFBA_MSPABI_Tag_Data_Model].i), + first_input_bfd, + data_model (out_msp_attr[OFBA_MSPABI_Tag_Data_Model].i)); result = FALSE; } /* The small code model requires the use of the small data model. */ - if (in_attr[OFBA_MSPABI_Tag_Code_Model].i == 1 - && out_attr[OFBA_MSPABI_Tag_Data_Model].i != 1) + if (in_msp_attr[OFBA_MSPABI_Tag_Code_Model].i == 1 + && out_msp_attr[OFBA_MSPABI_Tag_Data_Model].i != 1) { _bfd_error_handler - (_("error: %B uses the small code model but %B uses the %s data model"), + /* xgettext:c-format */ + (_("error: %pB uses the small code model but %pB uses the %s data model"), ibfd, first_input_bfd, - data_model (out_attr[OFBA_MSPABI_Tag_Data_Model].i)); + data_model (out_msp_attr[OFBA_MSPABI_Tag_Data_Model].i)); result = FALSE; } /* The large data models are only supported by the MSP430X. */ - if (in_attr[OFBA_MSPABI_Tag_Data_Model].i > 1 - && out_attr[OFBA_MSPABI_Tag_ISA].i != 2) + if (in_msp_attr[OFBA_MSPABI_Tag_Data_Model].i > 1 + && out_msp_attr[OFBA_MSPABI_Tag_ISA].i != 2) { _bfd_error_handler - (_("error: %B uses the %s data model but %B only uses MSP430 instructions"), - ibfd, first_input_bfd, - data_model (in_attr[OFBA_MSPABI_Tag_Data_Model].i)); + /* xgettext:c-format */ + (_("error: %pB uses the %s data model but %pB only uses MSP430 instructions"), + ibfd, data_model (in_msp_attr[OFBA_MSPABI_Tag_Data_Model].i), + first_input_bfd); result = FALSE; } - + + /* Just ignore the data region unless the large memory model is in use. + We have already checked that ibfd and obfd use the same memory model. */ + if ((in_msp_attr[OFBA_MSPABI_Tag_Code_Model].i + == OFBA_MSPABI_Val_Code_Model_LARGE) + && (in_msp_attr[OFBA_MSPABI_Tag_Data_Model].i + == OFBA_MSPABI_Val_Data_Model_LARGE)) + { + /* We cannot allow "lower region only" to be linked with any other + values (i.e. ANY or NONE). + Before this attribute existed, "ANY" region was the default. */ + bfd_boolean ibfd_lower_region_used + = (in_gnu_attr[Tag_GNU_MSP430_Data_Region].i + == Val_GNU_MSP430_Data_Region_Lower); + bfd_boolean obfd_lower_region_used + = (out_gnu_attr[Tag_GNU_MSP430_Data_Region].i + == Val_GNU_MSP430_Data_Region_Lower); + if (ibfd_lower_region_used != obfd_lower_region_used) + { + _bfd_error_handler + (_("error: %pB can use the upper region for data, " + "but %pB assumes data is exclusively in lower memory"), + ibfd_lower_region_used ? obfd : ibfd, + ibfd_lower_region_used ? ibfd : obfd); + result = FALSE; + } + } + return result; } @@ -2513,8 +2559,9 @@ elf32_msp430_merge_mspabi_attributes (bfd *ibfd, bfd *obfd) object file when linking. */ static bfd_boolean -elf32_msp430_merge_private_bfd_data (bfd * ibfd, bfd * obfd) +elf32_msp430_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) { + bfd *obfd = info->output_bfd; /* Make sure that the machine number reflects the most advanced version of the MSP architecture required. */ #define max(a,b) ((a) > (b) ? (a) : (b)) @@ -2523,7 +2570,7 @@ elf32_msp430_merge_private_bfd_data (bfd * ibfd, bfd * obfd) max (bfd_get_mach (ibfd), bfd_get_mach (obfd))); #undef max - return elf32_msp430_merge_mspabi_attributes (ibfd, obfd); + return elf32_msp430_merge_msp430_attributes (ibfd, info); } static bfd_boolean @@ -2532,13 +2579,35 @@ msp430_elf_is_target_special_symbol (bfd *abfd, asymbol *sym) return _bfd_elf_is_local_label_name (abfd, sym->name); } +static bfd_boolean +uses_large_model (bfd *abfd) +{ + obj_attribute * attr; + + if (abfd->flags & BFD_LINKER_CREATED) + return FALSE; + + attr = elf_known_obj_attributes_proc (abfd); + if (attr == NULL) + return FALSE; + + return attr[OFBA_MSPABI_Tag_Code_Model].i == 2; +} + +static unsigned int +elf32_msp430_eh_frame_address_size (bfd *abfd, + const asection *sec ATTRIBUTE_UNUSED) +{ + return uses_large_model (abfd) ? 4 : 2; +} + /* This is gross. The MSP430 EABI says that (sec 11.5): "An implementation may choose to use Rel or Rela type relocations for other relocations." But it also says that: - + "Certain relocations are identified as Rela only. [snip] Where Rela is specified, an implementation must honor this requirement." @@ -2552,17 +2621,18 @@ msp430_elf_is_target_special_symbol (bfd *abfd, asymbol *sym) #define elf_backend_may_use_rela_p 1 #define elf_backend_default_use_rela_p 1 -#undef elf_backend_obj_attrs_vendor +#undef elf_backend_obj_attrs_vendor #define elf_backend_obj_attrs_vendor "mspabi" -#undef elf_backend_obj_attrs_section +#undef elf_backend_obj_attrs_section #define elf_backend_obj_attrs_section ".MSP430.attributes" -#undef elf_backend_obj_attrs_section_type +#undef elf_backend_obj_attrs_section_type #define elf_backend_obj_attrs_section_type SHT_MSP430_ATTRIBUTES -#define elf_backend_section_from_shdr elf32_msp430_section_from_shdr -#define elf_backend_obj_attrs_handle_unknown elf32_msp430_obj_attrs_handle_unknown -#undef elf_backend_obj_attrs_arg_type +#define elf_backend_section_from_shdr elf32_msp430_section_from_shdr +#define elf_backend_obj_attrs_handle_unknown elf32_msp430_obj_attrs_handle_unknown +#undef elf_backend_obj_attrs_arg_type #define elf_backend_obj_attrs_arg_type elf32_msp430_obj_attrs_arg_type #define bfd_elf32_bfd_merge_private_bfd_data elf32_msp430_merge_private_bfd_data +#define elf_backend_eh_frame_address_size elf32_msp430_eh_frame_address_size #define ELF_ARCH bfd_arch_msp430 #define ELF_MACHINE_CODE EM_MSP430 @@ -2570,41 +2640,44 @@ msp430_elf_is_target_special_symbol (bfd *abfd, asymbol *sym) #define ELF_MAXPAGESIZE 4 #define ELF_OSABI ELFOSABI_STANDALONE -#define TARGET_LITTLE_SYM msp430_elf32_vec +#define TARGET_LITTLE_SYM msp430_elf32_vec #define TARGET_LITTLE_NAME "elf32-msp430" -#define elf_info_to_howto msp430_info_to_howto_rela -#define elf_info_to_howto_rel NULL -#define elf_backend_relocate_section elf32_msp430_relocate_section -#define elf_backend_check_relocs elf32_msp430_check_relocs -#define elf_backend_can_gc_sections 1 +#define elf_info_to_howto msp430_info_to_howto_rela +#define elf_info_to_howto_rel NULL +#define elf_backend_relocate_section elf32_msp430_relocate_section +#define elf_backend_check_relocs elf32_msp430_check_relocs +#define elf_backend_can_gc_sections 1 #define elf_backend_final_write_processing bfd_elf_msp430_final_write_processing #define elf_backend_object_p elf32_msp430_object_p #define bfd_elf32_bfd_relax_section msp430_elf_relax_section #define bfd_elf32_bfd_is_target_special_symbol msp430_elf_is_target_special_symbol -#undef elf32_bed +#undef elf32_bed #define elf32_bed elf32_msp430_bed #include "elf32-target.h" /* The TI compiler sets the OSABI field to ELFOSABI_NONE. */ -#undef TARGET_LITTLE_SYM -#define TARGET_LITTLE_SYM msp430_elf32_ti_vec +#undef TARGET_LITTLE_SYM +#define TARGET_LITTLE_SYM msp430_elf32_ti_vec -#undef elf32_bed +#undef elf32_bed #define elf32_bed elf32_msp430_ti_bed -#undef ELF_OSABI +#undef ELF_OSABI #define ELF_OSABI ELFOSABI_NONE static const struct bfd_elf_special_section msp430_ti_elf_special_sections[] = { - /* prefix, prefix_length, suffix_len, type, attributes. */ + /* prefix, prefix_length, suffix_len, type, attributes. */ { STRING_COMMA_LEN (".TI.symbol.alias"), 0, SHT_MSP430_SYM_ALIASES, 0 }, { STRING_COMMA_LEN (".TI.section.flags"), 0, SHT_MSP430_SEC_FLAGS, 0 }, { STRING_COMMA_LEN ("_TI_build_attrib"), 0, SHT_MSP430_ATTRIBUTES, 0 }, - { NULL, 0, 0, 0, 0 } + { NULL, 0, 0, 0, 0 } }; +#undef elf_backend_special_sections +#define elf_backend_special_sections msp430_ti_elf_special_sections + #include "elf32-target.h"