From 53215f214c61b850085196a8d69774eed026ecd9 Mon Sep 17 00:00:00 2001 From: Christophe Lyon Date: Tue, 17 Mar 2020 15:59:01 +0000 Subject: [PATCH] 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/ChangeLog | 14 +++++++++++++ bfd/elf32-arm.c | 9 +++----- bfd/elf32-csky.c | 9 +++----- bfd/elf32-hppa.c | 32 +++++++++++++--------------- bfd/elf32-m68hc11.c | 9 +++----- bfd/elf32-m68hc12.c | 9 +++----- bfd/elf32-metag.c | 9 +++----- bfd/elf32-nios2.c | 10 ++++----- bfd/elf64-ppc.c | 44 ++++++++++++++------------------------- bfd/elfnn-aarch64.c | 10 ++++----- ld/ChangeLog | 6 ++++++ ld/emultempl/xtensaelf.em | 6 ++---- ld/ldlang.c | 20 +++++++----------- 13 files changed, 82 insertions(+), 105 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f690147280..2780b76a90 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,17 @@ +2020-03-18 Christophe Lyon + + * 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. + 2020-03-17 Nick Clifton PR 25688 diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index e8b2ac4702..1ccbf143e0 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -5068,12 +5068,9 @@ arm_build_one_stub (struct bfd_hash_entry *gen_entry, section. The user should fix his linker script. */ if (stub_entry->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"), - stub_entry->target_section); - abort(); - } + info->callbacks->einfo (_("%F%P: Could not assign '%pA' to an output section. " + "Retry without --enable-non-contiguous-regions.\n"), + stub_entry->target_section); globals = elf32_arm_hash_table (info); if (globals == NULL) diff --git a/bfd/elf32-csky.c b/bfd/elf32-csky.c index 8415f7c5ec..06ea26632d 100644 --- a/bfd/elf32-csky.c +++ b/bfd/elf32-csky.c @@ -3625,12 +3625,9 @@ csky_build_one_stub (struct bfd_hash_entry *gen_entry, section. The user should fix his linker script. */ if (stub_entry->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"), - stub_entry->target_section); - abort(); - } + info->callbacks->einfo (_("%F%P: Could not assign '%pA' to an output section. " + "Retry without --enable-non-contiguous-regions.\n"), + stub_entry->target_section); globals = csky_elf_hash_table (info); if (globals == NULL) diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c index 9760b75161..6d5382dc26 100644 --- a/bfd/elf32-hppa.c +++ b/bfd/elf32-hppa.c @@ -735,12 +735,10 @@ hppa_build_one_stub (struct bfd_hash_entry *bh, void *in_arg) 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); /* Create the long branch. A long branch is formed with "ldil" loading the upper bits of the target address into a register, @@ -766,12 +764,11 @@ hppa_build_one_stub (struct bfd_hash_entry *bh, void *in_arg) 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); + /* Branches are relative. This is where we are going to. */ sym_value = (hsh->target_value + hsh->target_section->output_offset @@ -848,12 +845,11 @@ hppa_build_one_stub (struct bfd_hash_entry *bh, void *in_arg) 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); + /* Branches are relative. This is where we are going to. */ sym_value = (hsh->target_value + hsh->target_section->output_offset diff --git a/bfd/elf32-m68hc11.c b/bfd/elf32-m68hc11.c index 3e12ae5e44..46aa438063 100644 --- a/bfd/elf32-m68hc11.c +++ b/bfd/elf32-m68hc11.c @@ -419,12 +419,9 @@ m68hc11_elf_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) section. The user should fix his linker script. */ if (stub_entry->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"), - stub_entry->target_section); - abort(); - } + info->callbacks->einfo (_("%F%P: Could not assign '%pA' to an output section. " + "Retry without --enable-non-contiguous-regions.\n"), + stub_entry->target_section); htab = m68hc11_elf_hash_table (info); if (htab == NULL) diff --git a/bfd/elf32-m68hc12.c b/bfd/elf32-m68hc12.c index a04efd84e0..c74f5674db 100644 --- a/bfd/elf32-m68hc12.c +++ b/bfd/elf32-m68hc12.c @@ -539,12 +539,9 @@ m68hc12_elf_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) section. The user should fix his linker script. */ if (stub_entry->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"), - stub_entry->target_section); - abort(); - } + info->callbacks->einfo (_("%F%P: Could not assign '%pA' to an output section. " + "Retry without --enable-non-contiguous-regions.\n"), + stub_entry->target_section); htab = m68hc11_elf_hash_table (info); diff --git a/bfd/elf32-metag.c b/bfd/elf32-metag.c index 3f30d6dadd..44923edc7b 100644 --- a/bfd/elf32-metag.c +++ b/bfd/elf32-metag.c @@ -3477,12 +3477,9 @@ metag_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) 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); stub_sec = hsh->stub_sec; diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c index 8c8bc0c8f8..bfb6fd1632 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; diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index 83eaadfb0d..7f7e190ce2 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -11367,25 +11367,19 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) if (stub_entry->target_section != NULL && stub_entry->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"), - stub_entry->target_section); - abort(); - } + info->callbacks->einfo (_("%F%P: Could not assign '%pA' to an output section. " + "Retry without --enable-non-contiguous-regions.\n"), + stub_entry->target_section); /* Same for the group. */ if (stub_entry->group->stub_sec != NULL && stub_entry->group->stub_sec->output_section == NULL && info->non_contiguous_regions) - { - _bfd_error_handler (_("Could not assign group %pA target %pA to an " - "output section. Retry without " - "--enable-non-contiguous-regions.\n"), - stub_entry->group->stub_sec, - stub_entry->target_section); - abort(); - } + info->callbacks->einfo (_("%F%P: Could not assign group %pA target %pA to an " + "output section. Retry without " + "--enable-non-contiguous-regions.\n"), + stub_entry->group->stub_sec, + stub_entry->target_section); htab = ppc_hash_table (info); if (htab == NULL) @@ -11917,25 +11911,19 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) if (stub_entry->target_section != NULL && stub_entry->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"), - stub_entry->target_section); - abort(); - } + info->callbacks->einfo (_("%F%P: Could not assign %pA to an output section. " + "Retry without --enable-non-contiguous-regions.\n"), + stub_entry->target_section); /* Same for the group. */ if (stub_entry->group->stub_sec != NULL && stub_entry->group->stub_sec->output_section == NULL && info->non_contiguous_regions) - { - _bfd_error_handler (_("Could not assign group %pA target %pA to an " - "output section. Retry without " - "--enable-non-contiguous-regions.\n"), - stub_entry->group->stub_sec, - stub_entry->target_section); - abort(); - } + info->callbacks->einfo (_("%F%P: Could not assign group %pA target %pA to an " + "output section. Retry without " + "--enable-non-contiguous-regions.\n"), + stub_entry->group->stub_sec, + stub_entry->target_section); /* Make a note of the offset within the stubs for this entry. */ stub_entry->stub_offset = stub_entry->group->stub_sec->size; diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index b00b6c4818..02688ccee1 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -3302,12 +3302,10 @@ aarch64_build_one_stub (struct bfd_hash_entry *gen_entry, section. The user should fix his linker script. */ if (stub_entry->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"), - stub_entry->target_section); - abort(); - } + info->callbacks->einfo (_("%F%P: Could not assign '%pA' to an output section. " + "Retry without " + "--enable-non-contiguous-regions.\n"), + stub_entry->target_section); stub_sec = stub_entry->stub_sec; diff --git a/ld/ChangeLog b/ld/ChangeLog index 79fd3bef01..f8ee247ed7 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2020-03-18 Christophe Lyon + + * emultempl/xtensaelf.em: Emit a fatal error message + instead of calling abort. + * ldlang.c: Likewise. + 2020-03-14 Alan Modra * testsuite/ld-elf/non-contiguous.d: Don't xfail generic ELF diff --git a/ld/emultempl/xtensaelf.em b/ld/emultempl/xtensaelf.em index 74bd11c6b0..2d9f594969 100644 --- a/ld/emultempl/xtensaelf.em +++ b/ld/emultempl/xtensaelf.em @@ -1225,10 +1225,8 @@ ld_build_required_section_dependence (lang_statement_union_type *s) lang_statement_union_type *l = iter_stack_current (&stack); if (l == NULL && link_info.non_contiguous_regions) - { - einfo (_("Relaxation not supported with --enable-non-contiguous-regions.\n")); - abort(); - } + einfo (_("%F%P: Relaxation not supported with " + "--enable-non-contiguous-regions.\n")); if (l->header.type == lang_input_section_enum) { diff --git a/ld/ldlang.c b/ld/ldlang.c index 8e56e8678f..0bb5f3c044 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -5220,21 +5220,15 @@ size_input_section if (dot + TO_ADDR (i->size) > end) { if (i->flags & SEC_LINKER_CREATED) - { - einfo (_("Output section '%s' not large enough for the " - "linker-created stubs section '%s'.\n"), - i->output_section->name, i->name); - abort(); - } + einfo (_("%F%P: Output section '%s' not large enough for the " + "linker-created stubs section '%s'.\n"), + i->output_section->name, i->name); if (i->rawsize && i->rawsize != i->size) - { - einfo (_("Relaxation not supported with " - "--enable-non-contiguous-regions (section '%s' " - "would overflow '%s' after it changed size).\n"), - i->name, i->output_section->name); - abort(); - } + einfo (_("%F%P: Relaxation not supported with " + "--enable-non-contiguous-regions (section '%s' " + "would overflow '%s' after it changed size).\n"), + i->name, i->output_section->name); *removed = 1; dot = end;