From c08bb8dd9bd9fd101018b287726187d7ed6a0035 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 13 Apr 2017 10:58:40 +0930 Subject: Rewrite bfd error handler This steals _doprnt from libiberty, extended to handle %A and %B. Which lets us do away with the current horrible %A and %B handling that requires all %A and %B arguments to be passed first, rather than in the natural order. * bfd.c (PRINT_TYPE): Define. (_doprnt): New function. (error_handler_internal): Use _doprnt. * coff-arm.c: Put %A and %B arguments to _bfd_error_handler calls in their natural order, throughout file. * coff-mcore.c: Likewise. * coff-ppc.c: Likewise. * coff-tic80.c: Likewise. * cofflink.c: Likewise. * elf-s390-common.c: Likewise. * elf.c: Likewise. * elf32-arm.c: Likewise. * elf32-i386.c: Likewise. * elf32-m32r.c: Likewise. * elf32-msp430.c: Likewise. * elf32-spu.c: Likewise. * elf64-ia64-vms.c: Likewise. * elf64-sparc.c: Likewise. * elf64-x86-64.c: Likewise. * elflink.c: Likewise. * elfnn-aarch64.c: Likewise. * elfnn-ia64.c: Likewise. * elfxx-mips.c: Likewise. --- bfd/elf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bfd/elf.c') diff --git a/bfd/elf.c b/bfd/elf.c index 1f02d42..802a339 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -836,7 +836,7 @@ _bfd_elf_setup_sections (bfd *abfd) _bfd_error_handler /* xgettext:c-format */ (_("%B: sh_link [%d] in section `%A' is incorrect"), - s->owner, s, elfsec); + s->owner, elfsec, s); result = FALSE; } @@ -3213,7 +3213,7 @@ elf_fake_sections (bfd *abfd, asection *asect, void *fsarg) _bfd_error_handler /* xgettext:c-format */ (_("%B: error: Alignment power %d of section `%A' is too big"), - abfd, asect, asect->alignment_power); + abfd, asect->alignment_power, asect); arg->failed = TRUE; return; } -- cgit v1.1