diff options
author | Alan Modra <amodra@gmail.com> | 2018-02-24 10:28:12 +1030 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2018-02-26 10:51:12 +1030 |
commit | df5f2391f7b2e3cab7e677ab7dadd02aef06e269 (patch) | |
tree | 011c9dd1fdb526a1a8d3a2e96974fd04715c2fc8 /ld/emultempl/nds32elf.em | |
parent | 33589acbfea909ca2a26b977ff2f672332990747 (diff) | |
download | fsf-binutils-gdb-df5f2391f7b2e3cab7e677ab7dadd02aef06e269.zip fsf-binutils-gdb-df5f2391f7b2e3cab7e677ab7dadd02aef06e269.tar.gz fsf-binutils-gdb-df5f2391f7b2e3cab7e677ab7dadd02aef06e269.tar.bz2 |
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.
Diffstat (limited to 'ld/emultempl/nds32elf.em')
-rw-r--r-- | ld/emultempl/nds32elf.em | 60 |
1 files changed, 31 insertions, 29 deletions
diff --git a/ld/emultempl/nds32elf.em b/ld/emultempl/nds32elf.em index cfbf76e..3ea0ea2 100644 --- a/ld/emultempl/nds32elf.em +++ b/ld/emultempl/nds32elf.em @@ -51,8 +51,8 @@ nds32_elf_create_output_section_statements (void) if (strstr (bfd_get_target (link_info.output_bfd), "nds32") == NULL) { /* Check the output target is nds32. */ - einfo (_("%F%X%P: error: Cannot change output format whilst " - "linking NDS32 binaries.\n")); + einfo (_("%F%P: error: cannot change output format whilst " + "linking %s binaries\n"), "NDS32"); return; } @@ -121,7 +121,8 @@ nds32_elf_after_open (void) && abi_ver != (elf_elfheader (abfd)->e_flags & EF_NDS_ABI)) { /* Incompatible objects. */ - einfo (_("%F%pB: ABI version of object files mismatched\n"), abfd); + einfo (_("%F%P: %pB: ABI version of object files mismatched\n"), + abfd); } #if defined NDS32_EX9_EXT @@ -166,7 +167,7 @@ nds32_elf_after_open (void) if (bfd_link_pic (&link_info)) { /* For PIE or shared object, all input must be PIC. */ - einfo (_("%pB: must use -fpic to compile this file " + einfo (_("%P: %pB: must use -fpic to compile this file " "for shared object or PIE\n"), abfd); } else @@ -269,31 +270,35 @@ PARSE_AND_LIST_LONGOPTS=' ' PARSE_AND_LIST_OPTIONS=' fprintf (file, _("\ - --m[no-]fp-as-gp Disable/enable fp-as-gp relaxation\n\ - --mexport-symbols=FILE Exporting symbols in linker script\n\ -")); + --m[no-]fp-as-gp Disable/enable fp-as-gp relaxation\n")); + fprintf (file, _("\ + --mexport-symbols=FILE Exporting symbols in linker script\n")); #if defined NDS32_EX9_EXT fprintf (file, _("\ - --m[no-]ex9 Disable/enable link-time EX9 relaxation\n\ - --mexport-ex9=FILE Export EX9 table after linking\n\ - --mimport-ex9=FILE Import Ex9 table for EX9 relaxation\n\ - --mupdate-ex9 Update existing EX9 table\n\ - --mex9-limit=NUM Maximum number of entries in ex9 table\n\ - --mex9-loop-aware Avoid generate EX9 instruction inside loop\n\ -")); + --m[no-]ex9 Disable/enable link-time EX9 relaxation\n")); + fprintf (file, _("\ + --mexport-ex9=FILE Export EX9 table after linking\n")); + fprintf (file, _("\ + --mimport-ex9=FILE Import Ex9 table for EX9 relaxation\n")); + fprintf (file, _("\ + --mupdate-ex9 Update existing EX9 table\n")); + fprintf (file, _("\ + --mex9-limit=NUM Maximum number of entries in ex9 table\n")); + fprintf (file, _("\ + --mex9-loop-aware Avoid generate EX9 instruction inside loop\n")); #endif #if defined NDS32_IFC_EXT fprintf (file, _("\ - --m[no-]ifc Disable/enable link-time IFC optimization\n\ - --mifc-loop-aware Avoid generate IFC instruction inside loop\n\ -")); + --m[no-]ifc Disable/enable link-time IFC optimization\n")); + fprintf (file, _("\ + --mifc-loop-aware Avoid generate IFC instruction inside loop\n")); #endif ' PARSE_AND_LIST_ARGS_CASES=' case OPTION_BASELINE: - einfo (_("%P: --mbaseline is not used anymore.\n")); + einfo (_("%P: --mbaseline is not used anymore\n")); break; case OPTION_ELIM_GC_RELOCS: eliminate_gc_relocs = 1; @@ -304,11 +309,11 @@ PARSE_AND_LIST_ARGS_CASES=' break; case OPTION_REDUCE_FP_UPDATE: case OPTION_NO_REDUCE_FP_UPDATE: - einfo (_("%P: --relax-[no-]reduce-fp-updat is not used anymore.\n")); + einfo (_("%P: --relax-[no-]reduce-fp-updat is not used anymore\n")); break; case OPTION_EXPORT_SYMBOLS: if (!optarg) - einfo (_("Missing file for --mexport-symbols.\n"), optarg); + einfo (_("%P: missing file for --mexport-symbols\n"), optarg); if(strcmp (optarg, "-") == 0) sym_ld_script = stdout; @@ -316,7 +321,7 @@ PARSE_AND_LIST_ARGS_CASES=' { sym_ld_script = fopen (optarg, FOPEN_WT); if(sym_ld_script == NULL) - einfo (_("%P%F: cannot open map file %s: %E.\n"), optarg); + einfo (_("%F%P: cannot open map file %s: %E\n"), optarg); } break; #if defined NDS32_EX9_EXT @@ -328,7 +333,7 @@ PARSE_AND_LIST_ARGS_CASES=' break; case OPTION_EXPORT_EX9: if (!optarg) - einfo (_("Missing file for --mexport-ex9=<file>.\n")); + einfo (_("%P: missing file for --mexport-ex9=<file>\n")); if(strcmp (optarg, "-") == 0) ex9_export_file = stdout; @@ -336,16 +341,16 @@ PARSE_AND_LIST_ARGS_CASES=' { ex9_export_file = fopen (optarg, "wb"); if(ex9_export_file == NULL) - einfo (_("ERROR %P%F: cannot open ex9 export file %s.\n"), optarg); + einfo (_("%F%P: cannot open ex9 export file %s\n"), optarg); } break; case OPTION_IMPORT_EX9: if (!optarg) - einfo (_("Missing file for --mimport-ex9=<file>.\n")); + einfo (_("%P: missing file for --mimport-ex9=<file>\n")); ex9_import_file = fopen (optarg, "rb+"); if(ex9_import_file == NULL) - einfo (_("ERROR %P%F: cannot open ex9 import file %s.\n"), optarg); + einfo (_("%F%P: cannot open ex9 import file %s\n"), optarg); break; case OPTION_UPDATE_EX9: update_ex9_table = 1; @@ -355,10 +360,7 @@ PARSE_AND_LIST_ARGS_CASES=' { ex9_limit = atoi (optarg); if (ex9_limit > 511 || ex9_limit < 1) - { - einfo (_("ERROR: the range of ex9_limit must between 1 and 511\n")); - exit (1); - } + einfo (_("%F%P: the range of ex9_limit must between 1 and 511\n")); } break; case OPTION_EX9_LOOP: |