This is the mail archive of the binutils-cvs@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] Fix an illegal memory access when copying a PE format file with corrupt debug information.


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=aa4a8c2a2a67545e90c877162c53cc9de42dc8b4

commit aa4a8c2a2a67545e90c877162c53cc9de42dc8b4
Author: Nick Clifton <nickc@redhat.com>
Date:   Tue Apr 24 16:31:27 2018 +0100

    Fix an illegal memory access when copying a PE format file with corrupt debug information.
    
    	PR 23110
    	* peXXigen.c (_bfd_XX_bfd_copy_private_bfd_data_common): Check for
    	a negative PE_DEBUG_DATA size before iterating over the debug data.

Diff:
---
 bfd/ChangeLog  |    6 +
 bfd/peXXigen.c |    9 +
 bfd/po/bfd.pot | 5631 ++++++++++++++++++++++++++------------------------------
 3 files changed, 2662 insertions(+), 2984 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3c26f8a..32cd893 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2018-04-24  Nick Clifton  <nickc@redhat.com>
+
+	PR 23110
+	* peXXigen.c (_bfd_XX_bfd_copy_private_bfd_data_common): Check for
+	a negative PE_DEBUG_DATA size before iterating over the debug data.
+
 2018-04-23  Alan Modra  <amodra@gmail.com>
 
 	* elf-linux-core.h: Revert last change.
diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c
index bc97984..32ce195 100644
--- a/bfd/peXXigen.c
+++ b/bfd/peXXigen.c
@@ -2993,6 +2993,15 @@ _bfd_XX_bfd_copy_private_bfd_data_common (bfd * ibfd, bfd * obfd)
 		 (uint64_t) (section->size - (addr - section->vma)));
 	      return FALSE;
 	    }
+	  /* PR 23110.  */
+	  else if (ope->pe_opthdr.DataDirectory[PE_DEBUG_DATA].Size < 0)
+	    {
+	      /* xgettext:c-format */
+	      _bfd_error_handler
+		(_("%pB: Data Directory size (%#lx) is negative"),
+		 obfd, ope->pe_opthdr.DataDirectory[PE_DEBUG_DATA].Size);
+	      return FALSE;
+	    }
 
 	  for (i = 0; i < ope->pe_opthdr.DataDirectory[PE_DEBUG_DATA].Size
 		 / sizeof (struct external_IMAGE_DEBUG_DIRECTORY); i++)
diff --git a/bfd/po/bfd.pot b/bfd/po/bfd.pot
index 91c21b2..a6b2adb 100644
--- a/bfd/po/bfd.pot
+++ b/bfd/po/bfd.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2018-01-13 13:45+0000\n"
+"POT-Creation-Date: 2018-04-24 11:57+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,175 +18,214 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: aout-adobe.c:126
-#, c-format
-msgid "%B: Unknown section type in a.out.adobe file: %x\n"
-msgstr ""
-
 #: aout-cris.c:200
 #, c-format
-msgid "%B: Invalid relocation type exported: %d"
+msgid "%pB: unsupported relocation type exported: %#x"
 msgstr ""
 
 #: aout-cris.c:244
 #, c-format
-msgid "%B: Invalid relocation type imported: %d"
+msgid "%pB: unsupported relocation type imported: %#x"
 msgstr ""
 
 #: aout-cris.c:256
 #, c-format
-msgid "%B: Bad relocation record imported: %d"
+msgid "%pB: bad relocation record imported: %d"
 msgstr ""
 
-#: aoutx.h:1284 aoutx.h:1636 pdp11.c:1152 pdp11.c:1413
+#: aoutx.h:1264 aoutx.h:1617 pdp11.c:1138 pdp11.c:1399
 #, c-format
-msgid "%B: can not represent section `%A' in a.out object file format"
+msgid "%pB: can not represent section `%pA' in a.out object file format"
 msgstr ""
 
-#: aoutx.h:1600 pdp11.c:1385
+#: aoutx.h:1581 pdp11.c:1371
 #, c-format
 msgid ""
-"%B: can not represent section for symbol `%s' in a.out object file format"
+"%pB: can not represent section for symbol `%s' in a.out object file format"
 msgstr ""
 
-#: aoutx.h:1603 vms-alpha.c:7853
+#: aoutx.h:1584 vms-alpha.c:7854
 msgid "*unknown*"
 msgstr ""
 
-#: aoutx.h:2422 aoutx.h:2440
-msgid "%B: attempt to write out unknown reloc type"
+#: aoutx.h:1720
+#, c-format
+msgid "%pB: invalid string offset %<PRIu64> >= %<PRIu64>"
 msgstr ""
 
-#: aoutx.h:4093 aoutx.h:4414
-msgid "%P: %B: unexpected relocation type\n"
+#: aoutx.h:2411 aoutx.h:2429
+#, c-format
+msgid "%pB: attempt to write out unknown reloc type"
 msgstr ""
 
-#: aoutx.h:5440 pdp11.c:3708
+#: aoutx.h:4084
 #, c-format
-msgid "%B: relocatable link from %s to %s not supported"
+msgid "%pB: unsupported relocation type"
+msgstr ""
+
+#. Unknown relocation.
+#: aoutx.h:4405 coff-alpha.c:601 coff-alpha.c:1514 coff-rs6000.c:2773
+#: coff-sh.c:504 coff-tic4x.c:184 coff-tic54x.c:279 elf-hppa.h:1040
+#: elf-hppa.h:1068 elf-m10200.c:226 elf-m10300.c:812 elf32-arc.c:519
+#: elf32-arm.c:1852 elf32-avr.c:959 elf32-bfin.c:1061 elf32-bfin.c:4698
+#: elf32-cr16.c:653 elf32-cr16.c:683 elf32-cr16c.c:186 elf32-cris.c:467
+#: elf32-crx.c:429 elf32-d10v.c:234 elf32-d30v.c:522 elf32-d30v.c:544
+#: elf32-dlx.c:548 elf32-epiphany.c:376 elf32-fr30.c:381 elf32-frv.c:2558
+#: elf32-frv.c:6262 elf32-ft32.c:306 elf32-h8300.c:302 elf32-i386.c:401
+#: elf32-ip2k.c:1245 elf32-iq2000.c:442 elf32-lm32.c:539 elf32-m32c.c:305
+#: elf32-m32r.c:1286 elf32-m32r.c:1311 elf32-m32r.c:2417 elf32-m68hc11.c:390
+#: elf32-m68hc12.c:510 elf32-m68k.c:352 elf32-mcore.c:354 elf32-mcore.c:440
+#: elf32-mep.c:389 elf32-metag.c:878 elf32-microblaze.c:692
+#: elf32-microblaze.c:969 elf32-mips.c:2229 elf32-moxie.c:137
+#: elf32-msp430.c:648 elf32-msp430.c:658 elf32-mt.c:241 elf32-nds32.c:2880
+#: elf32-nds32.c:2904 elf32-nds32.c:4423 elf32-nios2.c:3015 elf32-or1k.c:715
+#: elf32-pj.c:325 elf32-ppc.c:2061 elf32-ppc.c:2074 elf32-pru.c:420
+#: elf32-rl78.c:292 elf32-rx.c:314 elf32-rx.c:323 elf32-s390.c:347
+#: elf32-sh.c:438 elf32-spu.c:160 elf32-tic6x.c:1508 elf32-tic6x.c:1518
+#: elf32-tic6x.c:1537 elf32-tic6x.c:1547 elf32-tic6x.c:2642 elf32-tilepro.c:803
+#: elf32-v850.c:1899 elf32-v850.c:1921 elf32-v850.c:4270 elf32-vax.c:290
+#: elf32-visium.c:482 elf32-wasm32.c:106 elf32-xc16x.c:241 elf32-xgate.c:428
+#: elf32-xstormy16.c:395 elf32-xtensa.c:454 elf32-xtensa.c:488
+#: elf64-alpha.c:1112 elf64-alpha.c:4101 elf64-alpha.c:4249
+#: elf64-ia64-vms.c:254 elf64-ia64-vms.c:3440 elf64-mips.c:3623
+#: elf64-mips.c:3639 elf64-mmix.c:1264 elf64-ppc.c:2281 elf64-ppc.c:2555
+#: elf64-ppc.c:2564 elf64-s390.c:328 elf64-s390.c:378 elf64-x86-64.c:285
+#: elfn32-mips.c:3451 elfxx-ia64.c:325 elfxx-riscv.c:955 elfxx-sparc.c:589
+#: elfxx-sparc.c:639 elfxx-sparc.c:661 elfxx-tilegx.c:912 elfxx-tilegx.c:952
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:2126
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:2224 elf32-ia64.c:211
+#: elf32-ia64.c:3863 elf64-ia64.c:211 elf64-ia64.c:3863
+#, c-format
+msgid "%pB: unsupported relocation type %#x"
+msgstr ""
+
+#: aoutx.h:5432 pdp11.c:3694
+#, c-format
+msgid "%pB: relocatable link from %s to %s not supported"
+msgstr ""
+
+#: archive.c:2216
+msgid "warning: writing archive was slow: rewriting timestamp"
+msgstr ""
+
+#: archive.c:2332 linker.c:1416
+#, c-format
+msgid "%pB: plugin needed to handle lto object"
+msgstr ""
+
+#: archive.c:2561
+msgid "Reading archive file mod timestamp"
 msgstr ""
 
-#: archive.c:2305
-msgid "Warning: writing archive was slow: rewriting timestamp\n"
+#: archive.c:2585
+msgid "Writing updated armap timestamp"
 msgstr ""
 
-#: archive.c:2421 linker.c:1410
-msgid "%B: plugin needed to handle lto object"
+#: bfd.c:448
+msgid "no error"
 msgstr ""
 
-#: archive.c:2650
-msgid "Reading archive file mod timestamp"
+#: bfd.c:449
+msgid "system call error"
 msgstr ""
 
-#: archive.c:2674
-msgid "Writing updated armap timestamp"
+#: bfd.c:450
+msgid "invalid bfd target"
+msgstr ""
+
+#: bfd.c:451
+msgid "file in wrong format"
+msgstr ""
+
+#: bfd.c:452
+msgid "archive object file in wrong format"
+msgstr ""
+
+#: bfd.c:453
+msgid "invalid operation"
 msgstr ""
 
 #: bfd.c:454
-msgid "No error"
+msgid "memory exhausted"
 msgstr ""
 
 #: bfd.c:455
-msgid "System call error"
+msgid "no symbols"
 msgstr ""
 
 #: bfd.c:456
-msgid "Invalid bfd target"
+msgid "archive has no index; run ranlib to add one"
 msgstr ""
 
 #: bfd.c:457
-msgid "File in wrong format"
+msgid "no more archived files"
 msgstr ""
 
 #: bfd.c:458
-msgid "Archive object file in wrong format"
+msgid "malformed archive"
 msgstr ""
 
 #: bfd.c:459
-msgid "Invalid operation"
+msgid "DSO missing from command line"
 msgstr ""
 
 #: bfd.c:460
-msgid "Memory exhausted"
+msgid "file format not recognized"
 msgstr ""
 
 #: bfd.c:461
-msgid "No symbols"
+msgid "file format is ambiguous"
 msgstr ""
 
 #: bfd.c:462
-msgid "Archive has no index; run ranlib to add one"
+msgid "section has no contents"
 msgstr ""
 
 #: bfd.c:463
-msgid "No more archived files"
+msgid "nonrepresentable section on output"
 msgstr ""
 
 #: bfd.c:464
-msgid "Malformed archive"
+msgid "symbol needs debug section which does not exist"
 msgstr ""
 
 #: bfd.c:465
-msgid "DSO missing from command line"
+msgid "bad value"
 msgstr ""
 
 #: bfd.c:466
-msgid "File format not recognized"
+msgid "file truncated"
 msgstr ""
 
 #: bfd.c:467
-msgid "File format is ambiguous"
+msgid "file too big"
 msgstr ""
 
 #: bfd.c:468
-msgid "Section has no contents"
-msgstr ""
-
-#: bfd.c:469
-msgid "Nonrepresentable section on output"
-msgstr ""
-
-#: bfd.c:470
-msgid "Symbol needs debug section which does not exist"
-msgstr ""
-
-#: bfd.c:471
-msgid "Bad value"
-msgstr ""
-
-#: bfd.c:472
-msgid "File truncated"
-msgstr ""
-
-#: bfd.c:473
-msgid "File too big"
-msgstr ""
-
-#: bfd.c:474
 #, c-format
-msgid "Error reading %s: %s"
+msgid "error reading %s: %s"
 msgstr ""
 
-#: bfd.c:475
-msgid "#<Invalid error code>"
+#: bfd.c:469
+msgid "#<invalid error code>"
 msgstr ""
 
-#: bfd.c:1442
+#: bfd.c:1416
 #, c-format
 msgid "BFD %s assertion fail %s:%d"
 msgstr ""
 
-#: bfd.c:1455
+#: bfd.c:1429
 #, c-format
 msgid "BFD %s internal error, aborting at %s:%d in %s\n"
 msgstr ""
 
-#: bfd.c:1460
+#: bfd.c:1434
 #, c-format
 msgid "BFD %s internal error, aborting at %s:%d\n"
 msgstr ""
 
-#: bfd.c:1462
+#: bfd.c:1436
 msgid "Please report this bug.\n"
 msgstr ""
 
@@ -202,129 +241,110 @@ msgstr ""
 
 #: binary.c:276
 #, c-format
-msgid "warning: writing section `%A' at huge (ie negative) file offset"
-msgstr ""
-
-#: bout.c:1142 elf-m10300.c:2647 elf32-avr.c:2484 elf32-frv.c:5633
-#: elf64-ia64-vms.c:353 elfxx-sparc.c:2817 reloc.c:8059 reloc16.c:156
-#: elf32-ia64.c:351 elf64-ia64.c:351
-msgid "%P%F: --relax and -r may not be used together\n"
+msgid "warning: writing section `%pA' at huge (ie negative) file offset"
 msgstr ""
 
 #: cache.c:273
 #, c-format
-msgid "reopening %B: %s\n"
+msgid "reopening %pB: %s\n"
 msgstr ""
 
 #: coff-alpha.c:450
+#, c-format
 msgid ""
-"%B: Cannot handle compressed Alpha binaries.\n"
-"   Use compiler flags, or objZ, to generate uncompressed binaries."
-msgstr ""
-
-#: coff-alpha.c:602
-msgid "%B: unknown/unsupported relocation type %d"
+"%pB: cannot handle compressed Alpha binaries; use compiler flags, or objZ, "
+"to generate uncompressed binaries"
 msgstr ""
 
-#: coff-alpha.c:851 coff-alpha.c:888 coff-alpha.c:1961 coff-mips.c:950
+#: coff-alpha.c:850 coff-alpha.c:887 coff-alpha.c:1957 coff-mips.c:950
 msgid "GP relative relocation used when GP not defined"
 msgstr ""
 
-#: coff-alpha.c:1444
+#: coff-alpha.c:1443
 msgid "using multiple gp values"
 msgstr ""
 
-#: coff-alpha.c:1503
-msgid "%B: unsupported relocation: ALPHA_R_GPRELHIGH"
-msgstr ""
-
-#: coff-alpha.c:1510
-msgid "%B: unsupported relocation: ALPHA_R_GPRELLOW"
-msgstr ""
-
-#: coff-alpha.c:1518 elf32-i370.c:1081 elf32-m32r.c:2404 elf32-microblaze.c:932
-#: elf64-alpha.c:4098 elf64-alpha.c:4246 elf64-ia64-vms.c:3430
-#: elf32-ia64.c:3847 elf64-ia64.c:3847
+#: coff-alpha.c:1501 coff-alpha.c:1507 elf.c:8972 elf32-mcore.c:100
+#: elf32-mcore.c:455 elf32-ppc.c:8751 elf32-ppc.c:9883 elf64-ppc.c:14922
 #, c-format
-msgid "%B: unknown relocation type %d"
+msgid "%pB: %s unsupported"
 msgstr ""
 
 #: coff-arm.c:1037
 #, c-format
-msgid "%B: unable to find THUMB glue '%s' for `%s'"
+msgid "%pB: unable to find THUMB glue '%s' for `%s'"
 msgstr ""
 
 #: coff-arm.c:1066
 #, c-format
-msgid "%B: unable to find ARM glue '%s' for `%s'"
+msgid "%pB: unable to find ARM glue '%s' for `%s'"
 msgstr ""
 
-#: coff-arm.c:1368 elf32-arm.c:8896
+#: coff-arm.c:1367
 #, c-format
 msgid ""
-"%B(%s): warning: interworking not enabled.\n"
-"  first occurrence: %B: arm call to thumb"
+"%pB(%s): warning: interworking not enabled; first occurrence: %pB: arm call "
+"to thumb"
 msgstr ""
 
-#: coff-arm.c:1458
+#: coff-arm.c:1457
 #, c-format
 msgid ""
