From 7db9a74e9f03427ed2844a17cebecc5e793f38ef Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Tue, 24 May 2016 20:45:30 +0100 Subject: [PATCH] MIPS/BFD: Unify `bfd_reloc_outofrange' error reporting code bfd/ * elfxx-mips.c (_bfd_mips_elf_relocate_section) : Unify error reporting code. --- bfd/ChangeLog | 5 +++++ bfd/elfxx-mips.c | 13 +++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 83d0bed5e41..1be092bc52f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2016-05-24 Maciej W. Rozycki + + * elfxx-mips.c (_bfd_mips_elf_relocate_section) + : Unify error reporting code. + 2016-05-23 Jim Wilson * elfnn-aarch64.c: Unconditionally enable R_AARCH64_NULL and diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index b561b430611..d09cbf12221 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -10259,16 +10259,13 @@ _bfd_mips_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, break; case bfd_reloc_outofrange: + msg = NULL; if (jal_reloc_p (howto->type)) + msg = _("JALX to a non-word-aligned address"); + else if (aligned_pcrel_reloc_p (howto->type)) + msg = _("PC-relative load from unaligned address"); + if (msg) { - msg = _("JALX to a non-word-aligned address"); - info->callbacks->warning - (info, msg, name, input_bfd, input_section, rel->r_offset); - return FALSE; - } - if (aligned_pcrel_reloc_p (howto->type)) - { - msg = _("PC-relative load from unaligned address"); info->callbacks->warning (info, msg, name, input_bfd, input_section, rel->r_offset); return FALSE; -- 2.30.2