From c2596ca5d7f6ab6d38882bf0f0fc44fe352afcb1 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 7 Dec 2016 10:19:42 +0000 Subject: [PATCH] Fix internal error in the linker by replacing a call to abort with an error message. PR ld/20932 * elflink.c (bfd_elf_record_link_assignment): Replace call to abort with an error message and error return value. --- bfd/ChangeLog | 6 ++++++ bfd/elflink.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 26fb42b8e4..7c21bb893b 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2016-12-07 Nick Clifton + + PR ld/20932 + * elflink.c (bfd_elf_record_link_assignment): Replace call to + abort with an error message and error return value. + 2016-12-06 Nick Clifton PR binutils/20931 diff --git a/bfd/elflink.c b/bfd/elflink.c index 320f3bea43..49c38032fe 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -625,8 +625,11 @@ bfd_elf_record_link_assignment (bfd *output_bfd, (*bed->elf_backend_copy_indirect_symbol) (info, h, hv); break; case bfd_link_hash_warning: - abort (); - break; + /* See PR 20932 for a reproducer. */ + _bfd_error_handler (_("%B: Attempt to assign a value to warning symbol '%s'"), + output_bfd, name); + bfd_set_error (bfd_error_invalid_operation); + return FALSE; } /* If this symbol is being provided by the linker script, and it is