-"%B(%s): warning: interworking not enabled.\n"
-"  first occurrence: %B: thumb call to arm\n"
-"  consider relinking with --support-old-code enabled"
+"%pB(%s): warning: interworking not enabled; first occurrence: %pB: thumb "
+"call to arm; consider relinking with --support-old-code enabled"
 msgstr ""
 
 #: coff-arm.c:1751 coff-tic80.c:672 cofflink.c:3127
 #, c-format
-msgid "%B: bad reloc address %#Lx in section `%A'"
+msgid "%pB: bad reloc address %#<PRIx64> in section `%pA'"
 msgstr ""
 
 #: coff-arm.c:2076
 #, c-format
-msgid "%B: illegal symbol index in reloc: %ld"
+msgid "%pB: illegal symbol index in reloc: %ld"
 msgstr ""
 
 #: coff-arm.c:2208
 #, c-format
-msgid "error: %B is compiled for APCS-%d, whereas %B is compiled for APCS-%d"
+msgid "error: %pB is compiled for APCS-%d, whereas %pB is compiled for APCS-%d"
 msgstr ""
 
-#: coff-arm.c:2221 elf32-arm.c:19582
+#: coff-arm.c:2221 elf32-arm.c:19614
 #, c-format
 msgid ""
-"error: %B passes floats in float registers, whereas %B passes them in "
+"error: %pB passes floats in float registers, whereas %pB passes them in "
 "integer registers"
 msgstr ""
 
-#: coff-arm.c:2226 elf32-arm.c:19586
+#: coff-arm.c:2226 elf32-arm.c:19618
 #, c-format
 msgid ""
-"error: %B passes floats in integer registers, whereas %B passes them in "
+"error: %pB passes floats in integer registers, whereas %pB passes them in "
 "float registers"
 msgstr ""
 
 #: coff-arm.c:2238
 #, c-format
 msgid ""
-"error: %B is compiled as position independent code, whereas target %B is "
+"error: %pB is compiled as position independent code, whereas target %pB is "
 "absolute position"
 msgstr ""
 
 #: coff-arm.c:2243
 #, c-format
 msgid ""
-"error: %B is compiled as absolute position code, whereas target %B is "
+"error: %pB is compiled as absolute position code, whereas target %pB is "
 "position independent"
 msgstr ""
 
-#: coff-arm.c:2270 elf32-arm.c:19651
+#: coff-arm.c:2270 elf32-arm.c:19683
 #, c-format
-msgid "Warning: %B supports interworking, whereas %B does not"
+msgid "warning: %pB supports interworking, whereas %pB does not"
 msgstr ""
 
-#: coff-arm.c:2275 elf32-arm.c:19657
+#: coff-arm.c:2275 elf32-arm.c:19689
 #, c-format
-msgid "Warning: %B does not support interworking, whereas %B does"
+msgid "warning: %pB does not support interworking, whereas %pB does"
 msgstr ""
 
 #: coff-arm.c:2298
@@ -332,7 +352,7 @@ msgstr ""
 msgid "private flags = %x:"
 msgstr ""
 
-#: coff-arm.c:2306 elf32-arm.c:14160
+#: coff-arm.c:2306 elf32-arm.c:14191
 #, c-format
 msgid " [floats passed in float registers]"
 msgstr ""
@@ -342,7 +362,7 @@ msgstr ""
 msgid " [floats passed in integer registers]"
 msgstr ""
 
-#: coff-arm.c:2311 elf32-arm.c:14163
+#: coff-arm.c:2311 elf32-arm.c:14194
 #, c-format
 msgid " [position independent]"
 msgstr ""
@@ -367,1418 +387,1421 @@ msgstr ""
 msgid " [interworking not supported]"
 msgstr ""
 
-#: coff-arm.c:2366 elf32-arm.c:13021
-msgid ""
-"Warning: Not setting interworking flag of %B since it has already been "
-"specified as non-interworking"
-msgstr ""
-
-#: coff-arm.c:2369 elf32-arm.c:13025
-msgid "Warning: Clearing the interworking flag of %B due to outside request"
-msgstr ""
-
-#: coff-arm.c:2426 elf32-arm.c:13070
+#: coff-arm.c:2366 elf32-arm.c:13052
 #, c-format
 msgid ""
-"Warning: Clearing the interworking flag of %B because non-interworking code "
-"in %B has been linked with it"
-msgstr ""
-
-#: coff-h8300.c:1068
-#, c-format
-msgid "cannot handle R_MEM_INDIRECT reloc when using %s output"
+"warning: not setting interworking flag of %pB since it has already been "
+"specified as non-interworking"
 msgstr ""
 
-#: coff-i860.c:151
+#: coff-arm.c:2369 elf32-arm.c:13056
 #, c-format
-msgid "relocation `%s' not yet implemented"
+msgid "warning: clearing the interworking flag of %pB due to outside request"
 msgstr ""
 
-#: coff-i860.c:613 coff-tic4x.c:227 coff-tic54x.c:365 coffcode.h:5343
+#: coff-arm.c:2426 elf32-arm.c:13101
 #, c-format
-msgid "%B: warning: illegal symbol index %ld in relocs"
-msgstr ""
-
-#: coff-i960.c:122 coff-i960.c:475
-msgid "uncertain calling convention for non-COFF symbol"
-msgstr ""
-
-#: coff-m68k.c:488 elf32-bfin.c:5340 elf32-cr16.c:2801 elf32-m68k.c:4385
-msgid "unsupported reloc type"
+msgid ""
+"warning: clearing the interworking flag of %pB because non-interworking code "
+"in %pB has been linked with it"
 msgstr ""
 
-#: coff-mips.c:640 elf32-mips.c:1744 elf32-score.c:430 elf32-score7.c:330
-#: elf64-mips.c:3135 elfn32-mips.c:2958
+#: coff-mips.c:640 elf32-mips.c:1742 elf32-score.c:430 elf32-score7.c:330
+#: elf64-mips.c:3131 elfn32-mips.c:2956
 msgid "GP relative relocation when _gp not defined"
 msgstr ""
 
-#: coff-rs6000.c:2773
-#, c-format
-msgid "%B: unsupported relocation type 0x%02x"
-msgstr ""
-
 #: coff-rs6000.c:2859
 #, c-format
-msgid "%B: TOC reloc at %#Lx to symbol `%s' with no TOC entry"
+msgid "%pB: TOC reloc at %#<PRIx64> to symbol `%s' with no TOC entry"
 msgstr ""
 
 #: coff-rs6000.c:3605 coff64-rs6000.c:2150
 #, c-format
-msgid "%B: symbol `%s' has unrecognized smclas %d"
+msgid "%pB: symbol `%s' has unrecognized smclas %d"
 msgstr ""
 
-#: coff-sh.c:504
+#: coff-sh.c:780 elf32-sh.c:521
 #, c-format
-msgid "SH Error: unknown reloc type %d"
+msgid "%pB: %#<PRIx64>: warning: bad R_SH_USES offset"
 msgstr ""
 
-#: coff-sh.c:778 elf32-sh.c:580
+#: coff-sh.c:791
 #, c-format
-msgid "%B: %#Lx: warning: bad R_SH_USES offset"
+msgid "%pB: %#<PRIx64>: warning: R_SH_USES points to unrecognized insn %#x"
 msgstr ""
 
-#: coff-sh.c:789
+#: coff-sh.c:809 elf32-sh.c:552
 #, c-format
-msgid "%B: %#Lx: warning: R_SH_USES points to unrecognized insn %#x"
+msgid "%pB: %#<PRIx64>: warning: bad R_SH_USES load offset"
 msgstr ""
 
-#: coff-sh.c:807 elf32-sh.c:610
+#: coff-sh.c:834 elf32-sh.c:568
 #, c-format
-msgid "%B: %#Lx: warning: bad R_SH_USES load offset"
+msgid "%pB: %#<PRIx64>: warning: could not find expected reloc"
 msgstr ""
 
-#: coff-sh.c:832 elf32-sh.c:626
+#: coff-sh.c:851 elf32-sh.c:597
 #, c-format
-msgid "%B: %#Lx: warning: could not find expected reloc"
+msgid "%pB: %#<PRIx64>: warning: symbol in unexpected section"
 msgstr ""
 
-#: coff-sh.c:849 elf32-sh.c:655
+#: coff-sh.c:977 elf32-sh.c:727
 #, c-format
-msgid "%B: %#Lx: warning: symbol in unexpected section"
+msgid "%pB: %#<PRIx64>: warning: could not find expected COUNT reloc"
 msgstr ""
 
-#: coff-sh.c:975 elf32-sh.c:785
+#: coff-sh.c:987 elf32-sh.c:738
 #, c-format
-msgid "%B: %#Lx: warning: could not find expected COUNT reloc"
+msgid "%pB: %#<PRIx64>: warning: bad count"
 msgstr ""
 
-#: coff-sh.c:985 elf32-sh.c:795
+#: coff-sh.c:1359 coff-sh.c:2647 elf32-sh.c:1142 elf32-sh.c:1512
 #, c-format
-msgid "%B: %#Lx: warning: bad count"
+msgid "%pB: %#<PRIx64>: fatal: reloc overflow while relaxing"
 msgstr ""
 
-#: coff-sh.c:1357 coff-sh.c:2645 elf32-sh.c:1199 elf32-sh.c:1570
+#: coff-sh.c:1454
 #, c-format
-msgid "%B: %#Lx: fatal: reloc overflow while relaxing"
-msgstr ""
-
-#: coff-sh.c:1452
-msgid "%B: fatal: generic symbols retrieved before relaxing"
+msgid "%pB: fatal: generic symbols retrieved before relaxing"
 msgstr ""
 
-#: coff-sh.c:2783 cofflink.c:2965
+#: coff-sh.c:2785 cofflink.c:2965
 #, c-format
-msgid "%B: illegal symbol index %ld in relocs"
+msgid "%pB: illegal symbol index %ld in relocs"
 msgstr ""
 
-#: coff-tic4x.c:183 coff-tic54x.c:278 coff-tic80.c:441
+#: coff-tic4x.c:228 coff-tic54x.c:366 coffcode.h:5007
 #, c-format
-msgid "Unrecognized reloc type 0x%x"
+msgid "%pB: warning: illegal symbol index %ld in relocs"
 msgstr ""
 
-#: coff-w65.c:352
+#: coff-tic80.c:441
 #, c-format
-msgid "ignoring reloc %s\n"
+msgid "unsupported relocation type %#x"
 msgstr ""
 
-#: coffcode.h:968
-msgid "%B: unable to load COMDAT section name"
+#: coffcode.h:954
+#, c-format
+msgid "%pB: unable to load COMDAT section name"
 msgstr ""
 
 #. Malformed input files can trigger this test.
 #. cf PR 21781.
-#: coffcode.h:1003
-msgid "%B: error: unexpected symbol '%s' in COMDAT section"
+#: coffcode.h:989
+#, c-format
+msgid "%pB: error: unexpected symbol '%s' in COMDAT section"
 msgstr ""
 
-#: coffcode.h:1015
+#: coffcode.h:1001
 #, c-format
-msgid "%B: warning: COMDAT symbol '%s' does not match section name '%s'"
+msgid "%pB: warning: COMDAT symbol '%s' does not match section name '%s'"
 msgstr ""
 
-#: coffcode.h:1025
+#: coffcode.h:1011
 #, c-format
-msgid "%B: warning: No symbol for section '%s' found"
+msgid "%pB: warning: no symbol for section '%s' found"
 msgstr ""
 
 #. 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.
-#: coffcode.h:1251
+#: coffcode.h:1237
 #, c-format
-msgid ""
-"%B: Warning: Ignoring section flag IMAGE_SCN_MEM_NOT_PAGED in section %s"
+msgid "%pB: warning: ignoring section flag %s in section %s"
 msgstr ""
 
-#: coffcode.h:1320
+#: coffcode.h:1306
 #, c-format
-msgid "%B (%s): Section flag %s (%#lx) ignored"
+msgid "%pB (%s): section flag %s (%#lx) ignored"
 msgstr ""
 
-#: coffcode.h:1950
-msgid "%B: warning: claims to have 0xffff relocs, without overflow"
+#: coffcode.h:1917
+#, c-format
+msgid "%pB: warning: claims to have 0xffff relocs, without overflow"
 msgstr ""
 
-#: coffcode.h:2466
+#: coffcode.h:2315
 #, c-format
-msgid "Unrecognized TI COFF target id '0x%x'"
+msgid "unrecognized TI COFF target id '0x%x'"
 msgstr ""
 
-#: coffcode.h:2784
+#: coffcode.h:2599
 #, c-format
-msgid "%B: reloc against a non-existent symbol index: %ld"
+msgid "%pB: reloc against a non-existent symbol index: %ld"
 msgstr ""
 
-#: coffcode.h:3187
+#: coffcode.h:2910
 #, c-format
-msgid "%B: page size is too large (0x%x)"
+msgid "%pB: page size is too large (0x%x)"
 msgstr ""
 
-#: coffcode.h:3347
+#: coffcode.h:3070
 #, c-format
-msgid "%B: too many sections (%d)"
+msgid "%pB: too many sections (%d)"
 msgstr ""
 
-#: coffcode.h:3768
+#: coffcode.h:3489
 #, c-format
-msgid "%B: section %A: string table overflow at offset %ld"
+msgid "%pB: section %pA: string table overflow at offset %ld"
 msgstr ""
 
-#: coffcode.h:3873
+#: coffcode.h:3589
 #, c-format
-msgid "%B:%s section %s: alignment 2**%u not representable"
+msgid "%pB:%s section %s: alignment 2**%u not representable"
 msgstr ""
 
-#: coffcode.h:4592
-msgid "%B: warning: line number count (%#lx) exceeds section size (%#lx)"
+#: coffcode.h:4273
+#, c-format
+msgid "%pB: warning: line number count (%#lx) exceeds section size (%#lx)"
 msgstr ""
 
-#: coffcode.h:4607
-msgid "%B: warning: line number table read failed"
+#: coffcode.h:4288
+#, c-format
+msgid "%pB: warning: line number table read failed"
 msgstr ""
 
-#: coffcode.h:4641 coffcode.h:4655
+#: coffcode.h:4322 coffcode.h:4336
 #, c-format
-msgid "%B: warning: illegal symbol index 0x%lx in line number entry %d"
+msgid "%pB: warning: illegal symbol index 0x%lx in line number entry %d"
 msgstr ""
 
-#: coffcode.h:4669
+#: coffcode.h:4350
 #, c-format
-msgid "%B: warning: illegal symbol in line number entry %d"
+msgid "%pB: warning: illegal symbol in line number entry %d"
 msgstr ""
 
-#: coffcode.h:4682
+#: coffcode.h:4363
 #, c-format
-msgid "%B: warning: duplicate line number information for `%s'"
+msgid "%pB: warning: duplicate line number information for `%s'"
 msgstr ""
 
-#: coffcode.h:5103
+#: coffcode.h:4771
 #, c-format
-msgid "%B: Unrecognized storage class %d for %s symbol `%s'"
+msgid "%pB: unrecognized storage class %d for %s symbol `%s'"
 msgstr ""
 
-#: coffcode.h:5236
+#: coffcode.h:4901
 #, c-format
-msgid "warning: %B: local symbol `%s' has no section"
+msgid "warning: %pB: local symbol `%s' has no section"
 msgstr ""
 
-#: coffcode.h:5383
+#: coffcode.h:5047
 #, c-format
-msgid "%B: illegal relocation type %d at address %#Lx"
+msgid "%pB: illegal relocation type %d at address %#<PRIx64>"
 msgstr ""
 
-#: coffgen.c:178 elf.c:1198
+#: coffgen.c:178 elf.c:1200
 #, c-format
-msgid "%B: unable to initialize compress status for section %s"
+msgid "%pB: unable to initialize compress status for section %s"
 msgstr ""
 
-#: coffgen.c:202 elf.c:1209
+#: coffgen.c:202 elf.c:1211
 #, c-format
-msgid "%B: unable to initialize decompress status for section %s"
+msgid "%pB: unable to initialize decompress status for section %s"
 msgstr ""
 
-#: coffgen.c:1649
-msgid "%B: corrupt symbol count: %#Lx"
+#: coffgen.c:1652
+#, c-format
+msgid "%pB: corrupt symbol count: %#<PRIx64>"
 msgstr ""
 
 #. PR 21013: Provide an error message when the alloc fails.
-#: coffgen.c:1658
-msgid "%B: not enough memory to allocate space for %#Lx symbols of size %#Lx"
+#: coffgen.c:1661
+#, c-format
+msgid ""
+"%pB: not enough memory to allocate space for %#<PRIx64> symbols of size "
+"%#<PRIx64>"
 msgstr ""
 
-#: coffgen.c:1725
+#: coffgen.c:1730
 #, c-format
-msgid "%B: bad string table size %Lu"
+msgid "%pB: bad string table size %<PRIu64>"
 msgstr ""
 
-#: coffgen.c:1902 coffgen.c:1962 coffgen.c:1980 cofflink.c:2045
-#: xcofflink.c:4507
+#: coffgen.c:1907 coffgen.c:1967 coffgen.c:1985 cofflink.c:2045
+#: xcofflink.c:4508
 msgid "<corrupt>"
 msgstr ""
 
