diff options
author | Alan Modra <amodra@gmail.com> | 2017-04-13 13:20:15 +0930 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2017-04-13 17:07:24 +0930 |
commit | dae82561a286618acf097ad9894eafba98377f66 (patch) | |
tree | f8258d3f7d0d7b12efc237898f5eeeed5bcbee4f /bfd/elf32-sh64.c | |
parent | c08bb8dd9bd9fd101018b287726187d7ed6a0035 (diff) | |
download | gdb-dae82561a286618acf097ad9894eafba98377f66.zip gdb-dae82561a286618acf097ad9894eafba98377f66.tar.gz gdb-dae82561a286618acf097ad9894eafba98377f66.tar.bz2 |
Use %A and %B in more error messages
* aoutx.h: Use %B and %A in error messages throughout file.
* aout-cris.c: Likewise.
* archive.c: Likewise.
* binary.c: Likewise.
* coff-rs6000.c: Likewise.
* coff-tic4x.c: Likewise.
* coffcode.h: Likewise.
* coffgen.c: Likewise.
* cofflink.c: Likewise.
* coffswap.h: Likewise.
* cpu-arm.c: Likewise.
* elf-eh-frame.c: Likewise.
* elf-m10300.c: Likewise.
* elf.c: Likewise.
* elf32-arc.c: Likewise.
* elf32-arm.c: Likewise.
* elf32-bfin.c: Likewise.
* elf32-frv.c: Likewise.
* elf32-iq2000.c: Likewise.
* elf32-m32c.c: Likewise.
* elf32-microblaze.c: Likewise.
* elf32-nds32.c: Likewise.
* elf32-rl78.c: Likewise.
* elf32-rx.c: Likewise.
* elf32-score.c: Likewise.
* elf32-score7.c: Likewise.
* elf32-sh64.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-vax.c: Likewise.
* elf32-visium.c: Likewise.
* elf64-ia64-vms.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-sh64.c: Likewise.
* elfcode.h: Likewise.
* elfnn-aarch64.c: Likewise.
* elfnn-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
* hpux-core.c: Likewise.
* ieee.c: Likewise.
* ihex.c: Likewise.
* linker.c: Likewise.
* merge.c: Likewise.
* mmo.c: Likewise.
* oasys.c: Likewise.
* pdp11.c: Likewise.
* peXXigen.c: Likewise.
* rs6000-core.c: Likewise.
* vms-alpha.c: Likewise.
* xcofflink.c: Likewise.
Diffstat (limited to 'bfd/elf32-sh64.c')
-rw-r--r-- | bfd/elf32-sh64.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/bfd/elf32-sh64.c b/bfd/elf32-sh64.c index 47ca44d..de7ce95d 100644 --- a/bfd/elf32-sh64.c +++ b/bfd/elf32-sh64.c @@ -222,17 +222,16 @@ sh64_elf_merge_private_data (bfd *ibfd, struct bfd_link_info *info) if (bfd_get_arch_size (ibfd) == 32 && bfd_get_arch_size (obfd) == 64) /* xgettext:c-format */ - msg = _("%s: compiled as 32-bit object and %s is 64-bit"); + msg = _("%B: compiled as 32-bit object and %B is 64-bit"); else if (bfd_get_arch_size (ibfd) == 64 && bfd_get_arch_size (obfd) == 32) /* xgettext:c-format */ - msg = _("%s: compiled as 64-bit object and %s is 32-bit"); + msg = _("%B: compiled as 64-bit object and %B is 32-bit"); else /* xgettext:c-format */ - msg = _("%s: object size does not match that of target %s"); + msg = _("%B: object size does not match that of target %B"); - _bfd_error_handler (msg, bfd_get_filename (ibfd), - bfd_get_filename (obfd)); + _bfd_error_handler (msg, ibfd, obfd); bfd_set_error (bfd_error_wrong_format); return FALSE; } @@ -249,8 +248,9 @@ sh64_elf_merge_private_data (bfd *ibfd, struct bfd_link_info *info) else if ((new_flags & EF_SH_MACH_MASK) != EF_SH5) { _bfd_error_handler - ("%s: uses non-SH64 instructions while previous modules use SH64 instructions", - bfd_get_filename (ibfd)); + ("%B: uses non-SH64 instructions while previous modules" + " use SH64 instructions", + ibfd); bfd_set_error (bfd_error_bad_value); return FALSE; } @@ -452,8 +452,7 @@ sh64_elf_add_symbol_hook (bfd *abfd, struct bfd_link_info *info, { /* Make sure we don't get confused on invalid input. */ _bfd_error_handler - (_("%s: encountered datalabel symbol in input"), - bfd_get_filename (abfd)); + (_("%B: encountered datalabel symbol in input"), abfd); bfd_set_error (bfd_error_bad_value); return FALSE; } @@ -548,8 +547,8 @@ shmedia_prepare_reloc (struct bfd_link_info *info, bfd *abfd, if ((insn & SHMEDIA_PTB_BIT) != 0) { _bfd_error_handler - (_("%s: GAS error: unexpected PTB insn with R_SH_PT_16"), - bfd_get_filename (input_section->owner)); + (_("%B: GAS error: unexpected PTB insn with R_SH_PT_16"), + input_section->owner); return FALSE; } @@ -674,8 +673,7 @@ sh64_elf_final_write_processing (bfd *abfd, { bfd_set_error (bfd_error_file_truncated); _bfd_error_handler - (_("%s: could not write out added .cranges entries"), - bfd_get_filename (abfd)); + (_("%B: could not write out added .cranges entries"), abfd); } } @@ -734,8 +732,7 @@ sh64_elf_final_write_processing (bfd *abfd, { bfd_set_error (bfd_error_file_truncated); _bfd_error_handler - (_("%s: could not write out sorted .cranges entries"), - bfd_get_filename (abfd)); + (_("%B: could not write out sorted .cranges entries"), abfd); } } } |