diff options
| author | Nick Clifton <nickc@redhat.com> | 2016-10-19 14:04:34 +0100 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2016-10-19 14:37:21 +0100 |
| commit | 695344c018c8e462280c47a644df02ea472b0a4e (patch) | |
| tree | 12cafcf8f151dd4189951e49b20fb6ff99233c30 /bfd | |
| parent | 15f205b11547e7ec0ce42a9b49e78229a2d569e1 (diff) | |
| download | gdb-695344c018c8e462280c47a644df02ea472b0a4e.zip gdb-695344c018c8e462280c47a644df02ea472b0a4e.tar.gz gdb-695344c018c8e462280c47a644df02ea472b0a4e.tar.bz2 | |
Add c-format tags to translatable strings with more than one argument-using formatting token.
* aout-adobe.c: Add missing c-format tags for translatable strings.
* aout-cris.c: Likewise.
* aoutx.h: Likewise.
* bfd.c: Likewise.
* binary.c: Likewise.
* cache.c: Likewise.
* coff-alpha.c: Likewise.
* coff-arm.c: Likewise.
* coff-i860.c: Likewise.
* coff-mcore.c: Likewise.
* coff-ppc.c: Likewise.
* coff-rs6000.c: Likewise.
* coff-sh.c: Likewise.
* coff-tic4x.c: Likewise.
* coff-tic54x.c: Likewise.
* coff-tic80.c: Likewise.
* coff64-rs6000.c: Likewise.
* coffcode.h: Likewise.
* coffgen.c: Likewise.
* cofflink.c: Likewise.
* coffswap.h: Likewise.
* cpu-arm.c: Likewise.
* dwarf2.c: Likewise.
* ecoff.c: Likewise.
* elf-attrs.c: Likewise.
* elf-eh-frame.c: Likewise.
* elf-ifunc.c: Likewise.
* elf-m10300.c: Likewise.
* elf-s390-common.c: Likewise.
* elf.c: Likewise.
* elf32-arc.c: Likewise.
* elf32-arm.c: Likewise.
* elf32-avr.c: Likewise.
* elf32-bfin.c: Likewise.
* elf32-cr16.c: Likewise.
* elf32-cr16c.c: Likewise.
* elf32-cris.c: Likewise.
* elf32-crx.c: Likewise.
* elf32-d10v.c: Likewise.
* elf32-d30v.c: Likewise.
* elf32-epiphany.c: Likewise.
* elf32-fr30.c: Likewise.
* elf32-frv.c: Likewise.
* elf32-gen.c: Likewise.
* elf32-hppa.c: Likewise.
* elf32-i370.c: Likewise.
* elf32-i386.c: Likewise.
* elf32-i960.c: Likewise.
* elf32-ip2k.c: Likewise.
* elf32-iq2000.c: Likewise.
* elf32-lm32.c: Likewise.
* elf32-m32c.c: Likewise.
* elf32-m32r.c: Likewise.
* elf32-m68hc11.c: Likewise.
* elf32-m68hc12.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-m68k.c: Likewise.
* elf32-mcore.c: Likewise.
* elf32-mep.c: Likewise.
* elf32-metag.c: Likewise.
* elf32-microblaze.c: Likewise.
* elf32-moxie.c: Likewise.
* elf32-msp430.c: Likewise.
* elf32-mt.c: Likewise.
* elf32-nds32.c: Likewise.
* elf32-nios2.c: Likewise.
* elf32-or1k.c: Likewise.
* elf32-pj.c: Likewise.
* elf32-ppc.c: Likewise.
* elf32-rl78.c: Likewise.
* elf32-rx.c: Likewise.
* elf32-s390.c: Likewise.
* elf32-score.c: Likewise.
* elf32-score7.c: Likewise.
* elf32-sh-symbian.c: Likewise.
* elf32-sh.c: Likewise.
* elf32-sh64.c: Likewise.
* elf32-spu.c: Likewise.
* elf32-tic6x.c: Likewise.
* elf32-tilepro.c: Likewise.
* elf32-v850.c: Likewise.
* elf32-vax.c: Likewise.
* elf32-visium.c: Likewise.
* elf32-xgate.c: Likewise.
* elf32-xtensa.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-gen.c: Likewise.
* elf64-hppa.c: Likewise.
* elf64-ia64-vms.c: Likewise.
* elf64-mmix.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-s390.c: Likewise.
* elf64-sh64.c: Likewise.
* elf64-sparc.c: Likewise.
* elf64-x86-64.c: Likewise.
* elfcode.h: Likewise.
* elfcore.h: Likewise.
* elflink.c: Likewise.
* elfnn-aarch64.c: Likewise.
* elfnn-ia64.c: Likewise.
* elfxx-mips.c: Likewise.
* elfxx-sparc.c: Likewise.
* elfxx-tilegx.c: Likewise.
* ieee.c: Likewise.
* ihex.c: Likewise.
* libbfd.c: Likewise.
* linker.c: Likewise.
* m68klinux.c: Likewise.
* mach-o.c: Likewise.
* merge.c: Likewise.
* mmo.c: Likewise.
* oasys.c: Likewise.
* pdp11.c: Likewise.
* pe-mips.c: Likewise.
* peXXigen.c: Likewise.
* pei-x86_64.c: Likewise.
* peicode.h: Likewise.
* ppcboot.c: Likewise.
* reloc.c: Likewise.
* sparclinux.c: Likewise.
* srec.c: Likewise.
* stabs.c: Likewise.
* vms-alpha.c: Likewise.
* vms-lib.c: Likewise.
* xcofflink.c: Likewise.
Diffstat (limited to 'bfd')
126 files changed, 1164 insertions, 198 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 79695b1..cffbb5a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,131 @@ +2016-10-19 Nick Clifton <nickc@redhat.com> + + * aout-adobe.c: Add missing c-format tags for translatable strings. + * aout-cris.c: Likewise. + * aoutx.h: Likewise. + * bfd.c: Likewise. + * binary.c: Likewise. + * cache.c: Likewise. + * coff-alpha.c: Likewise. + * coff-arm.c: Likewise. + * coff-i860.c: Likewise. + * coff-mcore.c: Likewise. + * coff-ppc.c: Likewise. + * coff-rs6000.c: Likewise. + * coff-sh.c: Likewise. + * coff-tic4x.c: Likewise. + * coff-tic54x.c: Likewise. + * coff-tic80.c: Likewise. + * coff64-rs6000.c: Likewise. + * coffcode.h: Likewise. + * coffgen.c: Likewise. + * cofflink.c: Likewise. + * coffswap.h: Likewise. + * cpu-arm.c: Likewise. + * dwarf2.c: Likewise. + * ecoff.c: Likewise. + * elf-attrs.c: Likewise. + * elf-eh-frame.c: Likewise. + * elf-ifunc.c: Likewise. + * elf-m10300.c: Likewise. + * elf-s390-common.c: Likewise. + * elf.c: Likewise. + * elf32-arc.c: Likewise. + * elf32-arm.c: Likewise. + * elf32-avr.c: Likewise. + * elf32-bfin.c: Likewise. + * elf32-cr16.c: Likewise. + * elf32-cr16c.c: Likewise. + * elf32-cris.c: Likewise. + * elf32-crx.c: Likewise. + * elf32-d10v.c: Likewise. + * elf32-d30v.c: Likewise. + * elf32-epiphany.c: Likewise. + * elf32-fr30.c: Likewise. + * elf32-frv.c: Likewise. + * elf32-gen.c: Likewise. + * elf32-hppa.c: Likewise. + * elf32-i370.c: Likewise. + * elf32-i386.c: Likewise. + * elf32-i960.c: Likewise. + * elf32-ip2k.c: Likewise. + * elf32-iq2000.c: Likewise. + * elf32-lm32.c: Likewise. + * elf32-m32c.c: Likewise. + * elf32-m32r.c: Likewise. + * elf32-m68hc11.c: Likewise. + * elf32-m68hc12.c: Likewise. + * elf32-m68hc1x.c: Likewise. + * elf32-m68k.c: Likewise. + * elf32-mcore.c: Likewise. + * elf32-mep.c: Likewise. + * elf32-metag.c: Likewise. + * elf32-microblaze.c: Likewise. + * elf32-moxie.c: Likewise. + * elf32-msp430.c: Likewise. + * elf32-mt.c: Likewise. + * elf32-nds32.c: Likewise. + * elf32-nios2.c: Likewise. + * elf32-or1k.c: Likewise. + * elf32-pj.c: Likewise. + * elf32-ppc.c: Likewise. + * elf32-rl78.c: Likewise. + * elf32-rx.c: Likewise. + * elf32-s390.c: Likewise. + * elf32-score.c: Likewise. + * elf32-score7.c: Likewise. + * elf32-sh-symbian.c: Likewise. + * elf32-sh.c: Likewise. + * elf32-sh64.c: Likewise. + * elf32-spu.c: Likewise. + * elf32-tic6x.c: Likewise. + * elf32-tilepro.c: Likewise. + * elf32-v850.c: Likewise. + * elf32-vax.c: Likewise. + * elf32-visium.c: Likewise. + * elf32-xgate.c: Likewise. + * elf32-xtensa.c: Likewise. + * elf64-alpha.c: Likewise. + * elf64-gen.c: Likewise. + * elf64-hppa.c: Likewise. + * elf64-ia64-vms.c: Likewise. + * elf64-mmix.c: Likewise. + * elf64-ppc.c: Likewise. + * elf64-s390.c: Likewise. + * elf64-sh64.c: Likewise. + * elf64-sparc.c: Likewise. + * elf64-x86-64.c: Likewise. + * elfcode.h: Likewise. + * elfcore.h: Likewise. + * elflink.c: Likewise. + * elfnn-aarch64.c: Likewise. + * elfnn-ia64.c: Likewise. + * elfxx-mips.c: Likewise. + * elfxx-sparc.c: Likewise. + * elfxx-tilegx.c: Likewise. + * ieee.c: Likewise. + * ihex.c: Likewise. + * libbfd.c: Likewise. + * linker.c: Likewise. + * m68klinux.c: Likewise. + * mach-o.c: Likewise. + * merge.c: Likewise. + * mmo.c: Likewise. + * oasys.c: Likewise. + * pdp11.c: Likewise. + * pe-mips.c: Likewise. + * peXXigen.c: Likewise. + * pei-x86_64.c: Likewise. + * peicode.h: Likewise. + * ppcboot.c: Likewise. + * reloc.c: Likewise. + * sparclinux.c: Likewise. + * srec.c: Likewise. + * stabs.c: Likewise. + * vms-alpha.c: Likewise. + * vms-lib.c: Likewise. + * xcofflink.c: Likewise. + 2016-10-18 Nick Clifton <nickc@redhat.com> * po/da.po: Updated Danish translation. diff --git a/bfd/aout-adobe.c b/bfd/aout-adobe.c index 1a85401..bfa30d9 100644 --- a/bfd/aout-adobe.c +++ b/bfd/aout-adobe.c @@ -122,6 +122,7 @@ aout_adobe_callback (bfd *abfd) default: _bfd_error_handler + /* xgettext:c-format */ (_("%B: Unknown section type in a.out.adobe file: %x\n"), abfd, ext->e_type[0]); goto no_more_sections; diff --git a/bfd/aout-cris.c b/bfd/aout-cris.c index efed721..54ffeaf 100644 --- a/bfd/aout-cris.c +++ b/bfd/aout-cris.c @@ -196,6 +196,7 @@ MY (swap_ext_reloc_out) (bfd *abfd, We may change this later, but assert this for the moment. */ if (r_type > 2) { + /* xgettext:c-format */ _bfd_error_handler (_("%s: Invalid relocation type exported: %d"), bfd_get_filename (abfd), r_type); @@ -239,6 +240,7 @@ MY (swap_ext_reloc_in) (bfd *abfd, if (r_type > 2) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: Invalid relocation type imported: %d"), abfd, r_type); @@ -250,6 +252,7 @@ MY (swap_ext_reloc_in) (bfd *abfd, if (r_extern && r_index > symcount) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: Bad relocation record imported: %d"), abfd, r_index); bfd_set_error (bfd_error_wrong_format); diff --git a/bfd/aoutx.h b/bfd/aoutx.h index 81658bf..089fe57 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h @@ -1278,6 +1278,7 @@ NAME (aout, set_section_contents) (bfd *abfd, else { _bfd_error_handler + /* xgettext:c-format */ (_("%s: can not represent section `%s' in a.out object file format"), bfd_get_filename (abfd), bfd_get_section_name (abfd, section)); bfd_set_error (bfd_error_nonrepresentable_section); @@ -1578,6 +1579,7 @@ translate_to_native_sym_flags (bfd *abfd, /* This case occurs, e.g., for the *DEBUG* section of a COFF file. */ _bfd_error_handler + /* xgettext:c-format */ (_("%s: can not represent section for symbol `%s' in a.out " "object file format"), bfd_get_filename (abfd), @@ -1613,6 +1615,7 @@ translate_to_native_sym_flags (bfd *abfd, else { _bfd_error_handler + /* xgettext:c-format */ (_("%s: can not represent section `%s' in a.out object file format"), bfd_get_filename (abfd), bfd_get_section_name (abfd, sec)); bfd_set_error (bfd_error_nonrepresentable_section); @@ -5376,6 +5379,7 @@ NAME (aout, final_link) (bfd *abfd, work out the number of relocs needed, and then multiply by the reloc size. */ _bfd_error_handler + /* xgettext:c-format */ (_("%s: relocatable link from %s to %s not supported"), bfd_get_filename (abfd), sub->xvec->name, abfd->xvec->name); @@ -1059,6 +1059,7 @@ bfd_set_file_flags (bfd *abfd, flagword flags) void bfd_assert (const char *file, int line) { + /* xgettext:c-format */ (*_bfd_assert_handler) (_("BFD %s assertion fail %s:%d"), BFD_VERSION_STRING, file, line); } @@ -1071,10 +1072,12 @@ _bfd_abort (const char *file, int line, const char *fn) { if (fn != NULL) _bfd_error_handler + /* xgettext:c-format */ (_("BFD %s internal error, aborting at %s:%d in %s\n"), BFD_VERSION_STRING, file, line, fn); else _bfd_error_handler + /* xgettext:c-format */ (_("BFD %s internal error, aborting at %s:%d\n"), BFD_VERSION_STRING, file, line); _bfd_error_handler (_("Please report this bug.\n")); diff --git a/bfd/binary.c b/bfd/binary.c index 39237d0..09d6847 100644 --- a/bfd/binary.c +++ b/bfd/binary.c @@ -270,6 +270,7 @@ binary_set_section_contents (bfd *abfd, if (s->filepos < 0) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: Writing section `%s' at huge (ie negative) " "file offset 0x%lx."), bfd_get_section_name (abfd, s), diff --git a/bfd/cache.c b/bfd/cache.c index 2f55717..b76044a 100644 --- a/bfd/cache.c +++ b/bfd/cache.c @@ -268,6 +268,7 @@ bfd_cache_lookup_worker (bfd *abfd, enum cache_flag flag) else return (FILE *) abfd->iostream; + /* xgettext:c-format */ _bfd_error_handler (_("reopening %B: %s\n"), orig_bfd, bfd_errmsg (bfd_get_error ())); return NULL; diff --git a/bfd/coff-alpha.c b/bfd/coff-alpha.c index 36877f7..eabfe0d 100644 --- a/bfd/coff-alpha.c +++ b/bfd/coff-alpha.c @@ -597,6 +597,7 @@ alpha_adjust_reloc_in (bfd *abfd, { if (intern->r_type > ALPHA_R_GPVALUE) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: unknown/unsupported relocation type %d"), abfd, intern->r_type); @@ -1513,6 +1514,7 @@ alpha_relocate_section (bfd *output_bfd, default: _bfd_error_handler + /* xgettext:c-format */ (_("%B: unknown relocation type %d"), input_bfd, (int) r_type); bfd_set_error (bfd_error_bad_value); diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c index 713f65b..c7a2861 100644 --- a/bfd/coff-arm.c +++ b/bfd/coff-arm.c @@ -1742,6 +1742,7 @@ coff_arm_relocate_section (bfd *output_bfd, break; case bfd_reloc_outofrange: _bfd_error_handler + /* xgettext:c-format */ (_("%B: bad reloc address 0x%lx in section `%A'"), input_bfd, input_section, (unsigned long) rel->r_vaddr); return FALSE; @@ -2066,6 +2067,7 @@ bfd_arm_process_before_allocation (bfd * abfd, /* If the index is outside of the range of our table, something has gone wrong. */ if (symndx >= obj_conv_table_size (abfd)) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: illegal symbol index in reloc: %d"), abfd, symndx); continue; @@ -2210,16 +2212,16 @@ coff_arm_merge_private_bfd_data (bfd * ibfd, struct bfd_link_info *info) if (APCS_FLOAT_FLAG (obfd) != APCS_FLOAT_FLAG (ibfd)) { - const char *msg; - if (APCS_FLOAT_FLAG (ibfd)) /* xgettext: c-format */ - msg = _("error: %B passes floats in float registers, whereas %B passes them in integer registers"); + _bfd_error_handler (_("\ +error: %B passes floats in float registers, whereas %B passes them in integer registers"), + ibfd, obfd); else /* xgettext: c-format */ - msg = _("error: %B passes floats in integer registers, whereas %B passes them in float registers"); - - _bfd_error_handler (msg, ibfd, obfd); + _bfd_error_handler (_("\ +error: %B passes floats in integer registers, whereas %B passes them in float registers"), + ibfd, obfd); bfd_set_error (bfd_error_wrong_format); return FALSE; @@ -2227,15 +2229,16 @@ coff_arm_merge_private_bfd_data (bfd * ibfd, struct bfd_link_info *info) if (PIC_FLAG (obfd) != PIC_FLAG (ibfd)) { - const char * msg; - if (PIC_FLAG (ibfd)) /* xgettext: c-format */ - msg = _("error: %B is compiled as position independent code, whereas target %B is absolute position"); + _bfd_error_handler (_("\ +error: %B is compiled as position independent code, whereas target %B is absolute position"), + ibfd, obfd); else /* xgettext: c-format */ - msg = _("error: %B is compiled as absolute position code, whereas target %B is position independent"); - _bfd_error_handler (msg, ibfd, obfd); + _bfd_error_handler (_("\ +error: %B is compiled as absolute position code, whereas target %B is position independent"), + ibfd, obfd); bfd_set_error (bfd_error_wrong_format); return FALSE; @@ -2258,16 +2261,16 @@ coff_arm_merge_private_bfd_data (bfd * ibfd, struct bfd_link_info *info) /* If the src and dest differ in their interworking issue a warning. */ if (INTERWORK_FLAG (obfd) != INTERWORK_FLAG (ibfd)) { - const char * msg; - if (INTERWORK_FLAG (ibfd)) /* xgettext: c-format */ - msg = _("Warning: %B supports interworking, whereas %B does not"); + _bfd_error_handler (_("\ +Warning: %B supports interworking, whereas %B does not"), + ibfd, obfd); else /* xgettext: c-format */ - msg = _("Warning: %B does not support interworking, whereas %B does"); - - _bfd_error_handler (msg, ibfd, obfd); + _bfd_error_handler (_("\ +Warning: %B does not support interworking, whereas %B does"), + ibfd, obfd); } } else @@ -2288,7 +2291,6 @@ coff_arm_print_private_bfd_data (bfd * abfd, void * ptr) BFD_ASSERT (abfd != NULL && ptr != NULL); - /* xgettext:c-format */ fprintf (file, _("private flags = %x:"), coff_data (abfd)->flags); if (APCS_SET (abfd)) @@ -2357,11 +2359,9 @@ _bfd_coff_arm_set_private_flags (bfd * abfd, flagword flags) if (INTERWORK_SET (abfd) && (INTERWORK_FLAG (abfd) != flag)) { if (flag) - /* xgettext: c-format */ _bfd_error_handler (_("Warning: Not setting interworking flag of %B since it has already been specified as non-interworking"), abfd); else - /* xgettext: c-format */ _bfd_error_handler (_("Warning: Clearing the interworking flag of %B due to outside request"), abfd); flag = 0; @@ -2419,7 +2419,7 @@ coff_arm_copy_private_bfd_data (bfd * src, bfd * dest) if (INTERWORK_FLAG (dest)) { /* xgettext:c-format */ - _bfd_error_handler (("\ + _bfd_error_handler (_("\ Warning: Clearing the interworking flag of %B because non-interworking code in %B has been linked with it"), dest, src); } diff --git a/bfd/coff-i860.c b/bfd/coff-i860.c index 5bf5231..86d554d 100644 --- a/bfd/coff-i860.c +++ b/bfd/coff-i860.c @@ -604,6 +604,7 @@ i860_reloc_processing (arelent *cache_ptr, struct internal_reloc *dst, if (dst->r_symndx < 0 || dst->r_symndx >= obj_conv_table_size (abfd)) { _bfd_error_handler + /* xgettext: c-format */ (_("%B: warning: illegal symbol index %ld in relocs"), abfd, dst->r_symndx); cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; diff --git a/bfd/coff-mcore.c b/bfd/coff-mcore.c index d3dcd9e..9be92cc 100644 --- a/bfd/coff-mcore.c +++ b/bfd/coff-mcore.c @@ -241,6 +241,7 @@ mcore_coff_unsupported_reloc (bfd * abfd, { BFD_ASSERT (reloc_entry->howto != (reloc_howto_type *)0); + /* xgettext: c-format */ _bfd_error_handler (_("%B: Relocation %s (%d) is not currently supported.\n"), abfd, reloc_entry->howto->name, @@ -366,6 +367,7 @@ coff_mcore_relocate_section (bfd * output_bfd, && output_bfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN) { _bfd_error_handler + /* xgettext: c-format */ (_("%B: compiled for a %s system and target is %s.\n"), input_bfd, bfd_big_endian (input_bfd) ? _("big endian") : _("little endian"), @@ -467,6 +469,7 @@ coff_mcore_relocate_section (bfd * output_bfd, switch (r_type) { default: + /* xgettext: c-format */ _bfd_error_handler (_("%B: unsupported relocation type 0x%02x"), input_bfd, r_type); bfd_set_error (bfd_error_bad_value); @@ -474,6 +477,7 @@ coff_mcore_relocate_section (bfd * output_bfd, case IMAGE_REL_MCORE_ABSOLUTE: _bfd_error_handler + /* xgettext: c-format */ (_("Warning: unsupported reloc %s <file %B, section %A>\n" "sym %ld (%s), r_vaddr %ld (%lx)"), input_bfd, input_section, howto->name, diff --git a/bfd/coff-ppc.c b/bfd/coff-ppc.c index 6c025b0..6755e54 100644 --- a/bfd/coff-ppc.c +++ b/bfd/coff-ppc.c @@ -79,9 +79,10 @@ extern void dump_toc (void *); #define HASH_CHECK_DCL char eye_catcher[8]; #define HASH_CHECK_INIT(ret) strcpy(ret->eye_catcher, EYE) #define HASH_CHECK(addr) \ - if (strcmp(addr->eye_catcher, EYE) != 0) \ + if (strcmp (addr->eye_catcher, EYE) != 0) \ { \ fprintf (stderr,\ + /* xgettext: c-format */ \ _("File %s, line %d, Hash check failure, bad eye %8s\n"), \ __FILE__, __LINE__, addr->eye_catcher); \ abort (); \ @@ -1038,6 +1039,7 @@ coff_ppc_relocate_section (bfd *output_bfd, { default: _bfd_error_handler + /* xgettext: c-format */ (_("%B: unsupported relocation type 0x%02x"), input_bfd, r_type); bfd_set_error (bfd_error_bad_value); return FALSE; @@ -1128,6 +1130,7 @@ coff_ppc_relocate_section (bfd *output_bfd, if ((bfd_vma) our_toc_offset >= 65535) { _bfd_error_handler + /* xgettext: c-format */ (_("%B: Relocation for %s of %lx exceeds " "Toc size limit"), input_bfd, name, @@ -1182,6 +1185,7 @@ coff_ppc_relocate_section (bfd *output_bfd, && (bfd_vma) our_toc_offset > toc_section->size) { _bfd_error_handler + /* xgettext: c-format */ (_("%B: Relocation exceeds allocated TOC (%lx)"), input_bfd, (unsigned long) toc_section->size); bfd_set_error (bfd_error_bad_value); @@ -1236,6 +1240,7 @@ coff_ppc_relocate_section (bfd *output_bfd, my_name = h->root.root.root.string; _bfd_error_handler + /* xgettext: c-format */ (_("Warning: unsupported reloc %s <file %B, section %A>\n" "sym %ld (%s), r_vaddr %ld (%lx)"), input_bfd, input_section, howto->name, @@ -1254,6 +1259,7 @@ coff_ppc_relocate_section (bfd *output_bfd, my_name = h->root.root.root.string; _bfd_error_handler + /* xgettext: c-format */ (_("%B: Out of order IMGLUE reloc for %s"), input_bfd, my_name); bfd_set_error (bfd_error_bad_value); return FALSE; @@ -1484,6 +1490,7 @@ dump_toc (void * vfile) else { fprintf (file, + /* xgettext: c-format */ _("**** global_toc_size %ld(%lx), thunk_size %ld(%lx)\n"), global_toc_size, (unsigned long) global_toc_size, thunk_size, (unsigned long) thunk_size); @@ -1761,6 +1768,7 @@ ppc_coff_rtype2howto (arelent *relent, struct internal_reloc *internal) break; default: _bfd_error_handler + /* xgettext: c-format */ (_("warning: unsupported reloc %s [%d] used -- it may not work"), ppc_coff_howto_table[r_type].name, r_type); howto = ppc_coff_howto_table + r_type; @@ -1832,6 +1840,7 @@ coff_ppc_rtype_to_howto (bfd *abfd ATTRIBUTE_UNUSED, break; default: _bfd_error_handler + /* xgettext: c-format */ (_("warning: unsupported reloc %s [%d] used -- it may not work"), ppc_coff_howto_table[r_type].name, r_type); howto = ppc_coff_howto_table + r_type; diff --git a/bfd/coff-rs6000.c b/bfd/coff-rs6000.c index f3e3b18..00d353b 100644 --- a/bfd/coff-rs6000.c +++ b/bfd/coff-rs6000.c @@ -2737,6 +2737,7 @@ xcoff_reloc_type_fail (bfd *input_bfd, bfd_byte *contents ATTRIBUTE_UNUSED) { _bfd_error_handler + /* xgettext: c-format */ (_("%s: unsupported relocation type 0x%02x"), bfd_get_filename (input_bfd), (unsigned int) rel->r_type); bfd_set_error (bfd_error_bad_value); @@ -2822,6 +2823,7 @@ xcoff_reloc_type_toc (bfd *input_bfd, if (h->toc_section == NULL) { _bfd_error_handler + /* xgettext: c-format */ (_("%s: TOC reloc at 0x%x to symbol `%s' with no TOC entry"), bfd_get_filename (input_bfd), rel->r_vaddr, h->root.root.string); @@ -3568,6 +3570,7 @@ xcoff_create_csect_from_smclas (bfd *abfd, else { _bfd_error_handler + /* xgettext: c-format */ (_("%B: symbol `%s' has unrecognized smclas %d"), abfd, symbol_name, aux->x_csect.x_smclas); bfd_set_error (bfd_error_bad_value); diff --git a/bfd/coff-sh.c b/bfd/coff-sh.c index e3e7fac..a52269b 100644 --- a/bfd/coff-sh.c +++ b/bfd/coff-sh.c @@ -771,7 +771,8 @@ sh_relax_section (bfd *abfd, laddr += ((irel->r_offset & 0xffffffff) ^ 0x80000000) - 0x80000000; if (laddr >= sec->size) { - _bfd_error_handler ("%B: 0x%lx: warning: bad R_SH_USES offset", + /* xgettext: c-format */ + _bfd_error_handler (_("%B: 0x%lx: warning: bad R_SH_USES offset"), abfd, (unsigned long) irel->r_vaddr); continue; } @@ -781,7 +782,8 @@ sh_relax_section (bfd *abfd, if ((insn & 0xf000) != 0xd000) { _bfd_error_handler - ("%B: 0x%lx: warning: R_SH_USES points to unrecognized insn 0x%x", + /* xgettext: c-format */ + (_("%B: 0x%lx: warning: R_SH_USES points to unrecognized insn 0x%x"), abfd, (unsigned long) irel->r_vaddr, insn); continue; } @@ -798,7 +800,8 @@ sh_relax_section (bfd *abfd, if (paddr >= sec->size) { _bfd_error_handler - ("%B: 0x%lx: warning: bad R_SH_USES load offset", + /* xgettext: c-format */ + (_("%B: 0x%lx: warning: bad R_SH_USES load offset"), abfd, (unsigned long) irel->r_vaddr); continue; } @@ -822,7 +825,8 @@ sh_relax_section (bfd *abfd, if (irelfn >= irelend) { _bfd_error_handler - ("%B: 0x%lx: warning: could not find expected reloc", + /* xgettext: c-format */ + (_("%B: 0x%lx: warning: could not find expected reloc"), abfd, (unsigned long) paddr); continue; } @@ -838,7 +842,8 @@ sh_relax_section (bfd *abfd, if (sym.n_scnum != 0 && sym.n_scnum != sec->target_index) { _bfd_error_handler - ("%B: 0x%lx: warning: symbol in unexpected section", + /* xgettext: c-format */ + (_("%B: 0x%lx: warning: symbol in unexpected section"), abfd, (unsigned long) paddr); continue; } @@ -963,7 +968,8 @@ sh_relax_section (bfd *abfd, if (irelcount >= irelend) { _bfd_error_handler - ("%B: 0x%lx: warning: could not find expected COUNT reloc", + /* xgettext: c-format */ + (_("%B: 0x%lx: warning: could not find expected COUNT reloc"), abfd, (unsigned long) paddr); continue; } @@ -972,7 +978,8 @@ sh_relax_section (bfd *abfd, just deleted one. */ if (irelcount->r_offset == 0) { - _bfd_error_handler ("%B: 0x%lx: warning: bad count", + /* xgettext: c-format */ + _bfd_error_handler (_("%B: 0x%lx: warning: bad count"), abfd, (unsigned long) paddr); continue; } @@ -1343,7 +1350,8 @@ sh_relax_delete_bytes (bfd *abfd, if (overflow) { _bfd_error_handler - ("%B: 0x%lx: fatal: reloc overflow while relaxing", + /* xgettext: c-format */ + (_("%B: 0x%lx: fatal: reloc overflow while relaxing"), abfd, (unsigned long) irel->r_vaddr); bfd_set_error (bfd_error_bad_value); return FALSE; @@ -1438,7 +1446,7 @@ sh_relax_delete_bytes (bfd *abfd, || obj_raw_syments (abfd) != NULL) { _bfd_error_handler - ("%B: fatal: generic symbols retrieved before relaxing", abfd); + (_("%B: fatal: generic symbols retrieved before relaxing"), abfd); bfd_set_error (bfd_error_invalid_operation); return FALSE; } @@ -2630,7 +2638,8 @@ sh_swap_insns (bfd * abfd, if (overflow) { _bfd_error_handler - ("%B: 0x%lx: fatal: reloc overflow while relaxing", + /* xgettext: c-format */ + (_("%B: 0x%lx: fatal: reloc overflow while relaxing"), abfd, (unsigned long) irel->r_vaddr); bfd_set_error (bfd_error_bad_value); return FALSE; @@ -2767,7 +2776,8 @@ sh_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, || (unsigned long) symndx >= obj_raw_syment_count (input_bfd)) { _bfd_error_handler - ("%B: illegal symbol index %ld in relocs", + /* xgettext: c-format */ + (_("%B: illegal symbol index %ld in relocs"), input_bfd, symndx); bfd_set_error (bfd_error_bad_value); return FALSE; diff --git a/bfd/coff-tic4x.c b/bfd/coff-tic4x.c index 4f86b5e..2a7dc86 100644 --- a/bfd/coff-tic4x.c +++ b/bfd/coff-tic4x.c @@ -223,6 +223,7 @@ tic4x_reloc_processing (arelent *relent, if (reloc->r_symndx < 0 || reloc->r_symndx >= obj_conv_table_size (abfd)) { _bfd_error_handler + /* xgettext: c-format */ (_("%s: warning: illegal symbol index %ld in relocs"), bfd_get_filename (abfd), reloc->r_symndx); relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; diff --git a/bfd/coff-tic54x.c b/bfd/coff-tic54x.c index d8a443a..f059694 100644 --- a/bfd/coff-tic54x.c +++ b/bfd/coff-tic54x.c @@ -361,6 +361,7 @@ tic54x_reloc_processing (arelent *relent, if (reloc->r_symndx < 0 || reloc->r_symndx >= obj_conv_table_size (abfd)) { _bfd_error_handler + /* xgettext: c-format */ (_("%B: warning: illegal symbol index %ld in relocs"), abfd, reloc->r_symndx); relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; diff --git a/bfd/coff-tic80.c b/bfd/coff-tic80.c index 912faca..2de7932 100644 --- a/bfd/coff-tic80.c +++ b/bfd/coff-tic80.c @@ -666,6 +666,7 @@ coff_tic80_relocate_section (bfd *output_bfd, break; case bfd_reloc_outofrange: _bfd_error_handler + /* xgettext: c-format */ (_("%B: bad reloc address 0x%lx in section `%A'"), input_bfd, input_section, (unsigned long) rel->r_vaddr); return FALSE; diff --git a/bfd/coff64-rs6000.c b/bfd/coff64-rs6000.c index a759283..20d1ed7 100644 --- a/bfd/coff64-rs6000.c +++ b/bfd/coff64-rs6000.c @@ -2106,6 +2106,7 @@ xcoff64_create_csect_from_smclas (bfd *abfd, union internal_auxent *aux, else { _bfd_error_handler + /* xgettext: c-format */ (_("%B: symbol `%s' has unrecognized smclas %d"), abfd, symbol_name, aux->x_csect.x_smclas); bfd_set_error (bfd_error_bad_value); diff --git a/bfd/coffcode.h b/bfd/coffcode.h index 31050ec..0862f66 100644 --- a/bfd/coffcode.h +++ b/bfd/coffcode.h @@ -1004,6 +1004,7 @@ handle_COMDAT (bfd * abfd, function). See comment above for more. */ if (isym.n_sclass == C_STAT && strcmp (name, symname) != 0) + /* xgettext:c-format */ _bfd_error_handler (_("%B: warning: COMDAT symbol '%s' does not match section name '%s'"), abfd, symname, name); @@ -1012,6 +1013,7 @@ handle_COMDAT (bfd * abfd, /* PR 17512: file: e2cfe54f. */ if (esym + bfd_coff_symesz (abfd) >= esymend) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: warning: No symbol for section '%s' found"), abfd, symname); break; @@ -1236,6 +1238,7 @@ styp_to_sec_flags (bfd *abfd, /* Generate a warning message rather using the 'unhandled' variable as this will allow some .sys files generate by other toolchains to be processed. See bugzilla issue 196. */ + /* xgettext:c-format */ _bfd_error_handler (_("%B: Warning: Ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section %s"), abfd, name); break; @@ -1303,6 +1306,7 @@ styp_to_sec_flags (bfd *abfd, if (unhandled != NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%B (%s): Section flag %s (0x%x) ignored"), abfd, name, unhandled, flag); result = FALSE; @@ -1938,7 +1942,7 @@ coff_set_alignment_hook (bfd * abfd ATTRIBUTE_UNUSED, } else if (hdr->s_nreloc == 0xffff) _bfd_error_handler - ("%s: warning: claims to have 0xffff relocs, without overflow", + (_("%s: warning: claims to have 0xffff relocs, without overflow"), bfd_get_filename (abfd)); } #undef ALIGN_SET @@ -2779,6 +2783,7 @@ coff_write_relocs (bfd * abfd, int first_undef) if (n.r_symndx > obj_conv_table_size (abfd)) { bfd_set_error (bfd_error_bad_value); + /* xgettext:c-format */ _bfd_error_handler (_("%B: reloc against a non-existant symbol index: %ld"), abfd, n.r_symndx); return FALSE; @@ -3180,6 +3185,7 @@ coff_compute_section_file_positions (bfd * abfd) { bfd_set_error (bfd_error_file_too_big); _bfd_error_handler + /* xgettext:c-format */ (_("%B: page size is too large (0x%x)"), abfd, page_size); return FALSE; } @@ -3339,6 +3345,7 @@ coff_compute_section_file_positions (bfd * abfd) { bfd_set_error (bfd_error_file_too_big); _bfd_error_handler + /* xgettext:c-format */ (_("%B: too many sections (%d)"), abfd, target_index); return FALSE; } @@ -3757,6 +3764,7 @@ coff_write_object_contents (bfd * abfd) { bfd_set_error (bfd_error_file_too_big); _bfd_error_handler + /* xgettext:c-format */ (_("%B: section %s: string table overflow at offset %ld"), abfd, current->name, string_size); return FALSE; @@ -4607,6 +4615,7 @@ coff_slurp_line_table (bfd *abfd, asection *asect) if (symndx >= obj_raw_syment_count (abfd)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: warning: illegal symbol index 0x%lx in line number entry %d"), abfd, (long) symndx, counter); cache_ptr->line_number = -1; @@ -4620,6 +4629,7 @@ coff_slurp_line_table (bfd *abfd, asection *asect) if (! ent->is_sym) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: warning: illegal symbol index 0x%lx in line number entry %d"), abfd, (long) symndx, counter); cache_ptr->line_number = -1; @@ -4633,6 +4643,7 @@ coff_slurp_line_table (bfd *abfd, asection *asect) || sym >= obj_symbols (abfd) + bfd_get_symcount (abfd)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: warning: illegal symbol in line number entry %d"), abfd, counter); cache_ptr->line_number = -1; @@ -4645,6 +4656,7 @@ coff_slurp_line_table (bfd *abfd, asection *asect) cache_ptr->u.sym = (asymbol *) sym; if (sym->lineno != NULL) _bfd_error_handler + /* xgettext:c-format */ (_("%B: warning: duplicate line number information for `%s'"), abfd, bfd_asymbol_name (&sym->symbol)); @@ -5059,6 +5071,7 @@ coff_slurp_symbol_table (bfd * abfd) case C_HIDDEN: /* Ext symbol in dmert public lib. */ default: _bfd_error_handler + /* xgettext:c-format */ (_("%B: Unrecognized storage class %d for %s symbol `%s'"), abfd, src->u.syment.n_sclass, dst->symbol.section->name, dst->symbol.name); @@ -5187,6 +5200,7 @@ coff_classify_symbol (bfd *abfd, char buf[SYMNMLEN + 1]; _bfd_error_handler + /* xgettext:c-format */ (_("warning: %B: local symbol `%s' has no section"), abfd, _bfd_coff_internal_syment_name (abfd, syment, buf)); } @@ -5293,6 +5307,7 @@ coff_slurp_reloc_table (bfd * abfd, sec_ptr asect, asymbol ** symbols) if (dst.r_symndx < 0 || dst.r_symndx >= obj_conv_table_size (abfd)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: warning: illegal symbol index %ld in relocs"), abfd, (long) dst.r_symndx); cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; @@ -5332,6 +5347,7 @@ coff_slurp_reloc_table (bfd * abfd, sec_ptr asect, asymbol ** symbols) if (cache_ptr->howto == NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: illegal relocation type %d at address 0x%lx"), abfd, dst.r_type, (long) dst.r_vaddr); bfd_set_error (bfd_error_bad_value); diff --git a/bfd/coffgen.c b/bfd/coffgen.c index 1dc77a4..e208cee 100644 --- a/bfd/coffgen.c +++ b/bfd/coffgen.c @@ -174,6 +174,7 @@ make_a_section_from_file (bfd *abfd, if (!bfd_init_section_compress_status (abfd, return_section)) { _bfd_error_handler + /* xgettext: c-format */ (_("%B: unable to initialize compress status for section %s"), abfd, name); return FALSE; @@ -197,6 +198,7 @@ make_a_section_from_file (bfd *abfd, if (!bfd_init_section_decompress_status (abfd, return_section)) { _bfd_error_handler + /* xgettext: c-format */ (_("%B: unable to initialize decompress status for section %s"), abfd, name); return FALSE; @@ -1705,6 +1707,7 @@ _bfd_coff_read_string_table (bfd *abfd) if (strsize < STRING_SIZE_SIZE) { _bfd_error_handler + /* xgettext: c-format */ (_("%B: bad string table size %lu"), abfd, (unsigned long) strsize); bfd_set_error (bfd_error_bad_value); return NULL; @@ -2953,6 +2956,7 @@ coff_gc_sweep (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *info) o->flags |= SEC_EXCLUDE; if (info->print_gc_sections && o->size != 0) + /* xgettext: c-format */ _bfd_error_handler (_("Removing unused section '%s' in file '%B'"), sub, o->name); #if 0 diff --git a/bfd/cofflink.c b/bfd/cofflink.c index 52ad84e..b9a2c27 100644 --- a/bfd/cofflink.c +++ b/bfd/cofflink.c @@ -345,7 +345,7 @@ coff_link_add_symbols (bfd *abfd, && (*sym_hash)->root.type != bfd_link_hash_undefined && (*sym_hash)->root.type != bfd_link_hash_undefweak) _bfd_error_handler - ("Warning: symbol `%s' is both section and non-section", + (_("Warning: symbol `%s' is both section and non-section"), name); addit = FALSE; @@ -446,6 +446,7 @@ coff_link_add_symbols (bfd *abfd, && (BTYPE ((*sym_hash)->type) == T_NULL || BTYPE (sym.n_type) == T_NULL))) _bfd_error_handler + /* xgettext: c-format */ (_("Warning: type of symbol `%s' changed from %d to %d in %B"), abfd, name, (*sym_hash)->type, sym.n_type); @@ -2363,6 +2364,7 @@ _bfd_coff_link_input_bfd (struct coff_final_link_info *flaginfo, bfd *input_bfd) && o->reloc_count != 0) { _bfd_error_handler + /* xgettext: c-format */ (_("%B: relocs in section `%A', but it has no contents"), input_bfd, o); bfd_set_error (bfd_error_no_contents); @@ -2425,6 +2427,7 @@ _bfd_coff_link_input_bfd (struct coff_final_link_info *flaginfo, bfd *input_bfd) /* Complain if definition comes from an excluded section. */ if (ps->flags & SEC_EXCLUDE) (*flaginfo->info->callbacks->einfo) + /* xgettext: c-format */ (_("%X`%s' referenced in section `%A' of %B: " "defined in discarded section `%A' of %B\n"), h->root.root.string, o, input_bfd, ps, ps->owner); @@ -2722,6 +2725,7 @@ _bfd_coff_write_global_sym (struct bfd_hash_entry *bh, void *data) && (! obj_pe (output_bfd) || bfd_link_relocatable (flaginfo->info))) _bfd_error_handler + /* xgettext: c-format */ (_("%s: %s: reloc overflow: 0x%lx > 0xffff"), bfd_get_filename (output_bfd), bfd_get_section_name (output_bfd, sec), @@ -2731,6 +2735,7 @@ _bfd_coff_write_global_sym (struct bfd_hash_entry *bh, void *data) && (! obj_pe (output_bfd) || bfd_link_relocatable (flaginfo->info))) _bfd_error_handler + /* xgettext: c-format */ (_("%s: warning: %s: line number overflow: 0x%lx > 0xffff"), bfd_get_filename (output_bfd), bfd_get_section_name (output_bfd, sec), @@ -2955,7 +2960,8 @@ _bfd_coff_generic_relocate_section (bfd *output_bfd, || (unsigned long) symndx >= obj_raw_syment_count (input_bfd)) { _bfd_error_handler - ("%B: illegal symbol index %ld in relocs", input_bfd, symndx); + /* xgettext: c-format */ + (_("%B: illegal symbol index %ld in relocs"), input_bfd, symndx); return FALSE; } else @@ -3116,6 +3122,7 @@ _bfd_coff_generic_relocate_section (bfd *output_bfd, break; case bfd_reloc_outofrange: _bfd_error_handler + /* xgettext: c-format */ (_("%B: bad reloc address 0x%lx in section `%A'"), input_bfd, input_section, (unsigned long) rel->r_vaddr); return FALSE; diff --git a/bfd/coffswap.h b/bfd/coffswap.h index 018e772..b7b5963 100644 --- a/bfd/coffswap.h +++ b/bfd/coffswap.h @@ -807,6 +807,7 @@ coff_swap_scnhdr_out (bfd * abfd, void * in, void * out) memcpy (buf, scnhdr_int->s_name, sizeof (scnhdr_int->s_name)); buf[sizeof (scnhdr_int->s_name)] = '\0'; _bfd_error_handler + /* xgettext:c-format */ (_("%s: warning: %s: line number overflow: 0x%lx > 0xffff"), bfd_get_filename (abfd), buf, scnhdr_int->s_nlnno); @@ -821,6 +822,7 @@ coff_swap_scnhdr_out (bfd * abfd, void * in, void * out) memcpy (buf, scnhdr_int->s_name, sizeof (scnhdr_int->s_name)); buf[sizeof (scnhdr_int->s_name)] = '\0'; + /* xgettext:c-format */ _bfd_error_handler (_("%s: %s: reloc overflow: 0x%lx > 0xffff"), bfd_get_filename (abfd), buf, scnhdr_int->s_nreloc); diff --git a/bfd/cpu-arm.c b/bfd/cpu-arm.c index 2eb99e1..e3c97c7 100644 --- a/bfd/cpu-arm.c +++ b/bfd/cpu-arm.c @@ -188,6 +188,7 @@ bfd_arm_merge_machines (bfd *ibfd, bfd *obfd) || out == bfd_mach_arm_iWMMXt || out == bfd_mach_arm_iWMMXt2)) { + /* xgettext: c-format */ _bfd_error_handler (_("\ error: %B is compiled for the EP9312, whereas %B is compiled for XScale"), ibfd, obfd); @@ -199,6 +200,7 @@ error: %B is compiled for the EP9312, whereas %B is compiled for XScale"), || in == bfd_mach_arm_iWMMXt || in == bfd_mach_arm_iWMMXt2)) { + /* xgettext: c-format */ _bfd_error_handler (_("\ error: %B is compiled for the EP9312, whereas %B is compiled for XScale"), obfd, ibfd); @@ -332,6 +334,7 @@ bfd_arm_update_notes (bfd *abfd, const char *note_section) (file_ptr) 0, buffer_size)) { _bfd_error_handler + /* xgettext: c-format */ (_("warning: unable to update contents of %s section in %s"), note_section, bfd_get_filename (abfd)); goto FAIL; diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c index 51f3de1..81001c4 100644 --- a/bfd/dwarf2.c +++ b/bfd/dwarf2.c @@ -546,6 +546,7 @@ read_section (bfd * abfd, that the client wants. Validate it here to avoid trouble later. */ if (offset != 0 && offset >= *section_size) { + /* xgettext: c-format */ _bfd_error_handler (_("Dwarf Error: Offset (%lu)" " greater than or equal to %s size (%lu)."), (long) offset, section_name, *section_size); @@ -1717,6 +1718,7 @@ decode_line_info (struct comp_unit *unit, struct dwarf2_debug *stash) if (lh.total_length > stash->dwarf_line_size) { _bfd_error_handler + /* xgettext: c-format */ (_("Dwarf Error: Line info data is bigger (0x%lx) than the section (0x%lx)"), (long) lh.total_length, (long) stash->dwarf_line_size); bfd_set_error (bfd_error_bad_value); @@ -2774,6 +2776,7 @@ parse_comp_unit (struct dwarf2_debug *stash, if (addr_size > sizeof (bfd_vma)) { _bfd_error_handler + /* xgettext: c-format */ (_("Dwarf Error: found address size '%u', this reader" " can not handle sizes greater than '%u'."), addr_size, diff --git a/bfd/ecoff.c b/bfd/ecoff.c index 6b46ab7..5c942bd 100644 --- a/bfd/ecoff.c +++ b/bfd/ecoff.c @@ -960,6 +960,7 @@ _bfd_ecoff_slurp_symbol_table (bfd *abfd) { bfd_get_symcount (abfd) = internal_ptr - internal; _bfd_error_handler + /* xgettext:c-format */ (_("%B: warning: isymMax (%ld) is greater than ifdMax (%d)\n"), abfd, ecoff_data (abfd)->debug_info.symbolic_header.isymMax, ecoff_data (abfd)->debug_info.symbolic_header.ifdMax); @@ -1536,6 +1537,7 @@ _bfd_ecoff_print_symbol (bfd *abfd, if (ECOFF_IS_STAB (&ecoff_ext.asym)) ; else if (ecoffsymbol (symbol)->local) + /* xgettext:c-format */ fprintf (file, _("\n End+1 symbol: %-7ld Type: %s"), ((long) (AUX_GET_ISYM (bigendian, diff --git a/bfd/elf-attrs.c b/bfd/elf-attrs.c index 50983c6..19bdafc 100644 --- a/bfd/elf-attrs.c +++ b/bfd/elf-attrs.c @@ -591,6 +591,7 @@ _bfd_elf_merge_object_attributes (bfd *ibfd, struct bfd_link_info *info) if (in_attr->i > 0 && strcmp (in_attr->s, "gnu") != 0) { _bfd_error_handler + /* xgettext:c-format */ (_("error: %B: Object has vendor-specific contents that " "must be processed by the '%s' toolchain"), ibfd, in_attr->s); @@ -600,6 +601,7 @@ _bfd_elf_merge_object_attributes (bfd *ibfd, struct bfd_link_info *info) if (in_attr->i != out_attr->i || (in_attr->i != 0 && strcmp (in_attr->s, out_attr->s) != 0)) { + /* xgettext:c-format */ _bfd_error_handler (_("error: %B: Object tag '%d, %s' is " "incompatible with tag '%d, %s'"), ibfd, diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c index 02152fe..44d4e1e 100644 --- a/bfd/elf-eh-frame.c +++ b/bfd/elf-eh-frame.c @@ -924,6 +924,7 @@ _bfd_elf_parse_eh_frame (bfd *abfd, struct bfd_link_info *info, && read_value (abfd, buf - length, length, FALSE) == 0) { (*info->callbacks->minfo) + /* xgettext:c-format */ (_("discarding zero address range FDE in %B(%A).\n"), abfd, sec); this_inf->u.fde.cie_inf = NULL; @@ -1028,6 +1029,7 @@ _bfd_elf_parse_eh_frame (bfd *abfd, struct bfd_link_info *info, free_no_table: (*info->callbacks->einfo) + /* xgettext:c-format */ (_("%P: error in %B(%A); no .eh_frame_hdr table will be created.\n"), abfd, sec); hdr_info->u.dwarf.table = FALSE; @@ -1379,6 +1381,7 @@ _bfd_elf_discard_section_eh_frame if (num_warnings_issued < 10) { (*info->callbacks->einfo) + /* xgettext:c-format */ (_("%P: FDE encoding in %B(%A) prevents .eh_frame_hdr" " table being created.\n"), abfd, sec); num_warnings_issued ++; @@ -1673,6 +1676,7 @@ _bfd_elf_write_section_eh_frame_entry (bfd *abfd, struct bfd_link_info *info, addr = bfd_get_signed_32 (abfd, contents + offset) + offset; if (addr <= last_addr) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: %s not in order"), sec->owner, sec->name); return FALSE; } @@ -1686,6 +1690,7 @@ _bfd_elf_write_section_eh_frame_entry (bfd *abfd, struct bfd_link_info *info, addr -= (sec->output_section->vma + sec->output_offset + sec->rawsize); if (addr & 1) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: %s invalid input section size"), sec->owner, sec->name); bfd_set_error (bfd_error_bad_value); @@ -1693,6 +1698,7 @@ _bfd_elf_write_section_eh_frame_entry (bfd *abfd, struct bfd_link_info *info, } if (last_addr >= addr + sec->rawsize) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: %s points past end of text section"), sec->owner, sec->name); bfd_set_error (bfd_error_bad_value); diff --git a/bfd/elf-ifunc.c b/bfd/elf-ifunc.c index 09cbf4a..564e464 100644 --- a/bfd/elf-ifunc.c +++ b/bfd/elf-ifunc.c @@ -138,6 +138,7 @@ _bfd_elf_allocate_ifunc_dyn_relocs (struct bfd_link_info *info, && h->pointer_equality_needed) { info->callbacks->einfo + /* xgettext:c-format */ (_("%F%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer " "equality in `%B' can not be used when making an " "executable; recompile with -fPIE and relink with -pie\n"), diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c index bb8132a..688a270 100644 --- a/bfd/elf-m10300.c +++ b/bfd/elf-m10300.c @@ -808,6 +808,7 @@ mn10300_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= R_MN10300_MAX) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: unrecognised MN10300 reloc number: %d"), abfd, r_type); bfd_set_error (bfd_error_bad_value); @@ -1023,6 +1024,7 @@ mn10300_do_tls_transition (bfd * input_bfd, default: _bfd_error_handler + /* xgettext:c-format */ (_("%s: Unsupported transition from %s to %s"), bfd_get_filename (input_bfd), elf_mn10300_howto_table[r_type].name, @@ -1215,6 +1217,7 @@ mn10300_elf_check_relocs (bfd *abfd, tls_type = GOT_TLS_IE; else _bfd_error_handler + /* xgettext:c-format */ (_("%B: %s' accessed both as normal and thread local symbol"), abfd, h ? h->root.root.string : "<local>"); } @@ -2111,6 +2114,7 @@ mn10300_elf_relocate_section (bfd *output_bfd, rel->r_offset) != (bfd_vma) -1) _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, input_section, @@ -2175,6 +2179,7 @@ mn10300_elf_relocate_section (bfd *output_bfd, msg = _("error: inappropriate relocation type for shared" " library (did you forget -fpic?)"); else if (r_type == R_MN10300_GOT32) + /* xgettext:c-format */ msg = _("%B: taking the address of protected function" " '%s' cannot be done when making a shared library"); else diff --git a/bfd/elf-s390-common.c b/bfd/elf-s390-common.c index 61241dc..dd60909 100644 --- a/bfd/elf-s390-common.c +++ b/bfd/elf-s390-common.c @@ -287,10 +287,12 @@ elf_s390_merge_obj_attributes (bfd *ibfd, struct bfd_link_info *info) if (in_attr->i > 2) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses unknown vector ABI %d"), ibfd, in_attr->i); else if (out_attr->i > 2) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses unknown vector ABI %d"), obfd, out_attr->i); else if (in_attr->i != out_attr->i) @@ -302,6 +304,7 @@ elf_s390_merge_obj_attributes (bfd *ibfd, struct bfd_link_info *info) const char abi_str[3][9] = { "none", "software", "hardware" }; _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses vector %s ABI, %B uses %s ABI"), ibfd, obfd, abi_str[in_attr->i], abi_str[out_attr->i]); } @@ -338,6 +338,7 @@ bfd_elf_string_from_elf_section (bfd *abfd, if (hdr->sh_type != SHT_STRTAB && hdr->sh_type < SHT_LOOS) { /* PR 17512: file: f057ec89. */ + /* xgettext:c-format */ _bfd_error_handler (_("%B: attempt to load strings from a non-string section (number %d)"), abfd, shindex); return NULL; @@ -351,6 +352,7 @@ bfd_elf_string_from_elf_section (bfd *abfd, { unsigned int shstrndx = elf_elfheader(abfd)->e_shstrndx; _bfd_error_handler + /* xgettext:c-format */ (_("%B: invalid string offset %u >= %lu for section `%s'"), abfd, strindex, (unsigned long) hdr->sh_size, (shindex == shstrndx && strindex == hdr->sh_name @@ -489,6 +491,7 @@ bfd_elf_get_elf_syms (bfd *ibfd, if (!(*bed->s->swap_symbol_in) (ibfd, esym, shndx, isym)) { symoffset += (esym - (bfd_byte *) extsym_buf) / extsym_size; + /* xgettext:c-format */ _bfd_error_handler (_("%B symbol number %lu references " "nonexistent SHT_SYMTAB_SHNDX section"), ibfd, (unsigned long) symoffset); @@ -645,6 +648,7 @@ setup_group (bfd *abfd, Elf_Internal_Shdr *hdr, asection *newsect) if (shdr->contents == NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: corrupt size field in group section header: 0x%lx"), abfd, shdr->sh_size); bfd_set_error (bfd_error_bad_value); -- num_group; @@ -658,6 +662,7 @@ setup_group (bfd *abfd, Elf_Internal_Shdr *hdr, asection *newsect) != shdr->sh_size)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: invalid size field in group section header: 0x%lx"), abfd, shdr->sh_size); bfd_set_error (bfd_error_bad_value); -- num_group; @@ -778,6 +783,7 @@ setup_group (bfd *abfd, Elf_Internal_Shdr *hdr, asection *newsect) if (elf_group_name (newsect) == NULL) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: no group info for section %A"), abfd, newsect); return FALSE; @@ -808,6 +814,7 @@ _bfd_elf_setup_sections (bfd *abfd) const struct elf_backend_data *bed = get_elf_backend_data (abfd); if (bed->link_order_error_handler) bed->link_order_error_handler + /* xgettext:c-format */ (_("%B: warning: sh_link not set for section `%A'"), abfd, s); } @@ -827,6 +834,7 @@ _bfd_elf_setup_sections (bfd *abfd) if (linksec == NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: sh_link [%d] in section `%A' is incorrect"), s->owner, s, elfsec); result = FALSE; @@ -839,6 +847,7 @@ _bfd_elf_setup_sections (bfd *abfd) && elf_next_in_group (s) == NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: SHT_GROUP section [index %d] has no SHF_GROUP sections"), abfd, elf_section_data (s)->this_idx); result = FALSE; @@ -859,6 +868,7 @@ _bfd_elf_setup_sections (bfd *abfd) if (shdr == NULL || shdr->bfd_section == NULL || shdr->contents == NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: section group entry number %u is corrupt"), abfd, i); result = FALSE; @@ -883,6 +893,7 @@ _bfd_elf_setup_sections (bfd *abfd) { /* There are some unknown sections in the group. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B: unknown [%d] section `%s' in group [%s]"), abfd, (unsigned int) idx->shdr->sh_type, @@ -1149,6 +1160,7 @@ _bfd_elf_make_section_from_shdr (bfd *abfd, if (!bfd_init_section_compress_status (abfd, newsect)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: unable to initialize compress status for section %s"), abfd, name); return FALSE; @@ -1159,6 +1171,7 @@ _bfd_elf_make_section_from_shdr (bfd *abfd, if (!bfd_init_section_decompress_status (abfd, newsect)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: unable to initialize decompress status for section %s"), abfd, name); return FALSE; @@ -1337,6 +1350,7 @@ copy_special_section_fields (const bfd *ibfd, /* FIXME: Should we install iheader->sh_link if we could not find a match ? */ (* _bfd_error_handler) + /* xgettext:c-format */ (_("%B: Failed to find link section for section %d"), obfd, secnum); } @@ -1363,6 +1377,7 @@ copy_special_section_fields (const bfd *ibfd, } else (* _bfd_error_handler) + /* xgettext:c-format */ (_("%B: Failed to find info section for section %d"), obfd, secnum); } @@ -2053,6 +2068,7 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex) if (elf_onesymtab (abfd) != 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: warning: multiple symbol tables detected - ignoring the table in section %u"), abfd, shindex); goto success; @@ -2135,6 +2151,7 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex) if (elf_dynsymtab (abfd) != 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: warning: multiple dynamic symbol tables detected - ignoring the table in section %u"), abfd, shindex); goto success; @@ -2246,6 +2263,7 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex) if (hdr->sh_link >= num_sec) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: invalid link %lu for reloc section %s (index %u)"), abfd, hdr->sh_link, name, shindex); ret = _bfd_elf_make_section_from_shdr (abfd, hdr, name, @@ -2431,6 +2449,7 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex) /* FIXME: How to properly handle allocated section reserved for applications? */ _bfd_error_handler + /* xgettext:c-format */ (_("%B: don't know how to handle allocated, application " "specific section `%s' [0x%8x]"), abfd, name, hdr->sh_type); @@ -2446,6 +2465,7 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex) && hdr->sh_type <= SHT_HIPROC) /* FIXME: We should handle this section. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B: don't know how to handle processor specific section " "`%s' [0x%8x]"), abfd, name, hdr->sh_type); @@ -2457,6 +2477,7 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex) required to correctly process the section and the file should be rejected with an error message. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B: don't know how to handle OS specific section " "`%s' [0x%8x]"), abfd, name, hdr->sh_type); @@ -2470,6 +2491,7 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex) else /* FIXME: We should handle this section. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B: don't know how to handle section `%s' [0x%8x]"), abfd, name, hdr->sh_type); @@ -3173,6 +3195,7 @@ elf_fake_sections (bfd *abfd, asection *asect, void *fsarg) if (asect->alignment_power >= (sizeof (bfd_vma) * 8) - 1) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: error: Alignment power %d of section `%A' is too big"), abfd, asect, asect->alignment_power); arg->failed = TRUE; @@ -3644,6 +3667,7 @@ assign_section_numbers (bfd *abfd, struct bfd_link_info *link_info) if (section_number >= SHN_LORESERVE) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: too many sections: %u"), abfd, section_number); return FALSE; @@ -3728,6 +3752,7 @@ assign_section_numbers (bfd *abfd, struct bfd_link_info *link_info) { asection *kept; _bfd_error_handler + /* xgettext:c-format */ (_("%B: sh_link of section `%A' points to discarded section `%A' of `%B'"), abfd, d->this_hdr.bfd_section, s, s->owner); @@ -3751,6 +3776,7 @@ assign_section_numbers (bfd *abfd, struct bfd_link_info *link_info) if (s->output_section == NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: sh_link of section `%A' points to removed section `%A' of `%B'"), abfd, d->this_hdr.bfd_section, s, s->owner); bfd_set_error (bfd_error_bad_value); @@ -3771,6 +3797,7 @@ assign_section_numbers (bfd *abfd, struct bfd_link_info *link_info) = get_elf_backend_data (abfd); if (bed->link_order_error_handler) bed->link_order_error_handler + /* xgettext:c-format */ (_("%B: warning: sh_link not set for section `%A'"), abfd, sec); } @@ -5379,6 +5406,7 @@ assign_file_positions_for_load_sections (bfd *abfd, || p_end < p_start)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: section %A lma %#lx adjusted to %#lx"), abfd, sec, (unsigned long) s_start, (unsigned long) p_end); adjust = 0; @@ -5515,6 +5543,7 @@ assign_file_positions_for_load_sections (bfd *abfd, && !ELF_TBSS_SPECIAL (this_hdr, p)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: section `%A' can't be allocated in segment %d"), abfd, sec, j); print_segment_map (m); @@ -5562,6 +5591,7 @@ assign_file_positions_for_non_load_sections (bfd *abfd, { if (hdr->sh_size != 0) _bfd_error_handler + /* xgettext:c-format */ (_("%B: warning: allocated section `%s' not in segment"), abfd, (hdr->bfd_section == NULL @@ -6237,6 +6267,7 @@ _bfd_elf_symbol_from_bfd_symbol (bfd *abfd, asymbol **asym_ptr_ptr) /* This case can occur when using --strip-symbol on a symbol which is used in a relocation entry. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B: symbol `%s' required but not present"), abfd, bfd_asymbol_name (asym_ptr)); bfd_set_error (bfd_error_no_symbols); @@ -7188,6 +7219,7 @@ rewrite: { /* PR 17512: file: f17299af. */ if (segment->p_align > (bfd_vma) 1 << ((sizeof (bfd_vma) * 8) - 2)) + /* xgettext:c-format */ _bfd_error_handler (_("\ %B: warning: segment alignment of 0x%llx is too large"), ibfd, (long long) segment->p_align); @@ -7664,6 +7696,7 @@ error_return: shndx = _bfd_elf_section_from_bfd_section (abfd, sec2); if (shndx == SHN_BAD) { + /* xgettext:c-format */ _bfd_error_handler (_("\ Unable to find equivalent output section for symbol '%s' from section '%s'"), syms[idx]->name ? syms[idx]->name : "<Local sym>", @@ -8674,6 +8707,7 @@ _bfd_elf_validate_reloc (bfd *abfd, arelent *areloc) fail: _bfd_error_handler + /* xgettext:c-format */ (_("%B: unsupported relocation type %s"), abfd, areloc->howto->name); bfd_set_error (bfd_error_bad_value); diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c index 68f714a..314a162 100644 --- a/bfd/elf32-arc.c +++ b/bfd/elf32-arc.c @@ -601,6 +601,7 @@ arc_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) { if (mach_ibfd != mach_obfd) { + /* xgettext:c-format */ _bfd_error_handler (_("ERROR: Attempting to link %B " "with a binary %s of different architecture"), ibfd, bfd_get_filename (obfd)); @@ -610,6 +611,7 @@ arc_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) { /* Warn if different flags. */ _bfd_error_handler + /* xgettext:c-format */ (_("%s: uses different e_flags (0x%lx) fields than " "previous modules (0x%lx)"), bfd_get_filename (ibfd), (long)in_flags, (long)out_flags); @@ -804,6 +806,7 @@ arc_special_overflow_checks (const struct arc_relocation_data reloc_data, { if (reloc_data.reloc_addend == 0) _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): CMEM relocation to `%s' is invalid, " "16 MSB should be 0x%04x (value is 0x%lx)"), reloc_data.input_section->owner, @@ -814,6 +817,7 @@ arc_special_overflow_checks (const struct arc_relocation_data reloc_data, (relocation)); else _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): CMEM relocation to `%s+0x%lx' is invalid, " "16 MSB should be 0x%04x (value is 0x%lx)"), reloc_data.input_section->owner, @@ -1526,22 +1530,27 @@ elf_arc_relocate_section (bfd * output_bfd, break; case bfd_reloc_other: + /* xgettext:c-format */ msg = _("%B(%A): warning: unaligned access to symbol '%s' in the small data area"); break; case bfd_reloc_outofrange: + /* xgettext:c-format */ msg = _("%B(%A): internal error: out of range error"); break; case bfd_reloc_notsupported: + /* xgettext:c-format */ msg = _("%B(%A): internal error: unsupported relocation error"); break; case bfd_reloc_dangerous: + /* xgettext:c-format */ msg = _("%B(%A): internal error: dangerous relocation"); break; default: + /* xgettext:c-format */ msg = _("%B(%A): internal error: unknown error"); break; } @@ -1724,6 +1733,7 @@ elf_arc_check_relocs (bfd * abfd, /* bfd_elf_sym_name (abfd, symtab_hdr, isym, NULL); */ name = "UNKNOWN"; _bfd_error_handler + /* xgettext:c-format */ (_("\ %B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"), abfd, diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index c6bca9e..dced01a 100644 --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -3998,8 +3998,7 @@ arm_type_of_stub (struct bfd_link_info *info, - it's a Thumb->Arm call and blx is not available, or it's a Thumb->Arm branch (not bl). A stub is needed in this case, but only if this call is not through a PLT entry. Indeed, - PLT stubs handle mode switching already. - */ + PLT stubs handle mode switching already. */ if ((!thumb2_bl && (branch_offset > THM_MAX_FWD_BRANCH_OFFSET || (branch_offset < THM_MAX_BWD_BRANCH_OFFSET))) @@ -4021,10 +4020,11 @@ arm_type_of_stub (struct bfd_link_info *info, PLT, use one that branches directly to the ARM PLT stub. If we pretended we'd use the pre-PLT Thumb->ARM stub, undo this now. */ - if ((branch_type == ST_BRANCH_TO_THUMB) && use_plt && !thumb_only) { - branch_type = ST_BRANCH_TO_ARM; - branch_offset += PLT_THUMB_STUB_SIZE; - } + if ((branch_type == ST_BRANCH_TO_THUMB) && use_plt && !thumb_only) + { + branch_type = ST_BRANCH_TO_ARM; + branch_offset += PLT_THUMB_STUB_SIZE; + } if (branch_type == ST_BRANCH_TO_THUMB) { @@ -4032,13 +4032,10 @@ arm_type_of_stub (struct bfd_link_info *info, if (!thumb_only) { if (input_sec->flags & SEC_ELF_PURECODE) - _bfd_error_handler (_("%B(%s): warning: long branch " - " veneers used in section with " - "SHF_ARM_PURECODE section " - "attribute is only supported" - " for M-profile targets that " - "implement the movw " - "instruction.")); + _bfd_error_handler (_("\ +%B(%A): warning: long branch veneers used in section with SHF_ARM_PURECODE section \ +attribute is only supported for M-profile targets that implement the movw instruction."), + input_sec); stub_type = (bfd_link_pic (info) | globals->pic_veneer) /* PIC stubs. */ @@ -4067,13 +4064,10 @@ arm_type_of_stub (struct bfd_link_info *info, else { if (input_sec->flags & SEC_ELF_PURECODE) - _bfd_error_handler (_("%B(%s): warning: long branch " - " veneers used in section with " - "SHF_ARM_PURECODE section " - "attribute is only supported" - " for M-profile targets that " - "implement the movw " - "instruction.")); + _bfd_error_handler (_("\ +%B(%A): warning: long branch veneers used in section with SHF_ARM_PURECODE section \ +attribute is only supported for M-profile targets that implement the movw instruction."), + input_sec); stub_type = (bfd_link_pic (info) | globals->pic_veneer) /* PIC stub. */ @@ -8633,10 +8627,11 @@ bfd_elf32_arm_stm32l4xx_erratum_scan (bfd *abfd, { _bfd_error_handler /* Note - overlong line used here to allow for translation. */ + /* xgettext:c-format */ (_("\ %B(%A+0x%lx): error: multiple load detected in non-last IT block instruction : STM32L4XX veneer cannot be generated.\n" "Use gcc option -mrestrict-it to generate only one instruction per IT block.\n"), - abfd, sec, (long)i); + abfd, sec, (long) i); } else { @@ -9735,7 +9730,8 @@ elf32_arm_tls_relax (struct elf32_arm_link_hash_table *globals, insn = (insn << 16) | bfd_get_16 (input_bfd, contents + rel->r_offset + 2); _bfd_error_handler - (_("%B(%A+0x%lx):unexpected Thumb instruction '0x%x' in TLS trampoline"), + /* xgettext:c-format */ + (_("%B(%A+0x%lx): unexpected Thumb instruction '0x%x' in TLS trampoline"), input_bfd, input_sec, (unsigned long)rel->r_offset, insn); return bfd_reloc_notsupported; } @@ -9774,7 +9770,8 @@ elf32_arm_tls_relax (struct elf32_arm_link_hash_table *globals, else { _bfd_error_handler - (_("%B(%A+0x%lx):unexpected ARM instruction '0x%x' in TLS trampoline"), + /* xgettext:c-format */ + (_("%B(%A+0x%lx): unexpected ARM instruction '0x%x' in TLS trampoline"), input_bfd, input_sec, (unsigned long)rel->r_offset, insn); return bfd_reloc_notsupported; } @@ -11530,7 +11527,8 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto, else { _bfd_error_handler - (_("%B(%A+0x%lx):unexpected Thumb instruction '0x%x' referenced by TLS_GOTDESC"), + /* xgettext:c-format */ + (_("%B(%A+0x%lx): unexpected Thumb instruction '0x%x' referenced by TLS_GOTDESC"), input_bfd, input_section, (unsigned long)rel->r_offset, insn); return bfd_reloc_notsupported; @@ -11553,7 +11551,8 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto, default: _bfd_error_handler - (_("%B(%A+0x%lx):unexpected ARM instruction '0x%x' referenced by TLS_GOTDESC"), + /* xgettext:c-format */ + (_("%B(%A+0x%lx): unexpected ARM instruction '0x%x' referenced by TLS_GOTDESC"), input_bfd, input_section, (unsigned long)rel->r_offset, insn); return bfd_reloc_notsupported; @@ -11582,6 +11581,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto, if (bfd_link_dll (info)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): R_ARM_TLS_LE32 relocation not permitted in shared object"), input_bfd, input_section, (long) rel->r_offset, howto->name); @@ -11795,6 +11795,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto, if (negative == 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): Only ADD or SUB instructions are allowed for ALU group relocations"), input_bfd, input_section, (long) rel->r_offset, howto->name); @@ -11835,6 +11836,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto, || r_type == R_ARM_ALU_SB_G2) && residual != 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, (long) rel->r_offset, signed_value < 0 ? - signed_value : signed_value, @@ -11925,6 +11927,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto, if (residual >= 0x1000) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, (long) rel->r_offset, labs (signed_value), howto->name); @@ -12010,6 +12013,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto, if (residual >= 0x100) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, (long) rel->r_offset, labs (signed_value), howto->name); @@ -12097,6 +12101,7 @@ elf32_arm_final_link_relocate (reloc_howto_type * howto, if ((residual & 0x3) != 0 || residual >= 0x400) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, (long) rel->r_offset, labs (signed_value), howto->name); @@ -12360,6 +12365,7 @@ elf32_arm_relocate_section (bfd * output_bfd, || (howto->src_mask & (howto->src_mask + 1))) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): %s relocation against SEC_MERGE section"), input_bfd, input_section, (long) rel->r_offset, howto->name); @@ -12471,7 +12477,9 @@ elf32_arm_relocate_section (bfd * output_bfd, { _bfd_error_handler ((sym_type == STT_TLS + /* xgettext:c-format */ ? _("%B(%A+0x%lx): %s used with TLS symbol %s") + /* xgettext:c-format */ : _("%B(%A+0x%lx): %s used with non-TLS symbol %s")), input_bfd, input_section, @@ -12524,6 +12532,7 @@ elf32_arm_relocate_section (bfd * output_bfd, rel->r_offset) != (bfd_vma) -1) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, input_section, @@ -14096,7 +14105,6 @@ elf32_arm_print_private_bfd_data (bfd *abfd, void * ptr) /* Ignore init flag - it may not be set, despite the flags field containing valid data. */ - /* xgettext:c-format */ fprintf (file, _("private flags = %lx:"), elf_elfheader (abfd)->e_flags); switch (EF_ARM_EABI_VERSION (flags)) @@ -16016,7 +16024,6 @@ elf32_arm_size_dynamic_sections (bfd * output_bfd ATTRIBUTE_UNUSED, if (!bfd_elf32_arm_process_before_allocation (ibfd, info) || !bfd_elf32_arm_vfp11_erratum_scan (ibfd, info) || !bfd_elf32_arm_stm32l4xx_erratum_scan (ibfd, info)) - /* xgettext:c-format */ _bfd_error_handler (_("Errors encountered processing file %s"), ibfd->filename); } diff --git a/bfd/elf32-avr.c b/bfd/elf32-avr.c index ef88f02..89c99fd 100644 --- a/bfd/elf32-avr.c +++ b/bfd/elf32-avr.c @@ -955,6 +955,7 @@ avr_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_AVR_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid AVR reloc number: %d"), abfd, r_type); r_type = 0; } @@ -3257,6 +3258,7 @@ avr_add_stub (const char *stub_name, if (hsh == NULL) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: cannot create stub entry %s"), NULL, stub_name); return NULL; diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c index eb06e14..fdf0299 100644 --- a/bfd/elf32-bfin.c +++ b/bfd/elf32-bfin.c @@ -1599,6 +1599,7 @@ bfin_relocate_section (bfd * output_bfd, rel->r_offset) != (bfd_vma) -1) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): unresolvable relocation against symbol `%s'"), input_bfd, input_section, (long) rel->r_offset, h->root.root.string); @@ -1629,6 +1630,7 @@ bfin_relocate_section (bfd * output_bfd, else { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): reloc against `%s': error %d"), input_bfd, input_section, (long) rel->r_offset, name, (int) r); @@ -2730,6 +2732,7 @@ bfinfdpic_relocate_section (bfd * output_bfd, rel->r_addend)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation at `%A+0x%x' references symbol `%s' with nonzero addend"), input_bfd, input_section, rel->r_offset, name); return FALSE; @@ -4908,6 +4911,7 @@ bfinfdpic_check_relocs (bfd *abfd, struct bfd_link_info *info, default: bad_reloc: _bfd_error_handler + /* xgettext:c-format */ (_("%B: unsupported relocation type %i"), abfd, ELF32_R_TYPE (rel->r_info)); return FALSE; diff --git a/bfd/elf32-cr16.c b/bfd/elf32-cr16.c index db1022f..8fbe2ab 100644 --- a/bfd/elf32-cr16.c +++ b/bfd/elf32-cr16.c @@ -647,7 +647,7 @@ elf_cr16_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, if (code == cr16_reloc_map[i].bfd_reloc_enum) return &cr16_elf_howto_table[cr16_reloc_map[i].cr16_reloc_type]; - _bfd_error_handler ("Unsupported CR16 relocation type: 0x%x\n", code); + _bfd_error_handler (_("Unsupported CR16 relocation type: 0x%x\n"), code); return NULL; } @@ -675,6 +675,7 @@ elf_cr16_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr, if (r_type >= R_CR16_MAX) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: unrecognised CR16 reloc number: %d"), abfd, r_type); bfd_set_error (bfd_error_bad_value); diff --git a/bfd/elf32-cr16c.c b/bfd/elf32-cr16c.c index d3f56f1..3fab5aa 100644 --- a/bfd/elf32-cr16c.c +++ b/bfd/elf32-cr16c.c @@ -182,6 +182,7 @@ elf_cr16c_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, if (r_type >= RINDEX_16C_MAX) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid CR16C reloc number: %d"), abfd, r_type); r_type = 0; } diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c index 92668fb..9d6d0c4 100644 --- a/bfd/elf32-cris.c +++ b/bfd/elf32-cris.c @@ -463,6 +463,7 @@ cris_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= R_CRIS_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid CRIS reloc number: %d"), abfd, r_type); r_type = 0; } @@ -1110,6 +1111,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, != (bfd_vma) -1)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B, section %A: unresolvable relocation %s against symbol `%s'"), input_bfd, input_section, @@ -1172,8 +1174,10 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, { _bfd_error_handler ((h->got.offset == (bfd_vma) -1) + /* xgettext:c-format */ ? _("%B, section %A: No PLT nor GOT for relocation %s" " against symbol `%s'") + /* xgettext:c-format */ : _("%B, section %A: No PLT for relocation %s" " against symbol `%s'"), input_bfd, @@ -1299,6 +1303,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, allowed to pass us these kinds of things. */ if (h == NULL) _bfd_error_handler + /* xgettext:c-format */ (_("%B, section %A: relocation %s with non-zero addend %d" " against local symbol"), input_bfd, @@ -1307,6 +1312,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, rel->r_addend); else _bfd_error_handler + /* xgettext:c-format */ (_("%B, section %A: relocation %s with non-zero addend %d" " against symbol `%s'"), input_bfd, @@ -1333,6 +1339,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, && h->root.type == bfd_link_hash_undefweak)))) { _bfd_error_handler + /* xgettext:c-format */ (_("%B, section %A: relocation %s is" " not allowed for global symbol: `%s'"), input_bfd, @@ -1349,6 +1356,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, if (sgot == NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%B, section %A: relocation %s with no GOT created"), input_bfd, input_section, @@ -1564,9 +1572,11 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, _bfd_error_handler ((h->root.type == bfd_link_hash_undefined) /* We shouldn't get here for GCC-emitted code. */ + /* xgettext:c-format */ ? _("%B, section %A: relocation %s has an undefined" " reference to `%s', perhaps a declaration mixup?") - : ("%B, section %A: relocation %s is" + /* xgettext:c-format */ + : _("%B, section %A: relocation %s is" " not allowed for `%s', a global symbol with default" " visibility, perhaps a declaration mixup?"), input_bfd, @@ -1650,6 +1660,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, symbols. Make this an error; the compiler isn't allowed to pass us these kinds of things. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B, section %A: relocation %s with non-zero addend %d" " against symbol `%s'"), input_bfd, @@ -1803,6 +1814,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, compiler isn't allowed to pass us these kinds of things. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B, section %A: relocation %s with non-zero addend %d" " against symbol `%s'"), input_bfd, @@ -1937,6 +1949,7 @@ cris_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, && h->root.type != bfd_link_hash_undefined) { _bfd_error_handler + /* xgettext:c-format */ (_("%B, section %A: relocation %s is" " not allowed for symbol: `%s'" " which is defined outside the program," @@ -3229,6 +3242,7 @@ cris_elf_check_relocs (bfd *abfd, if (bfd_get_mach (dynobj) == bfd_mach_cris_v10_v32) { _bfd_error_handler + /* xgettext:c-format */ (_("%B, section %A:\n v10/v32 compatible object %s" " must not contain a PIC relocation"), abfd, sec); @@ -3337,6 +3351,7 @@ cris_elf_check_relocs (bfd *abfd, if (bfd_link_pic (info)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B, section %A:\n relocation %s not valid" " in a shared object;" " typically an option mixup, recompile with -fPIC"), @@ -3551,6 +3566,7 @@ cris_elf_check_relocs (bfd *abfd, { /* FIXME: How do we make this optionally a warning only? */ _bfd_error_handler + /* xgettext:c-format */ (_("%B, section %A:\n relocation %s should not" " be used in a shared object; recompile with -fPIC"), abfd, @@ -3973,6 +3989,7 @@ elf_cris_discard_excess_dso_dynamics (struct elf_cris_link_hash_entry *h, { /* FIXME: How do we make this optionally a warning only? */ _bfd_error_handler + /* xgettext:c-format */ (_("%B, section `%A', to symbol `%s':\n" " relocation %s should not be used" " in a shared object; recompile with -fPIC"), diff --git a/bfd/elf32-crx.c b/bfd/elf32-crx.c index c903f26..307d42b 100644 --- a/bfd/elf32-crx.c +++ b/bfd/elf32-crx.c @@ -425,6 +425,7 @@ elf_crx_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr, unsigned int r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= R_CRX_MAX) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: unrecognised CRX reloc number: %d"), abfd, r_type); bfd_set_error (bfd_error_bad_value); diff --git a/bfd/elf32-d10v.c b/bfd/elf32-d10v.c index f6d4b0e..c45bd0d 100644 --- a/bfd/elf32-d10v.c +++ b/bfd/elf32-d10v.c @@ -230,6 +230,7 @@ d10v_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_D10V_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid D10V reloc number: %d"), abfd, r_type); r_type = 0; } diff --git a/bfd/elf32-d30v.c b/bfd/elf32-d30v.c index f103a04..ab7672d 100644 --- a/bfd/elf32-d30v.c +++ b/bfd/elf32-d30v.c @@ -518,6 +518,7 @@ d30v_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_D30V_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid D30V reloc number: %d"), abfd, r_type); r_type = 0; } @@ -536,6 +537,7 @@ d30v_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_D30V_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid D30V reloc number: %d"), abfd, r_type); r_type = 0; } diff --git a/bfd/elf32-epiphany.c b/bfd/elf32-epiphany.c index 6b798b1..988d418 100644 --- a/bfd/elf32-epiphany.c +++ b/bfd/elf32-epiphany.c @@ -372,6 +372,7 @@ epiphany_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_EPIPHANY_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid Epiphany reloc number: %d"), abfd, r_type); r_type = 0; } diff --git a/bfd/elf32-fr30.c b/bfd/elf32-fr30.c index 7dd4ca4..2891dbf 100644 --- a/bfd/elf32-fr30.c +++ b/bfd/elf32-fr30.c @@ -377,6 +377,7 @@ fr30_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_FR30_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid FR30 reloc number: %d"), abfd, r_type); r_type = 0; } diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c index 82a1330..a84ca7a 100644 --- a/bfd/elf32-frv.c +++ b/bfd/elf32-frv.c @@ -2561,6 +2561,7 @@ frv_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED, default: if (r_type >= (unsigned int) R_FRV_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid FRV reloc number: %d"), abfd, r_type); r_type = 0; } @@ -2826,6 +2827,7 @@ elf32_frv_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, rel->r_addend)) { info->callbacks->einfo + /* xgettext:c-format */ (_("%H: relocation to `%s+%v'" " may have caused the error above\n"), input_bfd, input_section, rel->r_offset, name, rel->r_addend); @@ -3912,6 +3914,7 @@ elf32_frv_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, && picrel->d.h->root.type == bfd_link_hash_undefined)) { info->callbacks->einfo + /* xgettext:c-format */ (_("%H: reloc against `%s' references a different segment\n"), input_bfd, input_section, rel->r_offset, name); } @@ -4062,6 +4065,7 @@ elf32_frv_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, if (msg) { info->callbacks->einfo + /* xgettext:c-format */ (_("%H: reloc against `%s': %s\n"), input_bfd, input_section, rel->r_offset, name, msg); return FALSE; @@ -6267,6 +6271,7 @@ elf32_frv_check_relocs (bfd *abfd, default: bad_reloc: info->callbacks->einfo + /* xgettext:c-format */ (_("%B: unsupported relocation type %i\n"), abfd, ELF32_R_TYPE (rel->r_info)); return FALSE; @@ -6518,6 +6523,7 @@ frv_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) #ifndef FRV_NO_PIC_ERROR 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"); @@ -6571,6 +6577,7 @@ 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); } @@ -6583,6 +6590,7 @@ frv_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) old_flags |= new_partial; 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); } diff --git a/bfd/elf32-gen.c b/bfd/elf32-gen.c index 2fddfcc..5e9bcb1 100644 --- a/bfd/elf32-gen.c +++ b/bfd/elf32-gen.c @@ -65,6 +65,7 @@ check_for_relocs (bfd * abfd, asection * o, void * failed) Elf_Internal_Ehdr *ehdrp; ehdrp = elf_elfheader (abfd); + /* xgettext:c-format */ _bfd_error_handler (_("%B: Relocations in generic ELF (EM: %d)"), abfd, ehdrp->e_machine); diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c index 8d9638f..55aec83 100644 --- a/bfd/elf32-hppa.c +++ b/bfd/elf32-hppa.c @@ -591,6 +591,7 @@ hppa_add_stub (const char *stub_name, TRUE, FALSE); if (hsh == NULL) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: cannot create stub entry %s"), section->owner, stub_name); return NULL; @@ -842,6 +843,7 @@ hppa_build_one_stub (struct bfd_hash_entry *bh, void *in_arg) || sym_value - 8 + (1 << (22 + 1)) >= (1 << (22 + 2)))) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): cannot reach %s, recompile with -ffunction-sections"), hsh->target_section->owner, stub_sec, @@ -1280,6 +1282,7 @@ elf32_hppa_check_relocs (bfd *abfd, if (bfd_link_pic (info)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation %s can not be used when making a shared object; recompile with -fPIC"), abfd, elf_hppa_howto_table[r_type].name); @@ -2788,6 +2791,7 @@ get_local_syms (bfd *output_bfd, bfd *input_bfd, struct bfd_link_info *info) } else { + /* xgettext:c-format */ _bfd_error_handler (_("%B: duplicate export stub %s"), input_bfd, stub_name); } @@ -3442,6 +3446,7 @@ final_link_relocate (asection *input_section, and convert the associated add instruction, so issue an error. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): %s fixup for insn 0x%x is not supported in a non-shared link"), input_bfd, input_section, @@ -3607,6 +3612,7 @@ final_link_relocate (asection *input_section, && value + addend + max_branch_offset >= 2*max_branch_offset) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): cannot reach %s, recompile with -ffunction-sections"), input_bfd, input_section, @@ -4297,6 +4303,7 @@ elf32_hppa_relocate_section (bfd *output_bfd, if (rstatus == bfd_reloc_notsupported || !warned_undef) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): cannot handle %s for %s"), input_bfd, input_section, diff --git a/bfd/elf32-i370.c b/bfd/elf32-i370.c index 3130f96..7427995 100644 --- a/bfd/elf32-i370.c +++ b/bfd/elf32-i370.c @@ -303,6 +303,7 @@ i370_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= R_I370_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: unrecognised I370 reloc number: %d"), abfd, r_type); bfd_set_error (bfd_error_bad_value); @@ -354,7 +355,8 @@ i370_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) else /* Incompatible flags. */ { _bfd_error_handler - ("%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)", + /* xgettext:c-format */ + (_("%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"), ibfd, (long) new_flags, (long) old_flags); bfd_set_error (bfd_error_bad_value); @@ -1075,7 +1077,8 @@ i370_elf_relocate_section (bfd *output_bfd, if ((unsigned) r_type >= (unsigned) R_I370_max || !i370_elf_howto_table[(int)r_type]) { - _bfd_error_handler ("%B: unknown relocation type %d", + /* xgettext:c-format */ + _bfd_error_handler (_("%B: unknown relocation type %d"), input_bfd, (int) r_type); bfd_set_error (bfd_error_bad_value); @@ -1158,7 +1161,7 @@ i370_elf_relocate_section (bfd *output_bfd, { default: _bfd_error_handler - ("%B: unknown relocation type %d for symbol %s", + (_("%B: unknown relocation type %d for symbol %s"), input_bfd, (int) r_type, sym_name); bfd_set_error (bfd_error_bad_value); @@ -1299,7 +1302,8 @@ i370_elf_relocate_section (bfd *output_bfd, case (int) R_I370_COPY: case (int) R_I370_RELATIVE: _bfd_error_handler - ("%B: Relocation %s is not yet supported for symbol %s.", + /* xgettext:c-format */ + (_("%B: Relocation %s is not yet supported for symbol %s."), input_bfd, i370_elf_howto_table[(int) r_type]->name, sym_name); diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index c6f2fd6..311ca37 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -383,6 +383,7 @@ elf_i386_rtype_to_howto (bfd *abfd, unsigned r_type) && ((indx = r_type - R_386_vt_offset) - R_386_ext2 >= R_386_vt - R_386_ext2)) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid relocation type %d"), abfd, (int) r_type); indx = R_386_NONE; @@ -1556,6 +1557,7 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd, } _bfd_error_handler + /* xgettext:c-format */ (_("%B: TLS transition from %s to %s against `%s' at 0x%lx " "in section `%A' failed"), abfd, sec, from->name, to->name, name, @@ -1643,6 +1645,7 @@ elf_i386_convert_load_reloc (bfd *abfd, Elf_Internal_Shdr *symtab_hdr, name = h->root.root.string; _bfd_error_handler + /* xgettext:c-format */ (_("%B: direct GOT relocation R_386_GOT32X against `%s' without base register can not be used when making a shared object"), abfd, name); return FALSE; @@ -1898,6 +1901,7 @@ elf_i386_check_relocs (bfd *abfd, if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr)) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: bad symbol index: %d"), abfd, r_symndx); goto error_return; @@ -2099,6 +2103,7 @@ elf_i386_check_relocs (bfd *abfd, name = bfd_elf_sym_name (abfd, symtab_hdr, isym, NULL); _bfd_error_handler + /* xgettext:c-format */ (_("%B: `%s' accessed both as normal and " "thread local symbol"), abfd, name); @@ -2187,6 +2192,7 @@ do_relocation: name = bfd_elf_sym_name (abfd, symtab_hdr, isym, NULL); _bfd_error_handler + /* xgettext:c-format */ (_("%B: unsupported non-PIC call to IFUNC `%s'"), abfd, name); bfd_set_error (bfd_error_bad_value); @@ -3061,6 +3067,7 @@ elf_i386_readonly_dynrelocs (struct elf_link_hash_entry *h, void *inf) if ((info->warn_shared_textrel && bfd_link_pic (info)) || info->error_textrel) + /* xgettext:c-format */ info->callbacks->einfo (_("%P: %B: warning: relocation against `%s' in readonly section `%A'\n"), p->sec->owner, h->root.root.string, p->sec); @@ -3272,6 +3279,7 @@ elf_i386_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info) info->flags |= DF_TEXTREL; if ((info->warn_shared_textrel && bfd_link_pic (info)) || info->error_textrel) + /* xgettext:c-format */ info->callbacks->einfo (_("%P: %B: warning: relocation in readonly section `%A'\n"), p->sec->owner, p->sec); } @@ -3768,6 +3776,7 @@ elf_i386_relocate_section (bfd *output_bfd, >= R_386_ext2 - R_386_ext)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: unrecognized relocation (0x%x) in section `%A'"), input_bfd, input_section, r_type); bfd_set_error (bfd_error_bad_value); @@ -4047,6 +4056,7 @@ bad_ifunc_reloc: name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym, NULL); _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation %s against STT_GNU_IFUNC " "symbol `%s' isn't supported"), input_bfd, howto->name, name); @@ -4294,6 +4304,7 @@ disallow_got32: name = h->root.root.string; _bfd_error_handler + /* xgettext:c-format */ (_("%B: direct GOT relocation %s against `%s' without base register can not be used when making a shared object"), input_bfd, howto->name, name); bfd_set_error (bfd_error_bad_value); @@ -4341,6 +4352,7 @@ disallow_got32: } _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation R_386_GOTOFF against undefined %s `%s' can not be used when making a shared object"), input_bfd, v, h->root.root.string); bfd_set_error (bfd_error_bad_value); @@ -4352,6 +4364,7 @@ disallow_got32: && ELF_ST_VISIBILITY (h->other) == STV_PROTECTED) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation R_386_GOTOFF against protected %s `%s' can not be used when making a shared object"), input_bfd, h->type == STT_FUNC ? "function" : "data", @@ -5143,6 +5156,7 @@ disallow_got32: rel->r_offset) != (bfd_vma) -1) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, input_section, @@ -5182,6 +5196,7 @@ check_relocation_error: else { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): reloc against `%s': error %d"), input_bfd, input_section, (long) rel->r_offset, name, (int) r); diff --git a/bfd/elf32-i960.c b/bfd/elf32-i960.c index 12d6204..292d969 100644 --- a/bfd/elf32-i960.c +++ b/bfd/elf32-i960.c @@ -136,6 +136,7 @@ elf32_i960_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, /* PR 17521: file: 9609b8d6. */ if (type >= R_960_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid i960 reloc number: %d"), abfd, type); type = 0; } diff --git a/bfd/elf32-ip2k.c b/bfd/elf32-ip2k.c index 820e146..41e5081 100644 --- a/bfd/elf32-ip2k.c +++ b/bfd/elf32-ip2k.c @@ -1241,6 +1241,7 @@ ip2k_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_IP2K_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid IP2K reloc number: %d"), abfd, r_type); r_type = 0; } @@ -1293,6 +1294,7 @@ ip2k_final_link_relocate (reloc_howto_type * howto, if (PAGENO (relocation + rel->r_addend) != ip2k_nominal_page_bits (input_bfd, input_section, rel->r_offset, contents)) + /* xgettext:c-format */ _bfd_error_handler (_("ip2k linker: missing page instruction at 0x%08lx (dest = 0x%08lx)."), BASEADDR (input_section) + rel->r_offset, relocation + rel->r_addend); @@ -1309,6 +1311,7 @@ ip2k_final_link_relocate (reloc_howto_type * howto, && (PAGENO (relocation + rel->r_addend) == ip2k_nominal_page_bits (input_bfd, input_section, rel->r_offset - 2, contents))) + /* xgettext:c-format */ _bfd_error_handler (_("ip2k linker: redundant page instruction at 0x%08lx (dest = 0x%08lx)."), page_addr, relocation + rel->r_addend); diff --git a/bfd/elf32-iq2000.c b/bfd/elf32-iq2000.c index e2db9a7..75ef97d 100644 --- a/bfd/elf32-iq2000.c +++ b/bfd/elf32-iq2000.c @@ -437,6 +437,7 @@ iq2000_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED, default: if (r_type >= (unsigned int) R_IQ2000_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid IQ2000 reloc number: %d"), abfd, r_type); r_type = 0; } @@ -827,6 +828,7 @@ iq2000_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); } @@ -840,6 +842,7 @@ iq2000_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) error = TRUE; _bfd_error_handler + /* xgettext:c-format */ (_("%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"), bfd_get_filename (ibfd), (long)new_flags, (long)old_flags); } diff --git a/bfd/elf32-lm32.c b/bfd/elf32-lm32.c index d222d8c..3729503 100644 --- a/bfd/elf32-lm32.c +++ b/bfd/elf32-lm32.c @@ -590,6 +590,7 @@ lm32_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_LM32_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid LM32 reloc number: %d"), abfd, r_type); r_type = 0; } diff --git a/bfd/elf32-m32c.c b/bfd/elf32-m32c.c index c2962e5..44fcc24 100644 --- a/bfd/elf32-m32c.c +++ b/bfd/elf32-m32c.c @@ -301,6 +301,7 @@ m32c_info_to_howto_rela r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_M32C_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid M32C reloc number: %d"), abfd, r_type); r_type = 0; } @@ -879,6 +880,7 @@ m32c_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); } @@ -891,6 +893,7 @@ m32c_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) { error = TRUE; _bfd_error_handler + /* xgettext:c-format */ (_("%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"), bfd_get_filename (ibfd), (long)new_flags, (long)old_flags); } diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c index 20dfab5..4cf5b56 100644 --- a/bfd/elf32-m32r.c +++ b/bfd/elf32-m32r.c @@ -1282,6 +1282,7 @@ m32r_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type > (unsigned int) R_M32R_GNU_VTENTRY) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid M32R reloc number: %d"), abfd, r_type); r_type = 0; } @@ -2444,6 +2445,7 @@ m32r_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (rel->r_info); if (r_type < 0 || r_type >= (int) R_M32R_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: unknown relocation type %d"), input_bfd, (int) r_type); bfd_set_error (bfd_error_bad_value); @@ -2565,6 +2567,7 @@ m32r_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, != (bfd_vma) -1)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, input_section, @@ -3009,6 +3012,7 @@ m32r_elf_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, else { _bfd_error_handler + /* xgettext:c-format */ (_("%B: The target (%s) of an %s relocation is in the wrong section (%A)"), input_bfd, sec, diff --git a/bfd/elf32-m68hc11.c b/bfd/elf32-m68hc11.c index fb70023..56c407e 100644 --- a/bfd/elf32-m68hc11.c +++ b/bfd/elf32-m68hc11.c @@ -386,6 +386,7 @@ m68hc11_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_M68HC11_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid M68HC11 reloc number: %d"), abfd, r_type); r_type = 0; } diff --git a/bfd/elf32-m68hc12.c b/bfd/elf32-m68hc12.c index 381e8e3..8ba9e59 100644 --- a/bfd/elf32-m68hc12.c +++ b/bfd/elf32-m68hc12.c @@ -506,6 +506,7 @@ m68hc11_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_M68HC11_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid M68HC12 reloc number: %d"), abfd, r_type); r_type = 0; } diff --git a/bfd/elf32-m68hc1x.c b/bfd/elf32-m68hc1x.c index ca7c49e..7e7bbab 100644 --- a/bfd/elf32-m68hc1x.c +++ b/bfd/elf32-m68hc1x.c @@ -161,6 +161,7 @@ m68hc12_add_stub (const char *stub_name, asection *section, TRUE, FALSE); if (stub_entry == NULL) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: cannot create stub entry %s"), section->owner, stub_name); return NULL; @@ -1166,6 +1167,7 @@ elf32_m68hc11_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, && m68hc11_addr_is_banked (pinfo, insn_addr) && phys_page != insn_page && !(e_flags & E_M68HC11_NO_BANK_WARNING)) { + /* xgettext:c-format */ msg = _("banked address [%lx:%04lx] (%lx) is not in the same bank " "as current banked address [%lx:%04lx] (%lx)"); buf = xmalloc (strlen (msg) + 128); @@ -1181,6 +1183,7 @@ elf32_m68hc11_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, if (phys_page != 0 && insn_page == 0) { + /* xgettext:c-format */ msg = _("reference to a banked address [%lx:%04lx] in the " "normal address space at %04lx"); buf = xmalloc (strlen (msg) + 128); @@ -1381,6 +1384,7 @@ _bfd_m68hc11_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) if (new_flags != old_flags) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"), ibfd, (unsigned long) new_flags, (unsigned long) old_flags); ok = FALSE; diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c index 0d05da0..7c2e0fc 100644 --- a/bfd/elf32-m68k.c +++ b/bfd/elf32-m68k.c @@ -348,6 +348,7 @@ rtype_to_howto (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst) if (indx >= (unsigned int) R_68K_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid relocation type %d"), abfd, (int) indx); indx = R_68K_NONE; @@ -507,7 +508,8 @@ static const bfd_byte elf_m68k_plt_entry[PLT_ENTRY_SIZE] = 0, 0, 0, 0 /* + .plt - . */ }; -static const struct elf_m68k_plt_info elf_m68k_plt_info = { +static const struct elf_m68k_plt_info elf_m68k_plt_info = +{ PLT_ENTRY_SIZE, elf_m68k_plt0_entry, { 4, 12 }, elf_m68k_plt_entry, { 4, 16 }, 8 @@ -541,7 +543,8 @@ static const bfd_byte elf_isab_plt_entry[ISAB_PLT_ENTRY_SIZE] = 0, 0, 0, 0 /* + .plt - . */ }; -static const struct elf_m68k_plt_info elf_isab_plt_info = { +static const struct elf_m68k_plt_info elf_isab_plt_info = +{ ISAB_PLT_ENTRY_SIZE, elf_isab_plt0_entry, { 2, 12 }, elf_isab_plt_entry, { 2, 20 }, 12 @@ -575,7 +578,8 @@ static const bfd_byte elf_isac_plt_entry[ISAC_PLT_ENTRY_SIZE] = 0, 0, 0, 0 /* replaced with .plt - . */ }; -static const struct elf_m68k_plt_info elf_isac_plt_info = { +static const struct elf_m68k_plt_info elf_isac_plt_info = +{ ISAC_PLT_ENTRY_SIZE, elf_isac_plt0_entry, { 2, 12}, elf_isac_plt_entry, { 2, 20 }, 12 @@ -606,7 +610,8 @@ static const bfd_byte elf_cpu32_plt_entry[CPU32_PLT_ENTRY_SIZE] = 0, 0 }; -static const struct elf_m68k_plt_info elf_cpu32_plt_info = { +static const struct elf_m68k_plt_info elf_cpu32_plt_info = +{ CPU32_PLT_ENTRY_SIZE, elf_cpu32_plt0_entry, { 4, 12 }, elf_cpu32_plt_entry, { 4, 18 }, 10 @@ -1671,12 +1676,14 @@ elf_m68k_add_entry_to_got (struct elf_m68k_got *got, /* This BFD has too many relocation. */ { if (got->n_slots[R_8] > ELF_M68K_R_8_MAX_N_SLOTS_IN_GOT (info)) + /* xgettext:c-format */ _bfd_error_handler (_("%B: GOT overflow: " "Number of relocations with 8-bit " "offset > %d"), abfd, ELF_M68K_R_8_MAX_N_SLOTS_IN_GOT (info)); else + /* xgettext:c-format */ _bfd_error_handler (_("%B: GOT overflow: " "Number of relocations with 8- or 16-bit " "offset > %d"), @@ -3920,6 +3927,7 @@ elf_m68k_relocate_section (bfd *output_bfd, if (bfd_link_dll (info)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): R_68K_TLS_LE32 relocation not permitted " "in shared object"), input_bfd, input_section, (long) rel->r_offset, howto->name); @@ -4119,6 +4127,7 @@ elf_m68k_relocate_section (bfd *output_bfd, rel->r_offset) != (bfd_vma) -1) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, input_section, @@ -4154,7 +4163,9 @@ elf_m68k_relocate_section (bfd *output_bfd, _bfd_error_handler ((sym_type == STT_TLS + /* xgettext:c-format */ ? _("%B(%A+0x%lx): %s used with TLS symbol %s") + /* xgettext:c-format */ : _("%B(%A+0x%lx): %s used with non-TLS symbol %s")), input_bfd, input_section, @@ -4192,6 +4203,7 @@ elf_m68k_relocate_section (bfd *output_bfd, else { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): reloc against `%s': error %d"), input_bfd, input_section, (long) rel->r_offset, name, (int) r); diff --git a/bfd/elf32-mcore.c b/bfd/elf32-mcore.c index bcefc80..899aa30 100644 --- a/bfd/elf32-mcore.c +++ b/bfd/elf32-mcore.c @@ -96,6 +96,7 @@ mcore_elf_unsupported_reloc (bfd * abfd, { BFD_ASSERT (reloc_entry->howto != (reloc_howto_type *)0); + /* xgettext:c-format */ _bfd_error_handler (_("%B: Relocation %s (%d) is not currently supported.\n"), abfd, reloc_entry->howto->name, @@ -350,6 +351,7 @@ mcore_elf_info_to_howto (bfd * abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= R_MCORE_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: unrecognised MCore reloc number: %d"), abfd, r_type); bfd_set_error (bfd_error_bad_value); @@ -434,6 +436,7 @@ mcore_elf_relocate_section (bfd * output_bfd, if ((unsigned) r_type >= (unsigned) R_MCORE_max || ! mcore_elf_howto_table [(int)r_type]) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: Unknown relocation type %d\n"), input_bfd, (int) r_type); @@ -448,6 +451,7 @@ mcore_elf_relocate_section (bfd * output_bfd, /* Complain about known relocation that are not yet supported. */ if (howto->special_function == mcore_elf_unsupported_reloc) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: Relocation %s (%d) is not currently supported.\n"), input_bfd, howto->name, diff --git a/bfd/elf32-mep.c b/bfd/elf32-mep.c index e9d1259..ad35395 100644 --- a/bfd/elf32-mep.c +++ b/bfd/elf32-mep.c @@ -142,6 +142,7 @@ mep_reloc_type_lookup if (mep_elf_howto_table[type].type != type) { + /* xgettext:c-format */ _bfd_error_handler (_("MeP: howto %d has type %d"), type, mep_elf_howto_table[type].type); abort (); @@ -385,6 +386,7 @@ mep_info_to_howto_rela r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= R_MEP_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid MEP reloc number: %d"), abfd, r_type); r_type = 0; } @@ -614,6 +616,7 @@ mep_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) old_flags = (old_flags & ~EF_MEP_CPU_MASK) | new_partial; else { + /* xgettext:c-format */ _bfd_error_handler (_("%B and %B are for different cores"), last_ibfd, ibfd); bfd_set_error (bfd_error_invalid_target); return FALSE; @@ -631,6 +634,7 @@ mep_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) old_flags = (old_flags & ~EF_MEP_INDEX_MASK) | new_partial; else { + /* xgettext:c-format */ _bfd_error_handler (_("%B and %B are for different configurations"), last_ibfd, ibfd); bfd_set_error (bfd_error_invalid_target); return FALSE; diff --git a/bfd/elf32-metag.c b/bfd/elf32-metag.c index 75e06d7..1557a37 100644 --- a/bfd/elf32-metag.c +++ b/bfd/elf32-metag.c @@ -898,6 +898,7 @@ metag_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_METAG_MAX) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid METAG reloc number: %d"), abfd, r_type); r_type = 0; } @@ -1202,6 +1203,7 @@ metag_add_stub (const char *stub_name, TRUE, FALSE); if (hsh == NULL) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: cannot create stub entry %s"), section->owner, stub_name); return NULL; @@ -1928,6 +1930,7 @@ elf_metag_relocate_section (bfd *output_bfd, if (bfd_link_pic (info)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): R_METAG_TLS_LE/IENONPIC relocation not permitted in shared object"), input_bfd, input_section, (long) rel->r_offset, howto->name); @@ -2286,6 +2289,7 @@ elf_metag_check_relocs (bfd *abfd, else name = bfd_elf_sym_name (abfd, symtab_hdr, isym, NULL); _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"), abfd, elf_metag_howto_table[r_type].name, name); bfd_set_error (bfd_error_bad_value); diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c index b29ac04..477e7b3 100644 --- a/bfd/elf32-microblaze.c +++ b/bfd/elf32-microblaze.c @@ -652,6 +652,7 @@ microblaze_elf_info_to_howto (bfd * abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= R_MICROBLAZE_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: unrecognised MicroBlaze reloc number: %d"), abfd, r_type); bfd_set_error (bfd_error_bad_value); @@ -956,6 +957,7 @@ microblaze_elf_relocate_section (bfd *output_bfd, if (r_type < 0 || r_type >= (int) R_MICROBLAZE_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%s: unknown relocation type %d"), bfd_get_filename (input_bfd), (int) r_type); bfd_set_error (bfd_error_bad_value); @@ -1083,6 +1085,7 @@ microblaze_elf_relocate_section (bfd *output_bfd, else { _bfd_error_handler + /* xgettext:c-format */ (_("%s: The target (%s) of an %s relocation " "is in the wrong section (%s)"), bfd_get_filename (input_bfd), @@ -1130,6 +1133,7 @@ microblaze_elf_relocate_section (bfd *output_bfd, else { _bfd_error_handler + /* xgettext:c-format */ (_("%s: The target (%s) of an %s relocation " "is in the wrong section (%s)"), bfd_get_filename (input_bfd), diff --git a/bfd/elf32-moxie.c b/bfd/elf32-moxie.c index 10a7a22..caf6d7b 100644 --- a/bfd/elf32-moxie.c +++ b/bfd/elf32-moxie.c @@ -133,6 +133,7 @@ moxie_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_MOXIE_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid Moxie reloc number: %d"), abfd, r_type); r_type = 0; } diff --git a/bfd/elf32-msp430.c b/bfd/elf32-msp430.c index d218528..33895f6 100644 --- a/bfd/elf32-msp430.c +++ b/bfd/elf32-msp430.c @@ -644,6 +644,7 @@ msp430_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED, { if (r_type >= (unsigned int) R_MSP430x_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid MSP430X reloc number: %d"), abfd, r_type); r_type = 0; } @@ -653,6 +654,7 @@ msp430_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED, if (r_type >= (unsigned int) R_MSP430_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid MSP430 reloc number: %d"), abfd, r_type); r_type = 0; } @@ -2348,6 +2350,7 @@ static bfd_boolean elf32_msp430_obj_attrs_handle_unknown (bfd *abfd, int tag) { _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B: Unknown MSPABI object attribute %d"), abfd, tag); return TRUE; @@ -2440,6 +2443,7 @@ elf32_msp430_merge_mspabi_attributes (bfd *ibfd, struct bfd_link_info *info) if (in_attr[OFBA_MSPABI_Tag_ISA].i != out_attr[OFBA_MSPABI_Tag_ISA].i) { _bfd_error_handler + /* xgettext:c-format */ (_("error: %B uses %s instructions but %B uses %s"), ibfd, first_input_bfd, isa_type (in_attr[OFBA_MSPABI_Tag_ISA].i), @@ -2452,6 +2456,7 @@ elf32_msp430_merge_mspabi_attributes (bfd *ibfd, struct bfd_link_info *info) out_attr[OFBA_MSPABI_Tag_Code_Model].i) { _bfd_error_handler + /* xgettext:c-format */ (_("error: %B uses the %s code model whereas %B uses the %s code model"), ibfd, first_input_bfd, code_model (in_attr[OFBA_MSPABI_Tag_Code_Model].i), @@ -2464,6 +2469,7 @@ elf32_msp430_merge_mspabi_attributes (bfd *ibfd, struct bfd_link_info *info) && out_attr[OFBA_MSPABI_Tag_ISA].i != 2) { _bfd_error_handler + /* xgettext:c-format */ (_("error: %B uses the large code model but %B uses MSP430 instructions"), ibfd, first_input_bfd); result = FALSE; @@ -2474,6 +2480,7 @@ elf32_msp430_merge_mspabi_attributes (bfd *ibfd, struct bfd_link_info *info) out_attr[OFBA_MSPABI_Tag_Data_Model].i) { _bfd_error_handler + /* xgettext:c-format */ (_("error: %B uses the %s data model whereas %B uses the %s data model"), ibfd, first_input_bfd, data_model (in_attr[OFBA_MSPABI_Tag_Data_Model].i), @@ -2486,6 +2493,7 @@ elf32_msp430_merge_mspabi_attributes (bfd *ibfd, struct bfd_link_info *info) && out_attr[OFBA_MSPABI_Tag_Data_Model].i != 1) { _bfd_error_handler + /* xgettext:c-format */ (_("error: %B uses the small code model but %B uses the %s data model"), ibfd, first_input_bfd, data_model (out_attr[OFBA_MSPABI_Tag_Data_Model].i)); @@ -2497,6 +2505,7 @@ elf32_msp430_merge_mspabi_attributes (bfd *ibfd, struct bfd_link_info *info) && out_attr[OFBA_MSPABI_Tag_ISA].i != 2) { _bfd_error_handler + /* xgettext:c-format */ (_("error: %B uses the %s data model but %B only uses MSP430 instructions"), ibfd, first_input_bfd, data_model (in_attr[OFBA_MSPABI_Tag_Data_Model].i)); diff --git a/bfd/elf32-mt.c b/bfd/elf32-mt.c index 02f1f88..f2f9b58 100644 --- a/bfd/elf32-mt.c +++ b/bfd/elf32-mt.c @@ -238,6 +238,7 @@ mt_info_to_howto_rela r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_MT_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid MT reloc number: %d"), abfd, r_type); r_type = 0; } diff --git a/bfd/elf32-nds32.c b/bfd/elf32-nds32.c index fdeada7..ab19801 100644 --- a/bfd/elf32-nds32.c +++ b/bfd/elf32-nds32.c @@ -2970,6 +2970,7 @@ nds32_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr, r_type = ELF32_R_TYPE (dst->r_info); if (r_type > R_NDS32_GNU_VTENTRY) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid NDS32 reloc number: %d"), abfd, r_type); r_type = 0; } @@ -4562,6 +4563,7 @@ nds32_elf_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (rel->r_info); if (r_type >= R_NDS32_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: error: unknown relocation type %d."), input_bfd, r_type); bfd_set_error (bfd_error_bad_value); @@ -5205,6 +5207,7 @@ handle_sda: { /* Incorrect alignment. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A): warning: unaligned small data access of type %d."), input_bfd, input_section, r_type); ret = FALSE; @@ -5970,6 +5973,7 @@ nds32_check_vec_size (bfd *ibfd) else if (nds32_vec_size != (flag_t & 0x3)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: ISR vector size mismatch" " with previous modules, previous %u-byte, current %u-byte"), ibfd, @@ -6138,6 +6142,7 @@ nds32_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) { if (in_version != out_version) _bfd_error_handler + /* xgettext:c-format */ (_("%B: warning: Incompatible elf-versions %s and %s."), ibfd, nds32_elfver_strtab[out_version], nds32_elfver_strtab[in_version]); @@ -8779,8 +8784,7 @@ done_adjust_diff: && (blank_t2->offset > raddr || blank_t2->next->offset <= raddr)) _bfd_error_handler - (_("%B: %s\n"), abfd, - "Error: search_nds32_elf_blank reports wrong node"); + (_("%B: Error: search_nds32_elf_blank reports wrong node\n"), abfd); /* Mark reloc in deleted portion as NONE. For some relocs like R_NDS32_LABEL that doesn't modify the @@ -9037,6 +9041,10 @@ relax_range_measurement (bfd *abfd) #define IS_OPTIMIZE(addend) ((addend) & 0x40000000) #define IS_16BIT_ON(addend) ((addend) & 0x20000000) +static const char * unrecognized_reloc_msg = + /* xgettext:c-format */ + N_("%B: warning: %s points to unrecognized reloc at 0x%lx."); + /* Relax LONGCALL1 relocation for nds32_elf_relax_section. */ static bfd_boolean @@ -9087,9 +9095,8 @@ nds32_elf_relax_longcall1 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel, if (hi_irelfn == irelend || lo_irelfn == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_LONGCALL1 points to unrecognized" - "reloc at 0x%lx.", abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGCALL1", + (long) irel->r_offset); return FALSE; } @@ -9169,9 +9176,8 @@ nds32_elf_relax_longcall2 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel, if (i1_irelfn == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_LONGCALL2 points to unrecognized" - "reloc at 0x%lx.", abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGCALL2", + (long) irel->r_offset); return FALSE; } @@ -9276,9 +9282,8 @@ nds32_elf_relax_longcall3 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel, if (hi_irelfn == irelend || lo_irelfn == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_LONGCALL3 points to unrecognized" - "reloc at 0x%lx.", abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGCALL3", + (long) irel->r_offset); return FALSE; } @@ -9411,9 +9416,8 @@ nds32_elf_relax_longjump1 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel, R_NDS32_LO12S0_ORI_RELA, laddr + 4); if (hi_irelfn == irelend || lo_irelfn == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_LONGJUMP1 points to unrecognized" - "reloc at 0x%lx.", abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGJUMP1", + (long) irel->r_offset); return FALSE; } @@ -9618,9 +9622,8 @@ nds32_elf_relax_longjump2 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel, if (i2_irelfn == irelend || cond_irelfn == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_LONGJUMP2 points to unrecognized" - "reloc at 0x%lx.", abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGJUMP2", + (long) irel->r_offset); return FALSE; } @@ -9811,9 +9814,8 @@ nds32_elf_relax_longjump3 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel, if (hi_irelfn == irelend || lo_irelfn == irelend || cond_irelfn == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_LONGJUMP3 points to unrecognized" - "reloc at 0x%lx.", abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGJUMP3", + (long) irel->r_offset); return FALSE; } @@ -9992,9 +9994,8 @@ nds32_elf_relax_longcall4 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel, if (hi_irel == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_LONGCALL4 points to unrecognized" - "reloc at 0x%lx.", abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGCALL4", + (long) irel->r_offset); return FALSE; } @@ -10023,9 +10024,8 @@ nds32_elf_relax_longcall4 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel, if (ptr_irel == irelend || em_irel == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_LONGCALL4 points to unrecognized" - "reloc at 0x%lx.", abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGCALL4", + (long) irel->r_offset); return FALSE; } /* Check these is enough space to insert jal in R_NDS32_EMPTY. */ @@ -10095,9 +10095,8 @@ nds32_elf_relax_longcall5 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel, R_NDS32_25_PCREL_RELA, irel->r_addend); if (cond_irel == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_LONGCALL5 points to unrecognized" - "reloc at 0x%lx.", abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGCALL5", + (long) irel->r_offset); return FALSE; } @@ -10174,9 +10173,8 @@ nds32_elf_relax_longcall6 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel, if (em_irel == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_LONGCALL6 points to unrecognized" - "reloc at 0x%lx.", abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGCALL6", + (long) irel->r_offset); return FALSE; } @@ -10213,9 +10211,8 @@ nds32_elf_relax_longcall6 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel, R_NDS32_PTR_RESOLVED, irel->r_addend); if (cond_irel == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_LONGCALL6 points to unrecognized" - "reloc at 0x%lx.", abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, + "R_NDS32_LONGCALL6", (long) irel->r_offset); return FALSE; } cond_irel->r_addend = 1; @@ -10263,9 +10260,8 @@ nds32_elf_relax_longcall6 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel, R_NDS32_PTR_RESOLVED, irel->r_addend); if (cond_irel == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_LONGCALL6 points to unrecognized" - "reloc at 0x%lx.", abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, + "R_NDS32_LONGCALL6", (long) irel->r_offset); return FALSE; } cond_irel->r_addend = 1; @@ -10314,9 +10310,8 @@ nds32_elf_relax_longjump4 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel, if (hi_irel == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_LONGJUMP4 points to unrecognized" - "reloc at 0x%lx.", abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGJUMP4", + (long) irel->r_offset); return FALSE; } @@ -10337,9 +10332,8 @@ nds32_elf_relax_longjump4 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel, if (ptr_irel == irelend || em_irel == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_LONGJUMP4 points to unrecognized" - "reloc at 0x%lx.", abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGJUMP4", + (long) irel->r_offset); return FALSE; } @@ -10412,9 +10406,8 @@ nds32_elf_relax_longjump5 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel, R_NDS32_25_PCREL_RELA, irel->r_addend); if (cond_irel == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_LONGJUMP5 points to unrecognized" - "reloc at 0x%lx.", abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGJUMP5", + (long) irel->r_offset); return FALSE; } @@ -10542,9 +10535,8 @@ nds32_elf_relax_longjump6 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel, if (em_irel == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_LONGJUMP6 points to unrecognized" - "reloc at 0x%lx.", abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGJUMP6", + (long) irel->r_offset); return FALSE; } @@ -10713,9 +10705,8 @@ nds32_elf_relax_longjump7 (bfd *abfd, asection *sec, Elf_Internal_Rela *irel, R_NDS32_15_PCREL_RELA, irel->r_addend); if (cond_irel == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_LONGJUMP7 points to unrecognized" - "reloc at 0x%lx.", abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LONGJUMP7", + (long) irel->r_offset); return FALSE; } @@ -10819,9 +10810,8 @@ nds32_elf_relax_loadstore (struct bfd_link_info *link_info, bfd *abfd, if (hi_irelfn == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_LOADSTORE points to unrecognized" - "reloc at 0x%lx.", abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_LOADSTORE", + (long) irel->r_offset); return FALSE; } @@ -11294,9 +11284,8 @@ nds32_elf_relax_ptr (bfd *abfd, asection *sec, Elf_Internal_Rela *irel, if (re_irel == irelend) { - _bfd_error_handler - ("%B: warning: R_NDS32_PTR points to unrecognized reloc at 0x%lx.", - abfd, (long) irel->r_offset); + _bfd_error_handler (unrecognized_reloc_msg, abfd, "R_NDS32_PTR", + (long) irel->r_offset); return FALSE; } @@ -12788,6 +12777,7 @@ nds32_relax_fp_as_gp (struct bfd_link_info *link_info, { /* Begin of the region. */ if (begin_rel) + /* xgettext:c-format */ _bfd_error_handler (_("%B: Nested OMIT_FP in %A."), abfd, sec); begin_rel = irel; @@ -12806,6 +12796,7 @@ nds32_relax_fp_as_gp (struct bfd_link_info *link_info, if (begin_rel == NULL) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: Unmatched OMIT_FP in %A."), abfd, sec); continue; } @@ -13088,6 +13079,7 @@ nds32_elf_get_relocated_section_contents (bfd *abfd, complete binaries. Do not abort, but issue an error message instead. */ link_info->callbacks->einfo + /* xgettext:c-format */ (_("%X%P: %B(%A): relocation \"%R\" goes out of range\n"), abfd, input_section, * parent); goto error_return; @@ -15497,6 +15489,7 @@ nds32_elf_ex9_build_hash_table (bfd *abfd, asection *sec, { /* Incorrect alignment. */ _bfd_error_handler + /* xgettext:c-format */ (_("%s: warning: unaligned small data access. " "For entry: {%d, %d, %d}, addr = 0x%x, align = 0x%x."), bfd_get_filename (abfd), irel->r_offset, diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c index f8ae3dd..ad8eb45 100644 --- a/bfd/elf32-nios2.c +++ b/bfd/elf32-nios2.c @@ -2225,6 +2225,7 @@ nios2_add_stub (const char *stub_name, TRUE, FALSE); if (hsh == NULL) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: cannot create stub entry %s"), section->owner, stub_name); @@ -2962,6 +2963,7 @@ nios2_elf32_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) /* So far, the only incompatible flags denote incompatible architectures. */ _bfd_error_handler + /* xgettext:c-format */ (_("error: %B: Conflicting CPU architectures %d/%d"), ibfd, new_flags, old_flags); bfd_set_error (bfd_error_bad_value); @@ -3846,6 +3848,7 @@ nios2_elf32_relocate_section (bfd *output_bfd, { if (h) name = h->root.root.string; + /* xgettext:c-format */ format = _("Unable to reach %s (at 0x%08x) from the " "global pointer (at 0x%08x) because the " "offset (%d) is out of the allowed range, " @@ -4367,6 +4370,7 @@ nios2_elf32_relocate_section (bfd *output_bfd, if (bfd_link_dll (info)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): R_NIOS2_TLS_LE16 relocation not " "permitted in shared object"), input_bfd, input_section, diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c index e9cd232..df2bf03 100644 --- a/bfd/elf32-or1k.c +++ b/bfd/elf32-or1k.c @@ -740,6 +740,7 @@ or1k_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_OR1K_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid OR1K reloc number: %d"), abfd, r_type); r_type = 0; } @@ -1643,6 +1644,7 @@ or1k_elf_check_relocs (bfd *abfd, name + 5) != 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: bad relocation section name `%s\'"), abfd, name); } diff --git a/bfd/elf32-pj.c b/bfd/elf32-pj.c index a129d61..31a9597 100644 --- a/bfd/elf32-pj.c +++ b/bfd/elf32-pj.c @@ -321,6 +321,7 @@ pj_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, if (r >= R_PJ_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: unrecognised PicoJava reloc number: %d"), abfd, r); bfd_set_error (bfd_error_bad_value); diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index 5f69374..2f09be4 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -2041,6 +2041,7 @@ ppc_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= R_PPC_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: unrecognised PPC reloc number: %d"), abfd, r_type); bfd_set_error (bfd_error_bad_value); @@ -2052,6 +2053,7 @@ ppc_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, ELF32_R_TYPE (dst->r_info) is necessarily a valid relocation. */ if (!cache_ptr->howto) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid relocation type %d"), abfd, r_type); bfd_set_error (bfd_error_bad_value); @@ -2758,6 +2760,7 @@ ppc_elf_begin_write_processing (bfd *abfd, struct bfd_link_info *link_info) if (asec == NULL) continue; + /* xgettext:c-format */ error_message = _("corrupt %s section in %B"); length = asec->size; if (length < 20) @@ -2777,6 +2780,7 @@ ppc_elf_begin_write_processing (bfd *abfd, struct bfd_link_info *link_info) if (bfd_seek (ibfd, asec->filepos, SEEK_SET) != 0 || (bfd_bread (buffer, length, ibfd) != length)) { + /* xgettext:c-format */ error_message = _("unable to read in %s section from %B"); goto fail; } @@ -2818,6 +2822,7 @@ ppc_elf_begin_write_processing (bfd *abfd, struct bfd_link_info *link_info) if (asec && ! bfd_set_section_size (abfd, asec, 20 + num_entries * 4)) { ibfd = abfd; + /* xgettext:c-format */ error_message = _("warning: unable to set size of %s section in %B"); } } @@ -3969,6 +3974,7 @@ static void bad_shared_reloc (bfd *abfd, enum elf_ppc_reloc_type r_type) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation %s cannot be used when making a shared object"), abfd, ppc_elf_howto_table[r_type]->name); @@ -4322,6 +4328,7 @@ ppc_elf_check_relocs (bfd *abfd, /* It does not make sense to have a procedure linkage table entry for a non-ifunc local symbol. */ info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %H: %s reloc against local symbol\n"), abfd, sec, rel->r_offset, ppc_elf_howto_table[r_type]->name); @@ -4682,16 +4689,20 @@ _bfd_elf_ppc_merge_fp_attributes (bfd *ibfd, struct bfd_link_info *info) } else if (out_fp != 2 && in_fp == 2) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses hard float, %B uses soft float"), obfd, ibfd); else if (out_fp == 2 && in_fp != 2) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses hard float, %B uses soft float"), ibfd, obfd); else if (out_fp == 1 && in_fp == 3) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses double-precision hard float, " "%B uses single-precision hard float"), obfd, ibfd); else if (out_fp == 3 && in_fp == 1) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses double-precision hard float, " "%B uses single-precision hard float"), ibfd, obfd); @@ -4706,18 +4717,22 @@ _bfd_elf_ppc_merge_fp_attributes (bfd *ibfd, struct bfd_link_info *info) } else if (out_fp != 2 * 4 && in_fp == 2 * 4) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses 64-bit long double, " "%B uses 128-bit long double"), ibfd, obfd); else if (in_fp != 2 * 4 && out_fp == 2 * 4) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses 64-bit long double, " "%B uses 128-bit long double"), obfd, ibfd); else if (out_fp == 1 * 4 && in_fp == 3 * 4) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses IBM long double, " "%B uses IEEE long double"), ibfd, obfd); else if (out_fp == 3 * 4 && in_fp == 1 * 4) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses IBM long double, " "%B uses IEEE long double"), obfd, ibfd); } @@ -4768,10 +4783,12 @@ ppc_elf_merge_obj_attributes (bfd *ibfd, struct bfd_link_info *info) } else if (out_vec < in_vec) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses AltiVec vector ABI, %B uses SPE vector ABI"), obfd, ibfd); else if (out_vec > in_vec) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses AltiVec vector ABI, %B uses SPE vector ABI"), ibfd, obfd); } @@ -4794,10 +4811,12 @@ ppc_elf_merge_obj_attributes (bfd *ibfd, struct bfd_link_info *info) } else if (out_struct < in_struct) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses r3/r4 for small structure returns, " "%B uses memory"), obfd, ibfd); else if (out_struct > in_struct) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses r3/r4 for small structure returns, " "%B uses memory"), ibfd, obfd); } @@ -4888,6 +4907,7 @@ ppc_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) { error = TRUE; _bfd_error_handler + /* xgettext:c-format */ (_("%B: uses different e_flags (0x%lx) fields " "than previous modules (0x%lx)"), ibfd, (long) new_flags, (long) old_flags); @@ -8253,6 +8273,7 @@ ppc_elf_relocate_section (bfd *output_bfd, } else info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %H: error: %s with unexpected instruction %x\n"), input_bfd, input_section, rel->r_offset, "R_PPC_ADDR16_HA", insn); @@ -8287,6 +8308,7 @@ ppc_elf_relocate_section (bfd *output_bfd, } else info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %H: error: %s with unexpected instruction %x\n"), input_bfd, input_section, rel->r_offset, "R_PPC_ADDR16_LO", insn); @@ -8342,6 +8364,7 @@ ppc_elf_relocate_section (bfd *output_bfd, is pointing into a .got2 section (and how far into .got2). */ info->callbacks->einfo + /* xgettext:c-format */ (_("%X%P: %H: unsupported bss-plt -fPIC ifunc %s\n"), input_bfd, input_section, rel->r_offset, sym_name); } @@ -8394,6 +8417,7 @@ ppc_elf_relocate_section (bfd *output_bfd, { default: info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %B: unknown relocation type %d for symbol %s\n"), input_bfd, (int) r_type, sym_name); @@ -8672,6 +8696,7 @@ ppc_elf_relocate_section (bfd *output_bfd, got at entry m+n bears little relation to the entry m. */ if (addend != 0) info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %H: non-zero addend on %s reloc against `%s'\n"), input_bfd, input_section, rel->r_offset, howto->name, @@ -8703,6 +8728,7 @@ ppc_elf_relocate_section (bfd *output_bfd, local won't have the +32k reloc addend trick marking -fPIC code, so the linker won't know whether r30 is _GLOBAL_OFFSET_TABLE_ or pointing into a .got2 section. */ + /* xgettext:c-format */ info->callbacks->einfo (_("%X%P: %H: @local call to ifunc %s\n"), input_bfd, input_section, rel->r_offset, h->root.root.string); @@ -8892,6 +8918,7 @@ ppc_elf_relocate_section (bfd *output_bfd, So we'll segfault when trying to run the indirection function to resolve the reloc. */ info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %H: relocation %s for indirect " "function %s unsupported\n"), input_bfd, input_section, rel->r_offset, @@ -9150,6 +9177,7 @@ ppc_elf_relocate_section (bfd *output_bfd, || strcmp (name, ".sbss") == 0)) { info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %B: the target (%s) of a %s relocation is " "in the wrong output section (%s)\n"), input_bfd, @@ -9180,6 +9208,7 @@ ppc_elf_relocate_section (bfd *output_bfd, || strcmp (name, ".sbss2") == 0)) { info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %B: the target (%s) of a %s relocation is " "in the wrong output section (%s)\n"), input_bfd, @@ -9264,6 +9293,7 @@ ppc_elf_relocate_section (bfd *output_bfd, else { info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %B: the target (%s) of a %s relocation is " "in the wrong output section (%s)\n"), input_bfd, @@ -9358,6 +9388,7 @@ ppc_elf_relocate_section (bfd *output_bfd, else { _bfd_error_handler + /* xgettext:c-format */ (_("%B: the target (%s) of a %s relocation is " "in the wrong output section (%s)"), input_bfd, @@ -9455,6 +9486,7 @@ ppc_elf_relocate_section (bfd *output_bfd, case R_PPC_EMB_RELST_HA: case R_PPC_EMB_BIT_FLD: info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %B: relocation %s is not yet supported for symbol %s\n"), input_bfd, howto->name, @@ -9539,6 +9571,7 @@ ppc_elf_relocate_section (bfd *output_bfd, { relocation ^= lobit; info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %H: error: %s against `%s' not a multiple of %u\n"), input_bfd, input_section, rel->r_offset, howto->name, sym_name, mask + 1); @@ -9567,6 +9600,7 @@ ppc_elf_relocate_section (bfd *output_bfd, rel->r_offset) != (bfd_vma) -1) { info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %H: unresolvable %s relocation against symbol `%s'\n"), input_bfd, input_section, rel->r_offset, howto->name, @@ -9647,6 +9681,7 @@ ppc_elf_relocate_section (bfd *output_bfd, else { info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %H: %s reloc against `%s': error %d\n"), input_bfd, input_section, rel->r_offset, howto->name, sym_name, (int) r); @@ -10452,6 +10487,7 @@ ppc_elf_finish_dynamic_sections (bfd *output_bfd, } else { + /* xgettext:c-format */ info->callbacks->einfo (_("%P: %s not defined in linker created %s\n"), htab->elf.hgot->root.root.string, (htab->sgotplt != NULL diff --git a/bfd/elf32-rl78.c b/bfd/elf32-rl78.c index f58fa4e..c6ee06b 100644 --- a/bfd/elf32-rl78.c +++ b/bfd/elf32-rl78.c @@ -287,6 +287,7 @@ rl78_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_RL78_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid RL78 reloc number: %d"), abfd, r_type); r_type = 0; } @@ -1079,6 +1080,7 @@ rl78_elf_relocate_section /* Catch the case of a missing function declaration and emit a more helpful error message. */ if (r_type == R_RL78_DIR24S_PCREL) + /* xgettext:c-format */ msg = _("%B(%A): error: call to undefined function '%s'"); else (*info->callbacks->reloc_overflow) @@ -1092,22 +1094,27 @@ rl78_elf_relocate_section break; case bfd_reloc_other: + /* xgettext:c-format */ msg = _("%B(%A): warning: unaligned access to symbol '%s' in the small data area"); break; case bfd_reloc_outofrange: + /* xgettext:c-format */ msg = _("%B(%A): internal error: out of range error"); break; case bfd_reloc_notsupported: + /* xgettext:c-format */ msg = _("%B(%A): internal error: unsupported relocation error"); break; case bfd_reloc_dangerous: + /* xgettext:c-format */ msg = _("%B(%A): internal error: dangerous relocation"); break; default: + /* xgettext:c-format */ msg = _("%B(%A): internal error: unknown error"); break; } @@ -1194,6 +1201,7 @@ rl78_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) error = TRUE; _bfd_error_handler + /* xgettext:c-format */ (_("RL78 ABI conflict: G10 file %s cannot be linked with %s file %s"), bfd_get_filename (ibfd), rl78_cpu_name (out_cpu), bfd_get_filename (obfd)); @@ -1210,6 +1218,7 @@ rl78_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) error = TRUE; _bfd_error_handler + /* xgettext:c-format */ (_("RL78 ABI conflict: cannot link %s file %s with %s file %s"), rl78_cpu_name (in_cpu), bfd_get_filename (ibfd), rl78_cpu_name (out_cpu), bfd_get_filename (obfd)); @@ -1222,9 +1231,11 @@ rl78_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) (_("RL78 merge conflict: cannot link 32-bit and 64-bit objects together")); if (old_flags & E_FLAG_RL78_64BIT_DOUBLES) + /* xgettext:c-format */ _bfd_error_handler (_("- %s is 64-bit, %s is not"), bfd_get_filename (obfd), bfd_get_filename (ibfd)); else + /* xgettext:c-format */ _bfd_error_handler (_("- %s is 64-bit, %s is not"), bfd_get_filename (ibfd), bfd_get_filename (obfd)); error = TRUE; diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c index 725cc28..f5377c0 100644 --- a/bfd/elf32-rx.c +++ b/bfd/elf32-rx.c @@ -309,6 +309,7 @@ rx_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_RX_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid RX reloc number: %d"), abfd, r_type); r_type = 0; } @@ -589,12 +590,14 @@ rx_elf_relocate_section if (table_end_cache <= entry_vma || entry_vma < table_start_cache) { + /* xgettext:c-format */ _bfd_error_handler (_("%B:%A: table entry %s outside table"), input_bfd, input_section, name); } else if ((int) (entry_vma - table_start_cache) % 4) { + /* xgettext:c-format */ _bfd_error_handler (_("%B:%A: table entry %s not word-aligned within table"), input_bfd, input_section, name); @@ -660,6 +663,7 @@ rx_elf_relocate_section #define ALIGN(m) if (relocation & m) r = bfd_reloc_other; #define OP(i) (contents[rel->r_offset + (i)]) #define WARN_REDHAT(type) \ + /* xgettext:c-format */ \ _bfd_error_handler (_("%B:%A: Warning: deprecated Red Hat reloc " type " detected against: %s."), \ input_bfd, input_section, name) @@ -678,6 +682,7 @@ rx_elf_relocate_section && strcmp (name, "__gp") != 0 \ && strcmp (name, "__romdatastart") != 0 \ && !saw_subtract) \ + /* xgettext:c-format */ \ _bfd_error_handler (_("%B(%A): unsafe PID relocation %s at 0x%08lx (against %s in %s)"), \ input_bfd, input_section, howto->name, \ input_section->output_section->vma + input_section->output_offset + rel->r_offset, \ @@ -1425,6 +1430,7 @@ rx_elf_relocate_section /* Catch the case of a missing function declaration and emit a more helpful error message. */ if (r_type == R_RX_DIR24S_PCREL) + /* xgettext:c-format */ msg = _("%B(%A): error: call to undefined function '%s'"); else (*info->callbacks->reloc_overflow) @@ -1438,22 +1444,27 @@ rx_elf_relocate_section break; case bfd_reloc_other: + /* xgettext:c-format */ msg = _("%B(%A): warning: unaligned access to symbol '%s' in the small data area"); break; case bfd_reloc_outofrange: + /* xgettext:c-format */ msg = _("%B(%A): internal error: out of range error"); break; case bfd_reloc_notsupported: + /* xgettext:c-format */ msg = _("%B(%A): internal error: unsupported relocation error"); break; case bfd_reloc_dangerous: + /* xgettext:c-format */ msg = _("%B(%A): internal error: dangerous relocation"); break; default: + /* xgettext:c-format */ msg = _("%B(%A): internal error: unknown error"); break; } @@ -3131,11 +3142,11 @@ rx_elf_merge_private_bfd_data (bfd * ibfd, struct bfd_link_info *info) } else { - _bfd_error_handler ("There is a conflict merging the ELF header flags from %s", + _bfd_error_handler (_("There is a conflict merging the ELF header flags from %s"), bfd_get_filename (ibfd)); - _bfd_error_handler (" the input file's flags: %s", + _bfd_error_handler (_(" the input file's flags: %s"), describe_flags (new_flags)); - _bfd_error_handler (" the output file's flags: %s", + _bfd_error_handler (_(" the output file's flags: %s"), describe_flags (old_flags)); error = TRUE; } @@ -3727,6 +3738,7 @@ rx_table_find (struct bfd_hash_entry *vent, void *vinfo) if (!h || (h->type != bfd_link_hash_defined && h->type != bfd_link_hash_defweak)) { + /* xgettext:c-format */ _bfd_error_handler (_("%B:%A: table %s missing corresponding %s"), abfd, sec, name, buf); return TRUE; @@ -3734,6 +3746,7 @@ rx_table_find (struct bfd_hash_entry *vent, void *vinfo) if (h->u.def.section != ent->u.def.section) { + /* xgettext:c-format */ _bfd_error_handler (_("%B:%A: %s and %s must be in the same input section"), h->u.def.section->owner, h->u.def.section, name, buf); diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c index d3f8746..3ad4e31 100644 --- a/bfd/elf32-s390.c +++ b/bfd/elf32-s390.c @@ -342,6 +342,7 @@ elf_s390_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, default: if (r_type >= sizeof (elf_howto_table) / sizeof (elf_howto_table[0])) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid relocation type %d"), abfd, (int) r_type); r_type = R_390_NONE; @@ -1002,6 +1003,7 @@ elf_s390_check_relocs (bfd *abfd, if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr)) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: bad symbol index: %d"), abfd, r_symndx); return FALSE; @@ -1233,6 +1235,7 @@ elf_s390_check_relocs (bfd *abfd, if (old_tls_type == GOT_NORMAL || tls_type == GOT_NORMAL) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: `%s' accessed both as normal and thread local symbol"), abfd, h->root.root.string); return FALSE; @@ -2345,6 +2348,7 @@ invalid_tls_insn (bfd *input_bfd, howto = elf_howto_table + ELF32_R_TYPE (rel->r_info); _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): invalid instruction for TLS relocation %s"), input_bfd, input_section, @@ -3395,6 +3399,7 @@ elf_s390_relocate_section (bfd *output_bfd, && _bfd_elf_section_offset (output_bfd, info, input_section, rel->r_offset) != (bfd_vma) -1) _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, input_section, @@ -3451,6 +3456,7 @@ elf_s390_relocate_section (bfd *output_bfd, else { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): reloc against `%s': error %d"), input_bfd, input_section, (long) rel->r_offset, name, (int) r); diff --git a/bfd/elf32-score.c b/bfd/elf32-score.c index dc4e38d..4ba3dd5 100644 --- a/bfd/elf32-score.c +++ b/bfd/elf32-score.c @@ -2826,6 +2826,7 @@ s3_bfd_score_elf_check_relocs (bfd *abfd, else if (r_symndx >= extsymoff + NUM_SHDR_ENTRIES (symtab_hdr)) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: Malformed reloc detected for section %s"), abfd, name); bfd_set_error (bfd_error_bad_value); return FALSE; @@ -2883,6 +2884,7 @@ s3_bfd_score_elf_check_relocs (bfd *abfd, if (h == NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: CALL15 reloc at 0x%lx not against global symbol"), abfd, (unsigned long) rel->r_offset); bfd_set_error (bfd_error_bad_value); diff --git a/bfd/elf32-score7.c b/bfd/elf32-score7.c index 7f38e8b..ab980ef 100644 --- a/bfd/elf32-score7.c +++ b/bfd/elf32-score7.c @@ -2632,6 +2632,7 @@ s7_bfd_score_elf_check_relocs (bfd *abfd, else if (r_symndx >= extsymoff + NUM_SHDR_ENTRIES (symtab_hdr)) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: Malformed reloc detected for section %s"), abfd, name); bfd_set_error (bfd_error_bad_value); return FALSE; @@ -2689,6 +2690,7 @@ s7_bfd_score_elf_check_relocs (bfd *abfd, if (h == NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: CALL15 reloc at 0x%lx not against global symbol"), abfd, (unsigned long) rel->r_offset); bfd_set_error (bfd_error_bad_value); diff --git a/bfd/elf32-sh-symbian.c b/bfd/elf32-sh-symbian.c index 58c607a..c347a0a 100644 --- a/bfd/elf32-sh-symbian.c +++ b/bfd/elf32-sh-symbian.c @@ -126,6 +126,7 @@ sh_symbian_import_as (struct bfd_link_info *info, bfd * abfd, return TRUE; bfd_set_error (bfd_error_invalid_operation); + /* xgettext:c-format */ _bfd_error_handler (_("%B: IMPORT AS directive for %s conceals previous IMPORT AS"), abfd, current_name); return FALSE; @@ -379,6 +380,7 @@ sh_symbian_process_embedded_commands (struct bfd_link_info *info, bfd * abfd, (long) (directive - (char *) contents)); bfd_set_error (bfd_error_invalid_operation); + /* xgettext:c-format */ _bfd_error_handler (_("%B: Unrecognised .directive command: %s"), abfd, directive); break; @@ -496,6 +498,7 @@ sh_symbian_relocate_section (bfd * output_bfd, if (new_hash == NULL) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: Failed to add renamed symbol %s"), input_bfd, ptr->new_name); continue; diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c index 753a736..c0a3368 100644 --- a/bfd/elf32-sh.c +++ b/bfd/elf32-sh.c @@ -487,6 +487,7 @@ sh_elf_info_to_howto (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst) || (r >= R_SH_FIRST_INVALID_RELOC_5 && r <= R_SH_LAST_INVALID_RELOC_5) || (r >= R_SH_FIRST_INVALID_RELOC_6 && r <= R_SH_LAST_INVALID_RELOC_6)) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: unrecognised SH reloc number: %d"), abfd, r); bfd_set_error (bfd_error_bad_value); @@ -575,6 +576,7 @@ sh_elf_relax_section (bfd *abfd, asection *sec, laddr = irel->r_offset + 4 + irel->r_addend; if (laddr >= sec->size) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: 0x%lx: warning: bad R_SH_USES offset"), abfd, (unsigned long) irel->r_offset); continue; @@ -586,6 +588,7 @@ sh_elf_relax_section (bfd *abfd, asection *sec, if ((insn & 0xf000) != 0xd000) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: 0x%lx: warning: R_SH_USES points to unrecognized insn 0x%x"), abfd, (unsigned long) irel->r_offset, insn); continue; @@ -603,6 +606,7 @@ sh_elf_relax_section (bfd *abfd, asection *sec, if (paddr >= sec->size) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: 0x%lx: warning: bad R_SH_USES load offset"), abfd, (unsigned long) irel->r_offset); continue; @@ -618,6 +622,7 @@ sh_elf_relax_section (bfd *abfd, asection *sec, if (irelfn >= irelend) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: 0x%lx: warning: could not find expected reloc"), abfd, (unsigned long) paddr); continue; @@ -646,6 +651,7 @@ sh_elf_relax_section (bfd *abfd, asection *sec, != (unsigned int) _bfd_elf_section_from_bfd_section (abfd, sec)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: 0x%lx: warning: symbol in unexpected section"), abfd, (unsigned long) paddr); continue; @@ -775,6 +781,7 @@ sh_elf_relax_section (bfd *abfd, asection *sec, if (irelcount >= irelend) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: 0x%lx: warning: could not find expected COUNT reloc"), abfd, (unsigned long) paddr); continue; @@ -784,6 +791,7 @@ sh_elf_relax_section (bfd *abfd, asection *sec, just deleted one. */ if (irelcount->r_addend == 0) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: 0x%lx: warning: bad count"), abfd, (unsigned long) paddr); continue; @@ -1187,6 +1195,7 @@ sh_elf_relax_delete_bytes (bfd *abfd, asection *sec, bfd_vma addr, if (overflow) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: 0x%lx: fatal: reloc overflow while relaxing"), abfd, (unsigned long) irel->r_offset); bfd_set_error (bfd_error_bad_value); @@ -1557,6 +1566,7 @@ sh_elf_swap_insns (bfd *abfd, asection *sec, void *relocs, if (overflow) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: 0x%lx: fatal: reloc overflow while relaxing"), abfd, (unsigned long) irel->r_offset); bfd_set_error (bfd_error_bad_value); @@ -4007,6 +4017,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, if (howto->rightshift || howto->src_mask != 0xffffffff) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): %s relocation against SEC_MERGE section"), input_bfd, input_section, (long) rel->r_offset, howto->name); @@ -4124,6 +4135,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, != (bfd_vma) -1)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, input_section, @@ -4202,6 +4214,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, if (disp & mask) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: 0x%lx: fatal: unaligned branch target for relax-support relocation"), input_section->owner, (unsigned long) rel->r_offset); @@ -4235,6 +4248,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, if (relocation & 3) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: 0x%lx: fatal: unaligned %s relocation 0x%lx"), input_section->owner, (unsigned long) rel->r_offset, howto->name, @@ -4250,6 +4264,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, if (relocation & 1) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: 0x%lx: fatal: unaligned %s relocation 0x%lx"), input_section->owner, (unsigned long) rel->r_offset, howto->name, @@ -4264,6 +4279,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, || (signed int)relocation > 32) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: 0x%lx: fatal: R_SH_PSHA relocation %d not in range -32..32"), input_section->owner, (unsigned long) rel->r_offset, @@ -4278,6 +4294,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, || (signed int)relocation > 16) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: 0x%lx: fatal: R_SH_PSHL relocation %d not in range -32..32"), input_section->owner, (unsigned long) rel->r_offset, @@ -4422,6 +4439,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, input_section->output_section)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): cannot emit fixup to `%s' in read-only section"), input_bfd, input_section, @@ -4900,6 +4918,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, reloc_section->output_section)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): cannot emit fixup to `%s' in read-only section"), input_bfd, input_section, @@ -5007,6 +5026,7 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, || !SYMBOL_FUNCDESC_LOCAL (info, h))) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): %s relocation against external symbol \"%s\""), input_bfd, input_section, (long) rel->r_offset, howto->name, h->root.root.string); @@ -5480,12 +5500,14 @@ sh_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, if (bfd_link_pic (info)) { info->callbacks->einfo + /* xgettext:c-format */ (_("%X%C: relocation to \"%s\" references a different segment\n"), input_bfd, input_section, rel->r_offset, symname); return FALSE; } else info->callbacks->einfo + /* xgettext:c-format */ (_("%C: warning: relocation to \"%s\" references a different segment\n"), input_bfd, input_section, rel->r_offset, symname); } @@ -6053,15 +6075,18 @@ sh_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec, if ((old_got_type == GOT_FUNCDESC || got_type == GOT_FUNCDESC) && (old_got_type == GOT_NORMAL || got_type == GOT_NORMAL)) _bfd_error_handler + /* xgettext:c-format */ (_("%B: `%s' accessed both as normal and FDPIC symbol"), abfd, h->root.root.string); else if (old_got_type == GOT_FUNCDESC || got_type == GOT_FUNCDESC) _bfd_error_handler + /* xgettext:c-format */ (_("%B: `%s' accessed both as FDPIC and thread local symbol"), abfd, h->root.root.string); else _bfd_error_handler + /* xgettext:c-format */ (_("%B: `%s' accessed both as normal and thread local symbol"), abfd, h->root.root.string); return FALSE; @@ -6136,10 +6161,12 @@ sh_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec, { if (old_got_type == GOT_NORMAL) _bfd_error_handler + /* xgettext:c-format */ (_("%B: `%s' accessed both as normal and FDPIC symbol"), abfd, h->root.root.string); else _bfd_error_handler + /* xgettext:c-format */ (_("%B: `%s' accessed both as FDPIC and thread local symbol"), abfd, h->root.root.string); } @@ -6438,8 +6465,9 @@ sh_merge_bfd_arch (bfd *ibfd, struct bfd_link_info *info) if (!SH_VALID_CO_ARCH_SET (merged_arch)) { _bfd_error_handler - ("%B: uses %s instructions while previous modules " - "use %s instructions", + /* xgettext:c-format */ + (_("%B: uses %s instructions while previous modules " + "use %s instructions"), ibfd, SH_ARCH_SET_HAS_DSP (new_arch) ? "dsp" : "floating point", SH_ARCH_SET_HAS_DSP (new_arch) ? "floating point" : "dsp"); @@ -6449,8 +6477,9 @@ sh_merge_bfd_arch (bfd *ibfd, struct bfd_link_info *info) else if (!SH_VALID_ARCH_SET (merged_arch)) { _bfd_error_handler - ("internal error: merge of architecture '%s' with " - "architecture '%s' produced unknown architecture", + /* xgettext:c-format */ + (_("internal error: merge of architecture '%s' with " + "architecture '%s' produced unknown architecture"), bfd_printable_name (obfd), bfd_printable_name (ibfd)); bfd_set_error (bfd_error_bad_value); @@ -6486,8 +6515,8 @@ sh_elf_merge_private_data (bfd *ibfd, struct bfd_link_info *info) if (! sh_merge_bfd_arch (ibfd, info)) { - _bfd_error_handler ("%B: uses instructions which are incompatible " - "with instructions used in previous modules", + _bfd_error_handler (_("%B: uses instructions which are incompatible " + "with instructions used in previous modules"), ibfd); bfd_set_error (bfd_error_bad_value); return FALSE; @@ -6499,7 +6528,7 @@ sh_elf_merge_private_data (bfd *ibfd, struct bfd_link_info *info) if (fdpic_object_p (ibfd) != fdpic_object_p (obfd)) { - _bfd_error_handler ("%B: attempt to mix FDPIC and non-FDPIC objects", + _bfd_error_handler (_("%B: attempt to mix FDPIC and non-FDPIC objects"), ibfd); bfd_set_error (bfd_error_bad_value); return FALSE; diff --git a/bfd/elf32-sh64.c b/bfd/elf32-sh64.c index bf865e1..04c443e 100644 --- a/bfd/elf32-sh64.c +++ b/bfd/elf32-sh64.c @@ -221,11 +221,14 @@ 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"); 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"); else + /* xgettext:c-format */ msg = _("%s: object size does not match that of target %s"); _bfd_error_handler (msg, bfd_get_filename (ibfd), @@ -594,6 +597,7 @@ shmedia_prepare_reloc (struct bfd_link_info *info, bfd *abfd, if (dropped != 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: error: unaligned relocation type %d at %08x reloc %p\n"), input_section->owner, ELF32_R_TYPE (rel->r_info), (unsigned) rel->r_offset, relocation); diff --git a/bfd/elf32-spu.c b/bfd/elf32-spu.c index 8e0d0c5..79c6ff2 100644 --- a/bfd/elf32-spu.c +++ b/bfd/elf32-spu.c @@ -156,6 +156,7 @@ spu_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, /* PR 17512: file: 90c2a92e. */ if (r_type >= R_SPU_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: unrecognised SPU reloc number: %d"), abfd, r_type); bfd_set_error (bfd_error_bad_value); @@ -790,6 +791,7 @@ spu_elf_find_overlays (struct bfd_link_info *info) spu_elf_section_data (s)->u.o.ovl_buf = num_buf; if (s0->vma != s->vma) { + /* xgettext:c-format */ info->callbacks->einfo (_("%X%P: overlay sections %A " "and %A do not start at the " "same address.\n"), @@ -1015,6 +1017,7 @@ needs_ovl_stub (struct elf_link_hash_entry *h, sym_sec); } _bfd_error_handler + /* xgettext:c-format */ (_("warning: call to non-function symbol %s defined in %B"), sym_sec->owner, sym_name); @@ -1364,6 +1367,7 @@ build_stub (struct bfd_link_info *info, if (stub_type != br000_ovl_stub && lrlive != stub_type - br000_ovl_stub) + /* xgettext:c-format */ info->callbacks->einfo (_("%A:0x%v lrlive .brinfo (%u) differs " "from analysis (%u)\n"), isec, irela->r_offset, lrlive, @@ -1895,6 +1899,7 @@ define_ovtab_symbol (struct spu_link_hash_table *htab, const char *name) } else if (h->root.u.def.section->owner != NULL) { + /* xgettext:c-format */ _bfd_error_handler (_("%B is not allowed to define %s"), h->root.u.def.section->owner, h->root.root.string); @@ -2557,6 +2562,7 @@ check_function_ranges (asection *sec, struct bfd_link_info *info) const char *f1 = func_name (&sinfo->fun[i - 1]); const char *f2 = func_name (&sinfo->fun[i]); + /* xgettext:c-format */ info->callbacks->einfo (_("warning: %s overlaps %s\n"), f1, f2); sinfo->fun[i - 1].hi = sinfo->fun[i].lo; } @@ -2604,6 +2610,7 @@ find_function (asection *sec, bfd_vma offset, struct bfd_link_info *info) else return &sinfo->fun[mid]; } + /* xgettext:c-format */ info->callbacks->einfo (_("%A:0x%v not found in function table\n"), sec, offset); bfd_set_error (bfd_error_bad_value); @@ -2744,6 +2751,7 @@ mark_functions_via_relocs (asection *sec, { if (!warned) info->callbacks->einfo + /* xgettext:c-format */ (_("%B(%A+0x%v): call to non-code section" " %B(%A), analysis incomplete\n"), sec->owner, sec, irela->r_offset, @@ -3312,6 +3320,7 @@ remove_cycles (struct function_info *fun, const char *f1 = func_name (fun); const char *f2 = func_name (call->fun); + /* xgettext:c-format */ info->callbacks->info (_("Stack analysis will ignore the call " "from %s to %s\n"), f1, f2); @@ -4003,8 +4012,8 @@ sum_stack (struct function_info *fun, if (htab->params->stack_analysis) { if (!fun->non_root) - info->callbacks->info (_(" %s: 0x%v\n"), f1, (bfd_vma) cum_stack); - info->callbacks->minfo (_("%s: 0x%v 0x%v\n"), + info->callbacks->info (" %s: 0x%v\n", f1, (bfd_vma) cum_stack); + info->callbacks->minfo ("%s: 0x%v 0x%v\n", f1, (bfd_vma) stack, (bfd_vma) cum_stack); if (has_call) @@ -4017,7 +4026,7 @@ sum_stack (struct function_info *fun, const char *ann1 = call->fun == max ? "*" : " "; const char *ann2 = call->is_tail ? "t" : " "; - info->callbacks->minfo (_(" %s%s %s\n"), ann1, ann2, f2); + info->callbacks->minfo (" %s%s %s\n", ann1, ann2, f2); } } } @@ -4322,6 +4331,7 @@ spu_elf_auto_overlay (struct bfd_link_info *info) if (bfd_arr[i - 1]->my_archive == bfd_arr[i]->my_archive) { if (bfd_arr[i - 1]->my_archive && bfd_arr[i]->my_archive) + /* xgettext:c-format */ info->callbacks->einfo (_("%s duplicated in %s\n"), bfd_arr[i]->filename, bfd_arr[i]->my_archive->filename); @@ -4374,6 +4384,7 @@ spu_elf_auto_overlay (struct bfd_link_info *info) } if (fixed_size + mos_param.max_overlay_size > htab->local_store) + /* xgettext:c-format */ info->callbacks->einfo (_("non-overlay size of 0x%v plus maximum overlay " "size of 0x%v exceeds local store\n"), (bfd_vma) fixed_size, @@ -4529,6 +4540,7 @@ spu_elf_auto_overlay (struct bfd_link_info *info) if (i == base) { + /* xgettext:c-format */ info->callbacks->einfo (_("%B:%A%s exceeds overlay size\n"), ovly_sections[2 * i]->owner, ovly_sections[2 * i], @@ -4670,7 +4682,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"); + info->callbacks->einfo (_("%F%P: auto overlay error: %E\n")); xexit (1); } @@ -4721,10 +4733,10 @@ spu_elf_final_link (bfd *output_bfd, struct bfd_link_info *info) || (htab->params->ovly_flavour == ovly_soft_icache && htab->params->lrlive_analysis)) && !spu_elf_stack_analysis (info)) - info->callbacks->einfo ("%X%P: stack/lrlive analysis error: %E\n"); + 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->einfo (_("%F%P: can not build overlay stubs: %E\n")); return bfd_elf_final_link (output_bfd, info); } @@ -5027,6 +5039,7 @@ spu_elf_relocate_section (bfd *output_bfd, rel->r_offset) != (bfd_vma) -1) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%s+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, bfd_get_section_name (input_bfd, input_section), diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c index a51254a..f2710ff 100644 --- a/bfd/elf32-tic6x.c +++ b/bfd/elf32-tic6x.c @@ -2631,6 +2631,7 @@ elf32_tic6x_relocate_section (bfd *output_bfd, allowed to pass us these kinds of things. */ if (h == NULL) _bfd_error_handler + /* xgettext:c-format */ (_("%B, section %A: relocation %s with non-zero addend %d" " against local symbol"), input_bfd, @@ -2639,6 +2640,7 @@ elf32_tic6x_relocate_section (bfd *output_bfd, rel->r_addend); else _bfd_error_handler + /* xgettext:c-format */ (_("%B, section %A: relocation %s with non-zero addend %d" " against symbol `%s'"), input_bfd, @@ -2668,6 +2670,7 @@ elf32_tic6x_relocate_section (bfd *output_bfd, /* Invalid in relocatable object. */ default: /* Unknown relocation. */ + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid relocation type %d"), input_bfd, r_type); ok = FALSE; @@ -2807,6 +2810,7 @@ elf32_tic6x_check_relocs (bfd *abfd, struct bfd_link_info *info, if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr)) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: bad symbol index: %d"), abfd, r_symndx); return FALSE; @@ -3642,6 +3646,7 @@ elf32_tic6x_obj_attrs_handle_unknown (bfd *abfd, int tag) if ((tag & 127) < 64) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: error: unknown mandatory EABI object attribute %d"), abfd, tag); bfd_set_error (bfd_error_bad_value); @@ -3650,6 +3655,7 @@ elf32_tic6x_obj_attrs_handle_unknown (bfd *abfd, int tag) else { _bfd_error_handler + /* xgettext:c-format */ (_("%B: warning: unknown EABI object attribute %d"), abfd, tag); return TRUE; @@ -3763,6 +3769,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info) < in_attr[Tag_ABI_stack_align_needed].i) { _bfd_error_handler + /* xgettext:c-format */ (_("error: %B requires more stack alignment than %B preserves"), ibfd, obfd); result = FALSE; @@ -3771,6 +3778,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info) < out_attr[Tag_ABI_stack_align_needed].i) { _bfd_error_handler + /* xgettext:c-format */ (_("error: %B requires more stack alignment than %B preserves"), obfd, ibfd); result = FALSE; @@ -3816,6 +3824,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info) if (array_align_out < array_expect_in) { _bfd_error_handler + /* xgettext:c-format */ (_("error: %B requires more array alignment than %B preserves"), ibfd, obfd); result = FALSE; @@ -3823,6 +3832,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info) if (array_align_in < array_expect_out) { _bfd_error_handler + /* xgettext:c-format */ (_("error: %B requires more array alignment than %B preserves"), obfd, ibfd); result = FALSE; @@ -3845,6 +3855,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info) && out_attr[i].i != in_attr[i].i) { _bfd_error_handler + /* xgettext:c-format */ (_("warning: %B and %B differ in wchar_t size"), obfd, ibfd); } break; @@ -3863,6 +3874,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info) if (out_attr[i].i != in_attr[i].i) { _bfd_error_handler + /* xgettext:c-format */ (_("warning: %B and %B differ in whether code is " "compiled for DSBT"), obfd, ibfd); diff --git a/bfd/elf32-tilepro.c b/bfd/elf32-tilepro.c index ae806fe..ebd5046 100644 --- a/bfd/elf32-tilepro.c +++ b/bfd/elf32-tilepro.c @@ -1508,6 +1508,7 @@ tilepro_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr)) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: bad symbol index: %d"), abfd, r_symndx); return FALSE; @@ -1624,6 +1625,7 @@ tilepro_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, else { _bfd_error_handler + /* xgettext:c-format */ (_("%B: `%s' accessed both as normal and thread local symbol"), abfd, h ? h->root.root.string : "<local>"); return FALSE; @@ -2872,6 +2874,7 @@ tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, { /* Not clear if we need to check here, but just be paranoid. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B: unrecognized relocation (0x%x) in section `%A'"), input_bfd, r_type, input_section); bfd_set_error (bfd_error_bad_value); @@ -3572,6 +3575,7 @@ tilepro_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, && _bfd_elf_section_offset (output_bfd, info, input_section, rel->r_offset) != (bfd_vma) -1) _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, input_section, diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c index d08e552..b52fa6e 100644 --- a/bfd/elf32-v850.c +++ b/bfd/elf32-v850.c @@ -1898,6 +1898,7 @@ v850_elf_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_V850_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid V850 reloc number: %d"), abfd, r_type); r_type = 0; } @@ -1916,6 +1917,7 @@ v850_elf_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_V850_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid V850 reloc number: %d"), abfd, r_type); r_type = 0; } @@ -2520,6 +2522,7 @@ v850_elf_merge_notes (bfd * ibfd, bfd *obfd) if (oval == EF_RH850_DATA_ALIGN4) { _bfd_error_handler + /* xgettext:c-format */ (_("error: %B needs 8-byte aligment but %B is set for 4-byte alignment"), ibfd, obfd); result = FALSE; @@ -2535,6 +2538,7 @@ v850_elf_merge_notes (bfd * ibfd, bfd *obfd) if (oval == EF_RH850_DOUBLE32) { _bfd_error_handler + /* xgettext:c-format */ (_("error: %B uses 64-bit doubles but " "%B uses 32-bit doubles"), ibfd, obfd); result = FALSE; @@ -2549,6 +2553,7 @@ v850_elf_merge_notes (bfd * ibfd, bfd *obfd) if (oval == EF_RH850_FPU20) { _bfd_error_handler + /* xgettext:c-format */ (_("error: %B uses FPU-3.0 but %B only supports FPU-2.0"), ibfd, obfd); result = FALSE; @@ -3594,8 +3599,9 @@ v850_elf_relax_section (bfd *abfd, else { _bfd_error_handler - ("%s: 0x%lx: warning: R_V850_LONGCALL points to " - "unrecognized insns", + /* xgettext:c-format */ + (_("%s: 0x%lx: warning: R_V850_LONGCALL points to " + "unrecognized insns"), bfd_get_filename (abfd), (unsigned long) irel->r_offset); continue; } @@ -3603,8 +3609,9 @@ v850_elf_relax_section (bfd *abfd, if (no_match >= 0) { _bfd_error_handler - ("%s: 0x%lx: warning: R_V850_LONGCALL points to " - "unrecognized insn 0x%x", + /* xgettext:c-format */ + (_("%s: 0x%lx: warning: R_V850_LONGCALL points to " + "unrecognized insn 0x%x"), bfd_get_filename (abfd), (unsigned long) irel->r_offset + no_match, insn[no_match]); @@ -3647,8 +3654,9 @@ v850_elf_relax_section (bfd *abfd, || irelcall == irelend) { _bfd_error_handler - ("%s: 0x%lx: warning: R_V850_LONGCALL points to " - "unrecognized reloc", + /* xgettext:c-format */ + (_("%s: 0x%lx: warning: R_V850_LONGCALL points to " + "unrecognized reloc"), bfd_get_filename (abfd), (unsigned long) irel->r_offset); continue; @@ -3686,8 +3694,9 @@ v850_elf_relax_section (bfd *abfd, if (symval + irelcall->r_addend != irelcall->r_offset + 4) { _bfd_error_handler - ("%s: 0x%lx: warning: R_V850_LONGCALL points to " - "unrecognized reloc 0x%lx", + /* xgettext:c-format */ + (_("%s: 0x%lx: warning: R_V850_LONGCALL points to " + "unrecognized reloc 0x%lx"), bfd_get_filename (abfd), (unsigned long) irel->r_offset, irelcall->r_offset); continue; @@ -3828,8 +3837,9 @@ v850_elf_relax_section (bfd *abfd, else { _bfd_error_handler - ("%s: 0x%lx: warning: R_V850_LONGJUMP points to " - "unrecognized insns", + /* xgettext:c-format */ + (_("%s: 0x%lx: warning: R_V850_LONGJUMP points to " + "unrecognized insns"), bfd_get_filename (abfd), (unsigned long) irel->r_offset); continue; } @@ -3837,8 +3847,9 @@ v850_elf_relax_section (bfd *abfd, if (no_match >= 0) { _bfd_error_handler - ("%s: 0x%lx: warning: R_V850_LONGJUMP points to " - "unrecognized insn 0x%x", + /* xgettext:c-format */ + (_("%s: 0x%lx: warning: R_V850_LONGJUMP points to " + "unrecognized insn 0x%x"), bfd_get_filename (abfd), (unsigned long) irel->r_offset + no_match, insn[no_match]); @@ -3870,8 +3881,9 @@ v850_elf_relax_section (bfd *abfd, || lo_irelfn == irelend) { _bfd_error_handler - ("%s: 0x%lx: warning: R_V850_LONGJUMP points to " - "unrecognized reloc", + /* xgettext:c-format */ + (_("%s: 0x%lx: warning: R_V850_LONGJUMP points to " + "unrecognized reloc"), bfd_get_filename (abfd), (unsigned long) irel->r_offset); continue; } diff --git a/bfd/elf32-vax.c b/bfd/elf32-vax.c index d406c5d..02b69a1 100644 --- a/bfd/elf32-vax.c +++ b/bfd/elf32-vax.c @@ -286,6 +286,7 @@ rtype_to_howto (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst) r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= R_VAX_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: unrecognised VAX reloc number: %d"), abfd, r_type); bfd_set_error (bfd_error_bad_value); @@ -659,6 +660,7 @@ elf_vax_check_relocs (bfd *abfd, struct bfd_link_info *info, asection *sec, h->got.refcount++; if (eh->got_addend != (bfd_vma) rel->r_addend) _bfd_error_handler + /* xgettext:c-format */ (_("%s: warning: GOT addend of %ld to `%s' does" " not match previous GOT addend of %ld"), bfd_get_filename (abfd), rel->r_addend, @@ -1546,6 +1548,7 @@ elf_vax_relocate_section (bfd *output_bfd, } else if (rel->r_addend != 0) _bfd_error_handler + /* xgettext:c-format */ (_("%s: warning: PLT addend of %d to `%s' from %s section ignored"), bfd_get_filename (input_bfd), rel->r_addend, h->root.root.string, @@ -1671,12 +1674,14 @@ elf_vax_relocate_section (bfd *output_bfd, { if (h != NULL) _bfd_error_handler + /* xgettext:c-format */ (_("%s: warning: %s relocation against symbol `%s' from %s section"), bfd_get_filename (input_bfd), howto->name, h->root.root.string, bfd_get_section_name (input_bfd, input_section)); else _bfd_error_handler + /* xgettext:c-format */ (_("%s: warning: %s relocation to 0x%x from %s section"), bfd_get_filename (input_bfd), howto->name, outrel.r_addend, diff --git a/bfd/elf32-visium.c b/bfd/elf32-visium.c index a042911..2983150 100644 --- a/bfd/elf32-visium.c +++ b/bfd/elf32-visium.c @@ -477,6 +477,7 @@ visium_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr, default: if (r_type >= (unsigned int) R_VISIUM_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid Visium reloc number: %d"), abfd, r_type); r_type = 0; } @@ -812,9 +813,9 @@ visium_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) if (mismatch) _bfd_error_handler - (_ - ("%s: compiled %s -mtune=%s and linked with modules" - " compiled %s -mtune=%s"), + /* xgettext:c-format */ + (_("%s: compiled %s -mtune=%s and linked with modules" + " compiled %s -mtune=%s"), bfd_get_filename (ibfd), new_opt_with, opt_arch, old_opt_with, opt_arch); } diff --git a/bfd/elf32-xgate.c b/bfd/elf32-xgate.c index 13cdf66..28a2030 100644 --- a/bfd/elf32-xgate.c +++ b/bfd/elf32-xgate.c @@ -424,6 +424,7 @@ xgate_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, r_type = ELF32_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_XGATE_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid XGate reloc number: %d"), abfd, r_type); r_type = 0; } diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c index 2940770..99d56bf 100644 --- a/bfd/elf32-xtensa.c +++ b/bfd/elf32-xtensa.c @@ -481,6 +481,7 @@ elf_xtensa_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED, if (r_type >= (unsigned int) R_XTENSA_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid XTENSA reloc number: %d"), abfd, r_type); r_type = 0; } @@ -912,6 +913,7 @@ xtensa_read_table_entries (bfd *abfd, if (blocks[blk - 1].address == blocks[blk].address && blocks[blk - 1].size != 0) { + /* xgettext:c-format */ _bfd_error_handler (_("%B(%A): invalid property table"), abfd, section); bfd_set_error (bfd_error_bad_value); @@ -1003,6 +1005,7 @@ elf_xtensa_check_relocs (bfd *abfd, if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr)) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: bad symbol index: %d"), abfd, r_symndx); return FALSE; @@ -1180,6 +1183,7 @@ elf_xtensa_check_relocs (bfd *abfd, else { _bfd_error_handler + /* xgettext:c-format */ (_("%B: `%s' accessed both as normal and thread local symbol"), abfd, h ? h->root.root.string : "<local>"); @@ -2778,6 +2782,7 @@ elf_xtensa_relocate_section (bfd *output_bfd, && ELF32_R_TYPE (rel->r_info) != R_XTENSA_NONE) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): relocation offset out of range (size=0x%x)"), input_bfd, input_section, rel->r_offset, input_size); bfd_set_error (bfd_error_bad_value); @@ -2803,7 +2808,9 @@ elf_xtensa_relocate_section (bfd *output_bfd, { _bfd_error_handler ((sym_type == STT_TLS + /* xgettext:c-format */ ? _("%B(%A+0x%lx): %s used with TLS symbol %s") + /* xgettext:c-format */ : _("%B(%A+0x%lx): %s used with non-TLS symbol %s")), input_bfd, input_section, @@ -3059,6 +3066,7 @@ elf_xtensa_relocate_section (bfd *output_bfd, rel->r_offset) != (bfd_vma) -1) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, input_section, @@ -3480,6 +3488,7 @@ elf_xtensa_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) if (out_mach != in_mach) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: incompatible machine type. Output is 0x%x. Input is 0x%x"), ibfd, out_mach, in_mach); bfd_set_error (bfd_error_wrong_format); @@ -6546,6 +6555,7 @@ extend_ebb_bounds_forward (ebb_t *ebb) if (insn_block_len != (entry_end - ebb->end_offset)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): could not decode instruction; possible configuration mismatch"), ebb->sec->owner, ebb->sec, ebb->end_offset + insn_block_len); return FALSE; @@ -6622,6 +6632,7 @@ extend_ebb_bounds_backward (ebb_t *ebb) if (insn_block_len != ebb->start_offset - block_begin) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): could not decode instruction; possible configuration mismatch"), ebb->sec->owner, ebb->sec, ebb->end_offset + insn_block_len); return FALSE; @@ -7735,6 +7746,7 @@ compute_text_actions (bfd *abfd, if (simplify_size == 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): could not decode instruction for XTENSA_ASM_SIMPLIFY relocation; possible configuration mismatch"), sec->owner, sec, r_offset); continue; @@ -7993,6 +8005,7 @@ compute_ebb_proposed_actions (ebb_constraint *ebb_table) decode_error: _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): could not decode instruction; possible configuration mismatch"), ebb->sec->owner, ebb->sec, offset); return FALSE; @@ -10769,6 +10782,7 @@ do_fix_for_relocatable_link (Elf_Internal_Rela *rel, if (r_type != R_XTENSA_ASM_EXPAND) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): unexpected fix for %s relocation"), input_bfd, input_section, rel->r_offset, elf_howto_table[r_type].name); diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c index f66eac4..bbea92c 100644 --- a/bfd/elf64-alpha.c +++ b/bfd/elf64-alpha.c @@ -1108,6 +1108,7 @@ elf64_alpha_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr, if (r_type >= R_ALPHA_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: unrecognised Alpha reloc number: %d"), abfd, r_type); bfd_set_error (bfd_error_bad_value); @@ -2520,6 +2521,7 @@ elf64_alpha_size_got_sections (struct bfd_link_info *info, { /* Yikes! A single object file has too many entries. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B: .got subsegment exceeds 64K (size %d)"), i, alpha_elf_tdata (this_got)->total_got_size); return FALSE; @@ -3072,7 +3074,8 @@ elf64_alpha_relax_got_load (struct alpha_relax_info *info, bfd_vma symval, { reloc_howto_type *howto = elf64_alpha_howto_table + r_type; _bfd_error_handler - ("%B: %A+0x%lx: warning: %s relocation against unexpected insn", + /* xgettext:c-format */ + (_("%B: %A+0x%lx: warning: %s relocation against unexpected insn"), info->abfd, info->sec, (unsigned long) irel->r_offset, howto->name); return TRUE; @@ -3265,7 +3268,8 @@ elf64_alpha_relax_with_lituse (struct alpha_relax_info *info, if (lit_insn >> 26 != OP_LDQ) { _bfd_error_handler - ("%B: %A+0x%lx: warning: LITERAL relocation against unexpected insn", + /* xgettext:c-format */ + (_("%B: %A+0x%lx: warning: LITERAL relocation against unexpected insn"), abfd, info->sec, (unsigned long) irel->r_offset); return TRUE; @@ -4151,6 +4155,7 @@ elf64_alpha_relocate_section_r (bfd *output_bfd ATTRIBUTE_UNUSED, if (r_type >= R_ALPHA_max) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: unknown relocation type %d"), input_bfd, (int) r_type); bfd_set_error (bfd_error_bad_value); @@ -4301,6 +4306,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info, if (r_type >= R_ALPHA_max) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: unknown relocation type %d"), input_bfd, (int) r_type); bfd_set_error (bfd_error_bad_value); @@ -4466,6 +4472,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info, if (dynamic_symbol_p) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: gp-relative relocation against dynamic symbol %s"), input_bfd, h->root.root.root.string); ret_val = FALSE; @@ -4478,6 +4485,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info, if (dynamic_symbol_p) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: gp-relative relocation against dynamic symbol %s"), input_bfd, h->root.root.root.string); ret_val = FALSE; @@ -4504,6 +4512,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info, if (dynamic_symbol_p) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: pc-relative relocation against dynamic symbol %s"), input_bfd, h->root.root.root.string); ret_val = FALSE; @@ -4532,6 +4541,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info, && gotobj != alpha_elf_tdata (sec->owner)->gotobj) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: change in gp: BRSGP %s"), input_bfd, h->root.root.root.string); ret_val = FALSE; @@ -4562,6 +4572,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info, name = bfd_section_name (input_bfd, sec); } _bfd_error_handler + /* xgettext:c-format */ (_("%B: !samegp reloc against symbol without .prologue: %s"), input_bfd, name); ret_val = FALSE; @@ -4619,6 +4630,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info, if (r_type == R_ALPHA_REFLONG) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: unhandled dynamic relocation against %s"), input_bfd, h->root.root.root.string); @@ -4644,6 +4656,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info, if (dynamic_symbol_p) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: pc-relative relocation against dynamic symbol %s"), input_bfd, h->root.root.root.string); ret_val = FALSE; @@ -4652,6 +4665,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info, && undef_weak_ref) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: pc-relative relocation against undefined weak symbol %s"), input_bfd, h->root.root.root.string); ret_val = FALSE; @@ -4717,6 +4731,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info, if (dynamic_symbol_p) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: dtp-relative relocation against dynamic symbol %s"), input_bfd, h->root.root.root.string); ret_val = FALSE; @@ -4733,6 +4748,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info, if (bfd_link_dll (info)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: TLS local exec code cannot be linked into shared objects"), input_bfd); ret_val = FALSE; @@ -4740,6 +4756,7 @@ elf64_alpha_relocate_section (bfd *output_bfd, struct bfd_link_info *info, else if (dynamic_symbol_p) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: tp-relative relocation against dynamic symbol %s"), input_bfd, h->root.root.root.string); ret_val = FALSE; diff --git a/bfd/elf64-gen.c b/bfd/elf64-gen.c index cfdc88c..938f07a 100644 --- a/bfd/elf64-gen.c +++ b/bfd/elf64-gen.c @@ -65,6 +65,7 @@ check_for_relocs (bfd * abfd, asection * o, void * failed) Elf_Internal_Ehdr *ehdrp; ehdrp = elf_elfheader (abfd); + /* xgettext:c-format */ _bfd_error_handler (_("%B: Relocations in generic ELF (EM: %d)"), abfd, ehdrp->e_machine); diff --git a/bfd/elf64-hppa.c b/bfd/elf64-hppa.c index f0df607..dbeda1c 100644 --- a/bfd/elf64-hppa.c +++ b/bfd/elf64-hppa.c @@ -2078,6 +2078,7 @@ elf64_hppa_finish_dynamic_symbol (bfd *output_bfd, if ((value & 7) || value + max_offset >= 2*max_offset - 8) { _bfd_error_handler + /* xgettext:c-format */ (_("stub entry for %s cannot load .plt, dp offset = %ld"), hh->eh.root.root.string, (long) value); return FALSE; @@ -3282,6 +3283,7 @@ elf_hppa_final_link_relocate (Elf_Internal_Rela *rel, && value + addend + max_branch_offset >= 2*max_branch_offset) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%" BFD_VMA_FMT "x): cannot reach %s"), input_bfd, input_section, diff --git a/bfd/elf64-ia64-vms.c b/bfd/elf64-ia64-vms.c index 4fce7df..e7b82ce 100644 --- a/bfd/elf64-ia64-vms.c +++ b/bfd/elf64-ia64-vms.c @@ -583,6 +583,7 @@ elf64_ia64_relax_section (bfd *abfd, asection *sec, || strcmp (sec->output_section->name, ".fini") == 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: Can't relax br at 0x%lx in section `%A'. Please use brl or indirect branch."), sec->owner, sec, (unsigned long) roff); bfd_set_error (bfd_error_bad_value); @@ -3276,6 +3277,7 @@ elf64_ia64_choose_gp (bfd *abfd, struct bfd_link_info *info, bfd_boolean final) { overflow: _bfd_error_handler + /* xgettext:c-format */ (_("%s: short data segment overflowed (0x%lx >= 0x400000)"), bfd_get_filename (abfd), (unsigned long) (max_short_vma - min_short_vma)); @@ -3426,6 +3428,7 @@ elf64_ia64_relocate_section (bfd *output_bfd, if (r_type > R_IA64_MAX_RELOC_CODE) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: unknown relocation type %d"), input_bfd, (int) r_type); bfd_set_error (bfd_error_bad_value); @@ -3552,6 +3555,7 @@ elf64_ia64_relocate_section (bfd *output_bfd, /* ??? People shouldn't be doing non-pic code in shared libraries nor dynamic executables. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B: non-pic code with imm relocation against dynamic symbol `%s'"), input_bfd, h ? h->root.root.string @@ -3614,6 +3618,7 @@ elf64_ia64_relocate_section (bfd *output_bfd, if (dynamic_symbol_p) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: @gprel relocation against dynamic symbol %s"), input_bfd, h ? h->root.root.string @@ -3774,10 +3779,13 @@ elf64_ia64_relocate_section (bfd *output_bfd, const char *msg; if (r_type == R_IA64_PCREL21BI) + /* xgettext:c-format */ msg = _("%B: @internal branch to dynamic symbol %s"); else if (r_type == R_IA64_PCREL21F || r_type == R_IA64_PCREL21M) + /* xgettext:c-format */ msg = _("%B: speculation fixup to dynamic symbol %s"); else + /* xgettext:c-format */ msg = _("%B: @pcrel relocation against dynamic symbol %s"); _bfd_error_handler (msg, input_bfd, h ? h->root.root.string @@ -3938,6 +3946,7 @@ elf64_ia64_relocate_section (bfd *output_bfd, case R_IA64_LTOFF_DTPMOD22: case R_IA64_LTOFF_DTPREL22: _bfd_error_handler + /* xgettext:c-format */ (_("%B: missing TLS section for relocation %s against `%s' at 0x%lx in section `%A'."), input_bfd, input_section, howto->name, name, rel->r_offset); @@ -3953,6 +3962,7 @@ elf64_ia64_relocate_section (bfd *output_bfd, Overflow failures for those relocations mean that the section is too big to relax. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B: Can't relax br (%s) to `%s' at 0x%lx in section `%A' with size 0x%lx (> 0x1000000)."), input_bfd, input_section, howto->name, name, rel->r_offset, input_section->size); @@ -5122,12 +5132,14 @@ error_free_dyn: /* PR binutils/2735 */ if (normal_bfd == NULL) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: alignment %u of common symbol `%s' in %B" " is greater than the alignment (%u) of its section %A"), common_bfd, h->root.u.def.section, 1 << common_align, name, 1 << normal_align); else _bfd_error_handler + /* xgettext:c-format */ (_("Warning: alignment %u of symbol `%s' in %B" " is smaller than %u in %B"), normal_bfd, common_bfd, @@ -5143,6 +5155,7 @@ error_free_dyn: && h->size != isym->st_size && ! size_change_ok) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: size of symbol `%s' changed" " from %lu in %B to %lu in %B"), old_bfd, abfd, @@ -5170,6 +5183,7 @@ error_free_dyn: { if (h->type != STT_NOTYPE && ! type_change_ok) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: type of symbol `%s' changed" " from %d to %d in %B"), abfd, name, h->type, type); diff --git a/bfd/elf64-mmix.c b/bfd/elf64-mmix.c index 406e683..d0c8db4 100644 --- a/bfd/elf64-mmix.c +++ b/bfd/elf64-mmix.c @@ -1191,6 +1191,7 @@ mmix_elf_perform_relocation (asection *isec, reloc_howto_type *howto, if (value != gregdata->reloc_request[bpo_index].value) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: Internal inconsistency error for value for\n\ linker-allocated global register: linked: 0x%lx%08lx != relaxed: 0x%lx%08lx\n"), bfd_get_filename (isec->owner), @@ -1261,6 +1262,7 @@ mmix_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED, r_type = ELF64_R_TYPE (dst->r_info); if (r_type >= (unsigned int) R_MMIX_max) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid MMIX reloc number: %d"), abfd, r_type); r_type = 0; } @@ -1612,11 +1614,13 @@ mmix_final_link_relocate (reloc_howto_type *howto, asection *input_section, to ease the translation into other languages. */ if (symname == NULL || *symname == 0) _bfd_error_handler + /* xgettext:c-format */ (_("%s: base-plus-offset relocation against register symbol: (unknown) in %s"), bfd_get_filename (input_section->owner), bfd_get_section_name (symsec->owner, symsec)); else _bfd_error_handler + /* xgettext:c-format */ (_("%s: base-plus-offset relocation against register symbol: %s in %s"), bfd_get_filename (input_section->owner), symname, bfd_get_section_name (symsec->owner, symsec)); @@ -1661,11 +1665,13 @@ mmix_final_link_relocate (reloc_howto_type *howto, asection *input_section, to ease the translation into other languages. */ if (symname == NULL || *symname == 0) _bfd_error_handler + /* xgettext:c-format */ (_("%s: register relocation against non-register symbol: (unknown) in %s"), bfd_get_filename (input_section->owner), bfd_get_section_name (symsec->owner, symsec)); else _bfd_error_handler + /* xgettext:c-format */ (_("%s: register relocation against non-register symbol: %s in %s"), bfd_get_filename (input_section->owner), symname, bfd_get_section_name (symsec->owner, symsec)); @@ -1733,6 +1739,7 @@ mmix_final_link_relocate (reloc_howto_type *howto, asection *input_section, { /* FIXME: Better error message. */ _bfd_error_handler + /* xgettext:c-format */ (_("%s: LOCAL directive: Register $%ld is not a local register. First global register is $%ld."), bfd_get_filename (input_section->owner), (long) srel, (long) first_global); @@ -2190,6 +2197,7 @@ mmix_elf_add_symbol_hook (bfd *abfd, /* How do we get the asymbol (or really: the filename) from h? h->u.def.section->owner is NULL. */ _bfd_error_handler + /* xgettext:c-format */ (_("%s: Error: multiple definition of `%s'; start of %s " "is set in a earlier linked file\n"), bfd_get_filename (abfd), *namep, @@ -2434,6 +2442,7 @@ _bfd_mmix_after_linker_allocation (bfd *abfd ATTRIBUTE_UNUSED, != gregdata->n_bpo_relocs) { _bfd_error_handler + /* xgettext:c-format */ (_("Internal inconsistency: remaining %u != max %u.\n\ Please report this bug."), gregdata->n_remaining_bpo_relocs_this_relaxation_round, diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index 507f316..7da380c 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -2490,6 +2490,7 @@ ppc64_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr, type = ELF64_R_TYPE (dst->r_info); if (type >= ARRAY_SIZE (ppc64_elf_howto_table)) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid relocation type %d"), abfd, (int) type); type = R_PPC64_NONE; @@ -4588,6 +4589,7 @@ ppc_add_stub (const char *stub_name, TRUE, FALSE); if (stub_entry == NULL) { + /* xgettext:c-format */ info->callbacks->einfo (_("%P: %B: cannot create stub entry %s\n"), section->owner, stub_name); return NULL; @@ -5125,6 +5127,7 @@ ppc64_elf_before_check_relocs (bfd *ibfd, struct bfd_link_info *info) set_abiversion (ibfd, 1); else if (abiversion (ibfd) >= 2) { + /* xgettext:c-format */ info->callbacks->einfo (_("%P: %B .opd not allowed in ABI" " version %d\n"), ibfd, abiversion (ibfd)); @@ -5559,6 +5562,7 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, /* It does not make sense to have a procedure linkage table entry for a non-ifunc local symbol. */ info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %H: %s reloc against local symbol\n"), abfd, sec, rel->r_offset, ppc64_elf_howto_table[r_type]->name); @@ -5606,6 +5610,7 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, { if (!ppc64_elf_howto_table[R_PPC64_ADDR32]) ppc_howto_init (); + /* xgettext:c-format */ info->callbacks->einfo (_("%P: %H: %s reloc unsupported " "in shared libraries and PIEs.\n"), abfd, sec, rel->r_offset, @@ -6019,6 +6024,7 @@ ppc64_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) if (iflags & ~EF_PPC64_ABI) { _bfd_error_handler + /* xgettext:c-format */ (_("%B uses unknown e_flags 0x%lx"), ibfd, iflags); bfd_set_error (bfd_error_bad_value); return FALSE; @@ -6026,6 +6032,7 @@ ppc64_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) else if (iflags != oflags && iflags != 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: ABI version %ld is not compatible with ABI version %ld output"), ibfd, iflags, oflags); bfd_set_error (bfd_error_bad_value); @@ -6050,7 +6057,6 @@ ppc64_elf_print_private_bfd_data (bfd *abfd, void *ptr) { FILE *file = ptr; - /* xgettext:c-format */ fprintf (file, _("private flags = 0x%lx:"), elf_elfheader (abfd)->e_flags); @@ -7831,6 +7837,7 @@ dec_dynrel_count (bfd_vma r_info, } } + /* xgettext:c-format */ info->callbacks->einfo (_("%P: dynreloc miscount for %B, section %A\n"), sec->owner, sec); bfd_set_error (bfd_error_bad_value); @@ -7929,6 +7936,7 @@ ppc64_elf_edit_opd (struct bfd_link_info *info) || (r_type = ELF64_R_TYPE ((rel + 1)->r_info)) != R_PPC64_TOC) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: unexpected reloc type %u in .opd section"), ibfd, r_type); broken = TRUE; @@ -7950,6 +7958,7 @@ ppc64_elf_edit_opd (struct bfd_link_info *info) sym_sec); _bfd_error_handler + /* xgettext:c-format */ (_("%B: undefined sym `%s' in .opd section"), ibfd, sym_name); broken = TRUE; @@ -8709,6 +8718,7 @@ ppc64_elf_tls_optimize (struct bfd_link_info *info) could just mark this symbol to exclude it from tls optimization but it's safer to skip the entire optimization. */ + /* xgettext:c-format */ info->callbacks->minfo (_("%H arg lost __tls_get_addr, " "TLS optimization disabled\n"), ibfd, sec, rel->r_offset); @@ -9207,6 +9217,7 @@ ppc64_elf_edit_toc (struct bfd_link_info *info) ppc64_elf_tdata (ibfd)->unexpected_toc_insn = 1; sprintf (str, "%#08x", insn); info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %H: toc optimization is not supported for" " %s instruction.\n"), ibfd, sec, rel->r_offset & ~3, str); @@ -9435,6 +9446,7 @@ ppc64_elf_edit_toc (struct bfd_link_info *info) if (!ppc64_elf_howto_table[R_PPC64_ADDR32]) ppc_howto_init (); info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %H: %s references " "optimized away TOC entry\n"), ibfd, sec, rel->r_offset, @@ -11124,6 +11136,7 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) if (off + 0x80008000 > 0xffffffff || (off & 7) != 0) { info->callbacks->einfo + /* xgettext:c-format */ (_("%P: linkage table error against `%T'\n"), stub_entry->h != NULL ? stub_entry->h->elf.root.root.string @@ -12106,6 +12119,7 @@ group_sections (struct bfd_link_info *info, big_sec = total > group_size; if (big_sec && !suppress_size_errors) + /* xgettext:c-format */ _bfd_error_handler (_("%B section %A exceeds stub group size"), tail->owner, tail); curr_toc = htab->sec_info[tail->id].toc_off; @@ -13560,7 +13574,9 @@ ppc64_elf_relocate_section (bfd *output_bfd, else info->callbacks->einfo (!IS_PPC64_TLS_RELOC (r_type) + /* xgettext:c-format */ ? _("%P: %H: %s used with TLS symbol `%T'\n") + /* xgettext:c-format */ : _("%P: %H: %s used with non-TLS symbol `%T'\n"), input_bfd, input_section, rel->r_offset, ppc64_elf_howto_table[r_type]->name, @@ -14190,11 +14206,13 @@ ppc64_elf_relocate_section (bfd *output_bfd, if (stub_entry->stub_type == ppc_stub_plt_call || stub_entry->stub_type == ppc_stub_plt_call_r2save) info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %H: call to `%T' lacks nop, can't restore toc; " "recompile with -fPIC\n"), input_bfd, input_section, rel->r_offset, sym_name); else info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %H: call to `%T' lacks nop, can't restore toc; " "(-mcmodel=small toc adjust stub)\n"), input_bfd, input_section, rel->r_offset, sym_name); @@ -14322,6 +14340,7 @@ ppc64_elf_relocate_section (bfd *output_bfd, { default: info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %B: unknown relocation type %d for `%T'\n"), input_bfd, (int) r_type, sym_name); @@ -14864,6 +14883,7 @@ ppc64_elf_relocate_section (bfd *output_bfd, : ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC) { info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %H: %s for indirect " "function `%T' unsupported\n"), input_bfd, input_section, rel->r_offset, @@ -14971,6 +14991,7 @@ ppc64_elf_relocate_section (bfd *output_bfd, /* These ones haven't been implemented yet. */ info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %B: %s is not supported for `%T'\n"), input_bfd, ppc64_elf_howto_table[r_type]->name, sym_name); @@ -15125,6 +15146,7 @@ ppc64_elf_relocate_section (bfd *output_bfd, { relocation ^= relocation & mask; info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %H: error: %s not a multiple of %u\n"), input_bfd, input_section, rel->r_offset, howto->name, @@ -15146,6 +15168,7 @@ ppc64_elf_relocate_section (bfd *output_bfd, rel->r_offset) != (bfd_vma) -1) { info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %H: unresolvable %s against `%T'\n"), input_bfd, input_section, rel->r_offset, howto->name, @@ -15242,6 +15265,7 @@ ppc64_elf_relocate_section (bfd *output_bfd, else { info->callbacks->einfo + /* xgettext:c-format */ (_("%P: %H: %s against `%T': error %d\n"), input_bfd, input_section, rel->r_offset, reloc_name, sym_name, (int) r); diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c index d422ff3..fa7c0be 100644 --- a/bfd/elf64-s390.c +++ b/bfd/elf64-s390.c @@ -368,6 +368,7 @@ elf_s390_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, default: if (r_type >= sizeof (elf_howto_table) / sizeof (elf_howto_table[0])) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid relocation type %d"), abfd, (int) r_type); r_type = R_390_NONE; @@ -924,6 +925,7 @@ elf_s390_check_relocs (bfd *abfd, if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr)) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: bad symbol index: %d"), abfd, r_symndx); return FALSE; @@ -1165,6 +1167,7 @@ elf_s390_check_relocs (bfd *abfd, if (old_tls_type == GOT_NORMAL || tls_type == GOT_NORMAL) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: `%s' accessed both as normal and thread local symbol"), abfd, h->root.root.string); return FALSE; @@ -2295,6 +2298,7 @@ invalid_tls_insn (bfd *input_bfd, howto = elf_howto_table + ELF64_R_TYPE (rel->r_info); _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): invalid instruction for TLS relocation %s"), input_bfd, input_section, @@ -3309,6 +3313,7 @@ elf_s390_relocate_section (bfd *output_bfd, && _bfd_elf_section_offset (output_bfd, info, input_section, rel->r_offset) != (bfd_vma) -1) _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, input_section, @@ -3365,6 +3370,7 @@ elf_s390_relocate_section (bfd *output_bfd, else { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): reloc against `%s': error %d"), input_bfd, input_section, (long) rel->r_offset, name, (int) r); diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c index 58976d6..81cfa00 100644 --- a/bfd/elf64-sh64.c +++ b/bfd/elf64-sh64.c @@ -1540,6 +1540,7 @@ sh_elf64_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, if (howto->rightshift || howto->src_mask != 0xffffffff) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): %s relocation against SEC_MERGE section"), input_bfd, input_section, (long) rel->r_offset, howto->name); @@ -1636,6 +1637,7 @@ sh_elf64_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, != (bfd_vma) -1)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, input_section, @@ -1679,6 +1681,7 @@ sh_elf64_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, if (dropped != 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: error: unaligned relocation type %d at %08x reloc %08x\n"), bfd_get_filename (input_bfd), (int)r_type, (unsigned)rel->r_offset, (unsigned)relocation); bfd_set_error (bfd_error_bad_value); @@ -2289,11 +2292,14 @@ sh_elf64_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"); 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"); else + /* xgettext:c-format */ msg = _("%s: object size does not match that of target %s"); _bfd_error_handler (msg, bfd_get_filename (ibfd), diff --git a/bfd/elf64-sparc.c b/bfd/elf64-sparc.c index d9d146f..65fb5e4 100644 --- a/bfd/elf64-sparc.c +++ b/bfd/elf64-sparc.c @@ -463,6 +463,7 @@ elf64_sparc_add_symbol_hook (bfd *abfd, struct bfd_link_info *info, if (p->name != NULL && strcmp (p->name, *namep)) { _bfd_error_handler + /* xgettext:c-format */ (_("Register %%g%d used incompatibly: %s in %B, previously %s in %B"), abfd, p->abfd, (int) sym->st_value, **namep ? *namep : "#scratch", @@ -486,6 +487,7 @@ elf64_sparc_add_symbol_hook (bfd *abfd, struct bfd_link_info *info, if (type > STT_FUNC) type = 0; _bfd_error_handler + /* xgettext:c-format */ (_("Symbol `%s' has differing types: REGISTER in %B, previously %s in %B"), abfd, p->abfd, *namep, stt_types[type]); return FALSE; @@ -531,6 +533,7 @@ elf64_sparc_add_symbol_hook (bfd *abfd, struct bfd_link_info *info, if (type > STT_FUNC) type = 0; _bfd_error_handler + /* xgettext:c-format */ (_("Symbol `%s' has differing types: %s in %B, previously REGISTER in %B"), abfd, p->abfd, *namep, stt_types[type]); return FALSE; @@ -704,6 +707,7 @@ elf64_sparc_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) { error = TRUE; _bfd_error_handler + /* xgettext:c-format */ (_("%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"), ibfd, (long) new_flags, (long) old_flags); } diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 79b8f1c..76f09bd 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -285,6 +285,7 @@ elf_x86_64_rtype_to_howto (bfd *abfd, unsigned r_type) { if (r_type >= (unsigned int) R_X86_64_standard) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: invalid relocation type %d"), abfd, (int) r_type); r_type = R_X86_64_NONE; @@ -1654,6 +1655,7 @@ elf_x86_64_tls_transition (struct bfd_link_info *info, bfd *abfd, } _bfd_error_handler + /* xgettext:c-format */ (_("%B: TLS transition from %s to %s against `%s' at 0x%lx " "in section `%A' failed"), abfd, sec, from->name, to->name, name, @@ -1712,6 +1714,7 @@ elf_x86_64_need_pic (bfd *input_bfd, asection *sec, pic = _("; recompile with -fPIC"); } + /* xgettext:c-format */ _bfd_error_handler (_("%B: relocation %s against %s%s`%s' can " "not be used when making a shared object%s"), input_bfd, howto->name, und, v, name, pic); @@ -2207,6 +2210,7 @@ elf_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr)) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: bad symbol index: %d"), abfd, r_symndx); goto error_return; @@ -2270,6 +2274,7 @@ elf_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, name = bfd_elf_sym_name (abfd, symtab_hdr, isym, NULL); _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation %s against symbol `%s' isn't " "supported in x32 mode"), abfd, x86_64_elf_howto_table[r_type].name, name); @@ -2459,6 +2464,7 @@ elf_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info, name = bfd_elf_sym_name (abfd, symtab_hdr, isym, NULL); _bfd_error_handler + /* xgettext:c-format */ (_("%B: '%s' accessed both as normal and thread local symbol"), abfd, name); bfd_set_error (bfd_error_bad_value); @@ -3458,6 +3464,7 @@ elf_x86_64_readonly_dynrelocs (struct elf_link_hash_entry *h, if ((info->warn_shared_textrel && bfd_link_pic (info)) || info->error_textrel) + /* xgettext:c-format */ info->callbacks->einfo (_("%P: %B: warning: relocation against `%s' in readonly section `%A'\n"), p->sec->owner, h->root.root.string, p->sec); @@ -3666,6 +3673,7 @@ elf_x86_64_size_dynamic_sections (bfd *output_bfd, info->flags |= DF_TEXTREL; if ((info->warn_shared_textrel && bfd_link_pic (info)) || info->error_textrel) + /* xgettext:c-format */ info->callbacks->einfo (_("%P: %B: warning: relocation in readonly section `%A'\n"), p->sec->owner, p->sec); } @@ -4150,6 +4158,7 @@ elf_x86_64_relocate_section (bfd *output_bfd, if (r_type >= (int) R_X86_64_standard) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: unrecognized relocation (0x%x) in section `%A'"), input_bfd, input_section, r_type); bfd_set_error (bfd_error_bad_value); @@ -4377,6 +4386,7 @@ bad_ifunc_reloc: name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym, NULL); _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation %s against STT_GNU_IFUNC " "symbol `%s' isn't supported"), input_bfd, howto->name, name); @@ -4402,6 +4412,7 @@ do_ifunc_pointer: name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym, NULL); _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation %s against STT_GNU_IFUNC " "symbol `%s' has non-zero addend: %d"), input_bfd, howto->name, name, rel->r_addend); @@ -4637,6 +4648,7 @@ do_ifunc_pointer: } _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation R_X86_64_GOTOFF64 against undefined %s `%s' can not be used when making a shared object"), input_bfd, v, h->root.root.string); bfd_set_error (bfd_error_bad_value); @@ -4649,6 +4661,7 @@ do_ifunc_pointer: && ELF_ST_VISIBILITY (h->other) == STV_PROTECTED) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation R_X86_64_GOTOFF64 against protected %s `%s' can not be used when making a shared object"), input_bfd, h->type == STT_FUNC ? "function" : "data", @@ -4916,6 +4929,7 @@ direct: sym, NULL); if (addend < 0) _bfd_error_handler + /* xgettext:c-format */ (_("%B: addend -0x%x in relocation %s against " "symbol `%s' at 0x%lx in section `%A' is " "out of range"), @@ -4924,6 +4938,7 @@ direct: (unsigned long) rel->r_offset); else _bfd_error_handler + /* xgettext:c-format */ (_("%B: addend 0x%x in relocation %s against " "symbol `%s' at 0x%lx in section `%A' is " "out of range"), @@ -5547,6 +5562,7 @@ direct: rel->r_offset) != (bfd_vma) -1) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, input_section, @@ -5586,6 +5602,7 @@ check_relocation_error: else { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): reloc against `%s': error %d"), input_bfd, input_section, (long) rel->r_offset, name, (int) r); @@ -5778,6 +5795,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%B: PC-relative offset overflow in PLT entry for `%s'\n"), output_bfd, h->root.root.string); @@ -5836,6 +5854,7 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd, check relocation index for overflow since branch displacement will overflow first. */ if (plt0_offset > 0x80000000) + /* xgettext:c-format */ info->callbacks->einfo (_("%F%B: branch displacement overflow in PLT entry for `%s'\n"), output_bfd, h->root.root.string); bfd_put_32 (output_bfd, - plt0_offset, @@ -5900,6 +5919,7 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd, got_after_plt = got->output_section->vma > plt->output_section->vma; if ((got_after_plt && got_pcrel_offset < 0) || (!got_after_plt && got_pcrel_offset > 0)) + /* xgettext:c-format */ info->callbacks->einfo (_("%F%B: PC-relative offset overflow in GOT PLT entry for `%s'\n"), output_bfd, h->root.root.string); diff --git a/bfd/elfcode.h b/bfd/elfcode.h index 0f3ccf2..eb3a1ff 100644 --- a/bfd/elfcode.h +++ b/bfd/elfcode.h @@ -1186,6 +1186,7 @@ elf_slurp_symbol_table (bfd *abfd, asymbol **symptrs, bfd_boolean dynamic) && verhdr->sh_size / sizeof (Elf_External_Versym) != symcount) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: version count (%ld) does not match symbol count (%ld)"), abfd->filename, (long) (verhdr->sh_size / sizeof (Elf_External_Versym)), @@ -1440,6 +1441,7 @@ elf_slurp_reloc_table_from_section (bfd *abfd, else if (ELF_R_SYM (rela.r_info) > symcount) { _bfd_error_handler + /* xgettext:c-format */ (_("%s(%s): relocation %d has invalid symbol index %ld"), abfd->filename, asect->name, i, ELF_R_SYM (rela.r_info)); relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; diff --git a/bfd/elfcore.h b/bfd/elfcore.h index 9f873b7..29b9ce4 100644 --- a/bfd/elfcore.h +++ b/bfd/elfcore.h @@ -296,6 +296,7 @@ elf_core_file_p (bfd *abfd) if ((bfd_size_type) statbuf.st_size < high) { _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B is truncated: expected core file " "size >= %lu, found: %lu."), abfd, (unsigned long) high, (unsigned long) statbuf.st_size); diff --git a/bfd/elflink.c b/bfd/elflink.c index 2f40eb0..76f91e9 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -1260,21 +1260,25 @@ _bfd_elf_merge_symbol (bfd *abfd, if (tdef && ntdef) _bfd_error_handler + /* xgettext:c-format */ (_("%s: TLS definition in %B section %A " "mismatches non-TLS definition in %B section %A"), tbfd, tsec, ntbfd, ntsec, h->root.root.string); else if (!tdef && !ntdef) _bfd_error_handler + /* xgettext:c-format */ (_("%s: TLS reference in %B " "mismatches non-TLS reference in %B"), tbfd, ntbfd, h->root.root.string); else if (tdef) _bfd_error_handler + /* xgettext:c-format */ (_("%s: TLS definition in %B section %A " "mismatches non-TLS reference in %B"), tbfd, tsec, ntbfd, h->root.root.string); else _bfd_error_handler + /* xgettext:c-format */ (_("%s: TLS reference in %B " "mismatches non-TLS definition in %B section %A"), tbfd, ntbfd, ntsec, h->root.root.string); @@ -1938,6 +1942,7 @@ nondefault: if (hi->root.type != bfd_link_hash_defined && hi->root.type != bfd_link_hash_defweak) _bfd_error_handler + /* xgettext:c-format */ (_("%B: unexpected redefinition of indirect versioned symbol `%s'"), abfd, shortname); } @@ -2230,6 +2235,7 @@ _bfd_elf_link_assign_sym_version (struct elf_link_hash_entry *h, void *data) /* We could not find the version for a symbol when generating a shared archive. Return an error. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B: version node not found for symbol %s"), info->output_bfd, h->root.root.string); bfd_set_error (bfd_error_bad_value); @@ -2318,6 +2324,7 @@ elf_link_read_relocs_from_section (bfd *abfd, if ((size_t) r_symndx >= nsyms) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: bad reloc symbol index (0x%lx >= 0x%lx)" " for offset 0x%lx in section `%A'"), abfd, sec, @@ -2329,6 +2336,7 @@ elf_link_read_relocs_from_section (bfd *abfd, else if (r_symndx != STN_UNDEF) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: non-zero symbol index (0x%lx) for offset 0x%lx in section `%A'" " when the object file has no symbol table"), abfd, sec, @@ -2519,6 +2527,7 @@ _bfd_elf_link_output_relocs (bfd *output_bfd, else { _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation size mismatch in %B section %A"), output_bfd, input_section->owner, input_section); bfd_set_error (bfd_error_wrong_format); @@ -3666,6 +3675,7 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) || (bed->elf_machine_alt2 != 0 && ehdr->e_machine == bed->elf_machine_alt2))) info->callbacks->einfo + /* xgettext:c-format */ (_("%P: alternate ELF machine code found (%d) in %B, expecting %d\n"), ehdr->e_machine, abfd, bed->elf_machine_code); @@ -4309,6 +4319,7 @@ error_free_dyn: if (verstr == NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: %s: invalid version %u (max %d)"), abfd, name, vernum, elf_tdata (abfd)->cverdefs); @@ -4345,6 +4356,7 @@ error_free_dyn: if (verstr == NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: %s: invalid needed version %d"), abfd, name, vernum); bfd_set_error (bfd_error_bad_value); @@ -4599,12 +4611,14 @@ error_free_dyn: /* PR binutils/2735 */ if (normal_bfd == NULL) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: alignment %u of common symbol `%s' in %B is" " greater than the alignment (%u) of its section %A"), common_bfd, h->root.u.def.section, 1 << common_align, name, 1 << normal_align); else _bfd_error_handler + /* xgettext:c-format */ (_("Warning: alignment %u of symbol `%s' in %B" " is smaller than %u in %B"), normal_bfd, common_bfd, @@ -4621,6 +4635,7 @@ error_free_dyn: && h->size != isym->st_size && ! size_change_ok) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: size of symbol `%s' changed" " from %lu in %B to %lu in %B"), old_bfd, abfd, @@ -4655,6 +4670,7 @@ error_free_dyn: if (h->type != type) { if (h->type != STT_NOTYPE && ! type_change_ok) + /* xgettext:c-format */ _bfd_error_handler (_("Warning: type of symbol `%s' changed" " from %d to %d in %B"), @@ -4757,6 +4773,7 @@ error_free_dyn: && (elf_dyn_lib_class (abfd) & DYN_NO_NEEDED) != 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: undefined reference to symbol '%s'"), old_bfd, name); bfd_set_error (bfd_error_missing_dso); @@ -5760,9 +5777,11 @@ bfd_elf_stack_segment_size (bfd *output_bfd, /* The symbol has no type if specified on the command line. */ h->type = STT_OBJECT; if (info->stacksize) + /* xgettext:c-format */ _bfd_error_handler (_("%B: stack size specified and %s set"), output_bfd, legacy_symbol); else if (h->root.u.def.section != bfd_abs_section_ptr) + /* xgettext:c-format */ _bfd_error_handler (_("%B: %s not absolute"), output_bfd, legacy_symbol); else @@ -7894,6 +7913,7 @@ resolve_section (const char *name, static void undefined_reference (const char *reftype, const char *name) { + /* xgettext:c-format */ _bfd_error_handler (_("undefined %s reference in complex symbol: %s"), reftype, name); } @@ -9022,6 +9042,7 @@ check_dynsym (bfd *abfd, Elf_Internal_Sym *sym) /* The gABI doesn't support dynamic symbols in output sections beyond 64k. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B: Too many sections: %d (>= %d)"), abfd, bfd_count_sections (abfd), SHN_LORESERVE & 0xffff); bfd_set_error (bfd_error_nonrepresentable_section); @@ -9311,10 +9332,13 @@ elf_link_output_extsym (struct bfd_hash_entry *bh, void *data) hi = (struct elf_link_hash_entry *) hi->root.u.i.link; if (ELF_ST_VISIBILITY (h->other) == STV_INTERNAL) + /* xgettext:c-format */ msg = _("%B: internal symbol `%s' in %B is referenced by DSO"); else if (ELF_ST_VISIBILITY (h->other) == STV_HIDDEN) + /* xgettext:c-format */ msg = _("%B: hidden symbol `%s' in %B is referenced by DSO"); else + /* xgettext:c-format */ msg = _("%B: local symbol `%s' in %B is referenced by DSO"); def_bfd = flinfo->output_bfd; if (hi->root.u.def.section != bfd_abs_section_ptr) @@ -9400,6 +9424,7 @@ elf_link_output_extsym (struct bfd_hash_entry *bh, void *data) if (sym.st_shndx == SHN_BAD) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: could not find output section %A for input section %A"), flinfo->output_bfd, input_sec->output_section, input_sec); bfd_set_error (bfd_error_nonrepresentable_section); @@ -9553,10 +9578,13 @@ elf_link_output_extsym (struct bfd_hash_entry *bh, void *data) const char *msg; if (ELF_ST_VISIBILITY (sym.st_other) == STV_PROTECTED) + /* xgettext:c-format */ msg = _("%B: protected symbol `%s' isn't defined"); else if (ELF_ST_VISIBILITY (sym.st_other) == STV_INTERNAL) + /* xgettext:c-format */ msg = _("%B: internal symbol `%s' isn't defined"); else + /* xgettext:c-format */ msg = _("%B: hidden symbol `%s' isn't defined"); _bfd_error_handler (msg, flinfo->output_bfd, h->root.root.string); bfd_set_error (bfd_error_bad_value); @@ -9589,6 +9617,7 @@ elf_link_output_extsym (struct bfd_hash_entry *bh, void *data) if (p && p [1] != '\0') { _bfd_error_handler + /* xgettext:c-format */ (_("%B: No symbol version section for versioned symbol `%s'"), flinfo->output_bfd, h->root.root.string); eoinfo->failed = TRUE; @@ -10193,6 +10222,7 @@ elf_link_input_bfd (struct elf_final_link_info *flinfo, bfd *input_bfd) if (o->size != o->reloc_count * address_size) { _bfd_error_handler + /* xgettext:c-format */ (_("error: %B: size of section %A is not " "multiple of address size"), input_bfd, o); @@ -10240,6 +10270,7 @@ elf_link_input_bfd (struct elf_final_link_info *flinfo, bfd *input_bfd) sprintf_vma (buffer, rel->r_info); _bfd_error_handler + /* xgettext:c-format */ (_("error: %B contains a reloc (0x%s) for section %A " "that references a non-existent global symbol"), input_bfd, o, buffer); @@ -10324,6 +10355,7 @@ elf_link_input_bfd (struct elf_final_link_info *flinfo, bfd *input_bfd) BFD_ASSERT (r_symndx != STN_UNDEF); if (action_discarded & COMPLAIN) (*flinfo->info->callbacks->einfo) + /* xgettext:c-format */ (_("%X`%s' referenced in section `%A' of %B: " "defined in discarded section `%A' of %B\n"), sym_name, o, input_bfd, sec, sec->owner); @@ -10912,6 +10944,7 @@ elf_get_linked_section_vma (struct bfd_link_order *p) = get_elf_backend_data (s->owner); if (bed->link_order_error_handler) bed->link_order_error_handler + /* xgettext:c-format */ (_("%B: warning: sh_link not set for section `%A'"), s->owner, s); return 0; } @@ -10992,6 +11025,7 @@ elf_fixup_link_order (bfd *abfd, asection *o) { if (other_sec && linkorder_sec) _bfd_error_handler + /* xgettext:c-format */ (_("%A has both ordered [`%A' in %B] " "and unordered [`%A' in %B] sections"), o, linkorder_sec, @@ -11723,6 +11757,7 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info) bfd_set_error (bfd_error_wrong_format); _bfd_error_handler + /* xgettext:c-format */ (_("%B: file class %s incompatible with %s"), sub, iclass, oclass); } @@ -12842,6 +12877,7 @@ elf_gc_sweep (bfd *abfd, struct bfd_link_info *info) o->flags |= SEC_EXCLUDE; if (info->print_gc_sections && o->size != 0) + /* xgettext:c-format */ _bfd_error_handler (_("Removing unused section '%s' in file '%B'"), sub, o->name); /* But we also have to update some of the relocation @@ -13196,7 +13232,8 @@ bfd_elf_gc_record_vtinherit (bfd *abfd, goto win; } - _bfd_error_handler ("%B: %A+%lu: No symbol found for INHERIT", + /* xgettext:c-format */ + _bfd_error_handler (_("%B: %A+%lu: No symbol found for INHERIT"), abfd, sec, (unsigned long) offset); bfd_set_error (bfd_error_invalid_operation); return FALSE; diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index b329273..544a8ea 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -2833,6 +2833,7 @@ _bfd_aarch64_add_stub_entry_in_group (const char *stub_name, TRUE, FALSE); if (stub_entry == NULL) { + /* xgettext:c-format */ _bfd_error_handler (_("%s: cannot create stub entry %s"), section->owner, stub_name); return NULL; @@ -4970,6 +4971,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym, NULL); _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation %s against STT_GNU_IFUNC " "symbol `%s' isn't handled by %s"), input_bfd, howto->name, name, __FUNCTION__); @@ -4985,6 +4987,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym, NULL); _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation %s against STT_GNU_IFUNC " "symbol `%s' has non-zero addend: %d"), input_bfd, howto->name, name, rel->r_addend); @@ -5305,6 +5308,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START; _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation %s against external symbol `%s' can not be used" " when making a shared object; recompile with -fPIC"), input_bfd, elfNN_aarch64_howto_table[howto_index].name, @@ -5372,6 +5376,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, { int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START; _bfd_error_handler + /* xgettext:c-format */ (_("%B: Local symbol descriptor table be NULL when applying " "relocation %s against local symbol"), input_bfd, elfNN_aarch64_howto_table[howto_index].name); @@ -5440,6 +5445,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, { int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START; _bfd_error_handler + /* xgettext:c-format */ (_("%B: Local symbol descriptor table be NULL when applying " "relocation %s against local symbol"), input_bfd, elfNN_aarch64_howto_table[howto_index].name); @@ -6041,6 +6047,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd, if (howto == NULL) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: unrecognized relocation (0x%x) in section `%A'"), input_bfd, input_section, r_type); @@ -6124,7 +6131,9 @@ elfNN_aarch64_relocate_section (bfd *output_bfd, { _bfd_error_handler ((sym_type == STT_TLS + /* xgettext:c-format */ ? _("%B(%A+0x%lx): %s used with TLS symbol %s") + /* xgettext:c-format */ : _("%B(%A+0x%lx): %s used with non-TLS symbol %s")), input_bfd, input_section, (long) rel->r_offset, howto->name, name); @@ -6394,8 +6403,8 @@ elfNN_aarch64_relocate_section (bfd *output_bfd, +rel->r_offset) != (bfd_vma) - 1) { _bfd_error_handler - (_ - ("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), + /* xgettext:c-format */ + (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, input_section, (long) rel->r_offset, howto->name, h->root.root.string); return FALSE; @@ -7020,6 +7029,7 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr)) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: bad symbol index: %d"), abfd, r_symndx); return FALSE; } @@ -7318,6 +7328,7 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, { int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START; _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation %s against `%s' can not be used when making " "a shared object; recompile with -fPIC"), abfd, elfNN_aarch64_howto_table[howto_index].name, diff --git a/bfd/elfnn-ia64.c b/bfd/elfnn-ia64.c index be2cd84..62370d9 100644 --- a/bfd/elfnn-ia64.c +++ b/bfd/elfnn-ia64.c @@ -616,6 +616,7 @@ elfNN_ia64_relax_section (bfd *abfd, asection *sec, || strcmp (sec->output_section->name, ".fini") == 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: Can't relax br at 0x%lx in section `%A'. Please use brl or indirect branch."), sec->owner, sec, (unsigned long) roff); bfd_set_error (bfd_error_bad_value); @@ -3682,6 +3683,7 @@ elfNN_ia64_choose_gp (bfd *abfd, struct bfd_link_info *info, bfd_boolean final) { overflow: _bfd_error_handler + /* xgettext:c-format */ (_("%s: short data segment overflowed (0x%lx >= 0x400000)"), bfd_get_filename (abfd), (unsigned long) (max_short_vma - min_short_vma)); @@ -3834,6 +3836,7 @@ elfNN_ia64_relocate_section (bfd *output_bfd, if (r_type > R_IA64_MAX_RELOC_CODE) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: unknown relocation type %d"), input_bfd, (int) r_type); bfd_set_error (bfd_error_bad_value); @@ -3960,6 +3963,7 @@ elfNN_ia64_relocate_section (bfd *output_bfd, /* ??? People shouldn't be doing non-pic code in shared libraries nor dynamic executables. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B: non-pic code with imm relocation against dynamic symbol `%s'"), input_bfd, h ? h->root.root.string @@ -4027,6 +4031,7 @@ elfNN_ia64_relocate_section (bfd *output_bfd, if (dynamic_symbol_p) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: @gprel relocation against dynamic symbol %s"), input_bfd, h ? h->root.root.string @@ -4227,10 +4232,13 @@ elfNN_ia64_relocate_section (bfd *output_bfd, const char *msg; if (r_type == R_IA64_PCREL21BI) + /* xgettext:c-format */ msg = _("%B: @internal branch to dynamic symbol %s"); else if (r_type == R_IA64_PCREL21F || r_type == R_IA64_PCREL21M) + /* xgettext:c-format */ msg = _("%B: speculation fixup to dynamic symbol %s"); else + /* xgettext:c-format */ msg = _("%B: @pcrel relocation against dynamic symbol %s"); _bfd_error_handler (msg, input_bfd, h ? h->root.root.string @@ -4465,6 +4473,7 @@ missing_tls_sec: case R_IA64_LTOFF_DTPMOD22: case R_IA64_LTOFF_DTPREL22: _bfd_error_handler + /* xgettext:c-format */ (_("%B: missing TLS section for relocation %s against `%s' at 0x%lx in section `%A'."), input_bfd, input_section, howto->name, name, rel->r_offset); @@ -4480,6 +4489,7 @@ missing_tls_sec: Overflow failures for those relocations mean that the section is too big to relax. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B: Can't relax br (%s) to `%s' at 0x%lx in section `%A' with size 0x%lx (> 0x1000000)."), input_bfd, input_section, howto->name, name, rel->r_offset, input_section->size); diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index cc29c0e..80714d2 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -7118,6 +7118,7 @@ _bfd_mips_elf_section_processing (bfd *abfd, Elf_Internal_Shdr *hdr) if (intopt.size < sizeof (Elf_External_Options)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: Warning: bad `%s' option size %u smaller than its header"), abfd, MIPS_ELF_OPTIONS_SECTION_NAME (abfd), intopt.size); break; @@ -7351,6 +7352,7 @@ _bfd_mips_elf_section_from_shdr (bfd *abfd, if (intopt.size < sizeof (Elf_External_Options)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: Warning: bad `%s' option size %u smaller than its header"), abfd, MIPS_ELF_OPTIONS_SECTION_NAME (abfd), intopt.size); break; @@ -8121,6 +8123,7 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, if (r_symndx == 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: Warning: cannot determine the target function for" " stub section `%s'"), abfd, name); @@ -8246,6 +8249,7 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, if (r_symndx == 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: Warning: cannot determine the target function for" " stub section `%s'"), abfd, name); @@ -8377,6 +8381,7 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, else if (r_symndx >= extsymoff + NUM_SHDR_ENTRIES (symtab_hdr)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: Malformed reloc detected for section %s"), abfd, name); bfd_set_error (bfd_error_bad_value); @@ -8452,6 +8457,7 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, if (htab->is_vxworks && !bfd_link_pic (info)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: GOT reloc at 0x%lx not expected in executables"), abfd, (unsigned long) rel->r_offset); bfd_set_error (bfd_error_bad_value); @@ -8589,6 +8595,7 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, if (h == NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: CALL16 reloc at 0x%lx not against global symbol"), abfd, (unsigned long) rel->r_offset); bfd_set_error (bfd_error_bad_value); @@ -8874,6 +8881,7 @@ _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, case R_MICROMIPS_26_S1: howto = MIPS_ELF_RTYPE_TO_HOWTO (abfd, r_type, FALSE); _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"), abfd, howto->name, (h) ? h->root.root.string : "a local symbol"); @@ -10279,6 +10287,7 @@ _bfd_mips_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, local_syms + r_symndx, sec); _bfd_error_handler + /* xgettext:c-format */ (_("%B: Can't find matching LO16 reloc against `%s' for %s at 0x%lx in section `%A'"), input_bfd, input_section, name, howto->name, rel->r_offset); @@ -10821,6 +10830,7 @@ _bfd_mips_elf_finish_dynamic_symbol (bfd *output_bfd, if (gotpc_offset + 0x1000000 >= 0x2000000) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: `%A' offset of %ld from `%A' " "beyond the range of ADDIUPC"), output_bfd, @@ -11384,6 +11394,7 @@ mips_finish_exec_plt (bfd *output_bfd, struct bfd_link_info *info) if (gotpc_offset + 0x1000000 >= 0x2000000) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: `%A' offset of %ld from `%A' beyond the range of ADDIUPC"), output_bfd, htab->sgotplt->output_section, @@ -14297,6 +14308,7 @@ update_mips_abiflags_isa (bfd *abfd, Elf_Internal_ABIFlags_v0 *abiflags) case E_MIPS_ARCH_64R6: new_isa = LEVEL_REV (64, 6); break; default: _bfd_error_handler + /* xgettext:c-format */ (_("%B: Unknown architecture %s"), abfd, bfd_printable_name (abfd)); } @@ -14826,6 +14838,7 @@ _bfd_mips_elf_final_link (bfd *abfd, struct bfd_link_info *info) else { _bfd_error_handler + /* xgettext:c-format */ (_("%s: illegal section name `%s'"), bfd_get_filename (abfd), o->name); bfd_set_error (bfd_error_nonrepresentable_section); @@ -15152,6 +15165,7 @@ mips_elf_merge_obj_e_flags (bfd *ibfd, struct bfd_link_info *info) { /* The ISAs aren't compatible. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B: linking %s module with previous %s modules"), ibfd, bfd_printable_name (ibfd), @@ -15175,6 +15189,7 @@ mips_elf_merge_obj_e_flags (bfd *ibfd, struct bfd_link_info *info) != elf_elfheader (obfd)->e_ident[EI_CLASS])) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: ABI mismatch: linking %s module with previous %s modules"), ibfd, elf_mips_abi_name (ibfd), @@ -15199,6 +15214,7 @@ mips_elf_merge_obj_e_flags (bfd *ibfd, struct bfd_link_info *info) if (m16_mis || micro_mis) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: ASE mismatch: linking %s module with previous %s modules"), ibfd, m16_mis ? "MIPS16" : "microMIPS", @@ -15215,6 +15231,7 @@ mips_elf_merge_obj_e_flags (bfd *ibfd, struct bfd_link_info *info) /* Compare NaN encodings. */ if ((new_flags & EF_MIPS_NAN2008) != (old_flags & EF_MIPS_NAN2008)) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: linking %s module with previous %s modules"), ibfd, (new_flags & EF_MIPS_NAN2008 @@ -15229,6 +15246,7 @@ mips_elf_merge_obj_e_flags (bfd *ibfd, struct bfd_link_info *info) /* Compare FP64 state. */ if ((new_flags & EF_MIPS_FP64) != (old_flags & EF_MIPS_FP64)) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: linking %s module with previous %s modules"), ibfd, (new_flags & EF_MIPS_FP64 @@ -15243,6 +15261,7 @@ mips_elf_merge_obj_e_flags (bfd *ibfd, struct bfd_link_info *info) /* Warn about any other mismatches */ if (new_flags != old_flags) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: uses different e_flags (0x%lx) fields than previous modules " "(0x%lx)"), @@ -15329,17 +15348,20 @@ mips_elf_merge_obj_attributes (bfd *ibfd, struct bfd_link_info *info) in_string = _bfd_mips_fp_abi_string (in_fp); /* First warn about cases involving unrecognised ABIs. */ if (!out_string && !in_string) + /* xgettext:c-format */ _bfd_error_handler (_("Warning: %B uses unknown floating point ABI %d " "(set by %B), %B uses unknown floating point ABI %d"), obfd, abi_fp_bfd, ibfd, out_fp, in_fp); else if (!out_string) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses unknown floating point ABI %d " "(set by %B), %B uses %s"), obfd, abi_fp_bfd, ibfd, out_fp, in_string); else if (!in_string) _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses %s (set by %B), " "%B uses unknown floating point ABI %d"), obfd, abi_fp_bfd, ibfd, out_string, in_fp); @@ -15353,6 +15375,7 @@ mips_elf_merge_obj_attributes (bfd *ibfd, struct bfd_link_info *info) else if (out_fp == Val_GNU_MIPS_ABI_FP_SOFT) in_string = "-mhard-float"; _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses %s (set by %B), %B uses %s"), obfd, abi_fp_bfd, ibfd, out_string, in_string); } @@ -15371,6 +15394,7 @@ mips_elf_merge_obj_attributes (bfd *ibfd, struct bfd_link_info *info) { case Val_GNU_MIPS_ABI_MSA_128: _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses %s (set by %B), " "%B uses unknown MSA ABI %d"), obfd, abi_msa_bfd, ibfd, @@ -15382,6 +15406,7 @@ mips_elf_merge_obj_attributes (bfd *ibfd, struct bfd_link_info *info) { case Val_GNU_MIPS_ABI_MSA_128: _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses unknown MSA ABI %d " "(set by %B), %B uses %s"), obfd, abi_msa_bfd, ibfd, @@ -15390,6 +15415,7 @@ mips_elf_merge_obj_attributes (bfd *ibfd, struct bfd_link_info *info) default: _bfd_error_handler + /* xgettext:c-format */ (_("Warning: %B uses unknown MSA ABI %d " "(set by %B), %B uses unknown MSA ABI %d"), obfd, abi_msa_bfd, ibfd, diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c index 3bba5aa..db8058f 100644 --- a/bfd/elfxx-sparc.c +++ b/bfd/elfxx-sparc.c @@ -1411,6 +1411,7 @@ _bfd_sparc_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr)) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: bad symbol index: %d"), abfd, r_symndx); return FALSE; } @@ -1591,6 +1592,7 @@ _bfd_sparc_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, else { _bfd_error_handler + /* xgettext:c-format */ (_("%B: `%s' accessed both as normal and thread local symbol"), abfd, h ? h->root.root.string : "<local>"); return FALSE; @@ -3147,6 +3149,7 @@ _bfd_sparc_elf_relocate_section (bfd *output_bfd, name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym, NULL); _bfd_error_handler + /* xgettext:c-format */ (_("%B: relocation %s against STT_GNU_IFUNC " "symbol `%s' isn't handled by %s"), input_bfd, _bfd_sparc_elf_howto_table[r_type].name, @@ -3906,6 +3909,7 @@ _bfd_sparc_elf_relocate_section (bfd *output_bfd, && _bfd_elf_section_offset (output_bfd, info, input_section, rel->r_offset) != (bfd_vma) -1) _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, input_section, diff --git a/bfd/elfxx-tilegx.c b/bfd/elfxx-tilegx.c index b318306..0705509 100644 --- a/bfd/elfxx-tilegx.c +++ b/bfd/elfxx-tilegx.c @@ -1725,6 +1725,7 @@ tilegx_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr)) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: bad symbol index: %d"), abfd, r_symndx); return FALSE; @@ -1833,6 +1834,7 @@ tilegx_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, else { _bfd_error_handler + /* xgettext:c-format */ (_("%B: `%s' accessed both as normal and thread local symbol"), abfd, h ? h->root.root.string : "<local>"); return FALSE; @@ -3171,6 +3173,7 @@ tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, { /* Not clear if we need to check here, but just be paranoid. */ _bfd_error_handler + /* xgettext:c-format */ (_("%B: unrecognized relocation (0x%x) in section `%A'"), input_bfd, r_type, input_section); bfd_set_error (bfd_error_bad_value); @@ -3979,6 +3982,7 @@ tilegx_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, && _bfd_elf_section_offset (output_bfd, info, input_section, rel->r_offset) != (bfd_vma) -1) _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"), input_bfd, input_section, @@ -4435,6 +4439,7 @@ _bfd_tilegx_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) if (strcmp (targ1, targ2) != 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: Cannot link together %s and %s objects."), ibfd, targ1, targ2); bfd_set_error (bfd_error_bad_value); @@ -155,6 +155,7 @@ ieee_write_id (bfd *abfd, const char *id) else { _bfd_error_handler + /* xgettext:c-format */ (_("%s: string too long (%d chars, max 65535)"), bfd_get_filename (abfd), length); bfd_set_error (bfd_error_invalid_operation); @@ -289,6 +290,7 @@ ieee_write_expression (bfd *abfd, else { _bfd_error_handler + /* xgettext:c-format */ (_("%s: unrecognized symbol `%s' flags 0x%x"), bfd_get_filename (abfd), bfd_asymbol_name (symbol), symbol->flags); @@ -824,6 +826,7 @@ ieee_slurp_external_symbols (bfd *abfd) break; default: _bfd_error_handler + /* xgettext:c-format */ (_("%B: unimplemented ATI record %u for symbol %u"), abfd, symbol_attribute_def, symbol_name_index); bfd_set_error (bfd_error_bad_value); @@ -848,6 +851,7 @@ ieee_slurp_external_symbols (bfd *abfd) if (value != 0x3f) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: unexpected ATN type %d in external part"), abfd, (int) value); bfd_set_error (bfd_error_bad_value); @@ -226,6 +226,7 @@ ihex_bad_byte (bfd *abfd, unsigned int lineno, int c, bfd_boolean error) buf[1] = '\0'; } _bfd_error_handler + /* xgettext:c-format */ (_("%B:%d: unexpected character `%s' in Intel Hex file"), abfd, lineno, buf); bfd_set_error (bfd_error_bad_value); @@ -333,6 +334,7 @@ ihex_scan (bfd *abfd) if (((- chksum) & 0xff) != (unsigned int) HEX2 (buf + 2 * i)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B:%u: bad checksum in Intel Hex file (expected %u, found %u)"), abfd, lineno, (- chksum) & 0xff, (unsigned int) HEX2 (buf + 2 * i)); @@ -388,6 +390,7 @@ ihex_scan (bfd *abfd) if (len != 2) { _bfd_error_handler + /* xgettext:c-format */ (_("%B:%u: bad extended address record length in Intel Hex file"), abfd, lineno); bfd_set_error (bfd_error_bad_value); @@ -405,6 +408,7 @@ ihex_scan (bfd *abfd) if (len != 4) { _bfd_error_handler + /* xgettext:c-format */ (_("%B:%u: bad extended start address length in Intel Hex file"), abfd, lineno); bfd_set_error (bfd_error_bad_value); @@ -422,6 +426,7 @@ ihex_scan (bfd *abfd) if (len != 2) { _bfd_error_handler + /* xgettext:c-format */ (_("%B:%u: bad extended linear address record length in Intel Hex file"), abfd, lineno); bfd_set_error (bfd_error_bad_value); @@ -439,6 +444,7 @@ ihex_scan (bfd *abfd) if (len != 2 && len != 4) { _bfd_error_handler + /* xgettext:c-format */ (_("%B:%u: bad extended linear start address length in Intel Hex file"), abfd, lineno); bfd_set_error (bfd_error_bad_value); @@ -456,6 +462,7 @@ ihex_scan (bfd *abfd) default: _bfd_error_handler + /* xgettext:c-format */ (_("%B:%u: unrecognized ihex type %u in Intel Hex file"), abfd, lineno, type); bfd_set_error (bfd_error_bad_value); @@ -822,6 +829,7 @@ ihex_write_object_contents (bfd *abfd) sprintf_vma (buf, where); _bfd_error_handler + /* xgettext:c-format */ (_("%s: address 0x%s out of range for Intel Hex file"), bfd_get_filename (abfd), buf); bfd_set_error (bfd_error_bad_value); diff --git a/bfd/libbfd.c b/bfd/libbfd.c index 7a6f381..f7b292c 100644 --- a/bfd/libbfd.c +++ b/bfd/libbfd.c @@ -786,6 +786,7 @@ _bfd_generic_get_section_contents (bfd *abfd, if (section->compress_status != COMPRESS_SECTION_NONE) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: unable to get decompressed section %A"), abfd, section); bfd_set_error (bfd_error_invalid_operation); @@ -940,6 +941,7 @@ warn_deprecated (const char *what, /* Note: separate sentences in order to allow for translation into other languages. */ if (func) + /* xgettext:c-format */ fprintf (stderr, _("Deprecated %s called at %s line %d in %s\n"), what, file, line, func); else diff --git a/bfd/linker.c b/bfd/linker.c index a5c93da..067ea9c 100644 --- a/bfd/linker.c +++ b/bfd/linker.c @@ -1739,6 +1739,7 @@ _bfd_generic_link_add_one_symbol (struct bfd_link_info *info, && inh->u.i.link == h) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: indirect symbol `%s' to `%s' is a loop"), abfd, name, string); bfd_set_error (bfd_error_invalid_operation); @@ -2607,6 +2608,7 @@ default_indirect_link_order (bfd *output_bfd, types of object files. Handling this case correctly is difficult, and sometimes impossible. */ _bfd_error_handler + /* xgettext:c-format */ (_("Attempt to do relocatable link with %s input and %s output"), bfd_get_target (input_bfd), bfd_get_target (output_bfd)); bfd_set_error (bfd_error_wrong_format); @@ -2892,6 +2894,7 @@ _bfd_handle_already_linked (asection *sec, case SEC_LINK_DUPLICATES_ONE_ONLY: info->callbacks->einfo + /* xgettext:c-format */ (_("%B: ignoring duplicate section `%A'\n"), sec->owner, sec); break; @@ -2901,6 +2904,7 @@ _bfd_handle_already_linked (asection *sec, ; else if (sec->size != l->sec->size) info->callbacks->einfo + /* xgettext:c-format */ (_("%B: duplicate section `%A' has different size\n"), sec->owner, sec); break; @@ -2910,6 +2914,7 @@ _bfd_handle_already_linked (asection *sec, ; else if (sec->size != l->sec->size) info->callbacks->einfo + /* xgettext:c-format */ (_("%B: duplicate section `%A' has different size\n"), sec->owner, sec); else if (sec->size != 0) @@ -2918,15 +2923,18 @@ _bfd_handle_already_linked (asection *sec, if (!bfd_malloc_and_get_section (sec->owner, sec, &sec_contents)) info->callbacks->einfo + /* xgettext:c-format */ (_("%B: could not read contents of section `%A'\n"), sec->owner, sec); else if (!bfd_malloc_and_get_section (l->sec->owner, l->sec, &l_sec_contents)) info->callbacks->einfo + /* xgettext:c-format */ (_("%B: could not read contents of section `%A'\n"), l->sec->owner, l->sec); else if (memcmp (sec_contents, l_sec_contents, sec->size) != 0) info->callbacks->einfo + /* xgettext:c-format */ (_("%B: duplicate section `%A' has different contents\n"), sec->owner, sec); diff --git a/bfd/m68klinux.c b/bfd/m68klinux.c index fa78ded..f2098d6 100644 --- a/bfd/m68klinux.c +++ b/bfd/m68klinux.c @@ -424,6 +424,7 @@ linux_tally_symbols (struct linux_link_hash_entry *h, p = strrchr (alloc, '_'); *p++ = '\0'; _bfd_error_handler + /* xgettext:c-format */ (_("Output file requires shared library `%s.so.%s'\n"), alloc, p); free (alloc); diff --git a/bfd/mach-o.c b/bfd/mach-o.c index 80aa499..cb7d446 100644 --- a/bfd/mach-o.c +++ b/bfd/mach-o.c @@ -2816,6 +2816,7 @@ bfd_mach_o_build_exec_seg_command (bfd *abfd, bfd_mach_o_segment_command *seg) if (s->addr < vma) { _bfd_error_handler + /* xgettext:c-format */ (_("section address (%lx) below start of segment (%lx)"), (unsigned long) s->addr, (unsigned long) vma); return FALSE; @@ -3586,6 +3587,7 @@ bfd_mach_o_read_symtab_symbol (bfd *abfd, || bfd_bread (&raw, symwidth, abfd) != symwidth) { _bfd_error_handler + /* xgettext:c-format */ (_("bfd_mach_o_read_symtab_symbol: unable to read %d bytes at %lu"), symwidth, (unsigned long) symoff); return FALSE; @@ -3604,6 +3606,7 @@ bfd_mach_o_read_symtab_symbol (bfd *abfd, if (stroff >= sym->strsize) { _bfd_error_handler + /* xgettext:c-format */ (_("bfd_mach_o_read_symtab_symbol: name out of range (%lu >= %lu)"), (unsigned long) stroff, (unsigned long) sym->strsize); @@ -3686,6 +3689,7 @@ bfd_mach_o_read_symtab_symbol (bfd *abfd, if (section != 0) { _bfd_error_handler + /* xgettext:c-format */ (_("bfd_mach_o_read_symtab_symbol: " "symbol \"%s\" specified invalid section %d (max %lu): " "setting to undefined"), @@ -3704,6 +3708,7 @@ bfd_mach_o_read_symtab_symbol (bfd *abfd, break; default: _bfd_error_handler + /* xgettext:c-format */ (_("bfd_mach_o_read_symtab_symbol: " "symbol \"%s\" specified invalid type field 0x%x: " "setting to undefined"), s->symbol.name, symtype); @@ -4941,6 +4946,7 @@ bfd_mach_o_scan (bfd *abfd, if (cputype == bfd_arch_unknown) { _bfd_error_handler + /* xgettext:c-format */ (_("bfd_mach_o_scan: unknown architecture 0x%lx/0x%lx"), header->cputype, header->cpusubtype); return FALSE; diff --git a/bfd/merge.c b/bfd/merge.c index 23e1e62..ee57e03 100644 --- a/bfd/merge.c +++ b/bfd/merge.c @@ -860,6 +860,7 @@ _bfd_merged_section_offset (bfd *output_bfd ATTRIBUTE_UNUSED, asection **psec, { if (offset > sec->rawsize) _bfd_error_handler + /* xgettext:c-format */ (_("%s: access beyond end of merged section (%ld)"), bfd_get_filename (sec->owner), (long) offset); return secinfo->first_str ? sec->size : 0; @@ -464,6 +464,7 @@ mmo_make_section (bfd *abfd, const char *secname) if (newsecname == NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: No core to allocate section name %s\n"), bfd_get_filename (abfd), secname); bfd_set_error (bfd_error_system_call); @@ -539,6 +540,7 @@ mmo_object_p (bfd *abfd) if (abfd->tdata.mmo_data->lop_stab_symbol == NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: No core to allocate a symbol %d bytes long\n"), bfd_get_filename (abfd), abfd->tdata.mmo_data->max_symbol_length); goto bad_final; @@ -952,6 +954,7 @@ mmo_write_loc_chunk (bfd *abfd, bfd_vma vma, const bfd_byte *loc, if ((vma & 3) != 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: attempt to emit contents at non-multiple-of-4 address 0x%lx\n"), bfd_get_filename (abfd), (unsigned long) vma); bfd_set_error (bfd_error_bad_value); @@ -1393,6 +1396,7 @@ SUBSECTION [abfd->tdata.mmo_data->symbol_position] = 0; _bfd_error_handler + /* xgettext:c-format */ (_("%s: unsupported wide character sequence" " 0x%02X 0x%02X after symbol name starting with `%s'\n"), bfd_get_filename (abfd), c, c2, @@ -1627,6 +1631,7 @@ mmo_scan (bfd *abfd) { default: _bfd_error_handler + /* xgettext:c-format */ (_("%s: invalid mmo file: unsupported lopcode `%d'\n"), bfd_get_filename (abfd), buf[1]); bfd_set_error (bfd_error_bad_value); @@ -1637,6 +1642,7 @@ mmo_scan (bfd *abfd) if (y != 0 || z != 1) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: invalid mmo file: expected YZ = 1 got YZ = %d for lop_quote\n"), bfd_get_filename (abfd), y*256+z); bfd_set_error (bfd_error_bad_value); @@ -1673,6 +1679,7 @@ mmo_scan (bfd *abfd) else { _bfd_error_handler + /* xgettext:c-format */ (_("%s: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_loc\n"), bfd_get_filename (abfd), z); bfd_set_error (bfd_error_bad_value); @@ -1722,6 +1729,7 @@ mmo_scan (bfd *abfd) else { _bfd_error_handler + /* xgettext:c-format */ (_("%s: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_fixo\n"), bfd_get_filename (abfd), z); bfd_set_error (bfd_error_bad_value); @@ -1761,6 +1769,7 @@ mmo_scan (bfd *abfd) if (y != 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: invalid mmo file: expected y = 0, got y = %d for lop_fixrx\n"), bfd_get_filename (abfd), y); bfd_set_error (bfd_error_bad_value); @@ -1770,6 +1779,7 @@ mmo_scan (bfd *abfd) if (z != 16 && z != 24) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: invalid mmo file: expected z = 16 or z = 24, got z = %d for lop_fixrx\n"), bfd_get_filename (abfd), z); bfd_set_error (bfd_error_bad_value); @@ -1793,6 +1803,7 @@ mmo_scan (bfd *abfd) else { _bfd_error_handler + /* xgettext:c-format */ (_("%s: invalid mmo file: leading byte of operand word must be 0 or 1, got %d for lop_fixrx\n"), bfd_get_filename (abfd), buf[0]); bfd_set_error (bfd_error_bad_value); @@ -1816,6 +1827,7 @@ mmo_scan (bfd *abfd) if (fname == NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: cannot allocate file name for file number %d, %d bytes\n"), bfd_get_filename (abfd), y, z * 4 + 1); bfd_set_error (bfd_error_system_call); @@ -1836,6 +1848,7 @@ mmo_scan (bfd *abfd) if (file_names[y] != NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: invalid mmo file: file number %d `%s'," " was already entered as `%s'\n"), bfd_get_filename (abfd), y, fname, file_names[y]); @@ -1849,6 +1862,7 @@ mmo_scan (bfd *abfd) if (file_names[y] == NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: invalid mmo file: file name for number %d" " was not specified before use\n"), bfd_get_filename (abfd), y); @@ -1955,6 +1969,7 @@ mmo_scan (bfd *abfd) if (y != 0 || z != 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: invalid mmo file: fields y and z of lop_stab" " non-zero, y: %d, z: %d\n"), bfd_get_filename (abfd), y, z); @@ -1991,6 +2006,7 @@ mmo_scan (bfd *abfd) if (statbuf.st_size != curpos) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: invalid mmo file: lop_end not last item in" " file\n"), bfd_get_filename (abfd)); @@ -2004,6 +2020,7 @@ mmo_scan (bfd *abfd) if ((long) (y * 256 + z) * 4 != (curpos - stab_loc) - 4) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: invalid mmo file: YZ of lop_end (%ld)" " not equal to the number of tetras to the preceding" " lop_stab (%ld)\n"), @@ -2714,6 +2731,7 @@ mmo_internal_add_3_sym (bfd *abfd, struct mmo_symbol_trie *rootp, if (trie->sym.name != NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: invalid symbol table: duplicate symbol `%s'\n"), bfd_get_filename (abfd), trie->sym.name); bfd_set_error (bfd_error_bad_value); @@ -2956,6 +2974,7 @@ mmo_write_symbols_and_terminator (bfd *abfd) sprintf_vma (vmas_start, vma_start); _bfd_error_handler + /* xgettext:c-format */ (_("%s: Bad symbol definition: `Main' set to %s rather" " than the start address %s\n"), bfd_get_filename (abfd), vmas_main, vmas_start); @@ -3054,6 +3073,7 @@ mmo_write_symbols_and_terminator (bfd *abfd) struct mmo_symbol sym; _bfd_error_handler + /* xgettext:c-format */ (_("%s: warning: symbol table too large for mmo, larger than 65535" " 32-bit words: %d. Only `Main' will be emitted.\n"), bfd_get_filename (abfd), trie_len); @@ -3099,6 +3119,7 @@ mmo_write_symbols_and_terminator (bfd *abfd) isn't debugged and abort if we get here. Instead emit a diagnostic and fail "normally". */ _bfd_error_handler + /* xgettext:c-format */ (_("%s: internal error, symbol table changed size from %d to %d" " words\n"), bfd_get_filename (abfd), trie_len, @@ -3151,6 +3172,7 @@ mmo_write_section_unless_reg_contents (bfd *abfd, asection *sec, void *p) make it carry contents, so we don't have a test-case for this. */ _bfd_error_handler + /* xgettext:c-format */ (_("%s: internal error, internal register section %s had" " contents\n"), bfd_get_filename (abfd), sec->name); @@ -3208,11 +3230,13 @@ mmo_write_object_contents (bfd *abfd) /* Provide better error message for the case of too many global registers. */ _bfd_error_handler + /* xgettext:c-format */ (_("%s: too many initialized registers; section length %ld\n"), bfd_get_filename (abfd), (long) sec->size); else _bfd_error_handler + /* xgettext:c-format */ (_("%s: invalid start address for initialized registers of" " length %ld: 0x%lx%08lx\n"), bfd_get_filename (abfd), diff --git a/bfd/oasys.c b/bfd/oasys.c index 5560d38..f5350a3 100644 --- a/bfd/oasys.c +++ b/bfd/oasys.c @@ -877,6 +877,7 @@ oasys_write_sections (bfd *abfd) if (!ISDIGIT (s->name[0])) { _bfd_error_handler + /* xgettext:c-format */ (_("%s: can not represent section `%s' in oasys"), bfd_get_filename (abfd), s->name); bfd_set_error (bfd_error_nonrepresentable_section); diff --git a/bfd/pdp11.c b/bfd/pdp11.c index 089c917..67936a6 100644 --- a/bfd/pdp11.c +++ b/bfd/pdp11.c @@ -1148,7 +1148,8 @@ NAME (aout, set_section_contents) (bfd *abfd, && section != obj_datasec (abfd)) { _bfd_error_handler - ("%s: can not represent section `%s' in a.out object file format", + /* xgettext:c-format */ + (_("%s: can not represent section `%s' in a.out object file format"), bfd_get_filename (abfd), bfd_get_section_name (abfd, section)); bfd_set_error (bfd_error_nonrepresentable_section); return FALSE; @@ -1380,7 +1381,8 @@ translate_to_native_sym_flags (bfd *abfd, /* This case occurs, e.g., for the *DEBUG* section of a COFF file. */ _bfd_error_handler - ("%B: can not represent section for symbol `%s' in a.out object file format", + /* xgettext:c-format */ + (_("%B: can not represent section for symbol `%s' in a.out object file format"), abfd, cache_ptr->name != NULL ? cache_ptr->name : "*unknown*"); bfd_set_error (bfd_error_nonrepresentable_section); return FALSE; @@ -1407,7 +1409,8 @@ translate_to_native_sym_flags (bfd *abfd, else { _bfd_error_handler - ("%B: can not represent section `%A' in a.out object file format", + /* xgettext:c-format */ + (_("%B: can not represent section `%A' in a.out object file format"), abfd, sec); bfd_set_error (bfd_error_nonrepresentable_section); return FALSE; @@ -3701,7 +3704,8 @@ NAME (aout, final_link) (bfd *abfd, work out the number of relocs needed, and then multiply by the reloc size. */ _bfd_error_handler - ("%s: relocatable link from %s to %s not supported", + /* xgettext:c-format */ + (_("%s: relocatable link from %s to %s not supported"), bfd_get_filename (abfd), sub->xvec->name, abfd->xvec->name); bfd_set_error (bfd_error_invalid_operation); diff --git a/bfd/pe-mips.c b/bfd/pe-mips.c index 5b62a52..b8621af 100644 --- a/bfd/pe-mips.c +++ b/bfd/pe-mips.c @@ -715,9 +715,11 @@ coff_pe_mips_relocate_section (bfd *output_bfd, mem = pointer to memory we're fixing up val = VMA of what we need to refer to. */ -#define UI(x) _bfd_error_handler (_("%B: unimplemented %s\n"), \ - input_bfd, x); \ - bfd_set_error (bfd_error_bad_value); +#define UI(x) \ + /* xgettext:c-format */ \ + _bfd_error_handler (_("%B: unimplemented %s\n"), \ + input_bfd, x); \ + bfd_set_error (bfd_error_bad_value); switch (rel->r_type) { diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c index fba31de..0bbd200 100644 --- a/bfd/peXXigen.c +++ b/bfd/peXXigen.c @@ -527,6 +527,7 @@ _bfd_XXi_swap_aouthdr_in (bfd * abfd, /* PR 17512: Corrupt PE binaries can cause seg-faults. */ if (a->NumberOfRvaAndSizes > IMAGE_NUMBEROF_DIRECTORY_ENTRIES) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: aout header specifies an invalid number of data-directory entries: %d"), abfd, a->NumberOfRvaAndSizes); @@ -1084,6 +1085,7 @@ _bfd_XXi_swap_scnhdr_out (bfd * abfd, void * in, void * out) H_PUT_16 (abfd, scnhdr_int->s_nlnno, scnhdr_ext->s_nlnno); else { + /* xgettext:c-format */ _bfd_error_handler (_("%s: line number overflow: 0x%lx > 0xffff"), bfd_get_filename (abfd), scnhdr_int->s_nlnno); @@ -1316,6 +1318,7 @@ pe_print_idata (bfd * abfd, void * vfile) } } + /* xgettext:c-format */ fprintf (file, _("\nThere is an import table in %s at 0x%lx\n"), section->name, (unsigned long) addr); @@ -1361,6 +1364,7 @@ pe_print_idata (bfd * abfd, void * vfile) _("\nFunction descriptor located at the start address: %04lx\n"), (unsigned long int) (abfd->start_address)); fprintf (file, + /* xgettext:c-format */ _("\tcode-base %08lx toc (loadable/actual) %08lx/%08lx\n"), start_address, loadable_toc_address, toc_address); if (data != NULL) @@ -1664,11 +1668,13 @@ pe_print_edata (bfd * abfd, void * vfile) if (datasize < 36) { fprintf (file, + /* xgettext:c-format */ _("\nThere is an export table in %s, but it is too small (%d)\n"), section->name, (int) datasize); return TRUE; } + /* xgettext:c-format */ fprintf (file, _("\nThere is an export table in %s at 0x%lx\n"), section->name, (unsigned long) addr); @@ -1707,6 +1713,7 @@ pe_print_edata (bfd * abfd, void * vfile) _("Time/Date stamp \t\t%lx\n"), (unsigned long) edt.time_stamp); fprintf (file, + /* xgettext:c-format */ _("Major/Minor \t\t\t%d/%d\n"), edt.major_ver, edt.minor_ver); fprintf (file, @@ -1815,12 +1822,14 @@ pe_print_edata (bfd * abfd, void * vfile) /* PR 17512: file: bb68816e. */ || edt.num_names * 4 < edt.num_names || (data + edt.npt_addr - adj) < data) + /* xgettext:c-format */ fprintf (file, _("\tInvalid Name Pointer Table rva (0x%lx) or entry count (0x%lx)\n"), (long) edt.npt_addr, (long) edt.num_names); /* PR 17512: file: 140-147171-0.004. */ else if (edt.ot_addr + (edt.num_names * 2) - adj >= datasize || data + edt.ot_addr - adj < data) + /* xgettext:c-format */ fprintf (file, _("\tInvalid Ordinal Table rva (0x%lx) or entry count (0x%lx)\n"), (long) edt.ot_addr, (long) edt.num_names); @@ -1834,6 +1843,7 @@ pe_print_edata (bfd * abfd, void * vfile) if ((name_ptr - adj) >= datasize) { + /* xgettext:c-format */ fprintf (file, _("\t[%4ld] <corrupt offset: %lx>\n"), (long) ord, (long) name_ptr); } @@ -1887,6 +1897,7 @@ pe_print_pdata (bfd * abfd, void * vfile) stop = pei_section_data (abfd, section)->virt_size; if ((stop % onaline) != 0) fprintf (file, + /* xgettext:c-format */ _("Warning, .pdata section size (%ld) is not a multiple of %d\n"), (long) stop, onaline); @@ -1908,6 +1919,7 @@ pe_print_pdata (bfd * abfd, void * vfile) /* PR 17512: file: 002-193900-0.004. */ if (datasize < stop) { + /* xgettext:c-format */ fprintf (file, _("Virtual size of .pdata section (%ld) larger than real size (%ld)\n"), (long) stop, (long) datasize); return FALSE; @@ -2082,6 +2094,7 @@ _bfd_XX_print_ce_compressed_pdata (bfd * abfd, void * vfile) stop = pei_section_data (abfd, section)->virt_size; if ((stop % onaline) != 0) fprintf (file, + /* xgettext:c-format */ _("Warning, .pdata section size (%ld) is not a multiple of %d\n"), (long) stop, onaline); @@ -2239,6 +2252,7 @@ pe_print_reloc (bfd * abfd, void * vfile) break; fprintf (file, + /* xgettext:c-format */ _("\nVirtual Address: %08lx Chunk size %ld (0x%lx) Number of fixups %ld\n"), (unsigned long) virtual_address, size, size, number); @@ -2256,6 +2270,7 @@ pe_print_reloc (bfd * abfd, void * vfile) t = (sizeof (tbl) / sizeof (tbl[0])) - 1; fprintf (file, + /* xgettext:c-format */ _("\treloc %4d offset %4x [%4lx] %s"), j, off, (unsigned long) (off + virtual_address), tbl[t]); @@ -2316,6 +2331,7 @@ rsrc_print_resource_entries (FILE * file, if (data + 8 >= regions->section_end) return regions->section_end + 1; + /* xgettext:c-format */ fprintf (file, _("%03x %*.s Entry: "), (int)(data - regions->section_start), indent, " "); entry = (unsigned long) bfd_get_32 (abfd, data); @@ -2399,6 +2415,7 @@ rsrc_print_resource_entries (FILE * file, || leaf < regions->section_start) return regions->section_end + 1; + /* xgettext:c-format */ fprintf (file, _("%03x %*.s Leaf: Addr: %#08lx, Size: %#08lx, Codepage: %d\n"), (int) (entry), indent, " ", addr = (long) bfd_get_32 (abfd, leaf), @@ -2448,6 +2465,7 @@ rsrc_print_resource_directory (FILE * file, return regions->section_end + 1; } + /* xgettext:c-format */ fprintf (file, _(" Table: Char: %d, Time: %08lx, Ver: %d/%d, Num Names: %d, IDs: %d\n"), (int) bfd_get_32 (abfd, data), (long) bfd_get_32 (abfd, data + 4), @@ -2567,10 +2585,10 @@ rsrc_print_section (bfd * abfd, void * vfile) } if (regions.strings_start != NULL) - fprintf (file, " String table starts at offset: %#03x\n", + fprintf (file, _(" String table starts at offset: %#03x\n"), (int) (regions.strings_start - regions.section_start)); if (regions.resource_start != NULL) - fprintf (file, " Resources start at offset: %#03x\n", + fprintf (file, _(" Resources start at offset: %#03x\n"), (int) (regions.resource_start - regions.section_start)); free (regions.section_start); @@ -2699,7 +2717,8 @@ pe_print_debugdata (bfd * abfd, void * vfile) for (i = 0; i < cvinfo->SignatureLength; i++) sprintf (&signature[i*2], "%02x", cvinfo->Signature[i] & 0xff); - fprintf (file, "(format %c%c%c%c signature %s age %ld)\n", + /* xgettext:c-format */ + fprintf (file, _("(format %c%c%c%c signature %s age %ld)\n"), buffer[0], buffer[1], buffer[2], buffer[3], signature, cvinfo->Age); } @@ -2961,6 +2980,7 @@ _bfd_XX_bfd_copy_private_bfd_data_common (bfd * ibfd, bfd * obfd) if (ope->pe_opthdr.DataDirectory[PE_DEBUG_DATA].Size + (addr - section->vma) > bfd_get_section_size (section)) { + /* xgettext:c-format */ _bfd_error_handler (_("%B: Data Directory size (%lx) exceeds space left in section (%lx)"), obfd, ope->pe_opthdr.DataDirectory[PE_DEBUG_DATA].Size, bfd_get_section_size (section) - (addr - section->vma)); diff --git a/bfd/pei-x86_64.c b/bfd/pei-x86_64.c index c19b946..1e628c8 100644 --- a/bfd/pei-x86_64.c +++ b/bfd/pei-x86_64.c @@ -487,6 +487,7 @@ pex64_bfd_print_pdata_section (bfd *abfd, void *vfile, asection *pdata_section) stop = pei_section_data (abfd, pdata_section)->virt_size; if ((stop % onaline) != 0) fprintf (file, + /* xgettext:c-format */ _("Warning: %s section size (%ld) is not a multiple of %d\n"), pdata_section->name, (long) stop, onaline); @@ -508,6 +509,7 @@ pex64_bfd_print_pdata_section (bfd *abfd, void *vfile, asection *pdata_section) else if (datasize < stop) { fprintf (file, + /* xgettext:c-format */ _("Warning: %s section size (%ld) is smaller than virtual size (%ld)\n"), pdata_section->name, (unsigned long) datasize, (unsigned long) stop); diff --git a/bfd/peicode.h b/bfd/peicode.h index fc8b20f..9f98f86 100644 --- a/bfd/peicode.h +++ b/bfd/peicode.h @@ -771,11 +771,13 @@ pe_ILF_build_a_bfd (bfd * abfd, case IMPORT_CONST: /* XXX code yet to be written. */ + /* xgettext:c-format */ _bfd_error_handler (_("%B: Unhandled import type; %x"), abfd, import_type); return FALSE; default: + /* xgettext:c-format */ _bfd_error_handler (_("%B: Unrecognised import type; %x"), abfd, import_type); return FALSE; @@ -790,6 +792,7 @@ pe_ILF_build_a_bfd (bfd * abfd, break; default: + /* xgettext:c-format */ _bfd_error_handler (_("%B: Unrecognised import name type; %x"), abfd, import_name_type); return FALSE; @@ -1210,6 +1213,7 @@ pe_ILF_object_p (bfd * abfd) /* We no longer support PowerPC. */ default: _bfd_error_handler + /* xgettext:c-format */ (_("%B: Unrecognised machine type (0x%x)" " in Import Library Format archive"), abfd, machine); @@ -1222,6 +1226,7 @@ pe_ILF_object_p (bfd * abfd) if (magic == 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: Recognised but unhandled machine type (0x%x)" " in Import Library Format archive"), abfd, machine); diff --git a/bfd/ppcboot.c b/bfd/ppcboot.c index afb6ce0..e8cf60d 100644 --- a/bfd/ppcboot.c +++ b/bfd/ppcboot.c @@ -422,20 +422,25 @@ ppcboot_bfd_print_private_bfd_data (bfd *abfd, void * farg) && !sector_begin && !sector_length) continue; + /* xgettext:c-format */ fprintf (f, _("\nPartition[%d] start = { 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x }\n"), i, tdata->header.partition[i].partition_begin.ind, tdata->header.partition[i].partition_begin.head, tdata->header.partition[i].partition_begin.sector, tdata->header.partition[i].partition_begin.cylinder); + /* xgettext:c-format */ fprintf (f, _("Partition[%d] end = { 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x }\n"), i, tdata->header.partition[i].partition_end.ind, tdata->header.partition[i].partition_end.head, tdata->header.partition[i].partition_end.sector, tdata->header.partition[i].partition_end.cylinder); + /* xgettext:c-format */ fprintf (f, _("Partition[%d] sector = 0x%.8lx (%ld)\n"), i, (unsigned long) sector_begin, sector_begin); + + /* xgettext:c-format */ fprintf (f, _("Partition[%d] length = 0x%.8lx (%ld)\n"), i, (unsigned long) sector_length, sector_length); } diff --git a/bfd/reloc.c b/bfd/reloc.c index 58cffdf..6ee3a4e 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -7973,6 +7973,7 @@ bfd_generic_get_relocated_section_contents (bfd *abfd, if (symbol == NULL) { link_info->callbacks->einfo + /* xgettext:c-format */ (_("%X%P: %B(%A): error: relocation for offset %V has no value\n"), abfd, input_section, (* parent)->address); goto error_return; @@ -8038,6 +8039,7 @@ bfd_generic_get_relocated_section_contents (bfd *abfd, complete binaries. Do not abort, but issue an error message instead. */ link_info->callbacks->einfo + /* xgettext:c-format */ (_("%X%P: %B(%A): relocation \"%R\" goes out of range\n"), abfd, input_section, * parent); goto error_return; @@ -8047,6 +8049,7 @@ bfd_generic_get_relocated_section_contents (bfd *abfd, This error can result when processing a corrupt binary. Do not abort. Issue an error message instead. */ link_info->callbacks->einfo + /* xgettext:c-format */ (_("%X%P: %B(%A): relocation \"%R\" is not supported\n"), abfd, input_section, * parent); goto error_return; @@ -8055,6 +8058,7 @@ bfd_generic_get_relocated_section_contents (bfd *abfd, /* PR 17512; file: 90c2a92e. Report unexpected results, without aborting. */ link_info->callbacks->einfo + /* xgettext:c-format */ (_("%X%P: %B(%A): relocation \"%R\" returns an unrecognized value %x\n"), abfd, input_section, * parent, r); break; diff --git a/bfd/sparclinux.c b/bfd/sparclinux.c index e7a7b95..23d448b 100644 --- a/bfd/sparclinux.c +++ b/bfd/sparclinux.c @@ -417,6 +417,7 @@ linux_tally_symbols (struct linux_link_hash_entry *h, void * data) p = strrchr (alloc, '_'); *p++ = '\0'; _bfd_error_handler + /* xgettext:c-format */ (_("Output file requires shared library `%s.so.%s'\n"), alloc, p); free (alloc); @@ -256,6 +256,7 @@ srec_bad_byte (bfd *abfd, buf[1] = '\0'; } _bfd_error_handler + /* xgettext:c-format */ (_("%B:%d: Unexpected character `%s' in S-record file\n"), abfd, lineno, buf); bfd_set_error (bfd_error_bad_value); @@ -483,6 +484,7 @@ srec_scan (bfd *abfd) min_bytes = 5; if (bytes < min_bytes) { + /* xgettext:c-format */ _bfd_error_handler (_("%B:%d: byte count %d too small\n"), abfd, lineno, bytes); bfd_set_error (bfd_error_bad_value); @@ -575,6 +577,7 @@ srec_scan (bfd *abfd) if (check_sum != HEX (data)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B:%d: Bad checksum in S-record file\n"), abfd, lineno); bfd_set_error (bfd_error_bad_value); @@ -608,6 +611,7 @@ srec_scan (bfd *abfd) if (check_sum != HEX (data)) { _bfd_error_handler + /* xgettext:c-format */ (_("%B:%d: Bad checksum in S-record file\n"), abfd, lineno); bfd_set_error (bfd_error_bad_value); diff --git a/bfd/stabs.c b/bfd/stabs.c index deb2c0f..da1c317 100644 --- a/bfd/stabs.c +++ b/bfd/stabs.c @@ -275,6 +275,7 @@ _bfd_link_section_stabs (bfd *abfd, if (symstroff >= stabstrsec->size) { _bfd_error_handler + /* xgettext:c-format */ (_("%B(%A+0x%lx): Stabs entry has invalid string index."), abfd, stabsec, (long) (sym - stabbuf)); bfd_set_error (bfd_error_bad_value); diff --git a/bfd/vms-alpha.c b/bfd/vms-alpha.c index 6b37e45..57e6975 100644 --- a/bfd/vms-alpha.c +++ b/bfd/vms-alpha.c @@ -2092,7 +2092,7 @@ _bfd_vms_slurp_etir (bfd *abfd, struct bfd_link_info *info) /* 214 Store-conditional NOP, BSR or HINT at psect + offset arg: none. */ case ETIR__C_STC_NBH_PS: - _bfd_error_handler ("%s: not supported", + _bfd_error_handler (_("%s: not supported"), _bfd_vms_etir_name (cmd)); return FALSE; break; @@ -4846,6 +4846,7 @@ alpha_vms_slurp_relocs (bfd *abfd) if (prev_cmd != ETIR__C_STA_PQ) { _bfd_error_handler + /* xgettext:c-format */ (_("Unknown reloc %s + %s"), _bfd_vms_etir_name (prev_cmd), _bfd_vms_etir_name (cmd)); return FALSE; @@ -4863,6 +4864,7 @@ alpha_vms_slurp_relocs (bfd *abfd) if (prev_cmd != ETIR__C_STA_GBL) { _bfd_error_handler + /* xgettext:c-format */ (_("Unknown reloc %s + %s"), _bfd_vms_etir_name (cmd), _bfd_vms_etir_name (ETIR__C_STA_LW)); return FALSE; @@ -4877,6 +4879,7 @@ alpha_vms_slurp_relocs (bfd *abfd) if (prev_cmd != -1 && prev_cmd != ETIR__C_STA_GBL) { _bfd_error_handler + /* xgettext:c-format */ (_("Unknown reloc %s + %s"), _bfd_vms_etir_name (cmd), _bfd_vms_etir_name (ETIR__C_STA_QW)); return FALSE; @@ -4892,6 +4895,7 @@ alpha_vms_slurp_relocs (bfd *abfd) && prev_cmd != ETIR__C_STA_LW && prev_cmd != ETIR__C_STA_PQ) { + /* xgettext:c-format */ _bfd_error_handler (_("Unknown reloc %s + %s"), _bfd_vms_etir_name (prev_cmd), _bfd_vms_etir_name (ETIR__C_STO_LW)); @@ -4904,6 +4908,7 @@ alpha_vms_slurp_relocs (bfd *abfd) /* ALPHA_R_REFQUAD abs_section, step 2 */ if (prev_cmd != ETIR__C_OPR_ADD && prev_cmd != ETIR__C_STA_QW) { + /* xgettext:c-format */ _bfd_error_handler (_("Unknown reloc %s + %s"), _bfd_vms_etir_name (prev_cmd), _bfd_vms_etir_name (ETIR__C_STO_QW)); @@ -4915,6 +4920,7 @@ alpha_vms_slurp_relocs (bfd *abfd) case ETIR__C_STO_OFF: /* ALPHA_R_REFQUAD others, step 2 */ if (prev_cmd != ETIR__C_STA_PQ) { + /* xgettext:c-format */ _bfd_error_handler (_("Unknown reloc %s + %s"), _bfd_vms_etir_name (prev_cmd), _bfd_vms_etir_name (ETIR__C_STO_OFF)); @@ -4927,6 +4933,7 @@ alpha_vms_slurp_relocs (bfd *abfd) /* ALPHA_R_REFQUAD und_section, step 3 */ if (prev_cmd != ETIR__C_STA_LW && prev_cmd != ETIR__C_STA_QW) { + /* xgettext:c-format */ _bfd_error_handler (_("Unknown reloc %s + %s"), _bfd_vms_etir_name (prev_cmd), _bfd_vms_etir_name (ETIR__C_OPR_ADD)); @@ -5450,7 +5457,7 @@ alpha_vms_bfd_reloc_type_lookup (bfd * abfd ATTRIBUTE_UNUSED, case BFD_RELOC_ALPHA_LDA: alpha_type = ALPHA_R_LDA; break; case BFD_RELOC_ALPHA_BOH: alpha_type = ALPHA_R_BOH; break; default: - _bfd_error_handler ("reloc (%d) is *UNKNOWN*", code); + _bfd_error_handler (_("reloc (%d) is *UNKNOWN*"), code); return NULL; } vms_debug2 ((2, "reloc is %s\n", alpha_howto_table[alpha_type].name)); @@ -5564,6 +5571,7 @@ evax_bfd_print_emh (FILE *file, unsigned char *rec, unsigned int rec_len) subtype = (unsigned)bfd_getl16 (emh->subtyp); + /* xgettext:c-format */ fprintf (file, _(" EMH %u (len=%u): "), subtype, rec_len); switch (subtype) @@ -5713,6 +5721,7 @@ evax_bfd_print_egsd (FILE *file, unsigned char *rec, unsigned int rec_len) type = (unsigned)bfd_getl16 (e->gsdtyp); len = (unsigned)bfd_getl16 (e->gsdsiz); + /* xgettext:c-format */ fprintf (file, _(" EGSD entry %2u (type: %u, len: %u): "), n, type, len); n++; @@ -5915,18 +5924,22 @@ evax_bfd_print_hex (FILE *file, const char *pfx, static void evax_bfd_print_etir_stc_ir (FILE *file, const unsigned char *buf, int is_ps) { + /* xgettext:c-format */ fprintf (file, _(" linkage index: %u, replacement insn: 0x%08x\n"), (unsigned)bfd_getl32 (buf), (unsigned)bfd_getl32 (buf + 16)); + /* xgettext:c-format */ fprintf (file, _(" psect idx 1: %u, offset 1: 0x%08x %08x\n"), (unsigned)bfd_getl32 (buf + 4), (unsigned)bfd_getl32 (buf + 12), (unsigned)bfd_getl32 (buf + 8)); + /* xgettext:c-format */ fprintf (file, _(" psect idx 2: %u, offset 2: 0x%08x %08x\n"), (unsigned)bfd_getl32 (buf + 20), (unsigned)bfd_getl32 (buf + 28), (unsigned)bfd_getl32 (buf + 24)); if (is_ps) + /* xgettext:c-format */ fprintf (file, _(" psect idx 3: %u, offset 3: 0x%08x %08x\n"), (unsigned)bfd_getl32 (buf + 32), (unsigned)bfd_getl32 (buf + 40), @@ -5942,6 +5955,7 @@ evax_bfd_print_etir (FILE *file, const char *name, unsigned int off = sizeof (struct vms_egsd); unsigned int sec_len = 0; + /* xgettext:c-format */ fprintf (file, _(" %s (len=%u+%u):\n"), name, (unsigned)(rec_len - sizeof (struct vms_eobjrec)), (unsigned)sizeof (struct vms_eobjrec)); @@ -5957,6 +5971,7 @@ evax_bfd_print_etir (FILE *file, const char *name, size = bfd_getl16 (etir->size); buf = rec + off + sizeof (struct vms_etir); + /* xgettext:c-format */ fprintf (file, _(" (type: %3u, size: 4+%3u): "), type, size - 4); switch (type) { @@ -5975,6 +5990,7 @@ evax_bfd_print_etir (FILE *file, const char *name, break; case ETIR__C_STA_PQ: fprintf (file, _("STA_PQ (stack psect base + offset)\n")); + /* xgettext:c-format */ fprintf (file, _(" psect: %u, offset: 0x%08x %08x\n"), (unsigned)bfd_getl32 (buf + 0), (unsigned)bfd_getl32 (buf + 8), @@ -6111,6 +6127,7 @@ evax_bfd_print_etir (FILE *file, const char *name, case ETIR__C_STC_LP_PSB: fprintf (file, _("STC_LP_PSB (store cond linkage pair + signature)\n")); + /* xgettext:c-format */ fprintf (file, _(" linkage index: %u, procedure: %.*s\n"), (unsigned)bfd_getl32 (buf), buf[4], buf + 5); buf += 4 + 1 + buf[4]; @@ -6118,17 +6135,20 @@ evax_bfd_print_etir (FILE *file, const char *name, break; case ETIR__C_STC_GBL: fprintf (file, _("STC_GBL (store cond global)\n")); + /* xgettext:c-format */ fprintf (file, _(" linkage index: %u, global: %.*s\n"), (unsigned)bfd_getl32 (buf), buf[4], buf + 5); break; case ETIR__C_STC_GCA: fprintf (file, _("STC_GCA (store cond code address)\n")); + /* xgettext:c-format */ fprintf (file, _(" linkage index: %u, procedure name: %.*s\n"), (unsigned)bfd_getl32 (buf), buf[4], buf + 5); break; case ETIR__C_STC_PS: fprintf (file, _("STC_PS (store cond psect + offset)\n")); fprintf (file, + /* xgettext:c-format */ _(" linkage index: %u, psect: %u, offset: 0x%08x %08x\n"), (unsigned)bfd_getl32 (buf), (unsigned)bfd_getl32 (buf + 4), @@ -6346,6 +6366,7 @@ evax_bfd_print_relocation_records (FILE *file, const unsigned char *rel, break; base = bfd_getl32 (rel + 4); + /* xgettext:c-format */ fprintf (file, _(" bitcount: %u, base addr: 0x%08x\n"), count, base); @@ -6359,6 +6380,7 @@ evax_bfd_print_relocation_records (FILE *file, const unsigned char *rel, val = bfd_getl32 (rel); rel += 4; + /* xgettext:c-format */ fprintf (file, _(" bitmap: 0x%08x (count: %u):\n"), val, count); for (k = 0; k < 32; k++) @@ -6391,11 +6413,13 @@ evax_bfd_print_address_fixups (FILE *file, const unsigned char *rel) count = bfd_getl32 (rel + 0); if (count == 0) return; + /* xgettext:c-format */ fprintf (file, _(" image %u (%u entries)\n"), (unsigned)bfd_getl32 (rel + 4), count); rel += 8; for (j = 0; j < count; j++) { + /* xgettext:c-format */ fprintf (file, _(" offset: 0x%08x, val: 0x%08x\n"), (unsigned)bfd_getl32 (rel + 0), (unsigned)bfd_getl32 (rel + 4)); @@ -6417,6 +6441,7 @@ evax_bfd_print_reference_fixups (FILE *file, const unsigned char *rel) count = bfd_getl32 (rel + 0); if (count == 0) break; + /* xgettext:c-format */ fprintf (file, _(" image %u (%u entries), offsets:\n"), (unsigned)bfd_getl32 (rel + 4), count); rel += 8; @@ -6550,6 +6575,7 @@ evax_bfd_print_desc (const unsigned char *buf, int indent, FILE *file) } else { + /* xgettext:c-format */ fprintf (file, _("class: %u, dtype: %u, length: %u, pointer: 0x%08x\n"), bclass, dtype, len, pointer); switch (bclass) @@ -6565,10 +6591,12 @@ evax_bfd_print_desc (const unsigned char *buf, int indent, FILE *file) evax_bfd_get_dsc_name (dsc->dtype)); evax_bfd_print_indent (indent + 1, file); fprintf (file, + /* xgettext:c-format */ _("dimct: %u, aflags: 0x%02x, digits: %u, scale: %u\n"), dsc->dimct, dsc->aflags, dsc->digits, dsc->scale); evax_bfd_print_indent (indent + 1, file); fprintf (file, + /* xgettext:c-format */ _("arsize: %u, a0: 0x%08x\n"), (unsigned)bfd_getl32 (dsc->arsize), (unsigned)bfd_getl32 (dsc->a0)); @@ -6578,7 +6606,7 @@ evax_bfd_print_desc (const unsigned char *buf, int indent, FILE *file) for (i = 0; i < dsc->dimct; i++) { evax_bfd_print_indent (indent + 2, file); - fprintf (file, _("[%u]: %u\n"), i + 1, + fprintf (file, "[%u]: %u\n", i + 1, (unsigned)bfd_getl32 (b)); b += 4; } @@ -6588,6 +6616,7 @@ evax_bfd_print_desc (const unsigned char *buf, int indent, FILE *file) for (i = 0; i < dsc->dimct; i++) { evax_bfd_print_indent (indent + 2, file); + /* xgettext:c-format */ fprintf (file, _("[%u]: Lower: %u, upper: %u\n"), i + 1, (unsigned)bfd_getl32 (b + 0), (unsigned)bfd_getl32 (b + 4)); @@ -6604,6 +6633,7 @@ evax_bfd_print_desc (const unsigned char *buf, int indent, FILE *file) evax_bfd_get_dsc_name (ubs->dtype)); evax_bfd_print_indent (indent + 1, file); fprintf (file, + /* xgettext:c-format */ _("base: %u, pos: %u\n"), (unsigned)bfd_getl32 (ubs->base), (unsigned)bfd_getl32 (ubs->pos)); @@ -6624,6 +6654,7 @@ evax_bfd_print_valspec (const unsigned char *buf, int indent, FILE *file) unsigned int len = 5; evax_bfd_print_indent (indent, file); + /* xgettext:c-format */ fprintf (file, _("vflags: 0x%02x, value: 0x%08x "), vflags, value); buf += 5; @@ -6652,6 +6683,7 @@ evax_bfd_print_valspec (const unsigned char *buf, int indent, FILE *file) fprintf (file, _("(at bit offset %u)\n"), value); break; default: + /* xgettext:c-format */ fprintf (file, _("(reg: %u, disp: %u, indir: %u, kind: "), (vflags & DST__K_REGNUM_MASK) >> DST__K_REGNUM_SHIFT, vflags & DST__K_DISP ? 1 : 0, @@ -6684,24 +6716,26 @@ evax_bfd_print_typspec (const unsigned char *buf, int indent, FILE *file) unsigned int len = (unsigned)bfd_getl16 (buf); evax_bfd_print_indent (indent, file); - fprintf (file, ("len: %2u, kind: %2u "), len, kind); + /* xgettext:c-format */ + fprintf (file, _("len: %2u, kind: %2u "), len, kind); buf += 3; switch (kind) { case DST__K_TS_ATOM: - fprintf (file, ("atomic, type=0x%02x %s\n"), + /* xgettext:c-format */ + fprintf (file, _("atomic, type=0x%02x %s\n"), buf[0], evax_bfd_get_dsc_name (buf[0])); break; case DST__K_TS_IND: - fprintf (file, ("indirect, defined at 0x%08x\n"), + fprintf (file, _("indirect, defined at 0x%08x\n"), (unsigned)bfd_getl32 (buf)); break; case DST__K_TS_TPTR: - fprintf (file, ("typed pointer\n")); + fprintf (file, _("typed pointer\n")); evax_bfd_print_typspec (buf, indent + 1, file); break; case DST__K_TS_PTR: - fprintf (file, ("pointer\n")); + fprintf (file, _("pointer\n")); break; case DST__K_TS_ARRAY: { @@ -6709,30 +6743,30 @@ evax_bfd_print_typspec (const unsigned char *buf, int indent, FILE *file) unsigned int vec_len; unsigned int i; - fprintf (file, ("array, dim: %u, bitmap: "), buf[0]); + fprintf (file, _("array, dim: %u, bitmap: "), buf[0]); vec_len = (buf[0] + 1 + 7) / 8; for (i = 0; i < vec_len; i++) fprintf (file, " %02x", buf[i + 1]); fputc ('\n', file); vs = buf + 1 + vec_len; evax_bfd_print_indent (indent, file); - fprintf (file, ("array descriptor:\n")); + fprintf (file, _("array descriptor:\n")); vs += evax_bfd_print_valspec (vs, indent + 1, file); for (i = 0; i < buf[0] + 1U; i++) if (buf[1 + i / 8] & (1 << (i % 8))) { evax_bfd_print_indent (indent, file); if (i == 0) - fprintf (file, ("type spec for element:\n")); + fprintf (file, _("type spec for element:\n")); else - fprintf (file, ("type spec for subscript %u:\n"), i); + fprintf (file, _("type spec for subscript %u:\n"), i); evax_bfd_print_typspec (vs, indent + 1, file); vs += bfd_getl16 (vs); } } break; default: - fprintf (file, ("*unhandled*\n")); + fprintf (file, _("*unhandled*\n")); } } @@ -6759,6 +6793,7 @@ evax_bfd_print_dst (struct bfd *abfd, unsigned int dst_size, FILE *file) } len = bfd_getl16 (dsth.length); type = bfd_getl16 (dsth.type); + /* xgettext:c-format */ fprintf (file, _(" type: %3u, len: %3u (at 0x%08x): "), type, len, off); if (len == 0) @@ -6827,6 +6862,7 @@ evax_bfd_print_dst (struct bfd *abfd, unsigned int dst_size, FILE *file) const char *name = (const char *)buf + sizeof (*dst); fprintf (file, _("modbeg\n")); + /* xgettext:c-format */ fprintf (file, _(" flags: %d, language: %u, " "major: %u, minor: %u\n"), dst->flags, @@ -6849,6 +6885,7 @@ evax_bfd_print_dst (struct bfd *abfd, unsigned int dst_size, FILE *file) const char *name = (const char *)buf + sizeof (*dst); fputs (_("rtnbeg\n"), file); + /* xgettext:c-format */ fprintf (file, _(" flags: %u, address: 0x%08x, " "pd-address: 0x%08x\n"), dst->flags, @@ -6878,6 +6915,7 @@ evax_bfd_print_dst (struct bfd *abfd, unsigned int dst_size, FILE *file) { struct vms_dst_epilog *dst = (void *)buf; + /* xgettext:c-format */ fprintf (file, _("epilog: flags: %u, count: %u\n"), dst->flags, (unsigned)bfd_getl32 (dst->count)); } @@ -6887,6 +6925,7 @@ evax_bfd_print_dst (struct bfd *abfd, unsigned int dst_size, FILE *file) struct vms_dst_blkbeg *dst = (void *)buf; const char *name = (const char *)buf + sizeof (*dst); + /* xgettext:c-format */ fprintf (file, _("blkbeg: address: 0x%08x, name: %.*s\n"), (unsigned)bfd_getl32 (dst->address), name[0], name + 1); @@ -6920,7 +6959,7 @@ evax_bfd_print_dst (struct bfd *abfd, unsigned int dst_size, FILE *file) fprintf (file, _("recbeg: name: %.*s\n"), name[0], name + 1); evax_bfd_print_valspec (buf, 4, file); - fprintf (file, (" len: %u bits\n"), + fprintf (file, _(" len: %u bits\n"), (unsigned)bfd_getl32 (name + 1 + name[0])); } break; @@ -6928,6 +6967,7 @@ evax_bfd_print_dst (struct bfd *abfd, unsigned int dst_size, FILE *file) fprintf (file, _("recend\n")); break; case DST__K_ENUMBEG: + /* xgettext:c-format */ fprintf (file, _("enumbeg, len: %u, name: %.*s\n"), buf[0], buf[1], buf + 2); break; @@ -6941,9 +6981,9 @@ evax_bfd_print_dst (struct bfd *abfd, unsigned int dst_size, FILE *file) case DST__K_LABEL: { struct vms_dst_label *lab = (void *)buf; - fprintf (file, ("label, name: %.*s\n"), + fprintf (file, _("label, name: %.*s\n"), lab->name[0], lab->name + 1); - fprintf (file, (" address: 0x%08x\n"), + fprintf (file, _(" address: 0x%08x\n"), (unsigned)bfd_getl32 (lab->value)); } break; @@ -6955,6 +6995,7 @@ evax_bfd_print_dst (struct bfd *abfd, unsigned int dst_size, FILE *file) fprintf (file, _("discontiguous range (nbr: %u)\n"), cnt); for (i = 0; i < cnt; i++, rng += 8) + /* xgettext:c-format */ fprintf (file, _(" address: 0x%08x, size: %u\n"), (unsigned)bfd_getl32 (rng), (unsigned)bfd_getl32 (rng + 4)); @@ -7049,6 +7090,7 @@ evax_bfd_print_dst (struct bfd *abfd, unsigned int dst_size, FILE *file) fprintf (file, _("delta pc +%-4d"), -cmd); line++; /* FIXME: curr increment. */ pc += -cmd; + /* xgettext:c-format */ fprintf (file, _(" pc: 0x%08x line: %5u\n"), pc, line); cmdlen = 1; @@ -7083,10 +7125,12 @@ evax_bfd_print_dst (struct bfd *abfd, unsigned int dst_size, FILE *file) struct vms_dst_src_decl_src *src = (void *)(buf + 1); const char *name; + /* xgettext:c-format */ fprintf (file, _(" declfile: len: %u, flags: %u, " "fileid: %u\n"), src->length, src->flags, (unsigned)bfd_getl16 (src->fileid)); + /* xgettext:c-format */ fprintf (file, _(" rms: cdt: 0x%08x %08x, " "ebk: 0x%08x, ffb: 0x%04x, " "rfo: %u\n"), @@ -7190,9 +7234,11 @@ evax_bfd_print_image (bfd *abfd, FILE *file) fprintf (file, _("cannot read EIHD\n")); return; } + /* xgettext:c-format */ fprintf (file, _("EIHD: (size: %u, nbr blocks: %u)\n"), (unsigned)bfd_getl32 (eihd.size), (unsigned)bfd_getl32 (eihd.hdrblkcnt)); + /* xgettext:c-format */ fprintf (file, _(" majorid: %u, minorid: %u\n"), (unsigned)bfd_getl32 (eihd.majorid), (unsigned)bfd_getl32 (eihd.minorid)); @@ -7210,6 +7256,7 @@ evax_bfd_print_image (bfd *abfd, FILE *file) name = _("unknown"); break; } + /* xgettext:c-format */ fprintf (file, _(" image type: %u (%s)"), val, name); val = (unsigned)bfd_getl32 (eihd.subtype); @@ -7225,12 +7272,14 @@ evax_bfd_print_image (bfd *abfd, FILE *file) name = _("unknown"); break; } + /* xgettext:c-format */ fprintf (file, _(", subtype: %u (%s)\n"), val, name); eisd_off = bfd_getl32 (eihd.isdoff); eiha_off = bfd_getl32 (eihd.activoff); eihi_off = bfd_getl32 (eihd.imgidoff); eihs_off = bfd_getl32 (eihd.symdbgoff); + /* xgettext:c-format */ fprintf (file, _(" offsets: isd: %u, activ: %u, symdbg: %u, " "imgid: %u, patch: %u\n"), eisd_off, eiha_off, eihs_off, eihi_off, @@ -7244,6 +7293,7 @@ evax_bfd_print_image (bfd *abfd, FILE *file) " version array off: %u\n"), eihvn_off); fprintf (file, + /* xgettext:c-format */ _(" img I/O count: %u, nbr channels: %u, req pri: %08x%08x\n"), (unsigned)bfd_getl32 (eihd.imgiocnt), (unsigned)bfd_getl32 (eihd.iochancnt), @@ -7280,6 +7330,7 @@ evax_bfd_print_image (bfd *abfd, FILE *file) if (val & EIHD__M_EXT_BIND_SECT) fprintf (file, " EXT_BIND_SECT"); fprintf (file, "\n"); + /* xgettext:c-format */ fprintf (file, _(" ident: 0x%08x, sysver: 0x%08x, " "match ctrl: %u, symvect_size: %u\n"), (unsigned)bfd_getl32 (eihd.ident), @@ -7292,6 +7343,7 @@ evax_bfd_print_image (bfd *abfd, FILE *file) { eihef_off = bfd_getl32 (eihd.ext_fixup_off); eihnp_off = bfd_getl32 (eihd.noopt_psect_off); + /* xgettext:c-format */ fprintf (file, _(", ext fixup offset: %u, no_opt psect off: %u"), eihef_off, eihnp_off); } @@ -7387,7 +7439,7 @@ evax_bfd_print_image (bfd *abfd, FILE *file) fputs (_("*unknown* "), file); break; } - fprintf (file, _(": %u.%u\n"), + fprintf (file, ": %u.%u\n", (unsigned)bfd_getl16 (ver.major), (unsigned)bfd_getl16 (ver.minor)); } @@ -7405,18 +7457,23 @@ evax_bfd_print_image (bfd *abfd, FILE *file) } fprintf (file, _("Image activation: (size=%u)\n"), (unsigned)bfd_getl32 (eiha.size)); + /* xgettext:c-format */ fprintf (file, _(" First address : 0x%08x 0x%08x\n"), (unsigned)bfd_getl32 (eiha.tfradr1_h), (unsigned)bfd_getl32 (eiha.tfradr1)); + /* xgettext:c-format */ fprintf (file, _(" Second address: 0x%08x 0x%08x\n"), (unsigned)bfd_getl32 (eiha.tfradr2_h), (unsigned)bfd_getl32 (eiha.tfradr2)); + /* xgettext:c-format */ fprintf (file, _(" Third address : 0x%08x 0x%08x\n"), (unsigned)bfd_getl32 (eiha.tfradr3_h), (unsigned)bfd_getl32 (eiha.tfradr3)); + /* xgettext:c-format */ fprintf (file, _(" Fourth address: 0x%08x 0x%08x\n"), (unsigned)bfd_getl32 (eiha.tfradr4_h), (unsigned)bfd_getl32 (eiha.tfradr4)); + /* xgettext:c-format */ fprintf (file, _(" Shared image : 0x%08x 0x%08x\n"), (unsigned)bfd_getl32 (eiha.inishr_h), (unsigned)bfd_getl32 (eiha.inishr)); @@ -7431,6 +7488,7 @@ evax_bfd_print_image (bfd *abfd, FILE *file) fprintf (file, _("cannot read EIHI\n")); return; } + /* xgettext:c-format */ fprintf (file, _("Image identification: (major: %u, minor: %u)\n"), (unsigned)bfd_getl32 (eihi.majorid), (unsigned)bfd_getl32 (eihi.minorid)); @@ -7455,19 +7513,23 @@ evax_bfd_print_image (bfd *abfd, FILE *file) fprintf (file, _("cannot read EIHS\n")); return; } + /* xgettext:c-format */ fprintf (file, _("Image symbol & debug table: (major: %u, minor: %u)\n"), (unsigned)bfd_getl32 (eihs.majorid), (unsigned)bfd_getl32 (eihs.minorid)); dst_vbn = bfd_getl32 (eihs.dstvbn); dst_size = bfd_getl32 (eihs.dstsize); + /* xgettext:c-format */ fprintf (file, _(" debug symbol table : vbn: %u, size: %u (0x%x)\n"), dst_vbn, dst_size, dst_size); gst_vbn = bfd_getl32 (eihs.gstvbn); gst_size = bfd_getl32 (eihs.gstsize); + /* xgettext:c-format */ fprintf (file, _(" global symbol table: vbn: %u, records: %u\n"), gst_vbn, gst_size); dmt_vbn = bfd_getl32 (eihs.dmtvbn); dmt_size = bfd_getl32 (eihs.dmtsize); + /* xgettext:c-format */ fprintf (file, _(" debug module table : vbn: %u, size: %u\n"), dmt_vbn, dmt_size); } @@ -7491,6 +7553,7 @@ evax_bfd_print_image (bfd *abfd, FILE *file) /* Next block. */ eisd_off = (eisd_off + VMS_BLOCK_SIZE) & ~(VMS_BLOCK_SIZE - 1); } + /* xgettext:c-format */ fprintf (file, _("Image section descriptor: (major: %u, minor: %u, " "size: %u, offset: %u)\n"), (unsigned)bfd_getl32 (eisd.majorid), @@ -7498,6 +7561,7 @@ evax_bfd_print_image (bfd *abfd, FILE *file) len, eisd_off); if (len == 0) break; + /* xgettext:c-format */ fprintf (file, _(" section: base: 0x%08x%08x size: 0x%08x\n"), (unsigned)bfd_getl32 (eisd.virt_addr + 4), (unsigned)bfd_getl32 (eisd.virt_addr + 0), @@ -7540,6 +7604,7 @@ evax_bfd_print_image (bfd *abfd, FILE *file) eiaf_vbn = bfd_getl32 (eisd.vbn); eiaf_size = bfd_getl32 (eisd.secsize); } + /* xgettext:c-format */ fprintf (file, _(" vbn: %u, pfc: %u, matchctl: %u type: %u ("), (unsigned)bfd_getl32 (eisd.vbn), eisd.pfc, eisd.matchctl, eisd.type); @@ -7569,6 +7634,7 @@ evax_bfd_print_image (bfd *abfd, FILE *file) } fputs (_(")\n"), file); if (val & EISD__M_GBL) + /* xgettext:c-format */ fprintf (file, _(" ident: 0x%08x, name: %.*s\n"), (unsigned)bfd_getl32 (eisd.ident), eisd.gblnam[0], eisd.gblnam + 1); @@ -7597,6 +7663,7 @@ evax_bfd_print_image (bfd *abfd, FILE *file) } count = bfd_getl16 (dmth.psect_count); fprintf (file, + /* xgettext:c-format */ _(" module offset: 0x%08x, size: 0x%08x, (%u psects)\n"), (unsigned)bfd_getl32 (dmth.modbeg), (unsigned)bfd_getl32 (dmth.size), count); @@ -7610,6 +7677,7 @@ evax_bfd_print_image (bfd *abfd, FILE *file) fprintf (file, _("cannot read DMT psect\n")); return; } + /* xgettext:c-format */ fprintf (file, _(" psect start: 0x%08x, length: %u\n"), (unsigned)bfd_getl32 (dmtp.start), (unsigned)bfd_getl32 (dmtp.length)); @@ -7665,12 +7733,15 @@ evax_bfd_print_image (bfd *abfd, FILE *file) } eiaf = (struct vms_eiaf *)buf; fprintf (file, + /* xgettext:c-format */ _("Image activator fixup: (major: %u, minor: %u)\n"), (unsigned)bfd_getl32 (eiaf->majorid), (unsigned)bfd_getl32 (eiaf->minorid)); + /* xgettext:c-format */ fprintf (file, _(" iaflink : 0x%08x %08x\n"), (unsigned)bfd_getl32 (eiaf->iaflink + 0), (unsigned)bfd_getl32 (eiaf->iaflink + 4)); + /* xgettext:c-format */ fprintf (file, _(" fixuplnk: 0x%08x %08x\n"), (unsigned)bfd_getl32 (eiaf->fixuplnk + 0), (unsigned)bfd_getl32 (eiaf->fixuplnk + 4)); @@ -7680,22 +7751,27 @@ evax_bfd_print_image (bfd *abfd, FILE *file) (unsigned)bfd_getl32 (eiaf->flags)); qrelfixoff = bfd_getl32 (eiaf->qrelfixoff); lrelfixoff = bfd_getl32 (eiaf->lrelfixoff); + /* xgettext:c-format */ fprintf (file, _(" qrelfixoff: %5u, lrelfixoff: %5u\n"), qrelfixoff, lrelfixoff); qdotadroff = bfd_getl32 (eiaf->qdotadroff); ldotadroff = bfd_getl32 (eiaf->ldotadroff); + /* xgettext:c-format */ fprintf (file, _(" qdotadroff: %5u, ldotadroff: %5u\n"), qdotadroff, ldotadroff); codeadroff = bfd_getl32 (eiaf->codeadroff); lpfixoff = bfd_getl32 (eiaf->lpfixoff); + /* xgettext:c-format */ fprintf (file, _(" codeadroff: %5u, lpfixoff : %5u\n"), codeadroff, lpfixoff); chgprtoff = bfd_getl32 (eiaf->chgprtoff); fprintf (file, _(" chgprtoff : %5u\n"), chgprtoff); shrimgcnt = bfd_getl32 (eiaf->shrimgcnt); shlstoff = bfd_getl32 (eiaf->shlstoff); + /* xgettext:c-format */ fprintf (file, _(" shlstoff : %5u, shrimgcnt : %5u\n"), shlstoff, shrimgcnt); + /* xgettext:c-format */ fprintf (file, _(" shlextra : %5u, permctx : %5u\n"), (unsigned)bfd_getl32 (eiaf->shlextra), (unsigned)bfd_getl32 (eiaf->permctx)); @@ -7713,6 +7789,7 @@ evax_bfd_print_image (bfd *abfd, FILE *file) for (j = 0; j < shrimgcnt; j++, shl++) { fprintf (file, + /* xgettext:c-format */ _(" %u: size: %u, flags: 0x%02x, name: %.*s\n"), j, shl->size, shl->flags, shl->imgnam[0], shl->imgnam + 1); @@ -7759,6 +7836,7 @@ evax_bfd_print_image (bfd *abfd, FILE *file) { unsigned int prot = bfd_getl32 (eicp->newprt); fprintf (file, + /* xgettext:c-format */ _(" base: 0x%08x %08x, size: 0x%08x, prot: 0x%08x "), (unsigned)bfd_getl32 (eicp->baseva + 4), (unsigned)bfd_getl32 (eicp->baseva + 0), @@ -8669,6 +8747,7 @@ alpha_vms_bfd_final_link (bfd *abfd, struct bfd_link_info *info) && !(PRIV2 (sub, eom_data).eom_b_tfrflg & EEOM__M_WKTFR)) { (*info->callbacks->einfo) + /* xgettext:c-format */ (_("%P: multiple entry points: in modules %B and %B\n"), startbfd, sub); continue; diff --git a/bfd/vms-lib.c b/bfd/vms-lib.c index eef0945..a67ecfa 100644 --- a/bfd/vms-lib.c +++ b/bfd/vms-lib.c @@ -1441,6 +1441,7 @@ _bfd_vms_lib_get_imagelib_file (bfd *el) if (res == NULL) { + /* xgettext:c-format */ _bfd_error_handler(_("could not open shared image '%s' from '%s'"), filename, archive->filename); bfd_release (archive, filename); diff --git a/bfd/xcofflink.c b/bfd/xcofflink.c index 20e9b8c..cfdd018 100644 --- a/bfd/xcofflink.c +++ b/bfd/xcofflink.c @@ -1409,6 +1409,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info) if (enclosing == NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: `%s' has line numbers but no enclosing section"), abfd, name); bfd_set_error (bfd_error_bad_value); @@ -1461,6 +1462,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info) if (sym.n_numaux == 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: class %d symbol `%s' has no aux entries"), abfd, sym.n_sclass, name); bfd_set_error (bfd_error_bad_value); @@ -1483,6 +1485,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info) { default: _bfd_error_handler + /* xgettext:c-format */ (_("%B: symbol `%s' has unrecognized csect type %d"), abfd, name, smtyp); bfd_set_error (bfd_error_bad_value); @@ -1495,6 +1498,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info) || aux.x_csect.x_scnlen.l != 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: bad XTY_ER symbol `%s': class %d scnum %d scnlen %d"), abfd, name, sym.n_sclass, sym.n_scnum, aux.x_csect.x_scnlen.l); @@ -1524,6 +1528,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info) || aux.x_csect.x_scnlen.l != 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: XMC_TC0 symbol `%s' is class %d scnlen %d"), abfd, name, sym.n_sclass, aux.x_csect.x_scnlen.l); bfd_set_error (bfd_error_bad_value); @@ -1670,6 +1675,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info) > enclosing->vma + enclosing->size))) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: csect `%s' not in enclosing section"), abfd, name); bfd_set_error (bfd_error_bad_value); @@ -1777,6 +1783,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info) if (bad) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: misplaced XTY_LD `%s'"), abfd, name); bfd_set_error (bfd_error_bad_value); @@ -2097,6 +2104,7 @@ xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info) if (*rel_csect == NULL) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: reloc %s:%d not in csect"), abfd, o->name, i); bfd_set_error (bfd_error_bad_value); @@ -4050,6 +4058,7 @@ xcoff_create_ldrel (bfd *output_bfd, struct xcoff_final_link_info *flinfo, else { _bfd_error_handler + /* xgettext:c-format */ (_("%B: loader reloc in unrecognized section `%s'"), reference_bfd, secname); bfd_set_error (bfd_error_nonrepresentable_section); @@ -4061,6 +4070,7 @@ xcoff_create_ldrel (bfd *output_bfd, struct xcoff_final_link_info *flinfo, if (h->ldindx < 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: `%s' in loader reloc but not loader sym"), reference_bfd, h->root.root.string); bfd_set_error (bfd_error_bad_value); @@ -4077,6 +4087,7 @@ xcoff_create_ldrel (bfd *output_bfd, struct xcoff_final_link_info *flinfo, && strcmp (output_section->name, ".text") == 0) { _bfd_error_handler + /* xgettext:c-format */ (_("%B: loader reloc in read-only section %A"), reference_bfd, output_section); bfd_set_error (bfd_error_invalid_operation); |