-#: coffgen.c:2104
+#: coffgen.c:2109
 #, c-format
 msgid "<corrupt info> %s"
 msgstr ""
 
-#: coffgen.c:2683 elflink.c:14149 linker.c:2940
+#: coffgen.c:2688 elflink.c:14182 linker.c:2946
 msgid "%F%P: already_linked_table: %E\n"
 msgstr ""
 
-#: coffgen.c:3024 elflink.c:13151
+#: coffgen.c:3029 elflink.c:13184
 #, c-format
-msgid "Removing unused section '%A' in file '%B'"
+msgid "removing unused section '%pA' in file '%pB'"
 msgstr ""
 
-#: coffgen.c:3101 elflink.c:13369
-msgid "Warning: gc-sections option ignored"
+#: coffgen.c:3106 elflink.c:13402
+msgid "warning: gc-sections option ignored"
 msgstr ""
 
 #: cofflink.c:352
 #, c-format
-msgid "Warning: symbol `%s' is both section and non-section"
+msgid "warning: symbol `%s' is both section and non-section"
 msgstr ""
 
-#: cofflink.c:454 elf64-ia64-vms.c:5186 elflink.c:4831
+#: cofflink.c:454 elf64-ia64-vms.c:5203 elflink.c:4846
 #, c-format
-msgid "Warning: type of symbol `%s' changed from %d to %d in %B"
+msgid "warning: type of symbol `%s' changed from %d to %d in %pB"
 msgstr ""
 
 #: cofflink.c:2373
 #, c-format
-msgid "%B: relocs in section `%A', but it has no contents"
+msgid "%pB: relocs in section `%pA', but it has no contents"
 msgstr ""
 
-#: cofflink.c:2436 elflink.c:10664
+#: cofflink.c:2436 elflink.c:10679
 #, c-format
 msgid ""
-"%X`%s' referenced in section `%A' of %B: defined in discarded section `%A' "
-"of %B\n"
+"%X`%s' referenced in section `%pA' of %pB: defined in discarded section `"
+"%pA' of %pB\n"
 msgstr ""
 
 #: cofflink.c:2734
 #, c-format
-msgid "%B: %A: reloc overflow: %#x > 0xffff"
+msgid "%pB: %pA: reloc overflow: %#x > 0xffff"
 msgstr ""
 
 #: cofflink.c:2742
 #, c-format
-msgid "%B: warning: %A: line number overflow: %#x > 0xffff"
+msgid "%pB: warning: %pA: line number overflow: %#x > 0xffff"
 msgstr ""
 
-#: coffswap.h:811
+#: coffswap.h:789
 #, c-format
-msgid "%B: warning: %s: line number overflow: 0x%lx > 0xffff"
+msgid "%pB: warning: %s: line number overflow: 0x%lx > 0xffff"
 msgstr ""
 
-#: coffswap.h:825
+#: coffswap.h:803
 #, c-format
-msgid "%B: %s: reloc overflow: 0x%lx > 0xffff"
+msgid "%pB: %s: reloc overflow: 0x%lx > 0xffff"
 msgstr ""
 
 #: compress.c:255
 #, c-format
-msgid "error: %B(%A) is too large (%#Lx bytes)"
+msgid "error: %pB(%pA) is too large (%#<PRIx64> bytes)"
 msgstr ""
 
 #: cpu-arm.c:192 cpu-arm.c:204
 #, c-format
-msgid "error: %B is compiled for the EP9312, whereas %B is compiled for XScale"
+msgid ""
+"error: %pB is compiled for the EP9312, whereas %pB is compiled for XScale"
 msgstr ""
 
 #: cpu-arm.c:338
 #, c-format
-msgid "warning: unable to update contents of %s section in %B"
+msgid "warning: unable to update contents of %s section in %pB"
 msgstr ""
 
 #: dwarf2.c:543
 #, c-format
-msgid "Dwarf Error: Can't find %s section."
+msgid "DWARF error: can't find %s section."
 msgstr ""
 
 #: dwarf2.c:572
 #, c-format
-msgid "Dwarf Error: Offset (%llu) greater than or equal to %s size (%Lu)."
+msgid ""
+"DWARF error: offset (%<PRIu64>) greater than or equal to %s size (%<PRIu64>)"
 msgstr ""
 
-#: dwarf2.c:1089
-msgid "Dwarf Error: Info pointer extends beyond end of attributes"
+#: dwarf2.c:1100
+msgid "DWARF error: info pointer extends beyond end of attributes"
 msgstr ""
 
-#: dwarf2.c:1261
+#: dwarf2.c:1268
 #, c-format
-msgid "Dwarf Error: Invalid or unhandled FORM value: %#x."
+msgid "DWARF error: invalid or unhandled FORM value: %#x"
 msgstr ""
 
-#: dwarf2.c:1567
-msgid "Dwarf Error: mangled line number section (bad file number)."
+#: dwarf2.c:1574
+msgid "DWARF error: mangled line number section (bad file number)"
 msgstr ""
 
-#: dwarf2.c:1912
-msgid "Dwarf Error: Zero format count."
+#: dwarf2.c:1919
+msgid "DWARF error: zero format count"
 msgstr ""
 
-#: dwarf2.c:1921
+#: dwarf2.c:1929
 #, c-format
-msgid "Dwarf Error: data count (%Lx) larger than buffer size."
+msgid "DWARF error: data count (%<PRIx64>) larger than buffer size"
 msgstr ""
 
-#: dwarf2.c:1962
+#: dwarf2.c:1970
 #, c-format
-msgid "Dwarf Error: Unknown format content type %Lu."
+msgid "DWARF error: unknown format content type %<PRIu64>"
 msgstr ""
 
-#: dwarf2.c:2042
+#: dwarf2.c:2050
 #, c-format
-msgid "Dwarf Error: Line info section is too small (%Ld)"
+msgid "DWARF error: line info section is too small (%<PRId64>)"
 msgstr ""
 
-#: dwarf2.c:2072
+#: dwarf2.c:2080
 #, c-format
 msgid ""
-"Dwarf Error: Line info data is bigger (%#Lx) than the space remaining in the "
-"section (%#lx)"
+"DWARF error: line info data is bigger (%#<PRIx64>) than the space remaining "
+"in the section (%#lx)"
 msgstr ""
 
-#: dwarf2.c:2085
+#: dwarf2.c:2093
 #, c-format
-msgid "Dwarf Error: Unhandled .debug_line version %d."
+msgid "DWARF error: unhandled .debug_line version %d"
 msgstr ""
 
-#: dwarf2.c:2095
-msgid "Dwarf Error: Ran out of room reading prologue"
+#: dwarf2.c:2103
+msgid "DWARF error: ran out of room reading prologue"
 msgstr ""
 
-#: dwarf2.c:2113
+#: dwarf2.c:2121
 #, c-format
-msgid "Dwarf Error: Line info unsupported segment selector size %u."
+msgid "DWARF error: line info unsupported segment selector size %u"
 msgstr ""
 
-#: dwarf2.c:2140
-msgid "Dwarf Error: Invalid maximum operations per instruction."
+#: dwarf2.c:2148
+msgid "DWARF error: invalid maximum operations per instruction"
 msgstr ""
 
-#: dwarf2.c:2159
-msgid "Dwarf Error: Ran out of room reading opcodes"
+#: dwarf2.c:2167
+msgid "DWARF error: ran out of room reading opcodes"
 msgstr ""
 
-#: dwarf2.c:2332
-msgid "Dwarf Error: mangled line number section."
+#: dwarf2.c:2340
+msgid "DWARF error: mangled line number section"
 msgstr ""
 
-#: dwarf2.c:2833 dwarf2.c:2894
-msgid "Dwarf Error: Invalid abstract instance DIE ref."
+#: dwarf2.c:2843 dwarf2.c:2904
+msgid "DWARF error: invalid abstract instance DIE ref"
 msgstr ""
 
-#: dwarf2.c:2870
+#: dwarf2.c:2880
 #, c-format
-msgid "Dwarf Error: Unable to read alt ref %llu."
+msgid "DWARF error: unable to read alt ref %<PRIu64>"
 msgstr ""
 
-#: dwarf2.c:2911 dwarf2.c:3076 dwarf2.c:3428
+#: dwarf2.c:2921 dwarf2.c:3094 dwarf2.c:3448
 #, c-format
-msgid "Dwarf Error: Could not find abbrev number %u."
+msgid "DWARF error: could not find abbrev number %u"
 msgstr ""
 
-#: dwarf2.c:2928
-msgid "Dwarf Error: Abstract instance recursion detected."
+#: dwarf2.c:2938
+msgid "DWARF error: abstract instance recursion detected"
 msgstr ""
 
-#: dwarf2.c:3347
+#: dwarf2.c:3367
 #, c-format
 msgid ""
-"Dwarf Error: found dwarf version '%u', this reader only handles version 2, "
-"3, 4 and 5 information."
+"DWARF error: found dwarf version '%u', this reader only handles version 2, "
+"3, 4 and 5 information"
 msgstr ""
 
-#: dwarf2.c:3391
+#: dwarf2.c:3411
 #, c-format
 msgid ""
-"Dwarf Error: found address size '%u', this reader can not handle sizes "
-"greater than '%u'."
+"DWARF error: found address size '%u', this reader can not handle sizes "
+"greater than '%u'"
 msgstr ""
 
-#: dwarf2.c:3494
+#: dwarf2.c:3514
 msgid ""
-"Dwarf Error: DW_AT_comp_dir attribute encountered with a non-string form."
+"DWARF error: DW_AT_comp_dir attribute encountered with a non-string form"
 msgstr ""
 
-#: ecoff.c:964
+#: ecoff.c:971
 #, c-format
-msgid "%B: warning: isymMax (%ld) is greater than ifdMax (%ld)"
+msgid "%pB: warning: isymMax (%ld) is greater than ifdMax (%ld)"
 msgstr ""
 
-#: ecoff.c:1261
+#: ecoff.c:1268
 #, c-format
-msgid "Unknown basic type %d"
+msgid "unknown basic type %d"
 msgstr ""
 
-#: ecoff.c:1518
+#: ecoff.c:1525
 #, c-format
 msgid ""
 "\n"
 "      End+1 symbol: %ld"
 msgstr ""
 
-#: ecoff.c:1525 ecoff.c:1528
+#: ecoff.c:1532 ecoff.c:1535
 #, c-format
 msgid ""
 "\n"
 "      First symbol: %ld"
 msgstr ""
 
-#: ecoff.c:1541
+#: ecoff.c:1548
 #, c-format
 msgid ""
 "\n"
 "      End+1 symbol: %-7ld   Type:  %s"
 msgstr ""
 
-#: ecoff.c:1548
+#: ecoff.c:1555
 #, c-format
 msgid ""
 "\n"
 "      Local symbol: %ld"
 msgstr ""
 
-#: ecoff.c:1556
+#: ecoff.c:1563
 #, c-format
 msgid ""
 "\n"
 "      struct; End+1 symbol: %ld"
 msgstr ""
 
-#: ecoff.c:1561
+#: ecoff.c:1568
 #, c-format
 msgid ""
 "\n"
 "      union; End+1 symbol: %ld"
 msgstr ""
 
-#: ecoff.c:1566
+#: ecoff.c:1573
 #, c-format
 msgid ""
 "\n"
 "      enum; End+1 symbol: %ld"
 msgstr ""
 
-#: ecoff.c:1572
+#: ecoff.c:1579
 #, c-format
 msgid ""
 "\n"
 "      Type: %s"
 msgstr ""
 
-#: elf-attrs.c:475
-msgid "%B: error: attribute section length too small: %ld"
+#: elf-attrs.c:476
+#, c-format
+msgid "%pB: error: attribute section length too small: %<PRId64>"
 msgstr ""
 
-#: elf-attrs.c:603
+#: elf-attrs.c:604
 #, c-format
 msgid ""
-"error: %B: Object has vendor-specific contents that must be processed by the "
-"'%s' toolchain"
+"error: %pB: object has vendor-specific contents that must be processed by "
+"the '%s' toolchain"
 msgstr ""
 
-#: elf-attrs.c:613
+#: elf-attrs.c:614
 #, c-format
-msgid "error: %B: Object tag '%d, %s' is incompatible with tag '%d, %s'"
+msgid "error: %pB: object tag '%d, %s' is incompatible with tag '%d, %s'"
 msgstr ""
 
 #: elf-eh-frame.c:942
 #, c-format
-msgid "discarding zero address range FDE in %B(%A).\n"
+msgid "discarding zero address range FDE in %pB(%pA).\n"
 msgstr ""
 
 #: elf-eh-frame.c:1047
 #, c-format
-msgid "%P: error in %B(%A); no .eh_frame_hdr table will be created.\n"
+msgid "error in %pB(%pA); no .eh_frame_hdr table will be created"
 msgstr ""
 
 #: elf-eh-frame.c:1537
 #, c-format
-msgid ""
-"%P: FDE encoding in %B(%A) prevents .eh_frame_hdr table being created.\n"
+msgid "FDE encoding in %pB(%pA) prevents .eh_frame_hdr table being created"
 msgstr ""
 
 #: elf-eh-frame.c:1544
 msgid ""
-"%P: Further warnings about FDE encoding preventing .eh_frame_hdr generation "
-"dropped.\n"
+"further warnings about FDE encoding preventing .eh_frame_hdr generation "
+"dropped"
 msgstr ""
 
 #: elf-eh-frame.c:1866
 #, c-format
-msgid "%B: %A not in order"
+msgid "%pB: %pA not in order"
 msgstr ""
 
 #: elf-eh-frame.c:1880
 #, c-format
-msgid "%B: %A invalid input section size"
+msgid "%pB: %pA invalid input section size"
 msgstr ""
 
 #: elf-eh-frame.c:1888
 #, c-format
-msgid "%B: %A points past end of text section"
+msgid "%pB: %pA points past end of text section"
 msgstr ""
 
 #: elf-eh-frame.c:2137
-msgid "%P: DW_EH_PE_datarel unspecified for this architecture.\n"
+msgid "DW_EH_PE_datarel unspecified for this architecture"
 msgstr ""
 
 #: elf-eh-frame.c:2307
 #, c-format
-msgid "Invalid output section for .eh_frame_entry: %A"
+msgid "invalid output section for .eh_frame_entry: %pA"
 msgstr ""
 
 #: elf-eh-frame.c:2330
 #, c-format
-msgid "Invalid contents in %A section"
+msgid "invalid contents in %pA section"
 msgstr ""
 
 #: elf-eh-frame.c:2486
-msgid "%P: .eh_frame_hdr entry overflow.\n"
+msgid ".eh_frame_hdr entry overflow"
 msgstr ""
 
-#: elf-eh-frame.c:2489
-msgid "%P: .eh_frame_hdr refers to overlapping FDEs.\n"
+#: elf-eh-frame.c:2488
+msgid ".eh_frame_hdr refers to overlapping FDEs"
 msgstr ""
 
 #: elf-ifunc.c:142
 #, c-format
 msgid ""
-"%F%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer equality in `%B' can "
+"%F%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer equality in `%pB' can "
 "not be used when making an executable; recompile with -fPIE and relink with -"
 "pie\n"
 msgstr ""
 
-#: elf-m10200.c:425 elf-m10300.c:2145 elf32-avr.c:1502 elf32-bfin.c:3116
-#: elf32-cr16.c:1462 elf32-cr16c.c:780 elf32-cris.c:2030 elf32-crx.c:924
-#: elf32-d10v.c:509 elf32-epiphany.c:563 elf32-fr30.c:591 elf32-frv.c:4041
-#: elf32-ft32.c:485 elf32-h8300.c:522 elf32-i860.c:1210 elf32-ip2k.c:1475
-#: elf32-iq2000.c:689 elf32-lm32.c:1106 elf32-m32c.c:622 elf32-m32r.c:3031
-#: elf32-m68hc1x.c:1265 elf32-mep.c:524 elf32-metag.c:1985
-#: elf32-microblaze.c:1556 elf32-moxie.c:285 elf32-mt.c:400 elf32-nds32.c:5328
-#: elf32-or1k.c:1238 elf32-score.c:2731 elf32-score7.c:2540 elf32-spu.c:5076
-#: elf32-tilepro.c:3497 elf32-v850.c:2283 elf32-visium.c:677
-#: elf32-xstormy16.c:923 elf64-mmix.c:1538 elfxx-tilegx.c:3857
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2237
+#: elf-m10200.c:434 elf-m10300.c:2147 elf32-avr.c:1505 elf32-bfin.c:3127
+#: elf32-cr16.c:1464 elf32-cr16c.c:783 elf32-cris.c:2033 elf32-crx.c:925
+#: elf32-d10v.c:512 elf32-epiphany.c:566 elf32-fr30.c:594 elf32-frv.c:4049
+#: elf32-ft32.c:494 elf32-h8300.c:523 elf32-ip2k.c:1482 elf32-iq2000.c:693
+#: elf32-lm32.c:1112 elf32-m32c.c:624 elf32-m32r.c:3045 elf32-m68hc1x.c:1266
+#: elf32-mep.c:526 elf32-metag.c:1990 elf32-microblaze.c:1631 elf32-moxie.c:288
+#: elf32-mt.c:402 elf32-nds32.c:5300 elf32-or1k.c:1242 elf32-score.c:2733
+#: elf32-score7.c:2542 elf32-spu.c:5078 elf32-tilepro.c:3506 elf32-v850.c:2291
+#: elf32-visium.c:681 elf32-xstormy16.c:931 elf64-mmix.c:1541
+#: elfxx-tilegx.c:3870
 msgid "internal error: out of range error"
 msgstr ""
 
