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;
}
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"),
+ /* xgettext:c-format */
+ (_("%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);
}