X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bfd%2Felf64-mmix.c;h=d332151a36552ec961be328e9aae3d0d8ac0996d;hb=b09548933ac880cd86f92965709c838a03f2365f;hp=ad6757f518b289fded4f48a1120dbc4d011954b7;hpb=6d00b590316c0b08de21a264893b0fd627c54686;p=external%2Fbinutils.git diff --git a/bfd/elf64-mmix.c b/bfd/elf64-mmix.c index ad6757f..d332151 100644 --- a/bfd/elf64-mmix.c +++ b/bfd/elf64-mmix.c @@ -1,5 +1,5 @@ /* MMIX-specific support for 64-bit ELF. - Copyright (C) 2001-2014 Free Software Foundation, Inc. + Copyright (C) 2001-2019 Free Software Foundation, Inc. Contributed by Hans-Peter Nilsson This file is part of BFD, the Binary File Descriptor library. @@ -172,7 +172,7 @@ extern void mmix_elf_symbol_processing (bfd *, asymbol *); /* Only intended to be called from a debugger. */ extern void mmix_dump_bpo_gregs - (struct bfd_link_info *, bfd_error_handler_type); + (struct bfd_link_info *, void (*) (const char *, ...)); static void mmix_set_relaxable_size (bfd *, asection *, void *); @@ -192,11 +192,11 @@ static reloc_howto_type elf_mmix_howto_table[] = /* This reloc does nothing. */ HOWTO (R_MMIX_NONE, /* type */ 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ - 32, /* bitsize */ + 3, /* size (0 = byte, 1 = short, 2 = long) */ + 0, /* bitsize */ FALSE, /* pc_relative */ 0, /* bitpos */ - complain_overflow_bitfield, /* complain_on_overflow */ + complain_overflow_dont, /* complain_on_overflow */ bfd_elf_generic_reloc, /* special_function */ "R_MMIX_NONE", /* name */ FALSE, /* partial_inplace */ @@ -460,7 +460,7 @@ static reloc_howto_type elf_mmix_howto_table[] = FALSE, /* partial_inplace */ ~0x0100ffff, /* src_mask */ 0x0100ffff, /* dst_mask */ - TRUE), /* pcrel_offset */ + TRUE), /* pcrel_offset */ HOWTO (R_MMIX_CBRANCH_J, /* type */ 2, /* rightshift */ @@ -982,10 +982,10 @@ mmix_elf_perform_relocation (asection *isec, reloc_howto_type *howto, a verbose message. */ *error_message = _("invalid input relocation when producing" - " non-ELF, non-mmo format output." - "\n Please use the objcopy program to convert from" + " non-ELF, non-mmo format output;" + " please use the objcopy program to convert from" " ELF or mmo," - "\n or assemble using" + " or assemble using" " \"-no-expand\" (for gcc, \"-Wa,-no-expand\""); mmix_elf_section_data (isec)->has_warned_pushj = TRUE; return bfd_reloc_dangerous; @@ -1166,10 +1166,10 @@ mmix_elf_perform_relocation (asection *isec, reloc_howto_type *howto, a verbose message. */ *error_message = _("invalid input relocation when producing" - " non-ELF, non-mmo format output." - "\n Please use the objcopy program to convert from" + " non-ELF, non-mmo format output;" + " please use the objcopy program to convert from" " ELF or mmo," - "\n or compile using the gcc-option" + " or compile using the gcc-option" " \"-mno-base-addresses\"."); mmix_elf_section_data (isec)->has_warned_bpo = TRUE; return bfd_reloc_dangerous; @@ -1190,14 +1190,13 @@ mmix_elf_perform_relocation (asection *isec, reloc_howto_type *howto, doesn't cost much, so can be left in at all times. */ if (value != gregdata->reloc_request[bpo_index].value) { - (*_bfd_error_handler) - (_("%s: Internal inconsistency error for value for\n\ - linker-allocated global register: linked: 0x%lx%08lx != relaxed: 0x%lx%08lx\n"), - bfd_get_filename (isec->owner), - (unsigned long) (value >> 32), (unsigned long) value, - (unsigned long) (gregdata->reloc_request[bpo_index].value - >> 32), - (unsigned long) gregdata->reloc_request[bpo_index].value); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: Internal inconsistency error for value for\n\ + linker-allocated global register: linked: %#" PRIx64 " != relaxed: %#" PRIx64 ""), + isec->owner, + (uint64_t) value, + (uint64_t) gregdata->reloc_request[bpo_index].value); bfd_set_error (bfd_error_bad_value); return bfd_reloc_overflow; } @@ -1251,16 +1250,24 @@ mmix_elf_perform_relocation (asection *isec, reloc_howto_type *howto, /* Set the howto pointer for an MMIX ELF reloc (type RELA). */ -static void -mmix_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED, +static bfd_boolean +mmix_info_to_howto_rela (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst) { unsigned int r_type; r_type = ELF64_R_TYPE (dst->r_info); - BFD_ASSERT (r_type < (unsigned int) R_MMIX_max); + if (r_type >= (unsigned int) R_MMIX_max) + { + /* 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_mmix_howto_table[r_type]; + return TRUE; } /* Any MMIX-specific relocation gets here at assembly time or when linking @@ -1425,7 +1432,7 @@ mmix_elf_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)) { /* This is a relocatable link. For most relocs we don't have to change anything, unless the reloc is against a section @@ -1512,13 +1519,12 @@ mmix_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, if (r != bfd_reloc_ok) { - bfd_boolean check_ok = TRUE; const char * msg = (const char *) NULL; switch (r) { case bfd_reloc_overflow: - check_ok = 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; @@ -1526,9 +1532,8 @@ mmix_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, case bfd_reloc_undefined: /* We may have sent this message above. */ if (! undefined_signalled) - check_ok = 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); undefined_signalled = TRUE; break; @@ -1550,11 +1555,8 @@ mmix_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, } if (msg) - check_ok = info->callbacks->warning - (info, msg, name, input_bfd, input_section, rel->r_offset); - - if (! check_ok) - return FALSE; + (*info->callbacks->warning) (info, msg, name, input_bfd, + input_section, rel->r_offset); } } @@ -1612,15 +1614,17 @@ mmix_final_link_relocate (reloc_howto_type *howto, asection *input_section, /* Note: This is separated out into two messages in order to ease the translation into other languages. */ if (symname == NULL || *symname == 0) - (*_bfd_error_handler) - (_("%s: base-plus-offset relocation against register symbol: (unknown) in %s"), - bfd_get_filename (input_section->owner), - bfd_get_section_name (symsec->owner, symsec)); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: base-plus-offset relocation against register symbol:" + " (unknown) in %pA"), + input_section->owner, symsec); else - (*_bfd_error_handler) - (_("%s: base-plus-offset relocation against register symbol: %s in %s"), - bfd_get_filename (input_section->owner), symname, - bfd_get_section_name (symsec->owner, symsec)); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: base-plus-offset relocation against register symbol:" + " %s in %pA"), + input_section->owner, symname, symsec); return bfd_reloc_overflow; } goto do_mmix_reloc; @@ -1661,15 +1665,17 @@ mmix_final_link_relocate (reloc_howto_type *howto, asection *input_section, /* Note: This is separated out into two messages in order to ease the translation into other languages. */ if (symname == NULL || *symname == 0) - (*_bfd_error_handler) - (_("%s: register relocation against non-register symbol: (unknown) in %s"), - bfd_get_filename (input_section->owner), - bfd_get_section_name (symsec->owner, symsec)); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: register relocation against non-register symbol:" + " (unknown) in %pA"), + input_section->owner, symsec); else - (*_bfd_error_handler) - (_("%s: register relocation against non-register symbol: %s in %s"), - bfd_get_filename (input_section->owner), symname, - bfd_get_section_name (symsec->owner, symsec)); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: register relocation against non-register symbol:" + " %s in %pA"), + input_section->owner, symname, symsec); /* The bfd_reloc_outofrange return value, though intuitively a better value, will not get us an error. */ @@ -1703,9 +1709,9 @@ mmix_final_link_relocate (reloc_howto_type *howto, asection *input_section, && strcmp (bfd_get_section_name (symsec->owner, symsec), MMIX_REG_SECTION_NAME) != 0) { - (*_bfd_error_handler) - (_("%s: directive LOCAL valid only with a register or absolute value"), - bfd_get_filename (input_section->owner)); + _bfd_error_handler + (_("%pB: directive LOCAL valid only with a register or absolute value"), + input_section->owner); return bfd_reloc_overflow; } @@ -1733,9 +1739,12 @@ mmix_final_link_relocate (reloc_howto_type *howto, asection *input_section, if ((bfd_vma) srel >= first_global) { /* FIXME: Better error message. */ - (*_bfd_error_handler) - (_("%s: LOCAL directive: Register $%ld is not a local register. First global register is $%ld."), - bfd_get_filename (input_section->owner), (long) srel, (long) first_global); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: LOCAL directive: " + "register $%" PRId64 " is not a local register;" + " first global register is $%" PRId64), + input_section->owner, (int64_t) srel, (int64_t) first_global); return bfd_reloc_overflow; } @@ -1772,33 +1781,6 @@ mmix_elf_gc_mark_hook (asection *sec, return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym); } - -/* Update relocation info for a GC-excluded section. We could supposedly - perform the allocation after GC, but there's no suitable hook between - GC (or section merge) and the point when all input sections must be - present. Better to waste some memory and (perhaps) a little time. */ - -static bfd_boolean -mmix_elf_gc_sweep_hook (bfd *abfd ATTRIBUTE_UNUSED, - struct bfd_link_info *info ATTRIBUTE_UNUSED, - asection *sec, - const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED) -{ - struct bpo_reloc_section_info *bpodata - = mmix_elf_section_data (sec)->bpo.reloc; - asection *allocated_gregs_section; - - /* If no bpodata here, we have nothing to do. */ - if (bpodata == NULL) - return TRUE; - - allocated_gregs_section = bpodata->bpo_greg_section; - - mmix_elf_section_data (allocated_gregs_section)->bpo.greg->n_bpo_relocs - -= bpodata->n_bpo_relocs_this_section; - - return TRUE; -} /* Sort register relocs to come before expanding relocs. */ @@ -1858,7 +1840,7 @@ mmix_elf_check_common_relocs (bfd *abfd, for (rel = relocs; rel < rel_end; rel++) { switch (ELF64_R_TYPE (rel->r_info)) - { + { /* This relocation causes a GREG allocation. We need to count them, and we need to create a section for them, so we need an object to fake as the owner of that section. We can't use @@ -1866,7 +1848,7 @@ mmix_elf_check_common_relocs (bfd *abfd, DSO-related stuff if that member is non-NULL. */ case R_MMIX_BASE_PLUS_OFFSET: /* We don't do anything with this reloc for a relocatable link. */ - if (info->relocatable) + if (bfd_link_relocatable (info)) break; if (bpo_greg_owner == NULL) @@ -1990,7 +1972,7 @@ mmix_elf_check_relocs (bfd *abfd, if (!mmix_elf_check_common_relocs (abfd, info, sec, relocs)) return FALSE; - if (info->relocatable) + if (bfd_link_relocatable (info)) return TRUE; rel_end = relocs + sec->reloc_count; @@ -2001,36 +1983,32 @@ mmix_elf_check_relocs (bfd *abfd, r_symndx = ELF64_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 (ELF64_R_TYPE (rel->r_info)) { - /* This relocation describes the C++ object vtable hierarchy. - Reconstruct it for later use during GC. */ - case R_MMIX_GNU_VTINHERIT: - if (!bfd_elf_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_MMIX_GNU_VTENTRY: - BFD_ASSERT (h != NULL); - if (h != NULL - && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend)) - return FALSE; - break; + /* This relocation describes the C++ object vtable hierarchy. + Reconstruct it for later use during GC. */ + case R_MMIX_GNU_VTINHERIT: + if (!bfd_elf_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_MMIX_GNU_VTENTRY: + BFD_ASSERT (h != NULL); + if (h != NULL + && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend)) + return FALSE; + break; } } @@ -2110,9 +2088,7 @@ static asymbol *mmix_elf_reg_section_symbol_ptr; /* Handle the special section numbers that a symbol may use. */ void -mmix_elf_symbol_processing (abfd, asym) - bfd *abfd ATTRIBUTE_UNUSED; - asymbol *asym; +mmix_elf_symbol_processing (bfd *abfd ATTRIBUTE_UNUSED, asymbol *asym) { elf_symbol_type *elfsym; @@ -2192,10 +2168,12 @@ mmix_elf_add_symbol_hook (bfd *abfd, { /* How do we get the asymbol (or really: the filename) from h? h->u.def.section->owner is NULL. */ - ((*_bfd_error_handler) - (_("%s: Error: multiple definition of `%s'; start of %s is set in a earlier linked file\n"), - bfd_get_filename (abfd), *namep, - *namep + strlen (MMIX_LOC_SECTION_START_SYMBOL_PREFIX))); + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB: error: multiple definition of `%s'; start of %s " + "is set in a earlier linked file"), + abfd, *namep, + *namep + strlen (MMIX_LOC_SECTION_START_SYMBOL_PREFIX)); bfd_set_error (bfd_error_bad_value); return FALSE; } @@ -2247,7 +2225,7 @@ mmix_elf_final_link (bfd *abfd, struct bfd_link_info *info) { /* FIXME: Pass error state gracefully. */ if (bfd_get_section_flags (abfd, reg_section) & SEC_HAS_CONTENTS) - _bfd_abort (__FILE__, __LINE__, _("Register section has contents\n")); + _bfd_abort (__FILE__, __LINE__, _("register section has contents\n")); /* Really remove the section, if it hasn't already been done. */ if (!bfd_section_removed_from_list (abfd, reg_section)) @@ -2299,7 +2277,7 @@ mmix_set_relaxable_size (bfd *abfd ATTRIBUTE_UNUSED, /* For use in relocatable link, we start with a max stubs size. See mmix_elf_relax_section. */ - if (info->relocatable && sec->output_section) + if (bfd_link_relocatable (info) && sec->output_section) mmix_elf_section_data (sec->output_section)->pjs.stubs_size_sum += (mmix_elf_section_data (sec)->pjs.n_pushj_relocs * MAX_PUSHJ_STUB_SIZE); @@ -2322,7 +2300,7 @@ _bfd_mmix_before_linker_allocation (bfd *abfd ATTRIBUTE_UNUSED, bfd *ibfd; /* Set the initial size of sections. */ - for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next) + for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link.next) bfd_map_over_sections (ibfd, mmix_set_relaxable_size, info); /* The bpo_greg_owner bfd is supposed to have been set by @@ -2435,11 +2413,12 @@ _bfd_mmix_after_linker_allocation (bfd *abfd ATTRIBUTE_UNUSED, if (gregdata->n_remaining_bpo_relocs_this_relaxation_round != gregdata->n_bpo_relocs) { - (*_bfd_error_handler) - (_("Internal inconsistency: remaining %u != max %u.\n\ - Please report this bug."), - gregdata->n_remaining_bpo_relocs_this_relaxation_round, - gregdata->n_bpo_relocs); + _bfd_error_handler + /* xgettext:c-format */ + (_("internal inconsistency: remaining %lu != max %lu;" + " please report this bug"), + (unsigned long) gregdata->n_remaining_bpo_relocs_this_relaxation_round, + (unsigned long) gregdata->n_bpo_relocs); return FALSE; } @@ -2487,9 +2466,8 @@ bpo_reloc_request_sort_fn (const void * p1, const void * p2) from base-plus-offset relocs. */ void -mmix_dump_bpo_gregs (link_info, pf) - struct bfd_link_info *link_info; - bfd_error_handler_type pf; +mmix_dump_bpo_gregs (struct bfd_link_info *link_info, + void (*pf) (const char *fmt, ...)) { bfd *bpo_greg_owner; asection *bpo_gregs_section; @@ -2581,7 +2559,7 @@ mmix_elf_relax_section (bfd *abfd, || (sec->flags & SEC_CODE) == 0 || (sec->flags & SEC_LINKER_CREATED) != 0 /* If no R_MMIX_BASE_PLUS_OFFSET relocs and no PUSHJ-stub relocs, - then nothing to do. */ + then nothing to do. */ || (bpodata == NULL && mmix_elf_section_data (sec)->pjs.n_pushj_relocs == 0)) return TRUE; @@ -2620,7 +2598,7 @@ mmix_elf_relax_section (bfd *abfd, /* We process relocs in a distinctly different way when this is a relocatable link (for one, we don't look at symbols), so we avoid mixing its code with that for the "normal" relaxation. */ - if (link_info->relocatable) + if (bfd_link_relocatable (link_info)) { /* The only transformation in a relocatable link is to generate a full stub at the location of the stub calculated for the @@ -2705,8 +2683,21 @@ mmix_elf_relax_section (bfd *abfd, indx = ELF64_R_SYM (irel->r_info) - symtab_hdr->sh_info; h = elf_sym_hashes (abfd)[indx]; BFD_ASSERT (h != NULL); - if (h->root.type != bfd_link_hash_defined - && h->root.type != bfd_link_hash_defweak) + if (h->root.type == bfd_link_hash_undefweak) + /* FIXME: for R_MMIX_PUSHJ_STUBBABLE, there are alternatives to + the canonical value 0 for an unresolved weak symbol to + consider: as the debug-friendly approach, resolve to "abort" + (or a port-specific function), or as the space-friendly + approach resolve to the next instruction (like some other + ports, notably ARM and AArch64). These alternatives require + matching code in mmix_elf_perform_relocation or its caller. */ + symval = 0; + else if (h->root.type == bfd_link_hash_defined + || h->root.type == bfd_link_hash_defweak) + symval = (h->root.u.def.value + + h->root.u.def.section->output_section->vma + + h->root.u.def.section->output_offset); + else { /* This appears to be a reference to an undefined symbol. Just ignore it--it will be caught by the regular reloc processing. @@ -2720,10 +2711,6 @@ mmix_elf_relax_section (bfd *abfd, } continue; } - - symval = (h->root.u.def.value - + h->root.u.def.section->output_section->vma - + h->root.u.def.section->output_offset); } if (ELF64_R_TYPE (irel->r_info) == (int) R_MMIX_PUSHJ_STUBBABLE) @@ -2861,6 +2848,8 @@ mmix_elf_relax_section (bfd *abfd, } } + BFD_ASSERT(pjsno == mmix_elf_section_data (sec)->pjs.n_pushj_relocs); + if (internal_relocs != NULL && elf_section_data (sec)->relocs != internal_relocs) free (internal_relocs); @@ -2886,7 +2875,7 @@ mmix_elf_relax_section (bfd *abfd, } #define ELF_ARCH bfd_arch_mmix -#define ELF_MACHINE_CODE EM_MMIX +#define ELF_MACHINE_CODE EM_MMIX /* According to mmix-doc page 36 (paragraph 45), this should be (1LL << 48LL). However, that's too much for something somewhere in the linker part of @@ -2909,7 +2898,6 @@ mmix_elf_relax_section (bfd *abfd, #define elf_info_to_howto mmix_info_to_howto_rela #define elf_backend_relocate_section mmix_elf_relocate_section #define elf_backend_gc_mark_hook mmix_elf_gc_mark_hook -#define elf_backend_gc_sweep_hook mmix_elf_gc_sweep_hook #define elf_backend_link_output_symbol_hook \ mmix_elf_link_output_symbol_hook @@ -2917,8 +2905,10 @@ mmix_elf_relax_section (bfd *abfd, #define elf_backend_check_relocs mmix_elf_check_relocs #define elf_backend_symbol_processing mmix_elf_symbol_processing -#define elf_backend_omit_section_dynsym \ - ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true) +#define elf_backend_omit_section_dynsym _bfd_elf_omit_section_dynsym_all + +#define bfd_elf64_bfd_copy_link_hash_symbol_type \ + _bfd_generic_copy_link_hash_symbol_type #define bfd_elf64_bfd_is_local_label_name \ mmix_elf_is_local_label_name