-#: elf-m10200.c:429 elf-m10300.c:2149 elf32-avr.c:1506 elf32-bfin.c:3120
-#: elf32-cr16.c:1466 elf32-cr16c.c:784 elf32-cris.c:2034 elf32-crx.c:928
-#: elf32-d10v.c:513 elf32-fr30.c:595 elf32-frv.c:4045 elf32-ft32.c:489
-#: elf32-h8300.c:526 elf32-i860.c:1214 elf32-iq2000.c:693 elf32-lm32.c:1110
-#: elf32-m32c.c:626 elf32-m32r.c:3035 elf32-m68hc1x.c:1269 elf32-mep.c:528
-#: elf32-metag.c:1989 elf32-microblaze.c:1560 elf32-moxie.c:289
-#: elf32-msp430.c:1357 elf32-nds32.c:5332 elf32-or1k.c:1242 elf32-score.c:2735
-#: elf32-score7.c:2544 elf32-spu.c:5080 elf32-tilepro.c:3501 elf32-v850.c:2287
-#: elf32-visium.c:681 elf32-xstormy16.c:927 elf64-mmix.c:1542
-#: elfxx-mips.c:10265 elfxx-tilegx.c:3861
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2241
+#: elf-m10200.c:438 elf-m10300.c:2151 elf32-avr.c:1509 elf32-bfin.c:3131
+#: elf32-cr16.c:1468 elf32-cr16c.c:787 elf32-cris.c:2037 elf32-crx.c:929
+#: elf32-d10v.c:516 elf32-fr30.c:598 elf32-frv.c:4053 elf32-ft32.c:498
+#: elf32-h8300.c:527 elf32-iq2000.c:697 elf32-lm32.c:1116 elf32-m32c.c:628
+#: elf32-m32r.c:3049 elf32-m68hc1x.c:1270 elf32-mep.c:530 elf32-metag.c:1994
+#: elf32-microblaze.c:1635 elf32-moxie.c:292 elf32-msp430.c:1362
+#: elf32-nds32.c:5304 elf32-or1k.c:1246 elf32-score.c:2737 elf32-score7.c:2546
+#: elf32-spu.c:5082 elf32-tilepro.c:3510 elf32-v850.c:2295 elf32-visium.c:685
+#: elf32-xstormy16.c:935 elf64-mmix.c:1545 elfxx-mips.c:10288
+#: elfxx-tilegx.c:3874
 msgid "internal error: unsupported relocation error"
 msgstr ""
 
-#: elf-m10200.c:433 elf32-cr16.c:1470 elf32-cr16c.c:788 elf32-crx.c:932
-#: elf32-d10v.c:517 elf32-h8300.c:530 elf32-lm32.c:1114 elf32-m32r.c:3039
-#: elf32-m68hc1x.c:1273 elf32-microblaze.c:1564 elf32-nds32.c:5336
-#: elf32-score.c:2739 elf32-score7.c:2548 elf32-spu.c:5084
+#: elf-m10200.c:442 elf32-cr16.c:1472 elf32-cr16c.c:791 elf32-crx.c:933
+#: elf32-d10v.c:520 elf32-h8300.c:531 elf32-lm32.c:1120 elf32-m32r.c:3053
+#: elf32-m68hc1x.c:1274 elf32-microblaze.c:1639 elf32-nds32.c:5308
+#: elf32-score.c:2741 elf32-score7.c:2550 elf32-spu.c:5086
 msgid "internal error: dangerous error"
 msgstr ""
 
-#: elf-m10200.c:437 elf-m10300.c:2166 elf32-avr.c:1514 elf32-bfin.c:3128
-#: elf32-cr16.c:1474 elf32-cr16c.c:792 elf32-cris.c:2042 elf32-crx.c:936
-#: elf32-d10v.c:521 elf32-epiphany.c:578 elf32-fr30.c:603 elf32-frv.c:4053
-#: elf32-ft32.c:497 elf32-h8300.c:534 elf32-i860.c:1222 elf32-ip2k.c:1490
-#: elf32-iq2000.c:701 elf32-lm32.c:1118 elf32-m32c.c:634 elf32-m32r.c:3043
-#: elf32-m68hc1x.c:1277 elf32-mep.c:536 elf32-metag.c:1997
-#: elf32-microblaze.c:1568 elf32-moxie.c:297 elf32-msp430.c:1365 elf32-mt.c:408
-#: elf32-nds32.c:5340 elf32-or1k.c:1250 elf32-score.c:2748 elf32-score7.c:2552
-#: elf32-spu.c:5088 elf32-tilepro.c:3509 elf32-v850.c:2307 elf32-visium.c:689
-#: elf32-xstormy16.c:935 elf64-mmix.c:1550 elfxx-tilegx.c:3869
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2249
+#: elf-m10200.c:446 elf-m10300.c:2168 elf32-avr.c:1517 elf32-bfin.c:3139
+#: elf32-cr16.c:1476 elf32-cr16c.c:795 elf32-cris.c:2045 elf32-crx.c:937
+#: elf32-d10v.c:524 elf32-epiphany.c:581 elf32-fr30.c:606 elf32-frv.c:4061
+#: elf32-ft32.c:506 elf32-h8300.c:535 elf32-ip2k.c:1497 elf32-iq2000.c:705
+#: elf32-lm32.c:1124 elf32-m32c.c:636 elf32-m32r.c:3057 elf32-m68hc1x.c:1278
+#: elf32-mep.c:538 elf32-metag.c:2002 elf32-microblaze.c:1643 elf32-moxie.c:300
+#: elf32-msp430.c:1370 elf32-mt.c:410 elf32-nds32.c:5312 elf32-or1k.c:1254
+#: elf32-score.c:2750 elf32-score7.c:2554 elf32-spu.c:5090 elf32-tilepro.c:3518
+#: elf32-v850.c:2315 elf32-visium.c:693 elf32-xstormy16.c:943 elf64-mmix.c:1553
+#: elfxx-tilegx.c:3882
 msgid "internal error: unknown error"
 msgstr ""
 
-#: elf-m10300.c:812
+#: elf-m10300.c:1029
 #, c-format
-msgid "%B: unrecognised MN10300 reloc number: %d"
+msgid "%pB: unsupported transition from %s to %s"
 msgstr ""
 
-#: elf-m10300.c:1028
+#: elf-m10300.c:1198
 #, c-format
-msgid "%B: Unsupported transition from %s to %s"
+msgid "%pB: %s' accessed both as normal and thread local symbol"
 msgstr ""
 
-#: elf-m10300.c:1197
+#: elf-m10300.c:2094 elf32-arm.c:12566 elf32-i386.c:3457 elf32-m32r.c:2539
+#: elf32-m68k.c:3899 elf32-s390.c:3208 elf32-sh.c:3796 elf32-tilepro.c:3409
+#: elf32-xtensa.c:2947 elf64-s390.c:3125 elf64-x86-64.c:3804 elfxx-sparc.c:3908
+#: elfxx-tilegx.c:3793 /work/sources/binutils/current/bfd/elfnn-aarch64.c:5258
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6738
+#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2226
 #, c-format
-msgid "%B: %s' accessed both as normal and thread local symbol"
+msgid "%pB(%pA+%#<PRIx64>): unresolvable %s relocation against symbol `%s'"
 msgstr ""
 
-#: elf-m10300.c:2093 elf32-arm.c:12536 elf32-i386.c:3433 elf32-m32r.c:2526
-#: elf32-m68k.c:3895 elf32-s390.c:3204 elf32-sh.c:4121 elf32-tilepro.c:3401
-#: elf32-xtensa.c:2939 elf64-s390.c:3118 elf64-sh64.c:1636 elf64-x86-64.c:3790
-#: elfxx-sparc.c:3918 elfxx-tilegx.c:3781
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:5001
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6457
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2206
-#, c-format
-msgid "%B(%A+%#Lx): unresolvable %s relocation against symbol `%s'"
-msgstr ""
-
-#: elf-m10300.c:2154
+#: elf-m10300.c:2156
 msgid ""
 "error: inappropriate relocation type for shared library (did you forget -"
 "fpic?)"
 msgstr ""
 
-#: elf-m10300.c:2158
+#: elf-m10300.c:2160
 #, c-format
 msgid ""
-"%B: taking the address of protected function '%s' cannot be done when making "
-"a shared library"
+"%pB: taking the address of protected function '%s' cannot be done when "
+"making a shared library"
 msgstr ""
 
-#: elf-m10300.c:2161
+#: elf-m10300.c:2163
 msgid "internal error: suspicious relocation type used in shared library"
 msgstr ""
 
+#: elf-m10300.c:2649 elf32-avr.c:2487 elf32-frv.c:5641 elf64-ia64-vms.c:364
+#: elfxx-sparc.c:2797 reloc.c:8078 reloc16.c:155 elf32-ia64.c:362
+#: elf64-ia64.c:362
+msgid "%P%F: --relax and -r may not be used together\n"
+msgstr ""
+
 #: elf-properties.c:65
-msgid "%B: out of memory in _bfd_elf_get_property"
+#, c-format
+msgid "%pB: out of memory in _bfd_elf_get_property"
 msgstr ""
 
 #: elf-properties.c:91
-msgid "warning: %B: corrupt GNU_PROPERTY_TYPE (%ld) size: %#lx"
+#, c-format
+msgid "warning: %pB: corrupt GNU_PROPERTY_TYPE (%ld) size: %#lx"
 msgstr ""
 
 #: elf-properties.c:112
-msgid "warning: %B: corrupt GNU_PROPERTY_TYPE (%ld) type (0x%x) datasz: 0x%x"
+#, c-format
+msgid "warning: %pB: corrupt GNU_PROPERTY_TYPE (%ld) type (0x%x) datasz: 0x%x"
 msgstr ""
 
 #: elf-properties.c:151
-msgid "warning: %B: corrupt stack size: 0x%x"
+#, c-format
+msgid "warning: %pB: corrupt stack size: 0x%x"
 msgstr ""
 
 #: elf-properties.c:169
-msgid "warning: %B: corrupt no copy on protected size: 0x%x"
+#, c-format
+msgid "warning: %pB: corrupt no copy on protected size: 0x%x"
 msgstr ""
 
 #: elf-properties.c:186
-msgid "warning: %B: unsupported GNU_PROPERTY_TYPE (%ld) type: 0x%x"
+#, c-format
+msgid "warning: %pB: unsupported GNU_PROPERTY_TYPE (%ld) type: 0x%x"
 msgstr ""
 
 #. PR 17512: file: f057ec89.
 #: elf.c:343
 #, c-format
-msgid "%B: attempt to load strings from a non-string section (number %d)"
+msgid "%pB: attempt to load strings from a non-string section (number %d)"
 msgstr ""
 
 #: elf.c:358
 #, c-format
-msgid "%B: invalid string offset %u >= %Lu for section `%s'"
+msgid "%pB: invalid string offset %u >= %<PRIu64> for section `%s'"
 msgstr ""
 
-#: elf.c:497 /work/sources/binutils/current/bfd/elfnn-aarch64.c:7535
+#: elf.c:497 /work/sources/binutils/current/bfd/elfnn-aarch64.c:7826
 #, c-format
-msgid "%B symbol number %lu references nonexistent SHT_SYMTAB_SHNDX section"
+msgid "%pB symbol number %lu references nonexistent SHT_SYMTAB_SHNDX section"
 msgstr ""
 
 #: elf.c:661
 #, c-format
-msgid "%B: corrupt size field in group section header: %#Lx"
+msgid "%pB: corrupt size field in group section header: %#<PRIx64>"
 msgstr ""
 
-#: elf.c:676
+#: elf.c:677
 #, c-format
-msgid "%B: invalid size field in group section header: %#Lx"
+msgid "%pB: invalid size field in group section header: %#<PRIx64>"
 msgstr ""
 
-#: elf.c:712
-msgid "%B: invalid SHT_GROUP entry"
+#: elf.c:714
+#, c-format
+msgid "%pB: invalid SHT_GROUP entry"
 msgstr ""
 
-#: elf.c:731
-msgid "%B: no valid group sections found"
+#: elf.c:733
+#, c-format
+msgid "%pB: no valid group sections found"
 msgstr ""
 
 #. See PR 21957 for a reproducer.
-#: elf.c:760
+#: elf.c:762
 #, c-format
-msgid "%B: group section '%A' has no contents"
+msgid "%pB: group section '%pA' has no contents"
 msgstr ""
 
-#: elf.c:820
+#: elf.c:822
 #, c-format
-msgid "%B: no group info for section '%A'"
+msgid "%pB: no group info for section '%pA'"
 msgstr ""
 
-#: elf.c:851 elf.c:3862 elflink.c:11252
+#: elf.c:853 elf.c:3864 elflink.c:11267
 #, c-format
-msgid "%B: warning: sh_link not set for section `%A'"
+msgid "%pB: warning: sh_link not set for section `%pA'"
 msgstr ""
 
-#: elf.c:871
+#: elf.c:873
 #, c-format
-msgid "%B: sh_link [%d] in section `%A' is incorrect"
+msgid "%pB: sh_link [%d] in section `%pA' is incorrect"
 msgstr ""
 
-#: elf.c:884
+#: elf.c:886
 #, c-format
-msgid "%B: SHT_GROUP section [index %d] has no SHF_GROUP sections"
+msgid "%pB: SHT_GROUP section [index %d] has no SHF_GROUP sections"
 msgstr ""
 
-#: elf.c:905
+#: elf.c:907
 #, c-format
-msgid "%B: section group entry number %u is corrupt"
+msgid "%pB: section group entry number %u is corrupt"
 msgstr ""
 
-#: elf.c:928
+#: elf.c:930
 #, c-format
-msgid "%B: unknown type [%#x] section `%s' in group [%A]"
+msgid "%pB: unknown type [%#x] section `%s' in group [%pA]"
 msgstr ""
 
-#: elf.c:1390
+#: elf.c:1392
 #, c-format
-msgid "%B: Invalid sh_link field (%d) in section number %d"
+msgid "%pB: invalid sh_link field (%d) in section number %d"
 msgstr ""
 
-#: elf.c:1406
+#: elf.c:1408
 #, c-format
-msgid "%B: Failed to find link section for section %d"
+msgid "%pB: failed to find link section for section %d"
 msgstr ""
 
-#: elf.c:1433
+#: elf.c:1435
 #, c-format
-msgid "%B: Failed to find info section for section %d"
+msgid "%pB: failed to find info section for section %d"
 msgstr ""
 
-#: elf.c:1605
+#: elf.c:1607
 #, c-format
 msgid ""
 "\n"
 "Program Header:\n"
 msgstr ""
 
-#: elf.c:1647
+#: elf.c:1649
 #, c-format
 msgid ""
 "\n"
 "Dynamic Section:\n"
 msgstr ""
 
-#: elf.c:1788
+#: elf.c:1790
 #, c-format
 msgid ""
 "\n"
 "Version definitions:\n"
 msgstr ""
 
-#: elf.c:1813
+#: elf.c:1815
 #, c-format
 msgid ""
 "\n"
 "Version References:\n"
 msgstr ""
 
-#: elf.c:1818
+#: elf.c:1820
 #, c-format
 msgid "  required from %s:\n"
 msgstr ""
 
-#: elf.c:2016
-msgid "%B: warning: loop in section dependencies detected"
+#: elf.c:2018
+#, c-format
+msgid "%pB: warning: loop in section dependencies detected"
 msgstr ""
 
-#: elf.c:2124
+#: elf.c:2126
 #, c-format
 msgid ""
-"%B: warning: multiple symbol tables detected - ignoring the table in section "
-"%u"
+"%pB: warning: multiple symbol tables detected - ignoring the table in "
+"section %u"
 msgstr ""
 
-#: elf.c:2208
+#: elf.c:2210
 #, c-format
 msgid ""
-"%B: warning: multiple dynamic symbol tables detected - ignoring the table in "
-"section %u"
+"%pB: warning: multiple dynamic symbol tables detected - ignoring the table "
+"in section %u"
 msgstr ""
 
-#: elf.c:2321
+#: elf.c:2323
 #, c-format
-msgid "%B: invalid link %u for reloc section %s (index %u)"
+msgid "%pB: invalid link %u for reloc section %s (index %u)"
 msgstr ""
 
