/* Visium-specific support for 32-bit ELF.
- Copyright (C) 2003-2014 Free Software Foundation, Inc.
+ Copyright (C) 2003-2017 Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
/* 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 */
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
break;
default:
+ if (r_type >= (unsigned int) R_VISIUM_max)
+ {
+ /* xgettext:c-format */
+ _bfd_error_handler (_("%B: invalid Visium reloc number: %d"), abfd, r_type);
+ r_type = 0;
+ }
cache_ptr->howto = &visium_elf_howto_table[r_type];
break;
}
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;
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);
}
}
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 */
+ (_("%B: 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;