/* Visium-specific support for 32-bit ELF.
- Copyright (C) 2003-2015 Free Software Foundation, Inc.
+ Copyright (C) 2003-2019 Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
#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 **);
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
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
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:
/* 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);
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.
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;
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)
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;
}
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);
}
}
struct bfd_link_info *info ATTRIBUTE_UNUSED)
{
Elf_Internal_Ehdr *i_ehdrp = elf_elfheader (abfd);
- i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_STANDALONE;
i_ehdrp->e_ident[EI_ABIVERSION] = 1;
}
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;
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;
#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