diff options
| -rw-r--r-- | bfd/ChangeLog | 8 | ||||
| -rw-r--r-- | bfd/elfxx-mips.c | 11 |
2 files changed, 13 insertions, 6 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 272ae0e..e737f35 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2018-11-27 Maciej W. Rozycki <macro@linux-mips.org> + + * elfxx-mips.c (_bfd_mips_elf_check_relocs) <R_MIPS16_26> + <R_MIPS_26, R_MICROMIPS_26_S1>: Use `info->callbacks->einfo' + rather than `_bfd_error_handler' to report refused relocations + in PIC code and continue processing. Fix error message: `can + not' -> `cannot'. + 2018-11-27 H.J. Lu <hongjiu.lu@intel.com> PR binutils/23919 diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index dfb3601..298f465 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -9077,14 +9077,13 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, case R_MIPS_26: case R_MICROMIPS_26_S1: howto = MIPS_ELF_RTYPE_TO_HOWTO (abfd, r_type, FALSE); - _bfd_error_handler + info->callbacks->einfo /* xgettext:c-format */ - (_("%pB: relocation %s against `%s' can not be used" - " when making a shared object; recompile with -fPIC"), - abfd, howto->name, + (_("%X%H: relocation %s against `%s' cannot be used" + " when making a shared object; recompile with -fPIC\n"), + abfd, sec, rel->r_offset, howto->name, (h) ? h->root.root.string : "a local symbol"); - bfd_set_error (bfd_error_bad_value); - return FALSE; + break; default: break; } |