X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Felf32-visium.c;h=431eb3448b9290e10b0fd83c6e3af729e237157b;hb=d4d8aee345704f7c39ebe9910cc08386708637b1;hp=5e304674cdaf97d260cd3199826258703ea66ddb;hpb=b90efa5b79ac1524ec260f8eb89d1be37e0219a7;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf32-visium.c b/bfd/elf32-visium.c index 5e304674cd..431eb3448b 100644 --- a/bfd/elf32-visium.c +++ b/bfd/elf32-visium.c @@ -1,6 +1,6 @@ /* Visium-specific support for 32-bit ELF. - Copyright (C) 2003-2015 Free Software Foundation, Inc. + Copyright (C) 2003-2020 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -25,6 +25,7 @@ #include "libbfd.h" #include "elf-bfd.h" #include "elf/visium.h" +#include "libiberty.h" static bfd_reloc_status_type visium_elf_howto_parity_reloc (bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **); @@ -33,11 +34,11 @@ static reloc_howto_type visium_elf_howto_table[] = { /* This reloc does nothing. */ HOWTO (R_VISIUM_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_VISIUM_NONE", /* name */ FALSE, /* partial_inplace */ @@ -276,32 +277,6 @@ static reloc_howto_type visium_elf_vtentry_howto = 0, /* dst_mask */ FALSE); /* pcrel_offset */ -/* Map BFD reloc types to VISIUM ELF reloc types. */ -struct visium_reloc_map -{ - bfd_reloc_code_real_type bfd_reloc_val; - unsigned int visium_reloc_val; -}; - -static const struct visium_reloc_map visium_reloc_map[] = { - {BFD_RELOC_NONE, R_VISIUM_NONE}, - {BFD_RELOC_8, R_VISIUM_8}, - {BFD_RELOC_16, R_VISIUM_16}, - {BFD_RELOC_32, R_VISIUM_32}, - {BFD_RELOC_8_PCREL, R_VISIUM_8_PCREL}, - {BFD_RELOC_16_PCREL, R_VISIUM_16_PCREL}, - {BFD_RELOC_32_PCREL, R_VISIUM_32_PCREL}, - {BFD_RELOC_VISIUM_REL16, R_VISIUM_PC16}, - {BFD_RELOC_VISIUM_HI16, R_VISIUM_HI16}, - {BFD_RELOC_VISIUM_LO16, R_VISIUM_LO16}, - {BFD_RELOC_VISIUM_IM16, R_VISIUM_IM16}, - {BFD_RELOC_VISIUM_HI16_PCREL, R_VISIUM_HI16_PCREL}, - {BFD_RELOC_VISIUM_LO16_PCREL, R_VISIUM_LO16_PCREL}, - {BFD_RELOC_VISIUM_IM16_PCREL, R_VISIUM_IM16_PCREL}, - {BFD_RELOC_VTABLE_INHERIT, R_VISIUM_GNU_VTINHERIT}, - {BFD_RELOC_VTABLE_ENTRY, R_VISIUM_GNU_VTENTRY}, -}; - /* Return the parity bit for INSN shifted to its final position. */ static bfd_vma @@ -337,7 +312,6 @@ visium_elf_howto_parity_reloc (bfd * input_bfd, arelent *reloc_entry, bfd_vma relocation; bfd_byte *inplace_address; bfd_vma insn; - const bfd_vma signmask = 0xffff8000; /* This part is from bfd_elf_generic_reloc. If we're relocating, and this an external symbol, we don't want @@ -376,19 +350,19 @@ visium_elf_howto_parity_reloc (bfd * input_bfd, arelent *reloc_entry, if (reloc_entry->howto->pc_relative) { - relocation -= input_section->output_section->vma - + input_section->output_offset; + relocation -= input_section->output_section->vma; + relocation -= input_section->output_offset; relocation -= reloc_entry->address; } switch (reloc_entry->howto->type) { case R_VISIUM_PC16: - relocation >>= 2; - if (ret == bfd_reloc_ok && (relocation & signmask) != 0 - && (relocation & signmask) != signmask) + if (ret == bfd_reloc_ok + && ((bfd_signed_vma) relocation < -0x20000 + || (bfd_signed_vma) relocation > 0x1ffff)) ret = bfd_reloc_overflow; - relocation &= 0xffff; + relocation = (relocation >> 2) & 0xffff; break; case R_VISIUM_HI16: case R_VISIUM_HI16_PCREL: @@ -484,8 +458,8 @@ visium_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, const char *r_name) /* Set the howto pointer for a VISIUM ELF reloc. */ -static void -visium_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr, +static bfd_boolean +visium_info_to_howto_rela (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst) { unsigned int r_type = ELF32_R_TYPE (dst->r_info); @@ -501,14 +475,18 @@ visium_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr, break; default: - if (r_type >= (unsigned int) R_VISIUM_max) + if (r_type >= ARRAY_SIZE (visium_elf_howto_table)) { - _bfd_error_handler (_("%A: invalid Visium 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 = &visium_elf_howto_table[r_type]; break; } + return TRUE; } /* Look through the relocs for a section during the first phase. @@ -524,7 +502,7 @@ visium_elf_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; @@ -621,7 +599,7 @@ visium_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 { @@ -642,14 +620,14 @@ visium_elf_relocate_section (bfd *output_bfd, or sections discarded by a linker script, we just want the section contents zeroed. Avoid any special processing. */ _bfd_clear_contents (howto, input_bfd, input_section, - contents + rel->r_offset); + contents, rel->r_offset); rel->r_info = 0; rel->r_addend = 0; continue; } - if (info->relocatable) + if (bfd_link_relocatable (info)) continue; switch (r_type) @@ -688,13 +666,13 @@ visium_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->callbacks->undefined_symbol) (info, name, input_bfd, input_section, rel->r_offset, TRUE); break; @@ -716,11 +694,8 @@ visium_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); } } @@ -747,13 +722,17 @@ visium_elf_gc_mark_hook (asection *sec, struct bfd_link_info *info, return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym); } -static void -visium_elf_post_process_headers (bfd *abfd, - struct bfd_link_info *info ATTRIBUTE_UNUSED) +static bfd_boolean +visium_elf_init_file_header (bfd *abfd, struct bfd_link_info *info) { - Elf_Internal_Ehdr *i_ehdrp = elf_elfheader (abfd); - i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_STANDALONE; + Elf_Internal_Ehdr *i_ehdrp; + + if (!_bfd_elf_init_file_header (abfd, info)) + return FALSE; + + i_ehdrp = elf_elfheader (abfd); i_ehdrp->e_ident[EI_ABIVERSION] = 1; + return TRUE; } /* Function to set the ELF flag bits. */ @@ -792,8 +771,9 @@ visium_elf_copy_private_bfd_data (bfd *ibfd, bfd *obfd) file to the output object file when linking. */ static bfd_boolean -visium_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd) +visium_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) { + bfd *obfd = info->output_bfd; flagword old_flags; flagword new_flags; flagword mismatch; @@ -840,11 +820,10 @@ visium_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd) if (mismatch) _bfd_error_handler - (_ - ("%s: compiled %s -mtune=%s and linked with modules" - " compiled %s -mtune=%s"), - bfd_get_filename (ibfd), new_opt_with, opt_arch, old_opt_with, - opt_arch); + /* xgettext:c-format */ + (_("%pB: compiled %s -mtune=%s and linked with modules" + " compiled %s -mtune=%s"), + ibfd, new_opt_with, opt_arch, old_opt_with, opt_arch); } return TRUE; @@ -877,6 +856,7 @@ visium_elf_print_private_bfd_data (bfd *abfd, void *ptr) #define ELF_ARCH bfd_arch_visium #define ELF_MACHINE_CODE EM_VISIUM +#define ELF_OSABI ELFOSABI_STANDALONE #define ELF_MAXPAGESIZE 1 #define TARGET_BIG_SYM visium_elf32_vec @@ -898,6 +878,6 @@ visium_elf_print_private_bfd_data (bfd *abfd, void *ptr) #define bfd_elf32_bfd_copy_private_bfd_data visium_elf_copy_private_bfd_data #define bfd_elf32_bfd_merge_private_bfd_data visium_elf_merge_private_bfd_data #define bfd_elf32_bfd_print_private_bfd_data visium_elf_print_private_bfd_data -#define elf_backend_post_process_headers visium_elf_post_process_headers +#define elf_backend_init_file_header visium_elf_init_file_header #include "elf32-target.h"