-#: elf.c:2480 elf.c:2495 elf.c:2506 elf.c:2519
+#: elf.c:2482 elf.c:2497 elf.c:2508 elf.c:2521
 #, c-format
-msgid "%B: unknown type [%#x] section `%s'"
+msgid "%pB: unknown type [%#x] section `%s'"
 msgstr ""
 
-#: elf.c:3224
+#: elf.c:3226
 #, c-format
-msgid "%B: error: Alignment power %d of section `%A' is too big"
+msgid "%pB: error: alignment power %d of section `%pA' is too big"
 msgstr ""
 
-#: elf.c:3254
+#: elf.c:3256
 #, c-format
-msgid "warning: section `%A' type changed to PROGBITS"
+msgid "warning: section `%pA' type changed to PROGBITS"
 msgstr ""
 
-#: elf.c:3730
+#: elf.c:3732
 #, c-format
-msgid "%B: too many sections: %u"
+msgid "%pB: too many sections: %u"
 msgstr ""
 
-#: elf.c:3815
+#: elf.c:3817
 #, c-format
-msgid "%B: sh_link of section `%A' points to discarded section `%A' of `%B'"
+msgid ""
+"%pB: sh_link of section `%pA' points to discarded section `%pA' of `%pB'"
 msgstr ""
 
-#: elf.c:3840
+#: elf.c:3842
 #, c-format
-msgid "%B: sh_link of section `%A' points to removed section `%A' of `%B'"
+msgid "%pB: sh_link of section `%pA' points to removed section `%pA' of `%pB'"
 msgstr ""
 
-#: elf.c:4392
+#: elf.c:4394
 #, c-format
-msgid "%B: GNU_MBIN section `%A' has invalid sh_info field: %d"
+msgid "%pB: GNU_MBIN section `%pA' has invalid sh_info field: %d"
 msgstr ""
 
-#: elf.c:4951
-msgid "%B: TLS sections are not adjacent:"
+#: elf.c:4940
+#, c-format
+msgid "%pB: TLS sections are not adjacent:"
 msgstr ""
 
-#: elf.c:4958
+#: elf.c:4947
 #, c-format
-msgid "\t    TLS: %A"
+msgid "\t    TLS: %pA"
 msgstr ""
 
-#: elf.c:4962
+#: elf.c:4951
 #, c-format
-msgid "\tnon-TLS: %A"
+msgid "\tnon-TLS: %pA"
 msgstr ""
 
-#: elf.c:5458
+#: elf.c:5447
+#, c-format
 msgid ""
-"%B: The first section in the PT_DYNAMIC segment is not the .dynamic section"
+"%pB: The first section in the PT_DYNAMIC segment is not the .dynamic section"
 msgstr ""
 
-#: elf.c:5486
-msgid "%B: Not enough room for program headers, try linking with -N"
+#: elf.c:5475
+#, c-format
+msgid "%pB: not enough room for program headers, try linking with -N"
 msgstr ""
 
-#: elf.c:5574
+#: elf.c:5563
 #, c-format
-msgid "%B: section %A lma %#Lx adjusted to %#Lx"
+msgid "%pB: section %pA lma %#<PRIx64> adjusted to %#<PRIx64>"
 msgstr ""
 
-#: elf.c:5711
+#: elf.c:5700
 #, c-format
-msgid "%B: section `%A' can't be allocated in segment %d"
+msgid "%pB: section `%pA' can't be allocated in segment %d"
 msgstr ""
 
-#: elf.c:5759
+#: elf.c:5748
 #, c-format
-msgid "%B: warning: allocated section `%s' not in segment"
+msgid "%pB: warning: allocated section `%s' not in segment"
 msgstr ""
 
-#: elf.c:5957
+#: elf.c:5981
+#, c-format
 msgid ""
-"%B: error: non-load segment %d includes file header and/or program header"
+"%pB: error: non-load segment %d includes file header and/or program header"
 msgstr ""
 
 #. The fix for this error is usually to edit the linker script being
 #. used and set up the program headers manually.  Either that or
 #. leave room for the headers at the start of the SECTIONS.
-#: elf.c:6134
-msgid "%B: error: PHDR segment not covered by LOAD segment"
+#: elf.c:6158
+#, c-format
+msgid "%pB: error: PHDR segment not covered by LOAD segment"
 msgstr ""
 
-#: elf.c:6478
+#: elf.c:6503
 #, c-format
-msgid "%B: symbol `%s' required but not present"
+msgid "%pB: symbol `%s' required but not present"
 msgstr ""
 
-#: elf.c:6821
+#: elf.c:6847
 #, c-format
 msgid ""
-"%B: warning: Empty loadable segment detected at vaddr=%#Lx, is this "
+"%pB: warning: empty loadable segment detected at vaddr=%#<PRIx64>, is this "
 "intentional?"
 msgstr ""
 
-#: elf.c:7435
+#: elf.c:7461
 #, c-format
-msgid "%B: warning: segment alignment of %#Lx is too large"
+msgid "%pB: warning: segment alignment of %#<PRIx64> is too large"
 msgstr ""
 
-#: elf.c:7916
+#: elf.c:7960
 #, c-format
 msgid ""
-"Unable to find equivalent output section for symbol '%s' from section '%s'"
+"unable to find equivalent output section for symbol '%s' from section '%s'"
 msgstr ""
 
-#: elf.c:8249
-msgid "%B: .gnu.version_r invalid entry"
-msgstr ""
-
-#: elf.c:8376
-msgid "%B: .gnu.version_d invalid entry"
+#: elf.c:8293
+#, c-format
+msgid "%pB: .gnu.version_r invalid entry"
 msgstr ""
 
-#: elf.c:8928
+#: elf.c:8420
 #, c-format
-msgid "%B: unsupported relocation type %s"
+msgid "%pB: .gnu.version_d invalid entry"
 msgstr ""
 
-#: elf32-arc.c:433 elf32-frv.c:6623 elf32-iq2000.c:866 elf32-m32c.c:912
-#: elf32-mt.c:560 elf32-rl78.c:1257 elf32-rx.c:3178 elf32-visium.c:837
-#: elf64-ppc.c:6067
+#: elf32-arc.c:442 elf32-frv.c:6630 elf32-iq2000.c:870 elf32-m32c.c:914
+#: elf32-mt.c:562 elf32-rl78.c:1261 elf32-rx.c:3200 elf32-visium.c:841
+#: elf64-ppc.c:6184
 #, c-format
 msgid "private flags = 0x%lx:"
 msgstr ""
 
-#: elf32-arc.c:611
-msgid "Warning: %B: Conflicting platform configuration %s with %s.\n"
+#: elf32-arc.c:629
+#, c-format
+msgid "warning: %pB: conflicting platform configuration %s with %s"
 msgstr ""
 
-#: elf32-arc.c:630
-msgid "error: %B: unable to merge CPU base attributes %s with %s.\n"
+#: elf32-arc.c:648
+#, c-format
+msgid "error: %pB: unable to merge CPU base attributes %s with %s"
 msgstr ""
 
-#: elf32-arc.c:667
-msgid "error: %B: unable to merge ISA extension attributes %s.\n"
+#: elf32-arc.c:685
+#, c-format
+msgid "error: %pB: unable to merge ISA extension attributes %s"
 msgstr ""
 
-#: elf32-arc.c:691
-msgid "error: %B: conflicting ISA extension attributes %s with %s.\n"
+#: elf32-arc.c:709
+#, c-format
+msgid "error: %pB: conflicting ISA extension attributes %s with %s"
 msgstr ""
 
-#: elf32-arc.c:726
-msgid "error: %B: cannot mix rf16 with full register set %B.\n"
+#: elf32-arc.c:744
+#, c-format
+msgid "error: %pB: cannot mix rf16 with full register set %pB"
 msgstr ""
 
-#: elf32-arc.c:752
-msgid "error: %B: conflicting attributes %s: %s with %s.\n"
+#: elf32-arc.c:770
+#, c-format
+msgid "error: %pB: conflicting attributes %s: %s with %s"
 msgstr ""
 
-#: elf32-arc.c:777
-msgid "error: %B: conflicting attributes %s.\n"
+#: elf32-arc.c:795
+#, c-format
+msgid "error: %pB: conflicting attributes %s"
 msgstr ""
 
-#: elf32-arc.c:877
+#: elf32-arc.c:895
 #, c-format
-msgid "ERROR: Attempting to link %B with a binary %B of different architecture"
+msgid ""
+"error: attempting to link %pB with a binary %pB of different architecture"
 msgstr ""
 
-#: elf32-arc.c:891 elf32-i370.c:359 elf32-iq2000.c:842 elf32-m32c.c:887
-#: elf32-m68hc1x.c:1384 elf32-ppc.c:4846 elf64-sparc.c:727 elfxx-mips.c:15082
+#: elf32-arc.c:909 elf32-iq2000.c:846 elf32-m32c.c:889 elf32-m68hc1x.c:1385
+#: elf32-ppc.c:4958 elf64-sparc.c:731 elfxx-mips.c:15118
 #, c-format
-msgid "%B: uses different e_flags (%#x) fields than previous modules (%#x)"
+msgid "%pB: uses different e_flags (%#x) fields than previous modules (%#x)"
 msgstr ""
 
-#: elf32-arc.c:980
-msgid "Error: The ARC4 architecture is no longer supported.\n"
+#: elf32-arc.c:998
+msgid "error: the ARC4 architecture is no longer supported"
 msgstr ""
 
-#: elf32-arc.c:986
-msgid ""
-"Warning: unset or old architecture flags. \n"
-"\t       Use default machine.\n"
+#: elf32-arc.c:1004
+msgid "warning: unset or old architecture flags; use default machine"
 msgstr ""
 
-#: elf32-arc.c:1119
+#: elf32-arc.c:1137
 #, c-format
 msgid ""
-"%B(%A+%#Lx): CMEM relocation to `%s' is invalid, 16 MSB should be %#x (value "
-"is %#Lx)"
+"%pB(%pA+%#<PRIx64>): CMEM relocation to `%s' is invalid, 16 MSB should be "
+"%#x (value is %#<PRIx64>)"
 msgstr ""
 
-#: elf32-arc.c:1130
+#: elf32-arc.c:1148
 #, c-format
 msgid ""
-"%B(%A+%#Lx): CMEM relocation to `%s+%#Lx' is invalid, 16 MSB should be %#x "
-"(value is %#Lx)"
+"%pB(%pA+%#<PRIx64>): CMEM relocation to `%s+%#<PRIx64>' is invalid, 16 MSB "
+"should be %#x (value is %#<PRIx64>)"
 msgstr ""
 
-#: elf32-arc.c:1836
-msgid "GOT and PLT relocations cannot be fixed with a non dynamic linker."
+#: elf32-arc.c:1853
+msgid "GOT and PLT relocations cannot be fixed with a non dynamic linker"
 msgstr ""
 
-#: elf32-arc.c:1860 elf32-rl78.c:1095 elf32-rx.c:1449
+#: elf32-arc.c:1877 elf32-rl78.c:1099 elf32-rx.c:1471
 #, c-format
-msgid "%B(%A): warning: unaligned access to symbol '%s' in the small data area"
+msgid ""
+"%pB(%pA): warning: unaligned access to symbol '%s' in the small data area"
 msgstr ""
 
-#: elf32-arc.c:1865 elf32-rl78.c:1100 elf32-rx.c:1454
+#: elf32-arc.c:1882 elf32-rl78.c:1104 elf32-rx.c:1476
 #, c-format
-msgid "%B(%A): internal error: out of range error"
+msgid "%pB(%pA): internal error: out of range error"
 msgstr ""
 
-#: elf32-arc.c:1870 elf32-rl78.c:1105 elf32-rx.c:1459
+#: elf32-arc.c:1887 elf32-rl78.c:1109 elf32-rx.c:1481
 #, c-format
-msgid "%B(%A): internal error: unsupported relocation error"
+msgid "%pB(%pA): internal error: unsupported relocation error"
 msgstr ""
 
-#: elf32-arc.c:1875 elf32-rl78.c:1110 elf32-rx.c:1464
+#: elf32-arc.c:1892 elf32-rl78.c:1114 elf32-rx.c:1486
 #, c-format
-msgid "%B(%A): internal error: dangerous relocation"
+msgid "%pB(%pA): internal error: dangerous relocation"
 msgstr ""
 
-#: elf32-arc.c:1880 elf32-rl78.c:1115 elf32-rx.c:1469
+#: elf32-arc.c:1897 elf32-rl78.c:1119 elf32-rx.c:1491
 #, c-format
-msgid "%B(%A): internal error: unknown error"
+msgid "%pB(%pA): internal error: unknown error"
 msgstr ""
 
-#: elf32-arc.c:1968 elf32-arm.c:14521 elf32-metag.c:2252 elfxx-mips.c:8889
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:7103
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:471
+#: elf32-arc.c:1985 elf32-arm.c:14552 elf32-metag.c:2257 elfxx-mips.c:8905
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:7394
+#: /work/sources/binutils/current/bfd/elfnn-riscv.c:474
 #, c-format
 msgid ""
-"%B: relocation %s against `%s' can not be used when making a shared object; "
+"%pB: relocation %s against `%s' can not be used when making a shared object; "
 "recompile with -fPIC"
 msgstr ""
 
-#: elf32-arc.c:2860
-msgid "%B: Unknown mandatory ARC object attribute %d."
+#: elf32-arc.c:2877
+#, c-format
+msgid "%pB: unknown mandatory ARC object attribute %d"
 msgstr ""
 
-#: elf32-arc.c:2868
-msgid "Warning: %B: Unknown ARC object attribute %d."
+#: elf32-arc.c:2885
+#, c-format
+msgid "warning: %pB: unknown ARC object attribute %d"
 msgstr ""
 
-#: elf32-arm.c:4022 elf32-arm.c:4056 elf32-arm.c:4075 elf32-arm.c:4127
+#: elf32-arm.c:4030 elf32-arm.c:4064 elf32-arm.c:4083 elf32-arm.c:4135
+#, c-format
 msgid ""
-"%B(%A): warning: long branch veneers used in section with SHF_ARM_PURECODE "
+"%pB(%pA): 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."
+"movw instruction"
 msgstr ""
 
-#: elf32-arm.c:4087 elf32-arm.c:8806
-msgid ""
-"%B(%s): warning: interworking not enabled.\n"
-"  first occurrence: %B: Thumb call to ARM"
-msgstr ""
-
-#: elf32-arm.c:4141
+#: elf32-arm.c:4095 elf32-arm.c:4149 elf32-arm.c:8813 elf32-arm.c:8903
+#, c-format
 msgid ""
-"%B(%s): warning: interworking not enabled.\n"
-"  first occurrence: %B: ARM call to Thumb"
+"%pB(%s): warning: interworking not enabled; first occurrence: %pB: %s call "
+"to %s"
 msgstr ""
 
-#: elf32-arm.c:4415
+#: elf32-arm.c:4423
 #, c-format
-msgid "No address assigned to the veneers output section %s"
+msgid "no address assigned to the veneers output section %s"
 msgstr ""
 
-#: elf32-arm.c:4490 elf32-arm.c:6627 elf32-hppa.c:577 elf32-m68hc1x.c:165
-#: elf32-metag.c:1183 elf32-nios2.c:2207
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:2854
+#: elf32-arm.c:4498 elf32-arm.c:6634 elf32-hppa.c:577 elf32-m68hc1x.c:165
+#: elf32-metag.c:1186 elf32-nios2.c:2208 elf64-ppc.c:4737
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:3099
 #, c-format
-msgid "%B: cannot create stub entry %s"
+msgid "%pB: cannot create stub entry %s"
 msgstr ""
 
-#: elf32-arm.c:5675
-msgid "%B: Special symbol `%s' only allowed for ARMv8-M architecture or later."
-msgstr ""
-
-#: elf32-arm.c:5684
-msgid "%B: invalid special symbol `%s'."
-msgstr ""
-
-#: elf32-arm.c:5686 elf32-arm.c:5726
-msgid "It must be a global or weak function symbol."
+#: elf32-arm.c:5683
+#, c-format
+msgid "%pB: special symbol `%s' only allowed for ARMv8-M architecture or later"
 msgstr ""
 
-#: elf32-arm.c:5724
-msgid "%B: invalid standard symbol `%s'."
+#: elf32-arm.c:5692
+#, c-format
+msgid ""
+"%pB: invalid special symbol `%s'; it must be a global or weak function symbol"
 msgstr ""
 
-#: elf32-arm.c:5730
-msgid "%B: absent standard symbol `%s'."
+#: elf32-arm.c:5731
+#, c-format
+msgid ""
+"%pB: invalid standard symbol `%s'; it must be a global or weak function "
+"symbol"
 msgstr ""
 
-#: elf32-arm.c:5742
-msgid "%B: `%s' and its special symbol are in different sections."
+#: elf32-arm.c:5737
+#, c-format
+msgid "%pB: absent standard symbol `%s'"
 msgstr ""
 
