X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=bfd%2Felf32-moxie.c;h=d857617c5786c2670a4cc8cfd9924463d2396e14;hb=ddc01737d34f16074b2c9a92c5a808be5c91340f;hp=1f685b9c2d6ef65ea0dfa59986c79be72a68316d;hpb=6d00b590316c0b08de21a264893b0fd627c54686;p=binutils-gdb.git diff --git a/bfd/elf32-moxie.c b/bfd/elf32-moxie.c index 1f685b9c2d6..d857617c578 100644 --- a/bfd/elf32-moxie.c +++ b/bfd/elf32-moxie.c @@ -1,8 +1,8 @@ /* moxie-specific support for 32-bit ELF. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2022 Free Software Foundation, Inc. Copied from elf32-fr30.c which is.. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2022 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -34,47 +34,47 @@ static reloc_howto_type moxie_elf_howto_table [] = /* This reloc does nothing. */ HOWTO (R_MOXIE_NONE, /* type */ 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ - 32, /* bitsize */ - FALSE, /* pc_relative */ + 0, /* size */ + 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_MOXIE_NONE", /* name */ - FALSE, /* partial_inplace */ + false, /* partial_inplace */ 0, /* src_mask */ 0, /* dst_mask */ - FALSE), /* pcrel_offset */ + false), /* pcrel_offset */ /* A 32 bit absolute relocation. */ HOWTO (R_MOXIE_32, /* type */ 0, /* rightshift */ - 2, /* size (0 = byte, 1 = short, 2 = long) */ + 4, /* size */ 32, /* bitsize */ - FALSE, /* pc_relative */ + false, /* pc_relative */ 0, /* bitpos */ complain_overflow_bitfield, /* complain_on_overflow */ bfd_elf_generic_reloc, /* special_function */ "R_MOXIE_32", /* name */ - FALSE, /* partial_inplace */ + false, /* partial_inplace */ 0x00000000, /* src_mask */ 0xffffffff, /* dst_mask */ - FALSE), /* pcrel_offset */ + false), /* pcrel_offset */ /* A 10 bit PC-relative relocation. */ HOWTO (R_MOXIE_PCREL10, /* type. */ 1, /* rightshift. */ - 1, /* size (0 = byte, 1 = short, 2 = long). */ + 2, /* size. */ 10, /* bitsize. */ - TRUE, /* pc_relative. */ + true, /* pc_relative. */ 0, /* bitpos. */ complain_overflow_signed, /* complain_on_overflow. */ bfd_elf_generic_reloc, /* special_function. */ "R_MOXIE_PCREL10", /* name. */ - FALSE, /* partial_inplace. */ + false, /* partial_inplace. */ 0, /* src_mask. */ 0x000003FF, /* dst_mask. */ - TRUE), /* pcrel_offset. */ + true), /* pcrel_offset. */ }; /* Map BFD reloc types to MOXIE ELF reloc types. */ @@ -87,8 +87,8 @@ struct moxie_reloc_map static const struct moxie_reloc_map moxie_reloc_map [] = { - { BFD_RELOC_NONE, R_MOXIE_NONE }, - { BFD_RELOC_32, R_MOXIE_32 }, + { BFD_RELOC_NONE, R_MOXIE_NONE }, + { BFD_RELOC_32, R_MOXIE_32 }, { BFD_RELOC_MOXIE_10_PCREL, R_MOXIE_PCREL10 }, }; @@ -99,7 +99,7 @@ moxie_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, unsigned int i; for (i = sizeof (moxie_reloc_map) / sizeof (moxie_reloc_map[0]); - --i;) + i--;) if (moxie_reloc_map [i].bfd_reloc_val == code) return & moxie_elf_howto_table [moxie_reloc_map[i].moxie_reloc_val]; @@ -123,16 +123,24 @@ moxie_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, const char *r_name) /* Set the howto pointer for an MOXIE ELF reloc. */ -static void -moxie_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED, +static bool +moxie_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); - BFD_ASSERT (r_type < (unsigned int) R_MOXIE_max); + if (r_type >= (unsigned int) R_MOXIE_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 = & moxie_elf_howto_table [r_type]; + return true; } /* Perform a single relocation. By default we use the standard BFD @@ -189,7 +197,7 @@ moxie_final_link_relocate (reloc_howto_type *howto, section, which means that the addend must be adjusted accordingly. */ -static bfd_boolean +static int moxie_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, bfd *input_bfd, @@ -235,11 +243,11 @@ moxie_elf_relocate_section (bfd *output_bfd, name = bfd_elf_string_from_elf_section (input_bfd, symtab_hdr->sh_link, sym->st_name); - name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name; + name = name == NULL ? bfd_section_name (sec) : name; } else { - bfd_boolean unresolved_reloc, warned, ignored; + bool unresolved_reloc, warned, ignored; RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel, r_symndx, symtab_hdr, sym_hashes, @@ -253,7 +261,7 @@ moxie_elf_relocate_section (bfd *output_bfd, 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 = moxie_final_link_relocate (howto, input_bfd, input_section, @@ -266,15 +274,14 @@ moxie_elf_relocate_section (bfd *output_bfd, 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: @@ -295,15 +302,12 @@ moxie_elf_relocate_section (bfd *output_bfd, } 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); } } - return TRUE; + return true; } /* Return the section that should be marked against GC for a given @@ -323,7 +327,7 @@ moxie_elf_gc_mark_hook (asection *sec, Since we don't do .gots or .plts, we just need to consider the virtual table relocs for gc. */ -static bfd_boolean +static bool moxie_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec, @@ -334,8 +338,8 @@ moxie_elf_check_relocs (bfd *abfd, const Elf_Internal_Rela *rel; const Elf_Internal_Rela *rel_end; - if (info->relocatable) - return TRUE; + if (bfd_link_relocatable (info)) + return true; symtab_hdr = &elf_tdata (abfd)->symtab_hdr; sym_hashes = elf_sym_hashes (abfd); @@ -348,37 +352,34 @@ moxie_elf_check_relocs (bfd *abfd, 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; } } - return TRUE; + return true; } #define ELF_ARCH bfd_arch_moxie #define ELF_MACHINE_CODE EM_MOXIE +#define ELF_MACHINE_ALT1 EM_MOXIE_OLD #define ELF_MAXPAGESIZE 0x1 -#define TARGET_BIG_SYM moxie_elf32_be_vec +#define TARGET_BIG_SYM moxie_elf32_be_vec #define TARGET_BIG_NAME "elf32-bigmoxie" -#define TARGET_LITTLE_SYM moxie_elf32_le_vec +#define TARGET_LITTLE_SYM moxie_elf32_le_vec #define TARGET_LITTLE_NAME "elf32-littlemoxie" #define elf_info_to_howto_rel NULL #define elf_info_to_howto moxie_info_to_howto_rela #define elf_backend_relocate_section moxie_elf_relocate_section #define elf_backend_gc_mark_hook moxie_elf_gc_mark_hook -#define elf_backend_check_relocs moxie_elf_check_relocs +#define elf_backend_check_relocs moxie_elf_check_relocs #define elf_backend_can_gc_sections 1 #define elf_backend_rela_normal 1