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-frv.c | |
| parent | c08bb8dd9bd9fd101018b287726187d7ed6a0035 (diff) | |
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-frv.c')
| -rw-r--r-- | bfd/elf32-frv.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c index f99869099a..d4b77275d5 100644 --- a/bfd/elf32-frv.c +++ b/bfd/elf32-frv.c @@ -6507,9 +6507,9 @@ frv_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) error = TRUE; _bfd_error_handler /* xgettext:c-format */ - (_("%s: compiled with %s and linked with modules that use non-pic relocations"), - bfd_get_filename (ibfd), - (new_flags & EF_FRV_BIGPIC) ? "-fPIC" : "-fpic"); + (_("%B: compiled with %s and linked with modules" + " that use non-pic relocations"), + ibfd, (new_flags & EF_FRV_BIGPIC) ? "-fPIC" : "-fpic"); #endif } } @@ -6561,8 +6561,8 @@ frv_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) error = TRUE; _bfd_error_handler /* xgettext:c-format */ - (_("%s: compiled with %s and linked with modules compiled with %s"), - bfd_get_filename (ibfd), new_opt, old_opt); + (_("%B: compiled with %s and linked with modules compiled with %s"), + ibfd, new_opt, old_opt); } /* Warn about any other mismatches */ @@ -6574,8 +6574,9 @@ frv_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) error = TRUE; _bfd_error_handler /* xgettext:c-format */ - (_("%s: uses different unknown e_flags (0x%lx) fields than previous modules (0x%lx)"), - bfd_get_filename (ibfd), (long)new_partial, (long)old_partial); + (_("%B: uses different unknown e_flags (0x%lx) fields" + " than previous modules (0x%lx)"), + ibfd, (long) new_partial, (long) old_partial); } } @@ -6595,12 +6596,12 @@ frv_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) error = TRUE; if (IS_FDPIC (obfd)) _bfd_error_handler - (_("%s: cannot link non-fdpic object file into fdpic executable"), - bfd_get_filename (ibfd)); + (_("%B: cannot link non-fdpic object file into fdpic executable"), + ibfd); else _bfd_error_handler - (_("%s: cannot link fdpic object file into non-fdpic executable"), - bfd_get_filename (ibfd)); + (_("%B: cannot link fdpic object file into non-fdpic executable"), + ibfd); } if (error) |