-#: elf32-arm.c:5754
-msgid "%B: entry function `%s' not output."
+#: elf32-arm.c:5749
+#, c-format
+msgid "%pB: `%s' and its special symbol are in different sections"
 msgstr ""
 
 #: elf32-arm.c:5761
-msgid "%B: entry function `%s' is empty."
+#, c-format
+msgid "%pB: entry function `%s' not output"
 msgstr ""
 
-#: elf32-arm.c:5890
-msgid "%B: --in-implib only supported for Secure Gateway import libraries."
+#: elf32-arm.c:5768
+#, c-format
+msgid "%pB: entry function `%s' is empty"
 msgstr ""
 
-#: elf32-arm.c:5936
-msgid "%B: invalid import library entry: `%s'."
+#: elf32-arm.c:5897
+#, c-format
+msgid "%pB: --in-implib only supported for Secure Gateway import libraries"
 msgstr ""
 
-#: elf32-arm.c:5938
-msgid "Symbol should be absolute, global and refer to Thumb functions."
+#: elf32-arm.c:5943
+#, c-format
+msgid ""
+"%pB: invalid import library entry: `%s'; symbol should be absolute, global "
+"and refer to Thumb functions"
 msgstr ""
 
-#: elf32-arm.c:5958
+#: elf32-arm.c:5965
 #, c-format
-msgid "Entry function `%s' disappeared from secure code."
+msgid "entry function `%s' disappeared from secure code"
 msgstr ""
 
-#: elf32-arm.c:5982
+#: elf32-arm.c:5989
 #, c-format
-msgid "`%s' refers to a non entry function."
+msgid "`%s' refers to a non entry function"
 msgstr ""
 
-#: elf32-arm.c:5997
-msgid "%B: visibility of symbol `%s' has changed."
+#: elf32-arm.c:6004
+#, c-format
+msgid "%pB: visibility of symbol `%s' has changed"
 msgstr ""
 
-#: elf32-arm.c:6006
-msgid "%B: incorrect size for symbol `%s'."
+#: elf32-arm.c:6013
+#, c-format
+msgid "%pB: incorrect size for symbol `%s'"
 msgstr ""
 
-#: elf32-arm.c:6025
+#: elf32-arm.c:6032
 #, c-format
-msgid "Offset of veneer for entry function `%s' not a multiple of its size."
+msgid "offset of veneer for entry function `%s' not a multiple of its size"
 msgstr ""
 
-#: elf32-arm.c:6045
+#: elf32-arm.c:6052
 msgid ""
 "new entry function(s) introduced but no output import library specified:"
 msgstr ""
 
-#: elf32-arm.c:6053
+#: elf32-arm.c:6060
 #, c-format
-msgid "Start address of `%s' is different from previous link."
+msgid "start address of `%s' is different from previous link"
 msgstr ""
 
-#: elf32-arm.c:6760
+#: elf32-arm.c:6767 elf32-arm.c:6803
 #, c-format
-msgid "unable to find THUMB glue '%s' for '%s'"
+msgid "unable to find %s glue '%s' for '%s'"
 msgstr ""
 
-#: elf32-arm.c:6796
+#: elf32-arm.c:7518
 #, c-format
-msgid "unable to find ARM glue '%s' for '%s'"
-msgstr ""
-
-#: elf32-arm.c:7511
-msgid "%B: BE8 images only valid in big-endian mode."
+msgid "%pB: BE8 images only valid in big-endian mode"
 msgstr ""
 
 #. Give a warning, but do as the user requests anyway.
-#: elf32-arm.c:7742
+#: elf32-arm.c:7749
+#, c-format
 msgid ""
-"%B: warning: selected VFP11 erratum workaround is not necessary for target "
+"%pB: warning: selected VFP11 erratum workaround is not necessary for target "
 "architecture"
 msgstr ""
 
-#: elf32-arm.c:7769
+#: elf32-arm.c:7776
+#, c-format
 msgid ""
-"%B: warning: selected STM32L4XX erratum workaround is not necessary for "
+"%pB: warning: selected STM32L4XX erratum workaround is not necessary for "
 "target architecture"
 msgstr ""
 
-#: elf32-arm.c:8306 elf32-arm.c:8326
-msgid "%B: unable to find VFP11 veneer `%s'"
-msgstr ""
-
-#: elf32-arm.c:8392 elf32-arm.c:8411
-msgid "%B: unable to find STM32L4XX veneer `%s'"
+#: elf32-arm.c:8313 elf32-arm.c:8333 elf32-arm.c:8399 elf32-arm.c:8418
+#, c-format
+msgid "%pB: unable to find %s veneer `%s'"
 msgstr ""
 
-#: elf32-arm.c:8618
+#: elf32-arm.c:8625
 #, c-format
 msgid ""
-"%B(%A+%#x): 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"
+"%pB(%pA+%#x): error: multiple load detected in non-last IT block "
+"instruction: STM32L4XX veneer cannot be generated; use gcc option -mrestrict-"
+"it to generate only one instruction per IT block"
 msgstr ""
 
-#: elf32-arm.c:8716
+#: elf32-arm.c:8723
 #, c-format
-msgid "Invalid TARGET2 relocation type '%s'."
+msgid "invalid TARGET2 relocation type '%s'"
 msgstr ""
 
 #. FIXME: We ought to be able to generate thumb-1 PLT
 #. instructions...
-#: elf32-arm.c:9458
-msgid "%B: Warning: thumb-1 mode PLT generation not currently supported"
-msgstr ""
-
-#: elf32-arm.c:9723
+#: elf32-arm.c:9465
 #, c-format
-msgid "%B(%A+%#Lx): unexpected Thumb instruction '%#lx' in TLS trampoline"
+msgid "%pB: warning: thumb-1 mode PLT generation not currently supported"
 msgstr ""
 
-#: elf32-arm.c:9763
+#: elf32-arm.c:9730 elf32-arm.c:9772
 #, c-format
-msgid "%B(%A+%#Lx): unexpected ARM instruction '%#lx' in TLS trampoline"
+msgid "%pB(%pA+%#<PRIx64>): unexpected %s instruction '%#lx' in TLS trampoline"
 msgstr ""
 
-#: elf32-arm.c:10103
+#: elf32-arm.c:10114
 msgid "shared object"
 msgstr ""
 
-#: elf32-arm.c:10106
+#: elf32-arm.c:10117
 msgid "PIE executable"
 msgstr ""
 
-#: elf32-arm.c:10109
+#: elf32-arm.c:10120
+#, c-format
 msgid ""
-"%B: relocation %s against external or undefined symbol `%s' can not be used "
+"%pB: relocation %s against external or undefined symbol `%s' can not be used "
 "when making a %s; recompile with -fPIC"
 msgstr ""
 
-#: elf32-arm.c:10240
-msgid "%B: Warning: Arm BLX instruction targets Arm function '%s'."
-msgstr ""
-
-#: elf32-arm.c:10666
-msgid "%B: Warning: Thumb BLX instruction targets thumb function '%s'."
-msgstr ""
-
-#: elf32-arm.c:11534
+#: elf32-arm.c:10251 elf32-arm.c:10678
 #, c-format
-msgid ""
-"%B(%A+%#Lx): unexpected Thumb instruction '%#lx' referenced by TLS_GOTDESC"
+msgid "%pB: warning: %s BLX instruction targets %s function '%s'"
 msgstr ""
 
-#: elf32-arm.c:11557
+#: elf32-arm.c:11547 elf32-arm.c:11573
 #, c-format
 msgid ""
-"%B(%A+%#Lx): unexpected ARM instruction '%#lx' referenced by TLS_GOTDESC"
+"%pB(%pA+%#<PRIx64>): unexpected %s instruction '%#lx' referenced by "
+"TLS_GOTDESC"
 msgstr ""
 
-#: elf32-arm.c:11586 elf32-m68k.c:3701 elf32-metag.c:1916 elf32-nios2.c:4358
+#: elf32-arm.c:11605 elf32-m68k.c:3703 elf32-metag.c:1919 elf32-nios2.c:4366
 #, c-format
-msgid "%B(%A+%#Lx): %s relocation not permitted in shared object"
+msgid "%pB(%pA+%#<PRIx64>): %s relocation not permitted in shared object"
 msgstr ""
 
-#: elf32-arm.c:11799
+#: elf32-arm.c:11819
 #, c-format
 msgid ""
-"%B(%A+%#Lx): Only ADD or SUB instructions are allowed for ALU group "
+"%pB(%pA+%#<PRIx64>): only ADD or SUB instructions are allowed for ALU group "
 "relocations"
 msgstr ""
 
-#: elf32-arm.c:11839 elf32-arm.c:11929 elf32-arm.c:12015 elf32-arm.c:12103
+#: elf32-arm.c:11860 elf32-arm.c:11952 elf32-arm.c:12040 elf32-arm.c:12130
 #, c-format
-msgid "%B(%A+%#Lx): Overflow whilst splitting %#Lx for group relocation %s"
+msgid ""
+"%pB(%pA+%#<PRIx64>): overflow whilst splitting %#<PRIx64> for group "
+"relocation %s"
 msgstr ""
 
-#: elf32-arm.c:12369 elf32-sh.c:4003 elf64-sh64.c:1539
+#: elf32-arm.c:12398 elf32-sh.c:3685
 #, c-format
-msgid "%B(%A+%#Lx): %s relocation against SEC_MERGE section"
+msgid "%pB(%pA+%#<PRIx64>): %s relocation against SEC_MERGE section"
 msgstr ""
 
-#: elf32-arm.c:12481 elf32-m68k.c:3931 elf32-xtensa.c:2681
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6185
+#: elf32-arm.c:12511 elf32-m68k.c:3936 elf32-xtensa.c:2689
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6466
 #, c-format
-msgid "%B(%A+%#Lx): %s used with TLS symbol %s"
+msgid "%pB(%pA+%#<PRIx64>): %s used with TLS symbol %s"
 msgstr ""
 
-#: elf32-arm.c:12483 elf32-m68k.c:3933 elf32-xtensa.c:2683
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6187
+#: elf32-arm.c:12513 elf32-m68k.c:3938 elf32-xtensa.c:2691
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6468
 #, c-format
-msgid "%B(%A+%#Lx): %s used with non-TLS symbol %s"
+msgid "%pB(%pA+%#<PRIx64>): %s used with non-TLS symbol %s"
 msgstr ""
 
-#: elf32-arm.c:12565 elf32-tic6x.c:2674
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6520
+#: elf32-arm.c:12596 elf32-tic6x.c:2708
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6802
 msgid "out of range"
 msgstr ""
 
-#: elf32-arm.c:12569 elf32-nios2.c:4492 elf32-pru.c:821 elf32-tic6x.c:2678
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6524
+#: elf32-arm.c:12600 elf32-nios2.c:4500 elf32-pru.c:835 elf32-tic6x.c:2712
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6806
 msgid "unsupported relocation"
 msgstr ""
 
-#: elf32-arm.c:12577 elf32-nios2.c:4502 elf32-pru.c:831 elf32-tic6x.c:2686
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6532
+#: elf32-arm.c:12608 elf32-nios2.c:4510 elf32-pru.c:845 elf32-tic6x.c:2720
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6814
 msgid "unknown error"
 msgstr ""
 
-#: elf32-arm.c:13157
-msgid "%B: Unknown mandatory EABI object attribute %d"
+#: elf32-arm.c:13188
+#, c-format
+msgid "%pB: unknown mandatory EABI object attribute %d"
 msgstr ""
 
-#: elf32-arm.c:13165
-msgid "Warning: %B: Unknown EABI object attribute %d"
+#: elf32-arm.c:13196
+#, c-format
+msgid "warning: %pB: unknown EABI object attribute %d"
 msgstr ""
 
-#: elf32-arm.c:13432
-msgid "error: %B: Unknown CPU architecture"
+#: elf32-arm.c:13463
+#, c-format
+msgid "error: %pB: unknown CPU architecture"
 msgstr ""
 
-#: elf32-arm.c:13470 elf32-nios2.c:2945
+#: elf32-arm.c:13501 elf32-nios2.c:2946
 #, c-format
-msgid "error: %B: Conflicting CPU architectures %d/%d"
+msgid "error: %pB: conflicting CPU architectures %d/%d"
 msgstr ""
 
-#: elf32-arm.c:13567
+#: elf32-arm.c:13598
+#, c-format
 msgid ""
-"Error: %B has both the current and legacy Tag_MPextension_use attributes"
+"Error: %pB has both the current and legacy Tag_MPextension_use attributes"
 msgstr ""
 
-#: elf32-arm.c:13596
-msgid "error: %B uses VFP register arguments, %B does not"
+#: elf32-arm.c:13627
+#, c-format
+msgid "error: %pB uses VFP register arguments, %pB does not"
 msgstr ""
 
-#: elf32-arm.c:13754
-msgid "error: %B: unable to merge virtualization attributes with %B"
+#: elf32-arm.c:13785
+#, c-format
+msgid "error: %pB: unable to merge virtualization attributes with %pB"
 msgstr ""
 
-#: elf32-arm.c:13780
-msgid "error: %B: Conflicting architecture profiles %c/%c"
+#: elf32-arm.c:13811
+#, c-format
+msgid "error: %pB: conflicting architecture profiles %c/%c"
 msgstr ""
 
-#: elf32-arm.c:13919
-msgid "Warning: %B: Conflicting platform configuration"
+#: elf32-arm.c:13950
+#, c-format
+msgid "warning: %pB: conflicting platform configuration"
 msgstr ""
 
-#: elf32-arm.c:13928
-msgid "error: %B: Conflicting use of R9"
+#: elf32-arm.c:13959
+#, c-format
+msgid "error: %pB: conflicting use of R9"
 msgstr ""
 
-#: elf32-arm.c:13940
-msgid "error: %B: SB relative addressing conflicts with use of R9"
+#: elf32-arm.c:13971
+#, c-format
+msgid "error: %pB: SB relative addressing conflicts with use of R9"
 msgstr ""
 
-#: elf32-arm.c:13953
+#: elf32-arm.c:13984
+#, c-format
 msgid ""
-"warning: %B uses %u-byte wchar_t yet the output is to use %u-byte wchar_t; "
+"warning: %pB uses %u-byte wchar_t yet the output is to use %u-byte wchar_t; "
 "use of wchar_t values across objects may fail"
 msgstr ""
 
-#: elf32-arm.c:13984
+#: elf32-arm.c:14015
+#, c-format
 msgid ""
-"warning: %B uses %s enums yet the output is to use %s enums; use of enum "
+"warning: %pB uses %s enums yet the output is to use %s enums; use of enum "
 "values across objects may fail"
 msgstr ""
 
-#: elf32-arm.c:13996
-msgid "error: %B uses iWMMXt register arguments, %B does not"
+#: elf32-arm.c:14027
+#, c-format
+msgid "error: %pB uses iWMMXt register arguments, %pB does not"
 msgstr ""
 
-#: elf32-arm.c:14013
-msgid "error: fp16 format mismatch between %B and %B"
+#: elf32-arm.c:14044
+#, c-format
+msgid "error: fp16 format mismatch between %pB and %pB"
 msgstr ""
 
-#: elf32-arm.c:14049
-msgid "%B has both the current and legacy Tag_MPextension_use attributes"
+#: elf32-arm.c:14080
+#, c-format
+msgid "%pB has both the current and legacy Tag_MPextension_use attributes"
 msgstr ""
 
 #. Ignore init flag - it may not be set, despite the flags field
@@ -1786,235 +1809,234 @@ msgstr ""
 #. Ignore init flag - it may not be set, despite the flags field containing valid data.
 #. Ignore init flag - it may not be set, despite the flags field
 #. containing valid data.
-#: elf32-arm.c:14136 elf32-bfin.c:4729 elf32-cris.c:3905 elf32-m68hc1x.c:1409
-#: elf32-m68k.c:1199 elf32-score.c:3998 elf32-score7.c:3803 elf32-vax.c:536
-#: elf32-xgate.c:669 elfxx-mips.c:15756
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6686
+#: elf32-arm.c:14167 elf32-bfin.c:4740 elf32-cris.c:3908 elf32-m68hc1x.c:1410
+#: elf32-m68k.c:1201 elf32-score.c:4000 elf32-score7.c:3805 elf32-vax.c:537
+#: elf32-xgate.c:672 elfxx-mips.c:15792
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6968
 #, c-format
 msgid "private flags = %lx:"
 msgstr ""
 
-#: elf32-arm.c:14145
+#: elf32-arm.c:14176
 #, c-format
 msgid " [interworking enabled]"
 msgstr ""
 
-#: elf32-arm.c:14153
+#: elf32-arm.c:14184
 #, c-format
 msgid " [VFP float format]"
 msgstr ""
 
-#: elf32-arm.c:14155
+#: elf32-arm.c:14186
 #, c-format
 msgid " [Maverick float format]"
 msgstr ""
 
-#: elf32-arm.c:14157
+#: elf32-arm.c:14188
 #, c-format
 msgid " [FPA float format]"
 msgstr ""
 
-#: elf32-arm.c:14166
+#: elf32-arm.c:14197
 #, c-format
 msgid " [new ABI]"
 msgstr ""
 
