@@ -46,5 +46,6 @@ SRC_URI = "\
file://CVE-2025-1181.patch \
file://CVE-2025-1182.patch \
file://0019-CVE-2025-1153-1.patch \
+ file://0020-CVE-2025-1153-2.patch \
"
S = "${WORKDIR}/git"
new file mode 100644
@@ -0,0 +1,840 @@
+From 31e9e2e8d1090da0c1da97a70005d8841fff8ddd Mon Sep 17 00:00:00 2001
+From: Alan Modra <amodra@gmail.com>
+Date: Sun, 16 Feb 2025 23:34:55 +1030
+Subject: [PATCH] PR 32603, more ld -w misbehaviour
+
+Commit 8d97c1a53f3d claimed to replace all einfo calls using %F with
+a call to fatal. It did so only for the ld/ directory. This patch
+adds a "fatal" to linker callbacks, and replaces those calls in bfd/
+too.
+
+Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=31e9e2e8d1090da0c1da97a70005d8841fff8ddd]
+CVE: CVE-2025-1153
+
+Signed-off-by: Sunil Dora <sunilkumar.dora@windriver.com>
+---
+ bfd/archive.c | 4 ++--
+ bfd/coff-aarch64.c | 4 +---
+ bfd/coffgen.c | 2 +-
+ bfd/elf-ifunc.c | 4 ++--
+ bfd/elf-m10300.c | 4 ++--
+ bfd/elf-properties.c | 4 ++--
+ bfd/elf.c | 4 ++--
+ bfd/elf32-arm.c | 2 +-
+ bfd/elf32-avr.c | 4 ++--
+ bfd/elf32-csky.c | 2 +-
+ bfd/elf32-frv.c | 4 ++--
+ bfd/elf32-hppa.c | 6 ++---
+ bfd/elf32-i386.c | 4 ++--
+ bfd/elf32-m68hc11.c | 2 +-
+ bfd/elf32-m68hc12.c | 2 +-
+ bfd/elf32-metag.c | 2 +-
+ bfd/elf32-spu.c | 5 ++--
+ bfd/elf64-ia64-vms.c | 4 ++--
+ bfd/elf64-ppc.c | 4 ++--
+ bfd/elf64-x86-64.c | 14 +++++------
+ bfd/elflink.c | 8 +++----
+ bfd/elfnn-aarch64.c | 6 ++---
+ bfd/elfnn-ia64.c | 4 ++--
+ bfd/elfnn-kvx.c | 2 +-
+ bfd/elfnn-loongarch.c | 4 ++--
+ bfd/elfxx-aarch64.c | 6 ++---
+ bfd/elfxx-sparc.c | 4 ++--
+ bfd/elfxx-x86.c | 56 +++++++++++++++++++++----------------------
+ bfd/linker.c | 2 +-
+ bfd/reloc.c | 4 ++--
+ bfd/reloc16.c | 4 ++--
+ bfd/xcofflink.c | 2 +-
+ include/bfdlink.h | 3 +++
+ ld/ldmain.c | 1 +
+ 34 files changed, 94 insertions(+), 93 deletions(-)
+
+diff --git a/bfd/archive.c b/bfd/archive.c
+index 9f3fbce9..0f617276 100644
+--- a/bfd/archive.c
++++ b/bfd/archive.c
+@@ -749,8 +749,8 @@ _bfd_get_elt_at_filepos (bfd *archive, file_ptr filepos,
+ case bfd_error_system_call:
+ if (info != NULL)
+ {
+- info->callbacks->einfo
+- (_("%F%P: %pB(%s): error opening thin archive member: %E\n"),
++ info->callbacks->fatal
++ (_("%P: %pB(%s): error opening thin archive member: %E\n"),
+ archive, filename);
+ break;
+ }
+diff --git a/bfd/coff-aarch64.c b/bfd/coff-aarch64.c
+index 825963c0..53f539e0 100644
+--- a/bfd/coff-aarch64.c
++++ b/bfd/coff-aarch64.c
+@@ -876,10 +876,8 @@ coff_pe_aarch64_relocate_section (bfd *output_bfd,
+ }
+
+ default:
+- info->callbacks->einfo (_("%F%P: Unhandled relocation type %u\n"),
++ info->callbacks->fatal (_("%P: Unhandled relocation type %u\n"),
+ rel->r_type);
+- BFD_FAIL ();
+- return false;
+ }
+ }
+
+diff --git a/bfd/coffgen.c b/bfd/coffgen.c
+index cc1c6557..3270cd2f 100644
+--- a/bfd/coffgen.c
++++ b/bfd/coffgen.c
+@@ -2793,7 +2793,7 @@ _bfd_coff_section_already_linked (bfd *abfd,
+
+ /* This is the first section with this name. Record it. */
+ if (!bfd_section_already_linked_table_insert (already_linked_list, sec))
+- info->callbacks->einfo (_("%F%P: already_linked_table: %E\n"));
++ info->callbacks->fatal (_("%P: already_linked_table: %E\n"));
+ return false;
+ }
+
+diff --git a/bfd/elf-ifunc.c b/bfd/elf-ifunc.c
+index 42a3bcdf..58a1ca5e 100644
+--- a/bfd/elf-ifunc.c
++++ b/bfd/elf-ifunc.c
+@@ -139,9 +139,9 @@ _bfd_elf_allocate_ifunc_dyn_relocs (struct bfd_link_info *info,
+ || info->export_dynamic)
+ && h->pointer_equality_needed)
+ {
+- info->callbacks->einfo
++ info->callbacks->fatal
+ /* xgettext:c-format */
+- (_("%F%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer "
++ (_("%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer "
+ "equality in `%pB' can not be used when making an "
+ "executable; recompile with -fPIE and relink with -pie\n"),
+ h->root.root.string,
+diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c
+index 24ea43a7..cf6bb13b 100644
+--- a/bfd/elf-m10300.c
++++ b/bfd/elf-m10300.c
+@@ -2646,8 +2646,8 @@ mn10300_elf_relax_section (bfd *abfd,
+ bfd_vma align_gap_adjustment;
+
+ if (bfd_link_relocatable (link_info))
+- (*link_info->callbacks->einfo)
+- (_("%P%F: --relax and -r may not be used together\n"));
++ link_info->callbacks->fatal
++ (_("%P: --relax and -r may not be used together\n"));
+
+ /* Assume nothing changes. */
+ *again = false;
+diff --git a/bfd/elf-properties.c b/bfd/elf-properties.c
+index ee8bd37f..a4591472 100644
+--- a/bfd/elf-properties.c
++++ b/bfd/elf-properties.c
+@@ -665,11 +665,11 @@ _bfd_elf_link_setup_gnu_properties (struct bfd_link_info *info)
+ | SEC_HAS_CONTENTS
+ | SEC_DATA));
+ if (sec == NULL)
+- info->callbacks->einfo (_("%F%P: failed to create GNU property section\n"));
++ info->callbacks->fatal (_("%P: failed to create GNU property section\n"));
+
+ if (!bfd_set_section_alignment (sec,
+ elfclass == ELFCLASS64 ? 3 : 2))
+- info->callbacks->einfo (_("%F%pA: failed to align section\n"),
++ info->callbacks->fatal (_("%pA: failed to align section\n"),
+ sec);
+
+ elf_section_type (sec) = SHT_NOTE;
+diff --git a/bfd/elf.c b/bfd/elf.c
+index 8bffd3c5..8e4e1e7f 100644
+--- a/bfd/elf.c
++++ b/bfd/elf.c
+@@ -5188,8 +5188,8 @@ _bfd_elf_map_sections_to_segments (bfd *abfd,
+ && need_layout != NULL
+ && bed->size_relative_relocs
+ && !bed->size_relative_relocs (info, need_layout))
+- info->callbacks->einfo
+- (_("%F%P: failed to size relative relocations\n"));
++ info->callbacks->fatal
++ (_("%P: failed to size relative relocations\n"));
+ }
+
+ if (no_user_phdrs && bfd_count_sections (abfd) != 0)
+diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
+index 4ad7c354..b4a822f1 100644
+--- a/bfd/elf32-arm.c
++++ b/bfd/elf32-arm.c
+@@ -5053,7 +5053,7 @@ 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)
+- info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. "
++ info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
+ "Retry without --enable-non-contiguous-regions.\n"),
+ stub_entry->target_section);
+
+diff --git a/bfd/elf32-avr.c b/bfd/elf32-avr.c
+index 20e03bd7..912f7533 100644
+--- a/bfd/elf32-avr.c
++++ b/bfd/elf32-avr.c
+@@ -2484,8 +2484,8 @@ elf32_avr_relax_section (bfd *abfd,
+ shrinkable = false;
+
+ if (bfd_link_relocatable (link_info))
+- (*link_info->callbacks->einfo)
+- (_("%P%F: --relax and -r may not be used together\n"));
++ link_info->callbacks->fatal
++ (_("%P: --relax and -r may not be used together\n"));
+
+ htab = avr_link_hash_table (link_info);
+ if (htab == NULL)
+diff --git a/bfd/elf32-csky.c b/bfd/elf32-csky.c
+index 9479705d..edff65a9 100644
+--- a/bfd/elf32-csky.c
++++ b/bfd/elf32-csky.c
+@@ -3728,7 +3728,7 @@ 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)
+- info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. "
++ info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
+ "Retry without --enable-non-contiguous-regions.\n"),
+ stub_entry->target_section);
+
+diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c
+index 5b66b074..245db7c2 100644
+--- a/bfd/elf32-frv.c
++++ b/bfd/elf32-frv.c
+@@ -5617,8 +5617,8 @@ elf32_frvfdpic_relax_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec,
+ struct _frvfdpic_dynamic_got_plt_info gpinfo;
+
+ if (bfd_link_relocatable (info))
+- (*info->callbacks->einfo)
+- (_("%P%F: --relax and -r may not be used together\n"));
++ info->callbacks->fatal
++ (_("%P: --relax and -r may not be used together\n"));
+
+ /* If we return early, we didn't change anything. */
+ *again = false;
+diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
+index c2a7ad98..f1e67a06 100644
+--- a/bfd/elf32-hppa.c
++++ b/bfd/elf32-hppa.c
+@@ -729,7 +729,7 @@ 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)
+- info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output "
++ info->callbacks->fatal (_("%P: Could not assign `%pA' to an output "
+ "section. Retry without "
+ "--enable-non-contiguous-regions.\n"),
+ hsh->target_section);
+@@ -758,7 +758,7 @@ 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)
+- info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output "
++ info->callbacks->fatal (_("%P: Could not assign `%pA' to an output "
+ "section. Retry without "
+ "--enable-non-contiguous-regions.\n"),
+ hsh->target_section);
+@@ -839,7 +839,7 @@ 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)
+- info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output "
++ info->callbacks->fatal (_("%P: Could not assign `%pA' to an output "
+ "section. Retry without "
+ "--enable-non-contiguous-regions.\n"),
+ hsh->target_section);
+diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
+index e2f88a11..1637e39f 100644
+--- a/bfd/elf32-i386.c
++++ b/bfd/elf32-i386.c
+@@ -4092,8 +4092,8 @@ elf_i386_finish_dynamic_sections (bfd *output_bfd,
+ {
+ if (bfd_is_abs_section (htab->elf.splt->output_section))
+ {
+- info->callbacks->einfo
+- (_("%F%P: discarded output section: `%pA'\n"),
++ info->callbacks->fatal
++ (_("%P: discarded output section: `%pA'\n"),
+ htab->elf.splt);
+ return false;
+ }
+diff --git a/bfd/elf32-m68hc11.c b/bfd/elf32-m68hc11.c
+index 5fc611f5..6f705718 100644
+--- a/bfd/elf32-m68hc11.c
++++ b/bfd/elf32-m68hc11.c
+@@ -419,7 +419,7 @@ 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)
+- info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. "
++ info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
+ "Retry without --enable-non-contiguous-regions.\n"),
+ stub_entry->target_section);
+
+diff --git a/bfd/elf32-m68hc12.c b/bfd/elf32-m68hc12.c
+index 1be174c0..bdfb9ca5 100644
+--- a/bfd/elf32-m68hc12.c
++++ b/bfd/elf32-m68hc12.c
+@@ -539,7 +539,7 @@ 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)
+- info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. "
++ info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
+ "Retry without --enable-non-contiguous-regions.\n"),
+ stub_entry->target_section);
+
+diff --git a/bfd/elf32-metag.c b/bfd/elf32-metag.c
+index de14dfe5..49f93cc7 100644
+--- a/bfd/elf32-metag.c
++++ b/bfd/elf32-metag.c
+@@ -3342,7 +3342,7 @@ 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)
+- info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. "
++ info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
+ "Retry without --enable-non-contiguous-regions.\n"),
+ hsh->target_section);
+
+diff --git a/bfd/elf32-spu.c b/bfd/elf32-spu.c
+index 881d4d8e..dd5d5fbe 100644
+--- a/bfd/elf32-spu.c
++++ b/bfd/elf32-spu.c
+@@ -4689,8 +4689,7 @@ spu_elf_auto_overlay (struct bfd_link_info *info)
+ file_err:
+ bfd_set_error (bfd_error_system_call);
+ err_exit:
+- info->callbacks->einfo (_("%F%P: auto overlay error: %E\n"));
+- xexit (1);
++ info->callbacks->fatal (_("%P: auto overlay error: %E\n"));
+ }
+
+ /* Provide an estimate of total stack required. */
+@@ -4743,7 +4742,7 @@ spu_elf_final_link (bfd *output_bfd, struct bfd_link_info *info)
+ info->callbacks->einfo (_("%X%P: stack/lrlive analysis error: %E\n"));
+
+ if (!spu_elf_build_stubs (info))
+- info->callbacks->einfo (_("%F%P: can not build overlay stubs: %E\n"));
++ info->callbacks->fatal (_("%P: can not build overlay stubs: %E\n"));
+
+ return bfd_elf_final_link (output_bfd, info);
+ }
+diff --git a/bfd/elf64-ia64-vms.c b/bfd/elf64-ia64-vms.c
+index 2f37e90c..b1eaaac0 100644
+--- a/bfd/elf64-ia64-vms.c
++++ b/bfd/elf64-ia64-vms.c
+@@ -361,8 +361,8 @@ elf64_ia64_relax_section (bfd *abfd, asection *sec,
+ *again = false;
+
+ if (bfd_link_relocatable (link_info))
+- (*link_info->callbacks->einfo)
+- (_("%P%F: --relax and -r may not be used together\n"));
++ link_info->callbacks->fatal
++ (_("%P: --relax and -r may not be used together\n"));
+
+ /* Don't even try to relax for non-ELF outputs. */
+ if (!is_elf_hash_table (link_info->hash))
+diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
+index 720d6ac9..7b798732 100644
+--- a/bfd/elf64-ppc.c
++++ b/bfd/elf64-ppc.c
+@@ -12289,7 +12289,7 @@ 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)
+- info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. "
++ info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
+ "Retry without --enable-non-contiguous-regions.\n"),
+ stub_entry->target_section);
+
+@@ -12297,7 +12297,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+ if (stub_entry->group->stub_sec != NULL
+ && stub_entry->group->stub_sec->output_section == NULL
+ && info->non_contiguous_regions)
+- info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. "
++ info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
+ "Retry without --enable-non-contiguous-regions.\n"),
+ stub_entry->group->stub_sec);
+
+diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
+index c3fb375c..a22d57d7 100644
+--- a/bfd/elf64-x86-64.c
++++ b/bfd/elf64-x86-64.c
+@@ -3706,8 +3706,8 @@ elf_x86_64_relocate_section (bfd *output_bfd,
+ || (roff - 3 + 22) > input_section->size)
+ {
+ corrupt_input:
+- info->callbacks->einfo
+- (_("%F%P: corrupt input: %pB\n"),
++ info->callbacks->fatal
++ (_("%P: corrupt input: %pB\n"),
+ input_bfd);
+ return false;
+ }
+@@ -4679,7 +4679,7 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd,
+ /* Check PC-relative offset overflow in PLT entry. */
+ if ((plt_got_pcrel_offset + 0x80000000) > 0xffffffff)
+ /* xgettext:c-format */
+- info->callbacks->einfo (_("%F%pB: PC-relative offset overflow in PLT entry for `%s'\n"),
++ info->callbacks->fatal (_("%pB: PC-relative offset overflow in PLT entry for `%s'\n"),
+ output_bfd, h->root.root.string);
+
+ bfd_put_32 (output_bfd, plt_got_pcrel_offset,
+@@ -4752,7 +4752,7 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd,
+ will overflow first. */
+ if (plt0_offset > 0x80000000)
+ /* xgettext:c-format */
+- info->callbacks->einfo (_("%F%pB: branch displacement overflow in PLT entry for `%s'\n"),
++ info->callbacks->fatal (_("%pB: branch displacement overflow in PLT entry for `%s'\n"),
+ output_bfd, h->root.root.string);
+ bfd_put_32 (output_bfd, - plt0_offset,
+ (plt->contents + h->plt.offset
+@@ -4805,7 +4805,7 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd,
+ if ((got_after_plt && got_pcrel_offset < 0)
+ || (!got_after_plt && got_pcrel_offset > 0))
+ /* xgettext:c-format */
+- info->callbacks->einfo (_("%F%pB: PC-relative offset overflow in GOT PLT entry for `%s'\n"),
++ info->callbacks->fatal (_("%pB: PC-relative offset overflow in GOT PLT entry for `%s'\n"),
+ output_bfd, h->root.root.string);
+
+ bfd_put_32 (output_bfd, got_pcrel_offset,
+@@ -5092,8 +5092,8 @@ elf_x86_64_finish_dynamic_sections (bfd *output_bfd,
+ {
+ if (bfd_is_abs_section (htab->elf.splt->output_section))
+ {
+- info->callbacks->einfo
+- (_("%F%P: discarded output section: `%pA'\n"),
++ info->callbacks->fatal
++ (_("%P: discarded output section: `%pA'\n"),
+ htab->elf.splt);
+ return false;
+ }
+diff --git a/bfd/elflink.c b/bfd/elflink.c
+index 8af6898a..dba176cc 100644
+--- a/bfd/elflink.c
++++ b/bfd/elflink.c
+@@ -12891,8 +12891,8 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
+ if (info->enable_dt_relr
+ && bed->finish_relative_relocs
+ && !bed->finish_relative_relocs (info))
+- info->callbacks->einfo
+- (_("%F%P: %pB: failed to finish relative relocations\n"), abfd);
++ info->callbacks->fatal
++ (_("%P: %pB: failed to finish relative relocations\n"), abfd);
+
+ /* Since ELF permits relocations to be against local symbols, we
+ must have the local symbols available when we do the relocations.
+@@ -14087,7 +14087,7 @@ _bfd_elf_gc_mark_extra_sections (struct bfd_link_info *info,
+ else if (strcmp (bfd_section_name (isec),
+ "__patchable_function_entries") == 0
+ && elf_linked_to_section (isec) == NULL)
+- info->callbacks->einfo (_("%F%P: %pB(%pA): error: "
++ info->callbacks->fatal (_("%P: %pB(%pA): error: "
+ "need linked-to section "
+ "for --gc-sections\n"),
+ isec->owner, isec);
+@@ -15264,7 +15264,7 @@ _bfd_elf_section_already_linked (bfd *abfd,
+
+ /* This is the first section with this name. Record it. */
+ if (!bfd_section_already_linked_table_insert (already_linked_list, sec))
+- info->callbacks->einfo (_("%F%P: already_linked_table: %E\n"));
++ info->callbacks->fatal (_("%P: already_linked_table: %E\n"));
+ return sec->output_section == bfd_abs_section_ptr;
+ }
+
+diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
+index 109517db..0f454d23 100644
+--- a/bfd/elfnn-aarch64.c
++++ b/bfd/elfnn-aarch64.c
+@@ -3272,7 +3272,7 @@ 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)
+- info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. "
++ info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
+ "Retry without "
+ "--enable-non-contiguous-regions.\n"),
+ stub_entry->target_section);
+@@ -9008,9 +9008,9 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+ asection *s = p->sec->output_section;
+ if (s != NULL && (s->flags & SEC_READONLY) != 0)
+ {
+- info->callbacks->einfo
++ info->callbacks->fatal
+ /* xgettext:c-format */
+- (_ ("%F%P: %pB: copy relocation against non-copyable "
++ (_ ("%P: %pB: copy relocation against non-copyable "
+ "protected symbol `%s'\n"),
+ p->sec->owner, h->root.root.string);
+ return false;
+diff --git a/bfd/elfnn-ia64.c b/bfd/elfnn-ia64.c
+index 7081ba1b..41d9e6fe 100644
+--- a/bfd/elfnn-ia64.c
++++ b/bfd/elfnn-ia64.c
+@@ -361,8 +361,8 @@ elfNN_ia64_relax_section (bfd *abfd, asection *sec,
+ *again = false;
+
+ if (bfd_link_relocatable (link_info))
+- (*link_info->callbacks->einfo)
+- (_("%P%F: --relax and -r may not be used together\n"));
++ link_info->callbacks->fatal
++ (_("%P: --relax and -r may not be used together\n"));
+
+ /* Don't even try to relax for non-ELF outputs. */
+ if (!is_elf_hash_table (link_info->hash))
+diff --git a/bfd/elfnn-kvx.c b/bfd/elfnn-kvx.c
+index ae5ed6bf..b752891b 100644
+--- a/bfd/elfnn-kvx.c
++++ b/bfd/elfnn-kvx.c
+@@ -927,7 +927,7 @@ kvx_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)
+- info->callbacks->einfo (_("%F%P: Could not assign '%pA' to an output section. "
++ info->callbacks->fatal (_("%P: Could not assign '%pA' to an output section. "
+ "Retry without "
+ "--enable-non-contiguous-regions.\n"),
+ stub_entry->target_section);
+diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c
+index a7daea67..a8c4226d 100644
+--- a/bfd/elfnn-loongarch.c
++++ b/bfd/elfnn-loongarch.c
+@@ -1445,9 +1445,9 @@ local_allocate_ifunc_dyn_relocs (struct bfd_link_info *info,
+ || info->export_dynamic)
+ && h->pointer_equality_needed)
+ {
+- info->callbacks->einfo
++ info->callbacks->fatal
+ /* xgettext:c-format. */
+- (_("%F%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer "
++ (_("%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer "
+ "equality in `%pB' can not be used when making an "
+ "executable; recompile with -fPIE and relink with -pie\n"),
+ h->root.root.string,
+diff --git a/bfd/elfxx-aarch64.c b/bfd/elfxx-aarch64.c
+index d1279adc..161c8a52 100644
+--- a/bfd/elfxx-aarch64.c
++++ b/bfd/elfxx-aarch64.c
+@@ -754,12 +754,12 @@ _bfd_aarch64_elf_link_setup_gnu_properties (struct bfd_link_info *info,
+ | SEC_HAS_CONTENTS
+ | SEC_DATA));
+ if (sec == NULL)
+- info->callbacks->einfo (
+- _("%F%P: failed to create GNU property section\n"));
++ info->callbacks->fatal (
++ _("%P: failed to create GNU property section\n"));
+
+ align = (bfd_get_mach (ebfd) & bfd_mach_aarch64_ilp32) ? 2 : 3;
+ if (!bfd_set_section_alignment (sec, align))
+- info->callbacks->einfo (_("%F%pA: failed to align section\n"),
++ info->callbacks->fatal (_("%pA: failed to align section\n"),
+ sec);
+
+ elf_section_type (sec) = SHT_NOTE;
+diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c
+index 6f5062bb..95b1928d 100644
+--- a/bfd/elfxx-sparc.c
++++ b/bfd/elfxx-sparc.c
+@@ -2680,8 +2680,8 @@ _bfd_sparc_elf_relax_section (bfd *abfd ATTRIBUTE_UNUSED,
+ bool *again)
+ {
+ if (bfd_link_relocatable (link_info))
+- (*link_info->callbacks->einfo)
+- (_("%P%F: --relax and -r may not be used together\n"));
++ link_info->callbacks->fatal
++ (_("%P: --relax and -r may not be used together\n"));
+
+ *again = false;
+ sec_do_relax (section) = 1;
+diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
+index 8c261cf8..606c8905 100644
+--- a/bfd/elfxx-x86.c
++++ b/bfd/elfxx-x86.c
+@@ -531,9 +531,9 @@ elf_x86_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+ asection *s = p->sec->output_section;
+ if (s != NULL && (s->flags & SEC_READONLY) != 0)
+ {
+- info->callbacks->einfo
++ info->callbacks->fatal
+ /* xgettext:c-format */
+- (_("%F%P: %pB: copy relocation against non-copyable "
++ (_("%P: %pB: copy relocation against non-copyable "
+ "protected symbol `%s' in %pB\n"),
+ p->sec->owner, h->root.root.string,
+ h->root.u.def.section->owner);
+@@ -1030,9 +1030,9 @@ elf_x86_relative_reloc_record_add
+
+ if (relative_reloc->data == NULL)
+ {
+- info->callbacks->einfo
++ info->callbacks->fatal
+ /* xgettext:c-format */
+- (_("%F%P: %pB: failed to allocate relative reloc record\n"),
++ (_("%P: %pB: failed to allocate relative reloc record\n"),
+ info->output_bfd);
+ return false;
+ }
+@@ -1388,9 +1388,9 @@ elf64_dt_relr_bitmap_add
+
+ if (bitmap->u.elf64 == NULL)
+ {
+- info->callbacks->einfo
++ info->callbacks->fatal
+ /* xgettext:c-format */
+- (_("%F%P: %pB: failed to allocate 64-bit DT_RELR bitmap\n"),
++ (_("%P: %pB: failed to allocate 64-bit DT_RELR bitmap\n"),
+ info->output_bfd);
+ }
+
+@@ -1424,9 +1424,9 @@ elf32_dt_relr_bitmap_add
+
+ if (bitmap->u.elf32 == NULL)
+ {
+- info->callbacks->einfo
++ info->callbacks->fatal
+ /* xgettext:c-format */
+- (_("%F%P: %pB: failed to allocate 32-bit DT_RELR bitmap\n"),
++ (_("%P: %pB: failed to allocate 32-bit DT_RELR bitmap\n"),
+ info->output_bfd);
+ }
+
+@@ -1750,9 +1750,9 @@ elf_x86_compute_dl_relr_bitmap
+ *need_layout = true;
+ }
+ else
+- info->callbacks->einfo
++ info->callbacks->fatal
+ /* xgettext:c-format */
+- (_("%F%P: %pB: size of compact relative reloc section is "
++ (_("%P: %pB: size of compact relative reloc section is "
+ "changed: new (%lu) != old (%lu)\n"),
+ info->output_bfd, htab->dt_relr_bitmap.count,
+ dt_relr_bitmap_count);
+@@ -1772,9 +1772,9 @@ elf_x86_write_dl_relr_bitmap (struct bfd_link_info *info,
+
+ contents = (unsigned char *) bfd_alloc (sec->owner, size);
+ if (contents == NULL)
+- info->callbacks->einfo
++ info->callbacks->fatal
+ /* xgettext:c-format */
+- (_("%F%P: %pB: failed to allocate compact relative reloc section\n"),
++ (_("%P: %pB: failed to allocate compact relative reloc section\n"),
+ info->output_bfd);
+
+ /* Cache the section contents for elf_link_input_bfd. */
+@@ -2219,9 +2219,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section,
+ else
+ name = bfd_elf_sym_name (input_section->owner, symtab_hdr,
+ sym, NULL);
+- info->callbacks->einfo
++ info->callbacks->fatal
+ /* xgettext:c-format */
+- (_("%F%P: %pB: relocation %s against absolute symbol "
++ (_("%P: %pB: relocation %s against absolute symbol "
+ "`%s' in section `%pA' is disallowed\n"),
+ input_section->owner, internal_reloc.howto->name, name,
+ input_section);
+@@ -3429,9 +3429,9 @@ _bfd_x86_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+ s = p->sec->output_section;
+ if (s != NULL && (s->flags & SEC_READONLY) != 0)
+ {
+- info->callbacks->einfo
++ info->callbacks->fatal
+ /* xgettext:c-format */
+- (_("%F%P: %pB: copy relocation against non-copyable "
++ (_("%P: %pB: copy relocation against non-copyable "
+ "protected symbol `%s' in %pB\n"),
+ p->sec->owner, h->root.root.string,
+ h->root.u.def.section->owner);
+@@ -4138,12 +4138,12 @@ _bfd_x86_elf_link_setup_gnu_properties
+ | SEC_HAS_CONTENTS
+ | SEC_DATA));
+ if (sec == NULL)
+- info->callbacks->einfo (_("%F%P: failed to create GNU property section\n"));
++ info->callbacks->fatal (_("%P: failed to create GNU property section\n"));
+
+ if (!bfd_set_section_alignment (sec, class_align))
+ {
+ error_alignment:
+- info->callbacks->einfo (_("%F%pA: failed to align section\n"),
++ info->callbacks->fatal (_("%pA: failed to align section\n"),
+ sec);
+ }
+
+@@ -4404,7 +4404,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+ && !elf_vxworks_create_dynamic_sections (dynobj, info,
+ &htab->srelplt2))
+ {
+- info->callbacks->einfo (_("%F%P: failed to create VxWorks dynamic sections\n"));
++ info->callbacks->fatal (_("%P: failed to create VxWorks dynamic sections\n"));
+ return pbfd;
+ }
+
+@@ -4413,7 +4413,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+ don't need to do it in check_relocs. */
+ if (htab->elf.sgot == NULL
+ && !_bfd_elf_create_got_section (dynobj, info))
+- info->callbacks->einfo (_("%F%P: failed to create GOT sections\n"));
++ info->callbacks->fatal (_("%P: failed to create GOT sections\n"));
+
+ got_align = (bed->target_id == X86_64_ELF_DATA) ? 3 : 2;
+
+@@ -4431,7 +4431,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+ /* Create the ifunc sections here so that check_relocs can be
+ simplified. */
+ if (!_bfd_elf_create_ifunc_sections (dynobj, info))
+- info->callbacks->einfo (_("%F%P: failed to create ifunc sections\n"));
++ info->callbacks->fatal (_("%P: failed to create ifunc sections\n"));
+
+ plt_alignment = bfd_log2 (htab->plt.plt_entry_size);
+
+@@ -4468,7 +4468,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+ ".plt.got",
+ pltflags);
+ if (sec == NULL)
+- info->callbacks->einfo (_("%F%P: failed to create GOT PLT section\n"));
++ info->callbacks->fatal (_("%P: failed to create GOT PLT section\n"));
+
+ if (!bfd_set_section_alignment (sec, non_lazy_plt_alignment))
+ goto error_alignment;
+@@ -4487,7 +4487,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+ ".plt.sec",
+ pltflags);
+ if (sec == NULL)
+- info->callbacks->einfo (_("%F%P: failed to create IBT-enabled PLT section\n"));
++ info->callbacks->fatal (_("%P: failed to create IBT-enabled PLT section\n"));
+
+ if (!bfd_set_section_alignment (sec, plt_alignment))
+ goto error_alignment;
+@@ -4507,7 +4507,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+ ".eh_frame",
+ flags);
+ if (sec == NULL)
+- info->callbacks->einfo (_("%F%P: failed to create PLT .eh_frame section\n"));
++ info->callbacks->fatal (_("%P: failed to create PLT .eh_frame section\n"));
+
+ if (!bfd_set_section_alignment (sec, class_align))
+ goto error_alignment;
+@@ -4520,7 +4520,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+ ".eh_frame",
+ flags);
+ if (sec == NULL)
+- info->callbacks->einfo (_("%F%P: failed to create GOT PLT .eh_frame section\n"));
++ info->callbacks->fatal (_("%P: failed to create GOT PLT .eh_frame section\n"));
+
+ if (!bfd_set_section_alignment (sec, class_align))
+ goto error_alignment;
+@@ -4534,7 +4534,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+ ".eh_frame",
+ flags);
+ if (sec == NULL)
+- info->callbacks->einfo (_("%F%P: failed to create the second PLT .eh_frame section\n"));
++ info->callbacks->fatal (_("%P: failed to create the second PLT .eh_frame section\n"));
+
+ if (!bfd_set_section_alignment (sec, class_align))
+ goto error_alignment;
+@@ -4554,7 +4554,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+ ".sframe",
+ flags);
+ if (sec == NULL)
+- info->callbacks->einfo (_("%F%P: failed to create PLT .sframe section\n"));
++ info->callbacks->fatal (_("%P: failed to create PLT .sframe section\n"));
+
+ // FIXME check this
+ // if (!bfd_set_section_alignment (sec, class_align))
+@@ -4569,7 +4569,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+ ".sframe",
+ flags);
+ if (sec == NULL)
+- info->callbacks->einfo (_("%F%P: failed to create second PLT .sframe section\n"));
++ info->callbacks->fatal (_("%P: failed to create second PLT .sframe section\n"));
+
+ htab->plt_second_sframe = sec;
+ }
+diff --git a/bfd/linker.c b/bfd/linker.c
+index 0821db55..5b912221 100644
+--- a/bfd/linker.c
++++ b/bfd/linker.c
+@@ -2982,7 +2982,7 @@ _bfd_generic_section_already_linked (bfd *abfd ATTRIBUTE_UNUSED,
+
+ /* This is the first section with this name. Record it. */
+ if (!bfd_section_already_linked_table_insert (already_linked_list, sec))
+- info->callbacks->einfo (_("%F%P: already_linked_table: %E\n"));
++ info->callbacks->fatal (_("%P: already_linked_table: %E\n"));
+ return false;
+ }
+
+diff --git a/bfd/reloc.c b/bfd/reloc.c
+index 7583b7fd..1fee86f1 100644
+--- a/bfd/reloc.c
++++ b/bfd/reloc.c
+@@ -8465,8 +8465,8 @@ bfd_generic_relax_section (bfd *abfd ATTRIBUTE_UNUSED,
+ bool *again)
+ {
+ if (bfd_link_relocatable (link_info))
+- (*link_info->callbacks->einfo)
+- (_("%P%F: --relax and -r may not be used together\n"));
++ link_info->callbacks->fatal
++ (_("%P: --relax and -r may not be used together\n"));
+
+ *again = false;
+ return true;
+diff --git a/bfd/reloc16.c b/bfd/reloc16.c
+index ff5412dc..a16d6b20 100644
+--- a/bfd/reloc16.c
++++ b/bfd/reloc16.c
+@@ -151,8 +151,8 @@ bfd_coff_reloc16_relax_section (bfd *abfd,
+ long reloc_count;
+
+ if (bfd_link_relocatable (link_info))
+- (*link_info->callbacks->einfo)
+- (_("%P%F: --relax and -r may not be used together\n"));
++ link_info->callbacks->fatal
++ (_("%P: --relax and -r may not be used together\n"));
+
+ /* We only do global relaxation once. It is not safe to do it multiple
+ times (see discussion of the "shrinks" array below). */
+diff --git a/bfd/xcofflink.c b/bfd/xcofflink.c
+index 6ef9abcd..9b01cc37 100644
+--- a/bfd/xcofflink.c
++++ b/bfd/xcofflink.c
+@@ -4681,7 +4681,7 @@ xcoff_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+ if (hstub->target_section != NULL
+ && hstub->target_section->output_section == NULL
+ && info->non_contiguous_regions)
+- info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. "
++ info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
+ "Retry without --enable-non-contiguous-regions.\n"),
+ hstub->target_section);
+
+diff --git a/include/bfdlink.h b/include/bfdlink.h
+index eac07d78..0d03fa70 100644
+--- a/include/bfdlink.h
++++ b/include/bfdlink.h
+@@ -868,6 +868,9 @@ struct bfd_link_callbacks
+ (struct bfd_link_info *, struct bfd_link_hash_entry *h,
+ struct bfd_link_hash_entry *inh,
+ bfd *abfd, asection *section, bfd_vma address, flagword flags);
++ /* Fatal error. */
++ void (*fatal)
++ (const char *fmt, ...) ATTRIBUTE_NORETURN;
+ /* Error or warning link info message. */
+ void (*einfo)
+ (const char *fmt, ...);
+diff --git a/ld/ldmain.c b/ld/ldmain.c
+index 878d9536..a61086c3 100644
+--- a/ld/ldmain.c
++++ b/ld/ldmain.c
+@@ -146,6 +146,7 @@ static struct bfd_link_callbacks link_callbacks =
+ reloc_dangerous,
+ unattached_reloc,
+ notice,
++ fatal,
+ einfo,
+ info_msg,
+ minfo,
+--
+2.43.0
+