X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Felf32-m32c.c;h=70ccd6203abdc6acabc70a6fa5bc875031bcfd0f;hb=7ef412cf72a197d68e532604cc1fa21351adc858;hp=8436fb10fb4f805d5130e3f611cfb1c1ed4b2f03;hpb=6f2750feaf2827ef8a1a0a5b2f90c1e9a6cabbd1;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf32-m32c.c b/bfd/elf32-m32c.c index 8436fb10fb..70ccd6203a 100644 --- a/bfd/elf32-m32c.c +++ b/bfd/elf32-m32c.c @@ -1,5 +1,5 @@ /* M16C/M32C specific support for 32-bit ELF. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2020 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -15,7 +15,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ #include "sysdep.h" #include "bfd.h" @@ -27,7 +28,7 @@ /* Forward declarations. */ static reloc_howto_type * m32c_reloc_type_lookup (bfd *, bfd_reloc_code_real_type); -static void m32c_info_to_howto_rela +static bfd_boolean m32c_info_to_howto_rela (bfd *, arelent *, Elf_Internal_Rela *); static bfd_boolean m32c_elf_relocate_section (bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *, asection **); @@ -116,9 +117,9 @@ static reloc_howto_type m32c_elf_howto_table [] = bfd_elf_generic_reloc, /* special_function */ "R_M32C_8_PCREL", /* name */ FALSE, /* partial_inplace */ - 0, /* src_mask */ - 0xff, /* dst_mask */ - TRUE), /* pcrel_offset */ + 0, /* src_mask */ + 0xff, /* dst_mask */ + TRUE), /* pcrel_offset */ HOWTO (R_M32C_16_PCREL, /* type */ 0, /* rightshift */ @@ -130,9 +131,9 @@ static reloc_howto_type m32c_elf_howto_table [] = bfd_elf_generic_reloc, /* special_function */ "R_M32C_16_PCREL", /* name */ FALSE, /* partial_inplace */ - 0, /* src_mask */ - 0xffff, /* dst_mask */ - TRUE), /* pcrel_offset */ + 0, /* src_mask */ + 0xffff, /* dst_mask */ + TRUE), /* pcrel_offset */ HOWTO (R_M32C_8, /* type */ 0, /* rightshift */ @@ -144,9 +145,9 @@ static reloc_howto_type m32c_elf_howto_table [] = bfd_elf_generic_reloc, /* special_function */ "R_M32C_8", /* name */ FALSE, /* partial_inplace */ - 0, /* src_mask */ + 0, /* src_mask */ 0xff, /* dst_mask */ - FALSE), /* pcrel_offset */ + FALSE), /* pcrel_offset */ HOWTO (R_M32C_LO16, /* type */ 0, /* rightshift */ @@ -158,9 +159,9 @@ static reloc_howto_type m32c_elf_howto_table [] = bfd_elf_generic_reloc, /* special_function */ "R_M32C_LO16", /* name */ FALSE, /* partial_inplace */ - 0, /* src_mask */ + 0, /* src_mask */ 0xffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + FALSE), /* pcrel_offset */ HOWTO (R_M32C_HI8, /* type */ 0, /* rightshift */ @@ -172,9 +173,9 @@ static reloc_howto_type m32c_elf_howto_table [] = bfd_elf_generic_reloc, /* special_function */ "R_M32C_HI8", /* name */ FALSE, /* partial_inplace */ - 0, /* src_mask */ + 0, /* src_mask */ 0xff, /* dst_mask */ - FALSE), /* pcrel_offset */ + FALSE), /* pcrel_offset */ HOWTO (R_M32C_HI16, /* type */ 0, /* rightshift */ @@ -186,9 +187,9 @@ static reloc_howto_type m32c_elf_howto_table [] = bfd_elf_generic_reloc, /* special_function */ "R_M32C_HI16", /* name */ FALSE, /* partial_inplace */ - 0, /* src_mask */ + 0, /* src_mask */ 0xffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + FALSE), /* pcrel_offset */ HOWTO (R_M32C_RL_JUMP, /* type */ 0, /* rightshift */ @@ -200,9 +201,9 @@ static reloc_howto_type m32c_elf_howto_table [] = bfd_elf_generic_reloc, /* special_function */ "R_M32C_RL_JUMP", /* name */ FALSE, /* partial_inplace */ - 0, /* src_mask */ - 0, /* dst_mask */ - FALSE), /* pcrel_offset */ + 0, /* src_mask */ + 0, /* dst_mask */ + FALSE), /* pcrel_offset */ HOWTO (R_M32C_RL_1ADDR, /* type */ 0, /* rightshift */ @@ -214,9 +215,9 @@ static reloc_howto_type m32c_elf_howto_table [] = bfd_elf_generic_reloc, /* special_function */ "R_M32C_RL_1ADDR", /* name */ FALSE, /* partial_inplace */ - 0, /* src_mask */ - 0, /* dst_mask */ - FALSE), /* pcrel_offset */ + 0, /* src_mask */ + 0, /* dst_mask */ + FALSE), /* pcrel_offset */ HOWTO (R_M32C_RL_2ADDR, /* type */ 0, /* rightshift */ @@ -228,9 +229,9 @@ static reloc_howto_type m32c_elf_howto_table [] = bfd_elf_generic_reloc, /* special_function */ "R_M32C_RL_2ADDR", /* name */ FALSE, /* partial_inplace */ - 0, /* src_mask */ - 0, /* dst_mask */ - FALSE), /* pcrel_offset */ + 0, /* src_mask */ + 0, /* dst_mask */ + FALSE), /* pcrel_offset */ }; @@ -246,10 +247,10 @@ static const struct m32c_reloc_map m32c_reloc_map [] = { { BFD_RELOC_NONE, R_M32C_NONE }, { BFD_RELOC_16, R_M32C_16 }, - { BFD_RELOC_24, R_M32C_24 }, + { BFD_RELOC_24, R_M32C_24 }, { BFD_RELOC_32, R_M32C_32 }, - { BFD_RELOC_8_PCREL, R_M32C_8_PCREL }, - { BFD_RELOC_16_PCREL, R_M32C_16_PCREL }, + { BFD_RELOC_8_PCREL, R_M32C_8_PCREL }, + { BFD_RELOC_16_PCREL, R_M32C_16_PCREL }, { BFD_RELOC_8, R_M32C_8 }, { BFD_RELOC_LO16, R_M32C_LO16 }, { BFD_RELOC_HI16, R_M32C_HI16 }, @@ -261,7 +262,7 @@ static const struct m32c_reloc_map m32c_reloc_map [] = static reloc_howto_type * m32c_reloc_type_lookup - (bfd * abfd ATTRIBUTE_UNUSED, + (bfd * abfd ATTRIBUTE_UNUSED, bfd_reloc_code_real_type code) { unsigned int i; @@ -290,21 +291,24 @@ m32c_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, const char *r_name) /* Set the howto pointer for an M32C ELF reloc. */ -static void -m32c_info_to_howto_rela - (bfd * abfd ATTRIBUTE_UNUSED, - arelent * cache_ptr, - Elf_Internal_Rela * dst) +static bfd_boolean +m32c_info_to_howto_rela (bfd * abfd, + arelent * cache_ptr, + Elf_Internal_Rela * dst) { unsigned int r_type; r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_M32C_max) { - _bfd_error_handler (_("%B: invalid M32C 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 = & m32c_elf_howto_table [r_type]; + return TRUE; } @@ -386,42 +390,38 @@ static bfd_reloc_status_type m32c_apply_reloc_24 (bfd *abfd ATTRIBUTE_UNUSED, static bfd_boolean m32c_elf_relocate_section - (bfd * output_bfd ATTRIBUTE_UNUSED, + (bfd * output_bfd ATTRIBUTE_UNUSED, struct bfd_link_info * info, - bfd * input_bfd, - asection * input_section, - bfd_byte * contents, + bfd * input_bfd, + asection * input_section, + bfd_byte * contents, Elf_Internal_Rela * relocs, - Elf_Internal_Sym * local_syms, - asection ** local_sections) + Elf_Internal_Sym * local_syms, + asection ** local_sections) { - Elf_Internal_Shdr * symtab_hdr; + Elf_Internal_Shdr * symtab_hdr; struct elf_link_hash_entry ** sym_hashes; - Elf_Internal_Rela * rel; - Elf_Internal_Rela * relend; - bfd *dynobj; + Elf_Internal_Rela * rel; + Elf_Internal_Rela * relend; asection *splt; symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr; sym_hashes = elf_sym_hashes (input_bfd); relend = relocs + input_section->reloc_count; - dynobj = elf_hash_table (info)->dynobj; - splt = NULL; - if (dynobj != NULL) - splt = bfd_get_linker_section (dynobj, ".plt"); + splt = elf_hash_table (info)->splt; for (rel = relocs; rel < relend; rel ++) { - reloc_howto_type * howto; - unsigned long r_symndx; - Elf_Internal_Sym * sym; - asection * sec; + reloc_howto_type * howto; + unsigned long r_symndx; + Elf_Internal_Sym * sym; + asection * sec; struct elf_link_hash_entry * h; - bfd_vma relocation; - bfd_reloc_status_type r; - const char * name = NULL; - int r_type; + bfd_vma relocation; + bfd_reloc_status_type r; + const char * name = NULL; + int r_type; r_type = ELF32_R_TYPE (rel->r_info); @@ -450,7 +450,7 @@ m32c_elf_relocate_section name = bfd_elf_string_from_elf_section (input_bfd, symtab_hdr->sh_link, sym->st_name); - name = (sym->st_name == 0) ? bfd_section_name (input_bfd, sec) : name; + name = sym->st_name == 0 ? bfd_section_name (sec) : name; } else { @@ -478,12 +478,9 @@ m32c_elf_relocate_section else if (h->root.type == bfd_link_hash_undefweak) ; else if (!bfd_link_relocatable (info)) - { - if (! ((*info->callbacks->undefined_symbol) - (info, h->root.root.string, input_bfd, - input_section, rel->r_offset, TRUE))) - return FALSE; - } + (*info->callbacks->undefined_symbol) (info, h->root.root.string, + input_bfd, input_section, + rel->r_offset, TRUE); } if (sec != NULL && discarded_section (sec)) @@ -493,9 +490,9 @@ m32c_elf_relocate_section if (bfd_link_relocatable (info)) { /* This is a relocatable link. We don't have to change - anything, unless the reloc is against a section symbol, - in which case we have to adjust according to where the - section symbol winds up in the output section. */ + anything, unless the reloc is against a section symbol, + in which case we have to adjust according to where the + section symbol winds up in the output section. */ if (sym != NULL && ELF_ST_TYPE (sym->st_info) == STT_SECTION) rel->r_addend += sec->output_offset; continue; @@ -516,9 +513,9 @@ m32c_elf_relocate_section relocation, *plt_offset);*/ if (relocation <= 0xffff) { - /* If the symbol is in range for a 16-bit address, we should + /* If the symbol is in range for a 16-bit address, we should have deallocated the plt entry in relax_section. */ - BFD_ASSERT (*plt_offset == (bfd_vma) -1); + BFD_ASSERT (*plt_offset == (bfd_vma) -1); } else { @@ -613,15 +610,14 @@ m32c_elf_relocate_section 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); 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: @@ -642,11 +638,8 @@ m32c_elf_relocate_section } 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); } } @@ -658,15 +651,15 @@ m32c_elf_relocate_section static bfd_boolean m32c_elf_check_relocs - (bfd * abfd, + (bfd * abfd, struct bfd_link_info * info, - asection * sec, + asection * sec, const Elf_Internal_Rela * relocs) { - Elf_Internal_Shdr * symtab_hdr; + Elf_Internal_Shdr * symtab_hdr; struct elf_link_hash_entry ** sym_hashes; - const Elf_Internal_Rela * rel; - const Elf_Internal_Rela * rel_end; + const Elf_Internal_Rela * rel; + const Elf_Internal_Rela * rel_end; bfd_vma *local_plt_offsets; asection *splt; bfd *dynobj; @@ -689,41 +682,35 @@ m32c_elf_check_relocs r_symndx = ELF32_R_SYM (rel->r_info); if (r_symndx < symtab_hdr->sh_info) - h = NULL; + h = NULL; 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; - - /* PR15323, ref flags aren't set for references in the same - object. */ - h->root.non_ir_ref = 1; } switch (ELF32_R_TYPE (rel->r_info)) - { + { /* This relocation describes a 16-bit pointer to a function. We may need to allocate a thunk in low memory; reserve memory for it now. */ case R_M32C_16: if (dynobj == NULL) elf_hash_table (info)->dynobj = dynobj = abfd; + splt = elf_hash_table (info)->splt; if (splt == NULL) { - splt = bfd_get_linker_section (dynobj, ".plt"); - if (splt == NULL) - { - flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS - | SEC_IN_MEMORY | SEC_LINKER_CREATED - | SEC_READONLY | SEC_CODE); - splt = bfd_make_section_anyway_with_flags (dynobj, ".plt", - flags); - if (splt == NULL - || ! bfd_set_section_alignment (dynobj, splt, 1)) - return FALSE; - } + flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS + | SEC_IN_MEMORY | SEC_LINKER_CREATED + | SEC_READONLY | SEC_CODE); + splt = bfd_make_section_anyway_with_flags (dynobj, ".plt", + flags); + elf_hash_table (info)->splt = splt; + if (splt == NULL + || !bfd_set_section_alignment (splt, 1)) + return FALSE; } if (h != NULL) @@ -753,7 +740,7 @@ m32c_elf_check_relocs splt->size += 4; } break; - } + } } return TRUE; @@ -763,16 +750,15 @@ m32c_elf_check_relocs static bfd_boolean m32c_elf_finish_dynamic_sections (bfd *abfd ATTRIBUTE_UNUSED, - struct bfd_link_info *info) + struct bfd_link_info *info) { - bfd *dynobj; - asection *splt; + bfd *dynobj = elf_hash_table (info)->dynobj; + asection *splt = elf_hash_table (info)->splt; /* As an extra sanity check, verify that all plt entries have been filled in. */ - if ((dynobj = elf_hash_table (info)->dynobj) != NULL - && (splt = bfd_get_linker_section (dynobj, ".plt")) != NULL) + if (dynobj != NULL && splt != NULL) { bfd_byte *contents = splt->contents; unsigned int i, size = splt->size; @@ -788,7 +774,7 @@ m32c_elf_finish_dynamic_sections (bfd *abfd ATTRIBUTE_UNUSED, static bfd_boolean m32c_elf_always_size_sections (bfd *output_bfd ATTRIBUTE_UNUSED, - struct bfd_link_info *info) + struct bfd_link_info *info) { bfd *dynobj; asection *splt; @@ -800,7 +786,7 @@ m32c_elf_always_size_sections (bfd *output_bfd ATTRIBUTE_UNUSED, if (dynobj == NULL) return TRUE; - splt = bfd_get_linker_section (dynobj, ".plt"); + splt = elf_hash_table (info)->splt; BFD_ASSERT (splt != NULL); splt->contents = (bfd_byte *) bfd_zalloc (dynobj, splt->size); @@ -824,8 +810,9 @@ m32c_elf_set_private_flags (bfd *abfd, flagword flags) object file when linking. */ static bfd_boolean -m32c_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd) +m32c_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) { + bfd *obfd = info->output_bfd; flagword old_flags, old_partial; flagword new_flags, new_partial; bfd_boolean error = FALSE; @@ -837,9 +824,10 @@ m32c_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd) old_flags = elf_elfheader (obfd)->e_flags; #ifdef DEBUG - (*_bfd_error_handler) ("old_flags = 0x%.8lx, new_flags = 0x%.8lx, init = %s, filename = %s", - old_flags, new_flags, elf_flags_init (obfd) ? "yes" : "no", - bfd_get_filename (ibfd)); + _bfd_error_handler + ("old_flags = 0x%.8x, new_flags = 0x%.8x, init = %s, filename = %s", + old_flags, new_flags, elf_flags_init (obfd) ? "yes" : "no", + bfd_get_filename (ibfd)); #endif if (!elf_flags_init (obfd)) @@ -883,9 +871,10 @@ m32c_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd) if (new_opt[0]) { error = TRUE; - (*_bfd_error_handler) - (_("%s: compiled with %s and linked with modules compiled with %s"), - bfd_get_filename (ibfd), new_opt, old_opt); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: compiled with %s and linked with modules compiled with %s"), + ibfd, new_opt, old_opt); } new_flags &= ~ EF_M32C_ALL_FLAGS; @@ -895,9 +884,11 @@ m32c_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd) if (new_flags != old_flags) { error = TRUE; - (*_bfd_error_handler) - (_("%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"), - bfd_get_filename (ibfd), (long)new_flags, (long)old_flags); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: uses different e_flags (%#x) fields" + " than previous modules (%#x)"), + ibfd, new_flags, old_flags); } } @@ -941,7 +932,7 @@ elf32_m32c_machine (bfd *abfd) switch (elf_elfheader (abfd)->e_flags & EF_M32C_CPU_MASK) { case EF_M32C_CPU_M16C: return bfd_mach_m16c; - case EF_M32C_CPU_M32C: return bfd_mach_m32c; + case EF_M32C_CPU_M32C: return bfd_mach_m32c; } return bfd_mach_m16c; @@ -1156,8 +1147,8 @@ m32c_relax_plt_realloc (struct elf_link_hash_entry *h, void * xdata) static bfd_boolean m32c_elf_relax_plt_section (asection *splt, - struct bfd_link_info *info, - bfd_boolean *again) + struct bfd_link_info *info, + bfd_boolean *again) { struct relax_plt_data relax_plt_data; bfd *ibfd; @@ -1267,7 +1258,7 @@ m32c_elf_relax_plt_section (asection *splt, for (idx = 0; idx < nlocals; ++idx) if (local_plt_offsets[idx] != (bfd_vma) -1) { - local_plt_offsets[idx] = entry; + local_plt_offsets[idx] = entry; entry += 4; } } @@ -1437,10 +1428,10 @@ static EncodingTable m32c_addr_encodings[] = { static bfd_boolean m32c_elf_relax_section - (bfd * abfd, - asection * sec, + (bfd * abfd, + asection * sec, struct bfd_link_info * link_info, - bfd_boolean * again) + bfd_boolean * again) { Elf_Internal_Shdr *symtab_hdr; Elf_Internal_Shdr *shndx_hdr; @@ -1525,7 +1516,7 @@ m32c_elf_relax_section /* The RL_ relocs must be just before the operand relocs they go with, so we must sort them to guarantee this. */ qsort (internal_relocs, sec->reloc_count, sizeof (Elf_Internal_Rela), - compare_reloc); + compare_reloc); /* Walk through them looking for relaxing opportunities. */ irelend = internal_relocs + sec->reloc_count; @@ -1595,9 +1586,9 @@ m32c_elf_relax_section */ /* Get the value of the symbol referred to by the reloc. Just - in case this is the last reloc in the list, use the RL's - addend to choose between this reloc (no addend) or the next - (yes addend, which means at least one following reloc). */ + in case this is the last reloc in the list, use the RL's + addend to choose between this reloc (no addend) or the next + (yes addend, which means at least one following reloc). */ srel = irel + (relax_relocs ? 1 : 0); symval = OFFSET_FOR_RELOC (srel); @@ -1964,10 +1955,10 @@ m32c_elf_relax_section static bfd_boolean m32c_elf_relax_delete_bytes - (bfd * abfd, + (bfd * abfd, asection * sec, bfd_vma addr, - int count) + int count) { Elf_Internal_Shdr *symtab_hdr; Elf_Internal_Shdr *shndx_hdr; @@ -1983,7 +1974,7 @@ m32c_elf_relax_delete_bytes Elf_External_Sym_Shndx *shndx; struct elf_link_hash_entry ** sym_hashes; struct elf_link_hash_entry ** end_hashes; - unsigned int symcount; + unsigned int symcount; contents = elf_section_data (sec)->this_hdr.contents; @@ -2115,7 +2106,8 @@ m32c_elf_relax_delete_bytes /* This is for versions of gcc prior to 4.3. */ static unsigned int -_bfd_m32c_elf_eh_frame_address_size (bfd *abfd, asection *sec ATTRIBUTE_UNUSED) +_bfd_m32c_elf_eh_frame_address_size (bfd *abfd, + const asection *sec ATTRIBUTE_UNUSED) { if ((elf_elfheader (abfd)->e_flags & EF_M32C_CPU_MASK) == EF_M32C_CPU_M16C) return 2; @@ -2141,9 +2133,9 @@ _bfd_m32c_elf_eh_frame_address_size (bfd *abfd, asection *sec ATTRIBUTE_UNUSED) #define elf_info_to_howto m32c_info_to_howto_rela #define elf_backend_object_p m32c_elf_object_p #define elf_backend_relocate_section m32c_elf_relocate_section -#define elf_backend_check_relocs m32c_elf_check_relocs +#define elf_backend_check_relocs m32c_elf_check_relocs #define elf_backend_object_p m32c_elf_object_p -#define elf_symbol_leading_char ('_') +#define elf_symbol_leading_char ('_') #define elf_backend_always_size_sections \ m32c_elf_always_size_sections #define elf_backend_finish_dynamic_sections \