mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-09-10 03:42:22 +08:00
ld error/warning messages
This patch standardizes messages in ld, to better conform to the GNU coding standard. Besides issues of capitalization and full-stops, I've - Split up help messages for target options, so that adding a new option does not mean loss of translation for all the others. - Embedded tabs have been removed, since a user might have tab stops set at other than 8 char intervals. - Added missing program name (%P). ld isn't the compiler. - Put %F and %X first (and removed %X if %F was present). These can go anywhere, but look silly in the m%Fiddle of a message, and choosing "%P%F:" in some messages but "%F%P:" in others leads to the likelihood of duplication in ld.pot. Besides, the colon belongs with %P. * emulparams/call_nop.sh, * emulparams/cet.sh, * emulparams/elf32mcore.sh, * emultempl/aarch64elf.em * emultempl/aix.em, * emultempl/alphaelf.em, * emultempl/armcoff.em, * emultempl/armelf.em, * emultempl/avrelf.em, * emultempl/beos.em, * emultempl/bfin.em, * emultempl/cr16elf.em, * emultempl/elf32.em, * emultempl/elf-generic.em, * emultempl/hppaelf.em, * emultempl/linux.em, * emultempl/lnk960.em, * emultempl/m68hc1xelf.em, * emultempl/m68kcoff.em, * emultempl/m68kelf.em, * emultempl/metagelf.em, * emultempl/mipself.em, * emultempl/mmix-elfnmmo.em, * emultempl/mmo.em, * emultempl/msp430.em, * emultempl/nds32elf.em, * emultempl/nios2elf.em, * emultempl/pe.em, * emultempl/pep.em, * emultempl/ppc32elf.em, * emultempl/ppc64elf.em, * emultempl/scoreelf.em, * emultempl/sh64elf.em, * emultempl/spuelf.em, * emultempl/sunos.em, * emultempl/tic6xdsbt.em, * emultempl/ticoff.em, * emultempl/v850elf.em, * emultempl/vms.em, * emultempl/vxworks.em, * emultempl/xtensaelf.em, * ldcref.c, * ldctor.c, * ldexp.c, * ldfile.c, * ldgram.y, * ldlang.c, * ldmain.c, * ldmisc.c, * ldwrite.c, * lexsup.c, * mri.c, * pe-dll.c, * plugin.c: Standardize error/warning messages. * testsuite/ld-arc/jli-overflow.err, * testsuite/ld-arm/cmse-implib-errors.out, * testsuite/ld-arm/cmse-new-earlier-later-implib.out, * testsuite/ld-arm/cmse-new-implib-not-sg-in-implib.out, * testsuite/ld-arm/cmse-new-wrong-implib.out, * testsuite/ld-arm/cmse-veneers-no-gnu_sgstubs.out, * testsuite/ld-arm/cmse-veneers-wrong-entryfct.out, * testsuite/ld-arm/vxworks1-static.d, * testsuite/ld-cris/tls-err-20x.d, * testsuite/ld-cris/tls-err-29.d, * testsuite/ld-cris/tls-err-31.d, * testsuite/ld-cris/tls-err-33.d, * testsuite/ld-cris/tls-err-35.d, * testsuite/ld-cris/tls-err-37.d, * testsuite/ld-cris/tls-err-39.d, * testsuite/ld-cris/tls-err-41.d, * testsuite/ld-cris/tls-err-43.d, * testsuite/ld-cris/tls-err-45.d, * testsuite/ld-cris/tls-err-47.d, * testsuite/ld-cris/tls-err-49.d, * testsuite/ld-cris/tls-err-51.d, * testsuite/ld-cris/tls-err-67.d, * testsuite/ld-elf/dwarf2.err, * testsuite/ld-elf/dwarf3.err, * testsuite/ld-elf/orphan-5.l, * testsuite/ld-elf/orphan-6.l, * testsuite/ld-i386/vxworks1-static.d, * testsuite/ld-mips-elf/bal-jalx-pic-micromips-n32.d, * testsuite/ld-mips-elf/bal-jalx-pic-micromips-n64.d, * testsuite/ld-mips-elf/bal-jalx-pic-micromips.d, * testsuite/ld-mips-elf/bal-jalx-pic-n32.d, * testsuite/ld-mips-elf/bal-jalx-pic-n64.d, * testsuite/ld-mips-elf/bal-jalx-pic.d, * testsuite/ld-mips-elf/jal-global-overflow-1.d, * testsuite/ld-mips-elf/jal-local-overflow-1.d, * testsuite/ld-mips-elf/mode-change-error-1.d, * testsuite/ld-mips-elf/unaligned-branch-2.d, * testsuite/ld-mips-elf/unaligned-branch-ignore-2.d, * testsuite/ld-mips-elf/unaligned-branch-ignore-micromips.d, * testsuite/ld-mips-elf/unaligned-branch-ignore-mips16.d, * testsuite/ld-mips-elf/unaligned-branch-ignore-r6-1.d, * testsuite/ld-mips-elf/unaligned-branch-micromips.d, * testsuite/ld-mips-elf/unaligned-branch-mips16.d, * testsuite/ld-mips-elf/unaligned-branch-r6-1.d, * testsuite/ld-mips-elf/unaligned-branch-r6-2.d, * testsuite/ld-mips-elf/unaligned-branch.d, * testsuite/ld-mips-elf/unaligned-jalx-1.d, * testsuite/ld-mips-elf/unaligned-jalx-3.d, * testsuite/ld-mips-elf/unaligned-jalx-addend-1.d, * testsuite/ld-mips-elf/unaligned-jalx-addend-3.d, * testsuite/ld-mips-elf/unaligned-jalx-addend-micromips-1.d, * testsuite/ld-mips-elf/unaligned-jalx-addend-mips16-1.d, * testsuite/ld-mips-elf/unaligned-jalx-micromips-1.d, * testsuite/ld-mips-elf/unaligned-jalx-mips16-1.d, * testsuite/ld-mips-elf/unaligned-jump-micromips.d, * testsuite/ld-mips-elf/unaligned-jump-mips16.d, * testsuite/ld-mips-elf/unaligned-jump.d, * testsuite/ld-mips-elf/unaligned-ldpc-1.d, * testsuite/ld-mips-elf/unaligned-lwpc-1.d, * testsuite/ld-mips-elf/undefined.d, * testsuite/ld-mips-elf/vxworks1-static.d, * testsuite/ld-mmix/bpo-20.d, * testsuite/ld-mmix/bpo-20m.d, * testsuite/ld-mmix/bpo-7.d, * testsuite/ld-mmix/bpo-7m.d, * testsuite/ld-mmix/bpo-8.d, * testsuite/ld-mmix/bpo-8m.d, * testsuite/ld-mmix/greg-17.d, * testsuite/ld-mmix/greg-18.d, * testsuite/ld-mmix/greg-8.d, * testsuite/ld-mmix/greg-9.d, * testsuite/ld-plugin/plugin-14.d, * testsuite/ld-plugin/plugin-15.d, * testsuite/ld-plugin/plugin-16.d, * testsuite/ld-plugin/plugin-20.d, * testsuite/ld-plugin/plugin-21.d, * testsuite/ld-plugin/plugin-22.d, * testsuite/ld-plugin/plugin-23.d, * testsuite/ld-plugin/plugin-6.d, * testsuite/ld-plugin/plugin-7.d, * testsuite/ld-plugin/plugin-8.d, * testsuite/ld-powerpc/aix-weak-3-32.d, * testsuite/ld-powerpc/aix-weak-3-64.d, * testsuite/ld-powerpc/vxworks1-static.d, * testsuite/ld-sh/vxworks1-static.d, * testsuite/ld-sparc/vxworks1-static.d, * testsuite/ld-undefined/undefined.exp, * testsuite/ld-x86-64/pie1.d: Update for changed errors and warnings. * testsuite/ld-elf/warn1.d, * testsuite/ld-elf/warn2.d: Correct regex.
This commit is contained in:
Alan Modra
@ -488,15 +488,15 @@ gld_${EMULATION_NAME}_list_options (FILE *file)
|
||||
executable image files\n"));
|
||||
fprintf (file, _(" --disable-long-section-names Never use long COFF section names, even\n\
|
||||
in object files\n"));
|
||||
fprintf (file, _(" --dynamicbase Image base address may be relocated using\n\
|
||||
address space layout randomization (ASLR)\n"));
|
||||
fprintf (file, _(" --forceinteg Code integrity checks are enforced\n"));
|
||||
fprintf (file, _(" --nxcompat Image is compatible with data execution prevention\n"));
|
||||
fprintf (file, _(" --no-isolation Image understands isolation but do not isolate the image\n"));
|
||||
fprintf (file, _(" --no-seh Image does not use SEH. No SE handler may\n\
|
||||
be called in this image\n"));
|
||||
fprintf (file, _(" --no-bind Do not bind this image\n"));
|
||||
fprintf (file, _(" --wdmdriver Driver uses the WDM model\n"));
|
||||
fprintf (file, _(" --dynamicbase Image base address may be relocated using\n\
|
||||
address space layout randomization (ASLR)\n"));
|
||||
fprintf (file, _(" --forceinteg Code integrity checks are enforced\n"));
|
||||
fprintf (file, _(" --nxcompat Image is compatible with data execution prevention\n"));
|
||||
fprintf (file, _(" --no-isolation Image understands isolation but do not isolate the image\n"));
|
||||
fprintf (file, _(" --no-seh Image does not use SEH. No SE handler may\n\
|
||||
be called in this image\n"));
|
||||
fprintf (file, _(" --no-bind Do not bind this image\n"));
|
||||
fprintf (file, _(" --wdmdriver Driver uses the WDM model\n"));
|
||||
fprintf (file, _(" --tsaware Image is Terminal Server aware\n"));
|
||||
fprintf (file, _(" --build-id[=STYLE] Generate build ID\n"));
|
||||
}
|
||||
@ -651,7 +651,7 @@ set_pe_subsystem (void)
|
||||
|
||||
if (v[i].name == NULL)
|
||||
{
|
||||
einfo (_("%P%F: invalid subsystem type %s\n"), optarg);
|
||||
einfo (_("%F%P: invalid subsystem type %s\n"), optarg);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -672,7 +672,7 @@ set_pe_value (char *name)
|
||||
set_pe_name (name, strtoul (optarg, &end, 0));
|
||||
|
||||
if (end == optarg)
|
||||
einfo (_("%P%F: invalid hex number for PE parameter '%s'\n"), optarg);
|
||||
einfo (_("%F%P: invalid hex number for PE parameter '%s'\n"), optarg);
|
||||
|
||||
optarg = end;
|
||||
}
|
||||
@ -689,7 +689,7 @@ set_pe_stack_heap (char *resname, char *comname)
|
||||
set_pe_value (comname);
|
||||
}
|
||||
else if (*optarg)
|
||||
einfo (_("%P%F: strange hex info for PE parameter '%s'\n"), optarg);
|
||||
einfo (_("%F%P: strange hex info for PE parameter '%s'\n"), optarg);
|
||||
}
|
||||
|
||||
#define DEFAULT_BUILD_ID_STYLE "md5"
|
||||
@ -1001,7 +1001,7 @@ gld_${EMULATION_NAME}_set_symbols (void)
|
||||
|
||||
if (pe.FileAlignment > pe.SectionAlignment)
|
||||
{
|
||||
einfo (_("%P: warning, file alignment > section alignment.\n"));
|
||||
einfo (_("%P: warning, file alignment > section alignment\n"));
|
||||
}
|
||||
}
|
||||
|
||||
@ -1066,7 +1066,7 @@ change_undef (struct bfd_link_hash_entry * undef,
|
||||
|
||||
if (pe_enable_stdcall_fixup == -1)
|
||||
{
|
||||
einfo (_("Warning: resolving %s by linking to %s\n"),
|
||||
einfo (_("%P: warning: resolving %s by linking to %s\n"),
|
||||
undef->root.string, sym->root.string);
|
||||
|
||||
if (! gave_warning_message)
|
||||
@ -1140,7 +1140,7 @@ make_import_fixup (arelent *rel, asection *s, char *name)
|
||||
(unsigned long) rel->address, (long) rel->addend);
|
||||
|
||||
if (! bfd_get_section_contents (s->owner, s, addend, rel->address, sizeof (addend)))
|
||||
einfo (_("%C: Cannot get section contents - auto-import exception\n"),
|
||||
einfo (_("%P: %C: cannot get section contents - auto-import exception\n"),
|
||||
s->owner, s, rel->address);
|
||||
|
||||
pe_create_import_fixup (rel, s, bfd_get_32 (s->owner, addend), name);
|
||||
@ -1212,15 +1212,15 @@ pe_find_data_imports (void)
|
||||
warned = TRUE;
|
||||
einfo (_("%P: warning: auto-importing has been activated "
|
||||
"without --enable-auto-import specified on the "
|
||||
"command line.\nThis should work unless it "
|
||||
"command line; this should work unless it "
|
||||
"involves constant data structures referencing "
|
||||
"symbols from auto-imported DLLs.\n"));
|
||||
"symbols from auto-imported DLLs\n"));
|
||||
}
|
||||
}
|
||||
|
||||
if (!bfd_generic_link_read_symbols (b))
|
||||
{
|
||||
einfo (_("%pB%F: could not read symbols: %E\n"), b);
|
||||
einfo (_("%F%P: %pB: could not read symbols: %E\n"), b);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1335,7 +1335,7 @@ write_build_id (bfd *abfd)
|
||||
if (!link_order)
|
||||
{
|
||||
einfo (_("%P: warning: .buildid section discarded,"
|
||||
" --build-id ignored.\n"));
|
||||
" --build-id ignored\n"));
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@ -1407,7 +1407,7 @@ setup_build_id (bfd *ibfd)
|
||||
|
||||
if (!validate_build_id_style (emit_build_id))
|
||||
{
|
||||
einfo (_("%P: warning: unrecognized --build-id style ignored.\n"));
|
||||
einfo (_("%P: warning: unrecognized --build-id style ignored\n"));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@ -1431,8 +1431,8 @@ setup_build_id (bfd *ibfd)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
einfo (_("%P: warning: Cannot create .buildid section,"
|
||||
" --build-id ignored.\n"));
|
||||
einfo (_("%P: warning: cannot create .buildid section,"
|
||||
" --build-id ignored\n"));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@ -1484,7 +1484,7 @@ gld_${EMULATION_NAME}_after_open (void)
|
||||
|
||||
if (coff_data (link_info.output_bfd) == NULL
|
||||
|| coff_data (link_info.output_bfd)->pe == 0)
|
||||
einfo (_("%F%P: cannot perform PE operations on non PE output file '%pB'.\n"),
|
||||
einfo (_("%F%P: cannot perform PE operations on non PE output file '%pB'\n"),
|
||||
link_info.output_bfd);
|
||||
|
||||
pe_data (link_info.output_bfd)->pe_opthdr = pe;
|
||||
@ -1556,8 +1556,8 @@ gld_${EMULATION_NAME}_after_open (void)
|
||||
These will only be created if the output format is an arm format,
|
||||
hence we do not support linking and changing output formats at the
|
||||
same time. Use a link followed by objcopy to change output formats. */
|
||||
einfo (_("%F%X%P: error: cannot change output format "
|
||||
"whilst linking ARM binaries\n"));
|
||||
einfo (_("%F%P: error: cannot change output format "
|
||||
"whilst linking %s binaries\n"), "ARM");
|
||||
return;
|
||||
}
|
||||
{
|
||||
@ -1616,7 +1616,7 @@ gld_${EMULATION_NAME}_after_open (void)
|
||||
|
||||
if (!bfd_generic_link_read_symbols (is->the_bfd))
|
||||
{
|
||||
einfo (_("%pB%F: could not read symbols: %E\n"),
|
||||
einfo (_("%F%P: %pB: could not read symbols: %E\n"),
|
||||
is->the_bfd);
|
||||
return;
|
||||
}
|
||||
@ -1823,7 +1823,7 @@ gld_${EMULATION_NAME}_after_open (void)
|
||||
|
||||
if (!bfd_generic_link_read_symbols (is->the_bfd))
|
||||
{
|
||||
einfo (_("%pB%F: could not read symbols: %E\n"),
|
||||
einfo (_("%F%P: %pB: could not read symbols: %E\n"),
|
||||
is->the_bfd);
|
||||
return;
|
||||
}
|
||||
@ -1866,7 +1866,7 @@ gld_${EMULATION_NAME}_before_allocation (void)
|
||||
if (!ppc_process_before_allocation (is->the_bfd, &link_info))
|
||||
{
|
||||
/* xgettext:c-format */
|
||||
einfo (_("Errors encountered processing file %s\n"), is->filename);
|
||||
einfo (_("%P: errors encountered processing file %s\n"), is->filename);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1889,7 +1889,7 @@ gld_${EMULATION_NAME}_before_allocation (void)
|
||||
(is->the_bfd, & link_info, support_old_code))
|
||||
{
|
||||
/* xgettext:c-format */
|
||||
einfo (_("Errors encountered processing file %s for interworking\n"),
|
||||
einfo (_("%P: errors encountered processing file %s for interworking\n"),
|
||||
is->filename);
|
||||
}
|
||||
}
|
||||
@ -1951,7 +1951,7 @@ gld_${EMULATION_NAME}_unrecognized_file (lang_input_statement_type *entry ATTRIB
|
||||
|
||||
h = bfd_link_hash_lookup (link_info.hash, buf, TRUE, TRUE, TRUE);
|
||||
if (h == (struct bfd_link_hash_entry *) NULL)
|
||||
einfo (_("%P%F: bfd_link_hash_lookup failed: %E\n"));
|
||||
einfo (_("%F%P: bfd_link_hash_lookup failed: %E\n"));
|
||||
if (h->type == bfd_link_hash_new)
|
||||
{
|
||||
h->type = bfd_link_hash_undefined;
|
||||
|
||||
Reference in New Issue
Block a user