From 53215f214c61b850085196a8d69774eed026ecd9 Mon Sep 17 00:00:00 2001 From: Christophe Lyon Date: Tue, 17 Mar 2020 15:59:01 +0000 Subject: Non-contiguous memory regions support: Avoid calls to abort Use '%F' format when printing error messages to exit cleanly rather than by calling abort(). 2020-03-18 Christophe Lyon bfd/ * elf32-arm.c (arm_build_one_stub): Emit a fatal error message instead of calling abort. * elf32-csky.c (csky_build_one_stub): Likewise. * elf32-hppa.c (hppa_build_one_stub): Likewise. * elf32-m68hc11.c (m68hc11_elf_build_one_stub): Likewise. * elf32-m68hc12.c (m68hc12_elf_build_one_stub): Likewise. * elf32-metag.c (metag_build_one_stub): Likewise. * elf32-nios2.c (nios2_build_one_stub): Likewise. * elf64-ppc.c (ppc_build_one_stub): Likewise. (ppc_size_one_stub): Likewise. * elfnn-aarch64.c (aarch64_build_one_stub): Likewise. ld/ * emultempl/xtensaelf.em: Emit a fatal error message instead of calling abort. * ldlang.c: Likewise. Change-Id: I60deaeeee59d4e7cab06b8a40a3e51837c43a8ab --- bfd/elf32-nios2.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'bfd/elf32-nios2.c') diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c index 8c8bc0c8f80..bfb6fd16325 100644 --- a/bfd/elf32-nios2.c +++ b/bfd/elf32-nios2.c @@ -2498,12 +2498,10 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U section. The user should fix his linker script. */ if (hsh->target_section->output_section == NULL && info->non_contiguous_regions) - { - _bfd_error_handler (_("Could not assign '%pA' to an output section. " - "Retry without --enable-non-contiguous-regions.\n"), - hsh->target_section); - abort(); - } + info->callbacks->einfo (_("%F%P: Could not assign '%pA' to an output section. " + "Retry without --enable-non-contiguous-regions.\n"), + hsh->target_section); + /* Make a note of the offset within the stubs for this entry. */ hsh->stub_offset = stub_sec->size; -- cgit v1.2.1