/* Visium-specific support for 32-bit ELF.
- Copyright (C) 2003-2016 Free Software Foundation, Inc.
+ Copyright (C) 2003-2018 Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
/* 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);
default:
if (r_type >= (unsigned int) R_VISIUM_max)
{
- _bfd_error_handler (_("%B: 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.
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;