-#: elf32-arm.c:14169
+#: elf32-arm.c:14200
 #, c-format
 msgid " [old ABI]"
 msgstr ""
 
-#: elf32-arm.c:14172
+#: elf32-arm.c:14203
 #, c-format
 msgid " [software FP]"
 msgstr ""
 
-#: elf32-arm.c:14181
+#: elf32-arm.c:14212
 #, c-format
 msgid " [Version1 EABI]"
 msgstr ""
 
-#: elf32-arm.c:14184 elf32-arm.c:14195
+#: elf32-arm.c:14215 elf32-arm.c:14226
 #, c-format
 msgid " [sorted symbol table]"
 msgstr ""
 
-#: elf32-arm.c:14186 elf32-arm.c:14197
+#: elf32-arm.c:14217 elf32-arm.c:14228
 #, c-format
 msgid " [unsorted symbol table]"
 msgstr ""
 
-#: elf32-arm.c:14192
+#: elf32-arm.c:14223
 #, c-format
 msgid " [Version2 EABI]"
 msgstr ""
 
-#: elf32-arm.c:14200
+#: elf32-arm.c:14231
 #, c-format
 msgid " [dynamic symbols use segment index]"
 msgstr ""
 
-#: elf32-arm.c:14203
+#: elf32-arm.c:14234
 #, c-format
 msgid " [mapping symbols precede others]"
 msgstr ""
 
-#: elf32-arm.c:14210
+#: elf32-arm.c:14241
 #, c-format
 msgid " [Version3 EABI]"
 msgstr ""
 
-#: elf32-arm.c:14214
+#: elf32-arm.c:14245
 #, c-format
 msgid " [Version4 EABI]"
 msgstr ""
 
-#: elf32-arm.c:14218
+#: elf32-arm.c:14249
 #, c-format
 msgid " [Version5 EABI]"
 msgstr ""
 
-#: elf32-arm.c:14221
+#: elf32-arm.c:14252
 #, c-format
 msgid " [soft-float ABI]"
 msgstr ""
 
-#: elf32-arm.c:14224
+#: elf32-arm.c:14255
 #, c-format
 msgid " [hard-float ABI]"
 msgstr ""
 
-#: elf32-arm.c:14230
+#: elf32-arm.c:14261
 #, c-format
 msgid " [BE8]"
 msgstr ""
 
-#: elf32-arm.c:14233
+#: elf32-arm.c:14264
 #, c-format
 msgid " [LE8]"
 msgstr ""
 
-#: elf32-arm.c:14239
+#: elf32-arm.c:14270
 #, c-format
 msgid " <EABI version unrecognised>"
 msgstr ""
 
-#: elf32-arm.c:14246
+#: elf32-arm.c:14277
 #, c-format
 msgid " [relocatable executable]"
 msgstr ""
 
-#: elf32-arm.c:14251 /work/sources/binutils/current/bfd/elfnn-aarch64.c:6689
+#: elf32-arm.c:14282 /work/sources/binutils/current/bfd/elfnn-aarch64.c:6971
 #, c-format
 msgid "<Unrecognised flag bits set>"
 msgstr ""
 
-#: elf32-arm.c:14368 elf32-i386.c:1510 elf32-s390.c:956 elf32-tic6x.c:2749
-#: elf32-tilepro.c:1471 elf32-xtensa.c:1018 elf64-s390.c:875
-#: elf64-x86-64.c:1823 elfxx-sparc.c:1420 elfxx-tilegx.c:1688
-#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:6978
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:513
+#: elf32-arm.c:14399 elf32-i386.c:1517 elf32-s390.c:960 elf32-tic6x.c:2783
+#: elf32-tilepro.c:1479 elf32-xtensa.c:1024 elf64-s390.c:882
+#: elf64-x86-64.c:1826 elfxx-sparc.c:1424 elfxx-tilegx.c:1700
+#: /work/sources/binutils/current/bfd/elfnn-aarch64.c:7260
+#: /work/sources/binutils/current/bfd/elfnn-riscv.c:516
 #, c-format
-msgid "%B: bad symbol index: %d"
+msgid "%pB: bad symbol index: %d"
 msgstr ""
 
-#: elf32-arm.c:15636 elf32-hppa.c:2082 elf32-lm32.c:1989 elf32-m32r.c:2097
-#: elf32-metag.c:2792 elf32-nds32.c:3844 elf32-or1k.c:2281 elf32-ppc.c:6156
-#: elf32-s390.c:1851 elf32-sh.c:3289 elf32-tic6x.c:3205 elf32-tilepro.c:2237
-#: elf64-ppc.c:9893 elf64-s390.c:1785 elfxx-sparc.c:2457 elfxx-tilegx.c:2479
-#: elfxx-x86.c:563 /work/sources/binutils/current/bfd/elfnn-aarch64.c:8319
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:1112
+#: elf32-arm.c:15667 elf32-hppa.c:2088 elf32-lm32.c:1998 elf32-m32r.c:2110
+#: elf32-metag.c:2797 elf32-nds32.c:3840 elf32-or1k.c:2285 elf32-ppc.c:6550
+#: elf32-s390.c:1855 elf32-sh.c:2975 elf32-tic6x.c:3239 elf32-tilepro.c:2245
+#: elf64-ppc.c:10249 elf64-s390.c:1792 elfxx-sparc.c:2437 elfxx-tilegx.c:2491
+#: elfxx-x86.c:571 /work/sources/binutils/current/bfd/elfnn-aarch64.c:8610
+#: /work/sources/binutils/current/bfd/elfnn-riscv.c:1117
 #, c-format
-msgid "%B: dynamic relocation against `%T' in read-only section `%A'\n"
+msgid "%pB: dynamic relocation against `%pT' in read-only section `%pA'\n"
 msgstr ""
 
-#: elf32-arm.c:15881
-msgid "Errors encountered processing file %B"
+#: elf32-arm.c:15912
+#, c-format
+msgid "errors encountered processing file %pB"
 msgstr ""
 
-#: elf32-arm.c:16318 elflink.c:12394 elflink.c:12441
+#: elf32-arm.c:16349 elflink.c:12416 elflink.c:12463
 #, c-format
 msgid "could not find section %s"
 msgstr ""
 
-#: elf32-arm.c:17494
-msgid "%B: error: Cortex-A8 erratum stub is allocated in unsafe location"
+#: elf32-arm.c:17525
+#, c-format
+msgid "%pB: error: Cortex-A8 erratum stub is allocated in unsafe location"
 msgstr ""
 
 #. There's not much we can do apart from complain if this
 #. happens.
-#: elf32-arm.c:17521
-msgid "%B: error: Cortex-A8 erratum stub out of range (input file too large)"
+#: elf32-arm.c:17552
+#, c-format
+msgid "%pB: error: Cortex-A8 erratum stub out of range (input file too large)"
 msgstr ""
 
-#: elf32-arm.c:18348 elf32-arm.c:18370
-msgid "%B: error: VFP11 veneer out of range"
+#: elf32-arm.c:18379 elf32-arm.c:18401
+#, c-format
+msgid "%pB: error: VFP11 veneer out of range"
 msgstr ""
 
-#: elf32-arm.c:18421
+#: elf32-arm.c:18452
+#, c-format
 msgid ""
-"%B(%#Lx): error: Cannot create STM32L4XX veneer. Jump out of range by %Ld "
-"bytes. Cannot encode branch instruction. "
+"%pB(%#<PRIx64>): error: cannot create STM32L4XX veneer; jump out of range by "
+"%<PRId64> bytes; cannot encode branch instruction"
 msgstr ""
 
-#: elf32-arm.c:18459
-msgid "%B: error: Cannot create STM32L4XX veneer."
+#: elf32-arm.c:18491
+#, c-format
+msgid "%pB: error: cannot create STM32L4XX veneer"
 msgstr ""
 
-#: elf32-arm.c:19481
-msgid "error: %B is already in final BE8 format"
+#: elf32-arm.c:19513
+#, c-format
+msgid "error: %pB is already in final BE8 format"
 msgstr ""
 
-#: elf32-arm.c:19557
+#: elf32-arm.c:19589
+#, c-format
 msgid ""
-"error: Source object %B has EABI version %d, but target %B has EABI version "
-"%d"
-msgstr ""
-
-#: elf32-arm.c:19572
-msgid "error: %B is compiled for APCS-%d, whereas target %B uses APCS-%d"
+"error: source object %pB has EABI version %d, but target %pB has EABI "
+"version %d"
 msgstr ""
 
-#: elf32-arm.c:19596
-msgid "error: %B uses VFP instructions, whereas %B does not"
-msgstr ""
-
-#: elf32-arm.c:19600
-msgid "error: %B uses FPA instructions, whereas %B does not"
-msgstr ""
-
-#: elf32-arm.c:19610
-msgid "error: %B uses Maverick instructions, whereas %B does not"
+#: elf32-arm.c:19604
+#, c-format
+msgid "error: %pB is compiled for APCS-%d, whereas target %pB uses APCS-%d"
 msgstr ""
 
-#: elf32-arm.c:19614
-msgid "error: %B does not use Maverick instructions, whereas %B does"
+#: elf32-arm.c:19628 elf32-arm.c:19632 elf32-arm.c:19642
+#, c-format
+msgid "error: %pB uses %s instructions, whereas %pB does not"
 msgstr ""
 
-#: elf32-arm.c:19633
-msgid "error: %B uses software FP, whereas %B uses hardware FP"
+#: elf32-arm.c:19646
+#, c-format
+msgid "error: %pB does not use %s instructions, whereas %pB does"
 msgstr ""
 
-#: elf32-arm.c:19637
-msgid "error: %B uses hardware FP, whereas %B uses software FP"
+#: elf32-arm.c:19665
+#, c-format
+msgid "error: %pB uses software FP, whereas %pB uses hardware FP"
 msgstr ""
 
-#: elf32-avr.c:959
+#: elf32-arm.c:19669
 #, c-format
-msgid "%B: invalid AVR reloc number: %d"
+msgid "error: %pB uses hardware FP, whereas %pB uses software FP"
 msgstr ""
 
-#: elf32-avr.c:1510 elf32-bfin.c:3124 elf32-cris.c:2038 elf32-epiphany.c:574
-#: elf32-fr30.c:599 elf32-frv.c:4049 elf32-ft32.c:493 elf32-i860.c:1218
-#: elf32-ip2k.c:1486 elf32-iq2000.c:697 elf32-m32c.c:630 elf32-mep.c:532
-#: elf32-metag.c:1993 elf32-moxie.c:293 elf32-msp430.c:1361 elf32-mt.c:404
-#: elf32-or1k.c:1246 elf32-tilepro.c:3505 elf32-v850.c:2291 elf32-visium.c:685
-#: elf32-xstormy16.c:931 elf64-mmix.c:1546 elfxx-tilegx.c:3865
-#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2245
+#: elf32-avr.c:1513 elf32-bfin.c:3135 elf32-cris.c:2041 elf32-epiphany.c:577
+#: elf32-fr30.c:602 elf32-frv.c:4057 elf32-ft32.c:502 elf32-ip2k.c:1493
+#: elf32-iq2000.c:701 elf32-m32c.c:632 elf32-mep.c:534 elf32-metag.c:1998
+#: elf32-moxie.c:296 elf32-msp430.c:1366 elf32-mt.c:406 elf32-or1k.c:1250
+#: elf32-tilepro.c:3514 elf32-v850.c:2299 elf32-visium.c:689
+#: elf32-xstormy16.c:939 elf64-mmix.c:1549 elfxx-tilegx.c:3878
 msgid "internal error: dangerous relocation"
 msgstr ""
 
-#: elf32-avr.c:3319 /work/sources/binutils/current/bfd/elfnn-aarch64.c:2882
+#: elf32-avr.c:3322 /work/sources/binutils/current/bfd/elfnn-aarch64.c:3127
 #, c-format
 msgid "cannot create stub entry %s"
 msgstr ""
@@ -2023,536 +2045,464 @@ msgstr ""
 msgid "relocation should be even number"
 msgstr ""
 
-#: elf32-bfin.c:1577
+#: elf32-bfin.c:1585
 #, c-format
-msgid "%B(%A+%#Lx): unresolvable relocation against symbol `%s'"
+msgid "%pB(%pA+%#<PRIx64>): unresolvable relocation against symbol `%s'"
 msgstr ""
 
-#: elf32-bfin.c:1608 elf32-i386.c:3473 elf32-m68k.c:3971 elf32-s390.c:3261
-#: elf64-s390.c:3175 elf64-x86-64.c:3839
+#: elf32-bfin.c:1617 elf32-i386.c:3497 elf32-m68k.c:3976 elf32-s390.c:3266
+#: elf64-s390.c:3183 elf64-x86-64.c:3854
 #, c-format
-msgid "%B(%A+%#Lx): reloc against `%s': error %d"
+msgid "%pB(%pA+%#<PRIx64>): reloc against `%s': error %d"
 msgstr ""
 
-#: elf32-bfin.c:2628
+#: elf32-bfin.c:2638
 #, c-format
-msgid "%B: relocation at `%A+%#Lx' references symbol `%s' with nonzero addend"
+msgid ""
+"%pB: relocation at `%pA+%#<PRIx64>' references symbol `%s' with nonzero "
+"addend"
 msgstr ""
 
-#: elf32-bfin.c:2644
+#: elf32-bfin.c:2655
 msgid "relocation references symbol not defined in the module"
 msgstr ""
 
-#: elf32-bfin.c:2741
+#: elf32-bfin.c:2752
 msgid "R_BFIN_FUNCDESC references dynamic symbol with nonzero addend"
 msgstr ""
 
-#: elf32-bfin.c:2782 elf32-bfin.c:2905
+#: elf32-bfin.c:2793 elf32-bfin.c:2916
 msgid "cannot emit fixups in read-only section"
 msgstr ""
 
-#: elf32-bfin.c:2813 elf32-bfin.c:2943 elf32-lm32.c:1044 elf32-sh.c:4926
+#: elf32-bfin.c:2824 elf32-bfin.c:2954 elf32-lm32.c:1049 elf32-sh.c:4507
 msgid "cannot emit dynamic relocations in read-only section"
 msgstr ""
 
-#: elf32-bfin.c:2863
+#: elf32-bfin.c:2874
 msgid "R_BFIN_FUNCDESC_VALUE references dynamic symbol with nonzero addend"
 msgstr ""
 
-#: elf32-bfin.c:3028
+#: elf32-bfin.c:3039
 msgid "relocations between different segments are not supported"
 msgstr ""
 
-#: elf32-bfin.c:3029
+#: elf32-bfin.c:3040
 msgid "warning: relocation references a different segment"
 msgstr ""
 
-#: elf32-bfin.c:4687
+#: elf32-bfin.c:4787 elf32-frv.c:6603
 #, c-format
-msgid "%B: unsupported relocation type %d"
+msgid "%pB: cannot link non-fdpic object file into fdpic executable"
 msgstr ""
 
-#: elf32-bfin.c:4776 elf32-frv.c:6596
-msgid "%B: cannot link non-fdpic object file into fdpic executable"
-msgstr ""
-
-#: elf32-bfin.c:4780 elf32-frv.c:6600
-msgid "%B: cannot link fdpic object file into non-fdpic executable"
+#: elf32-bfin.c:4791 elf32-frv.c:6607
+#, c-format
+msgid "%pB: cannot link fdpic object file into non-fdpic executable"
 msgstr ""
 
-#: elf32-bfin.c:4930
+#: elf32-bfin.c:4941
 #, c-format
 msgid "*** check this relocation %s"
 msgstr ""
 
-#: elf32-bfin.c:5046
+#: elf32-bfin.c:5057
 msgid ""
 "the bfin target does not currently support the generation of copy relocations"
 msgstr ""
 
-#: elf32-cr16.c:653
-#, c-format
-msgid "Unsupported CR16 relocation type: 0x%x\n"
-msgstr ""
-
-#: elf32-cr16.c:682
-#, c-format
-msgid "%B: unrecognised CR16 reloc number: %d"
-msgstr ""
-
-#: elf32-cr16c.c:186
-#, c-format
-msgid "%B: invalid CR16C reloc number: %d"
+#: elf32-bfin.c:5351 elf32-cr16.c:2803 elf32-m68k.c:4390
+msgid "unsupported relocation type"
 msgstr ""
 
-#: elf32-cris.c:467
+#: elf32-cris.c:1119
 #, c-format
-msgid "%B: invalid CRIS reloc number: %d"
+msgid "%pB, section %pA: unresolvable relocation %s against symbol `%s'"
 msgstr ""
 
-#: elf32-cris.c:1116
+#: elf32-cris.c:1184
 #, c-format
-msgid "%B, section %A: unresolvable relocation %s against symbol `%s'"
+msgid "%pB, section %pA: no PLT nor GOT for relocation %s against symbol `%s'"
 msgstr ""
 
-#: elf32-cris.c:1181
+#: elf32-cris.c:1187
 #, c-format
-msgid "%B, section %A: No PLT nor GOT for relocation %s against symbol `%s'"
+msgid "%pB, section %pA: no PLT for relocation %s against symbol `%s'"
 msgstr ""
 
-#: elf32-cris.c:1184
-#, c-format
-msgid "%B, section %A: No PLT for relocation %s against symbol `%s'"
-msgstr ""
-
-#: elf32-cris.c:1190 elf32-cris.c:1323 elf32-cris.c:1588 elf32-cris.c:1671
-#: elf32-cris.c:1824 elf32-tic6x.c:2586
+#: elf32-cris.c:1193 elf32-cris.c:1326 elf32-cris.c:1591 elf32-cris.c:1674
+#: elf32-cris.c:1827 elf32-tic6x.c:2619
 msgid "[whose name is lost]"
 msgstr ""
 
-#: elf32-cris.c:1308 elf32-tic6x.c:2570
+#: elf32-cris.c:1311 elf32-tic6x.c:2603
 #, c-format
 msgid ""
-"%B, section %A: relocation %s with non-zero addend %Ld against local symbol"
+"%pB, section %pA: relocation %s with non-zero addend %<PRId64> against local "
+"symbol"
 msgstr ""
 
-#: elf32-cris.c:1317 elf32-cris.c:1665 elf32-cris.c:1818 elf32-tic6x.c:2579
+#: elf32-cris.c:1320 elf32-cris.c:1668 elf32-cris.c:1821 elf32-tic6x.c:2612
 #, c-format
 msgid ""
-"%B, section %A: relocation %s with non-zero addend %Ld against symbol `%s'"
+"%pB, section %pA: relocation %s with non-zero addend %<PRId64> against "
+"symbol `%s'"
 msgstr ""
 
-#: elf32-cris.c:1344
+#: elf32-cris.c:1347
 #, c-format
-msgid "%B, section %A: relocation %s is not allowed for global symbol: `%s'"
+msgid "%pB, section %pA: relocation %s is not allowed for global symbol: `%s'"
 msgstr ""
 
-#: elf32-cris.c:1361
+#: elf32-cris.c:1364
 #, c-format
-msgid "%B, section %A: relocation %s with no GOT created"
+msgid "%pB, section %pA: relocation %s with no GOT created"
 msgstr ""
 
 #. We shouldn't get here for GCC-emitted code.
-#: elf32-cris.c:1578
+#: elf32-cris.c:1581
 #, c-format
 msgid ""
-"%B, section %A: relocation %s has an undefined reference to `%s', perhaps a "
-"declaration mixup?"
+"%pB, section %pA: relocation %s has an undefined reference to `%s', perhaps "
+"a declaration mixup?"
 msgstr ""
 
-#: elf32-cris.c:1581
+#: elf32-cris.c:1584
 #, c-format
 msgid ""
-"%B, section %A: relocation %s is not allowed for `%s', a global symbol with "
-"default visibility, perhaps a declaration mixup?"
+"%pB, section %pA: relocation %s is not allowed for `%s', a global symbol "
+"with default visibility, perhaps a declaration mixup?"
 msgstr ""
 
-#: elf32-cris.c:1952
+#: elf32-cris.c:1955
 #, c-format
 msgid ""
-"%B, section %A: relocation %s is not allowed for symbol: `%s' which is "
+"%pB, section %pA: relocation %s is not allowed for symbol: `%s' which is "
 "defined outside the program, perhaps a declaration mixup?"
 msgstr ""
 
-#: elf32-cris.c:2005
+#: elf32-cris.c:2008
 msgid "(too many global variables for -fpic: recompile with -fPIC)"
 msgstr ""
 
-#: elf32-cris.c:2012
+#: elf32-cris.c:2015
 msgid ""
 "(thread-local data too big for -fpic or -msmall-tls: recompile with -fPIC or "
 "-mno-small-tls)"
 msgstr ""
 
-#: elf32-cris.c:3047
+#: elf32-cris.c:3050
 #, c-format
 msgid ""
-"%B, section %A:\n"
-"  v10/v32 compatible object must not contain a PIC relocation"
+"%pB, section %pA: v10/v32 compatible object must not contain a PIC relocation"
 msgstr ""
 
-#: elf32-cris.c:3101
+#: elf32-cris.c:3104
 #, c-format
 msgid ""
-"%B, section %A:\n"
+"%pB, section %pA:\n"
 "  relocation %s not valid in a shared object; typically an option mixup, "
 "recompile with -fPIC"
 msgstr ""
 
-#: elf32-cris.c:3319
+#: elf32-cris.c:3322
 #, c-format
 msgid ""
-"%B, section %A:\n"
-"  relocation %s should not be used in a shared object; recompile with -fPIC"
+"%pB, section %pA: relocation %s should not be used in a shared object; "
+"recompile with -fPIC"
 msgstr ""
 
-#: elf32-cris.c:3744
+#: elf32-cris.c:3747
 #, c-format
 msgid ""
-"%B, section `%A', to symbol `%s':\n"
-"  relocation %s should not be used in a shared object; recompile with -fPIC"
+"%pB, section `%pA', to symbol `%s': relocation %s should not be used in a "
+"shared object; recompile with -fPIC"
 msgstr ""
 
-#: elf32-cris.c:3857
-msgid "Unexpected machine number"
+#: elf32-cris.c:3860
+msgid "unexpected machine number"
 msgstr ""
 
-#: elf32-cris.c:3908
+#: elf32-cris.c:3911
 #, c-format
 msgid " [symbols have a _ prefix]"
 msgstr ""
 
-#: elf32-cris.c:3911
+#: elf32-cris.c:3914
 #, c-format
 msgid " [v10 and v32]"
 msgstr ""
 
-#: elf32-cris.c:3914
+#: elf32-cris.c:3917
 #, c-format
 msgid " [v32]"
 msgstr ""
 
-#: elf32-cris.c:3958
-msgid "%B: uses _-prefixed symbols, but writing file with non-prefixed symbols"
-msgstr ""
-
-#: elf32-cris.c:3959
-msgid "%B: uses non-prefixed symbols, but writing file with _-prefixed symbols"
-msgstr ""
-
-#: elf32-cris.c:3978
-msgid "%B contains CRIS v32 code, incompatible with previous objects"
-msgstr ""
-
-#: elf32-cris.c:3980
-msgid "%B contains non-CRIS-v32 code, incompatible with previous objects"
+#: elf32-cris.c:3961
+#, c-format
+msgid ""
+"%pB: uses _-prefixed symbols, but writing file with non-prefixed symbols"
 msgstr ""
 
-#: elf32-crx.c:429
+#: elf32-cris.c:3962
 #, c-format
-msgid "%B: unrecognised CRX reloc number: %d"
+msgid ""
+"%pB: uses non-prefixed symbols, but writing file with _-prefixed symbols"
 msgstr ""
 
-#: elf32-d10v.c:234
+#: elf32-cris.c:3981
 #, c-format
-msgid "%B: invalid D10V reloc number: %d"
+msgid "%pB contains CRIS v32 code, incompatible with previous objects"
 msgstr ""
 
-#: elf32-d30v.c:522 elf32-d30v.c:541
+#: elf32-cris.c:3983
 #, c-format
-msgid "%B: invalid D30V reloc number: %d"
+msgid "%pB contains non-CRIS-v32 code, incompatible with previous objects"
 msgstr ""
 
 #: elf32-dlx.c:141
 #, c-format
-msgid "BFD Link Error: branch (PC rel16) to section (%s) not supported"
+msgid "branch (PC rel16) to section (%s) not supported"
 msgstr ""
 
 #: elf32-dlx.c:204
 #, c-format
-msgid "BFD Link Error: jump (PC rel26) to section (%s) not supported"
-msgstr ""
-
-#: elf32-dlx.c:548
-#, c-format
-msgid "Invalid DLX reloc number: %d"
-msgstr ""
-
-#: elf32-epiphany.c:376
-#, c-format
-msgid "%B: invalid Epiphany reloc number: %d"
+msgid "jump (PC rel26) to section (%s) not supported"
 msgstr ""
 
 #. Only if it's not an unresolved symbol.
-#: elf32-epiphany.c:570 elf32-ip2k.c:1482
+#: elf32-epiphany.c:573 elf32-ip2k.c:1489
 msgid "unsupported relocation between data/insn address spaces"
 msgstr ""
 
-#: elf32-fr30.c:381
-#, c-format
-msgid "%B: invalid FR30 reloc number: %d"
-msgstr ""
-
-#: elf32-frv.c:1451 elf32-frv.c:1602
+#: elf32-frv.c:1452 elf32-frv.c:1603
 msgid "relocation requires zero addend"
 msgstr ""
 
-#: elf32-frv.c:2557
-#, c-format
-msgid "%B: invalid FRV reloc number: %d"
-msgstr ""
-
-#: elf32-frv.c:2823
+#: elf32-frv.c:2829
 #, c-format
 msgid "%H: relocation to `%s+%v' may have caused the error above\n"
 msgstr ""
 
-#: elf32-frv.c:2840
+#: elf32-frv.c:2846
 msgid "%H: relocation references symbol not defined in the module\n"
 msgstr ""
 
-#: elf32-frv.c:2916
+#: elf32-frv.c:2922
 msgid "%H: R_FRV_GETTLSOFF not applied to a call instruction\n"
 msgstr ""
 
-#: elf32-frv.c:2957
+#: elf32-frv.c:2963
 msgid "%H: R_FRV_GOTTLSDESC12 not applied to an lddi instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3028
+#: elf32-frv.c:3034
 msgid "%H: R_FRV_GOTTLSDESCHI not applied to a sethi instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3065
+#: elf32-frv.c:3071
 msgid "%H: R_FRV_GOTTLSDESCLO not applied to a setlo or setlos instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3112
+#: elf32-frv.c:3118
 msgid "%H: R_FRV_TLSDESC_RELAX not applied to an ldd instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3196
+#: elf32-frv.c:3202
 msgid "%H: R_FRV_GETTLSOFF_RELAX not applied to a calll instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3250
+#: elf32-frv.c:3256
 msgid "%H: R_FRV_GOTTLSOFF12 not applied to an ldi instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3280
+#: elf32-frv.c:3286
 msgid "%H: R_FRV_GOTTLSOFFHI not applied to a sethi instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3309
+#: elf32-frv.c:3315
 msgid "%H: R_FRV_GOTTLSOFFLO not applied to a setlo or setlos instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3339
+#: elf32-frv.c:3345
 msgid "%H: R_FRV_TLSOFF_RELAX not applied to an ld instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3384
+#: elf32-frv.c:3390
 msgid "%H: R_FRV_TLSMOFFHI not applied to a sethi instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3411
+#: elf32-frv.c:3417
 msgid "R_FRV_TLSMOFFLO not applied to a setlo or setlos instruction\n"
 msgstr ""
 
-#: elf32-frv.c:3532
-msgid "%H: R_FRV_FUNCDESC references dynamic symbol with nonzero addend\n"
+#: elf32-frv.c:3538 elf32-frv.c:3660
+msgid "%H: %s references dynamic symbol with nonzero addend\n"
 msgstr ""
 
-#: elf32-frv.c:3573 elf32-frv.c:3695
+#: elf32-frv.c:3580 elf32-frv.c:3703
 msgid "%H: cannot emit fixups in read-only section\n"
 msgstr ""
 
-#: elf32-frv.c:3604 elf32-frv.c:3738
+#: elf32-frv.c:3611 elf32-frv.c:3746
 msgid "%H: cannot emit dynamic relocations in read-only section\n"
 msgstr ""
 
-#: elf32-frv.c:3653
-msgid ""
-"%H: R_FRV_FUNCDESC_VALUE references dynamic symbol with nonzero addend\n"
-msgstr ""
-
-#: elf32-frv.c:3910
+#: elf32-frv.c:3918
 #, c-format
 msgid "%H: reloc against `%s' references a different segment\n"
 msgstr ""
 
-#: elf32-frv.c:4061
+#: elf32-frv.c:4069
 #, c-format
 msgid "%H: reloc against `%s': %s\n"
 msgstr ""
 
-#: elf32-frv.c:6255
-#, c-format
-msgid "%B: unsupported relocation type %i\n"
-msgstr ""
-
-#: elf32-frv.c:6507
+#: elf32-frv.c:6514
 #, c-format
 msgid ""
-"%B: compiled with %s and linked with modules that use non-pic relocations"
+"%pB: compiled with %s and linked with modules that use non-pic relocations"
 msgstr ""
 
-#: elf32-frv.c:6561 elf32-iq2000.c:828 elf32-m32c.c:874
+#: elf32-frv.c:6568 elf32-iq2000.c:832 elf32-m32c.c:876
 #, c-format
-msgid "%B: compiled with %s and linked with modules compiled with %s"
+msgid "%pB: compiled with %s and linked with modules compiled with %s"
 msgstr ""
 
-#: elf32-frv.c:6574
+#: elf32-frv.c:6581
 #, c-format
 msgid ""
-"%B: uses different unknown e_flags (%#x) fields than previous modules (%#x)"
+"%pB: uses different unknown e_flags (%#x) fields than previous modules (%#x)"
 msgstr ""
 
-#: elf32-gen.c:69 elf64-gen.c:69
+#: elf32-gen.c:71
 #, c-format
-msgid "%B: Relocations in generic ELF (EM: %d)"
+msgid "%pB: relocations in generic ELF (EM: %d)"
 msgstr ""
 
-#: elf32-hppa.c:829 elf32-hppa.c:3499
+#: elf32-hppa.c:832 elf32-hppa.c:3506
 #, c-format
-msgid "%B(%A+%#Lx): cannot reach %s, recompile with -ffunction-sections"
+msgid ""
+"%pB(%pA+%#<PRIx64>): cannot reach %s, recompile with -ffunction-sections"
 msgstr ""
 
-#: elf32-hppa.c:1242
+#: elf32-hppa.c:1246
 #, c-format
 msgid ""
-"%B: relocation %s can not be used when making a shared object; recompile "
+"%pB: relocation %s can not be used when making a shared object; recompile "
 "with -fPIC"
 msgstr ""
 
-#: elf32-hppa.c:2680
+#: elf32-hppa.c:2686
 #, c-format
-msgid "%B: duplicate export stub %s"
+msgid "%pB: duplicate export stub %s"
 msgstr ""
 
-#: elf32-hppa.c:3333
+#: elf32-hppa.c:3339
 #, c-format
 msgid ""
-"%B(%A+%#Lx): %s fixup for insn %#x is not supported in a non-shared link"
+"%pB(%pA+%#<PRIx64>): %s fixup for insn %#x is not supported in a non-shared "
+"link"
 msgstr ""
 
-#: elf32-hppa.c:4124
+#: elf32-hppa.c:4135
 #, c-format
 msgid "%s has both normal and TLS relocs"
 msgstr ""
 
-#: elf32-hppa.c:4142
-msgid "%B:%s has both normal and TLS relocs"
-msgstr ""
-
-#: elf32-hppa.c:4201
+#: elf32-hppa.c:4153
 #, c-format
-msgid "%B(%A+%#Lx): cannot handle %s for %s"
+msgid "%pB:%s has both normal and TLS relocs"
 msgstr ""
 
-#: elf32-hppa.c:4505
-msgid ".got section not immediately after .plt section"
-msgstr ""
-
-#: elf32-i370.c:307
+#: elf32-hppa.c:4212
 #, c-format
-msgid "%B: unrecognised I370 reloc number: %d"
+msgid "%pB(%pA+%#<PRIx64>): cannot handle %s for %s"
 msgstr ""
 
-#: elf32-i370.c:1164
-msgid "%B: unknown relocation type %d for symbol %s"
-msgstr ""
-
-#: elf32-i370.c:1306
-#, c-format
-msgid "%B: Relocation %s is not yet supported for symbol %s."
+#: elf32-hppa.c:4516
+msgid ".got section not immediately after .plt section"
 msgstr ""
 
-#. Unknown relocation.
-#: elf32-i386.c:384 elf32-m68k.c:352 elf32-ppc.c:2039 elf32-s390.c:346
-#: elf32-tic6x.c:2609 elf32-wasm32.c:106 elf64-ppc.c:2516 elf64-s390.c:373
-#: elf64-x86-64.c:285
+#: elf32-i386.c:351
 #, c-format
-msgid "%B: invalid relocation type %d"
+msgid "%pB: unsupported relocation type: %#x"
 msgstr ""
 
-#: elf32-i386.c:1159 elf64-x86-64.c:1335
+#: elf32-i386.c:1166 elf64-x86-64.c:1338
 #, c-format
 msgid ""
-"%B: TLS transition from %s to %s against `%s' at %#Lx in section `%A' failed"
+"%pB: TLS transition from %s to %s against `%s' at %#<PRIx64> in section `"
+"%pA' failed"
 msgstr ""
 
-#: elf32-i386.c:1250
+#: elf32-i386.c:1257
 #, c-format
 msgid ""
-"%B: direct GO[...]

[diff truncated at 100000 bytes]


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]