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/testsuite/ld-elf | |
parent | 33589acbfea909ca2a26b977ff2f672332990747 (diff) | |
download | gdb-df5f2391f7b2e3cab7e677ab7dadd02aef06e269.zip gdb-df5f2391f7b2e3cab7e677ab7dadd02aef06e269.tar.gz 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/testsuite/ld-elf')
-rw-r--r-- | ld/testsuite/ld-elf/dwarf2.err | 6 | ||||
-rw-r--r-- | ld/testsuite/ld-elf/dwarf3.err | 2 | ||||
-rw-r--r-- | ld/testsuite/ld-elf/orphan-5.l | 4 | ||||
-rw-r--r-- | ld/testsuite/ld-elf/orphan-6.l | 4 | ||||
-rw-r--r-- | ld/testsuite/ld-elf/warn1.d | 2 | ||||
-rw-r--r-- | ld/testsuite/ld-elf/warn2.d | 2 |
6 files changed, 9 insertions, 11 deletions
diff --git a/ld/testsuite/ld-elf/dwarf2.err b/ld/testsuite/ld-elf/dwarf2.err index b3d301f..82d3651 100644 --- a/ld/testsuite/ld-elf/dwarf2.err +++ b/ld/testsuite/ld-elf/dwarf2.err @@ -1,6 +1,4 @@ -tmpdir/dwarf2b\.o:.*dwarf2b\.c:1: multiple definition of `global_var' -tmpdir/dwarf2a\.o:.*dwarf2a\.c:1: first defined here +.*: tmpdir/dwarf2b\.o:.*dwarf2b\.c:1: multiple definition of `global_var'; tmpdir/dwarf2a\.o:.*dwarf2a\.c:1: first defined here #... -tmpdir/dwarf2b\.o:.*dwarf2b\.c:2: multiple definition of `other_var' -tmpdir/dwarf2a\.o:.*dwarf2a\.c:2: first defined here +.*: tmpdir/dwarf2b\.o:.*dwarf2b\.c:2: multiple definition of `other_var'; tmpdir/dwarf2a\.o:.*dwarf2a\.c:2: first defined here #... diff --git a/ld/testsuite/ld-elf/dwarf3.err b/ld/testsuite/ld-elf/dwarf3.err index 6f5a8cc..8d1f0d5 100644 --- a/ld/testsuite/ld-elf/dwarf3.err +++ b/ld/testsuite/ld-elf/dwarf3.err @@ -1,4 +1,4 @@ -.*/dwarf3\.o: In function `main': +.*/dwarf3\.o: in function `main': .*\(\.text.*\+0x[0-9a-f]+\): undefined reference to `bar' .*\(\.text.*\+0x[0-9a-f]+\): undefined reference to `bar' #... diff --git a/ld/testsuite/ld-elf/orphan-5.l b/ld/testsuite/ld-elf/orphan-5.l index 765c8ff..53cf257 100644 --- a/ld/testsuite/ld-elf/orphan-5.l +++ b/ld/testsuite/ld-elf/orphan-5.l @@ -1,5 +1,5 @@ #... -.*warning: orphan section `\.notbad' from `tmpdir/.*\.o' being placed in section `\.notbad'\. +.*warning: orphan section `\.notbad' from `tmpdir/.*\.o' being placed in section `\.notbad' #... -.*warning: orphan section `\.note\.bar' from `tmpdir/.*\.o' being placed in section `\.note\.bar'\. +.*warning: orphan section `\.note\.bar' from `tmpdir/.*\.o' being placed in section `\.note\.bar' #... diff --git a/ld/testsuite/ld-elf/orphan-6.l b/ld/testsuite/ld-elf/orphan-6.l index 9936140..b1e6937 100644 --- a/ld/testsuite/ld-elf/orphan-6.l +++ b/ld/testsuite/ld-elf/orphan-6.l @@ -1,5 +1,5 @@ #... -.*error: unplaced orphan section `\.notbad' from `tmpdir/.*\.o'\. +.*error: unplaced orphan section `\.notbad' from `tmpdir/.*\.o' #... -.*error: unplaced orphan section `\.note\.bar' from `tmpdir/.*\.o'\. +.*error: unplaced orphan section `\.note\.bar' from `tmpdir/.*\.o' #... diff --git a/ld/testsuite/ld-elf/warn1.d b/ld/testsuite/ld-elf/warn1.d index da1173a..1ee4a5d 100644 --- a/ld/testsuite/ld-elf/warn1.d +++ b/ld/testsuite/ld-elf/warn1.d @@ -2,7 +2,7 @@ #source: symbol1ref.s #source: symbol1w.s #ld: -T group.ld -#warning: ^[^\\n]*\): warning: witty one-liner$ +#warning: ^[^\n]*\): warning: witty one-liner$ #readelf: -s #notarget: "sparc64-*-solaris2*" "sparcv9-*-solaris2*" #xfail: "d30v-*-*" "dlx-*-*" "i960-*-*" "pj-*-*" diff --git a/ld/testsuite/ld-elf/warn2.d b/ld/testsuite/ld-elf/warn2.d index cfeb8ce..4e723dd 100644 --- a/ld/testsuite/ld-elf/warn2.d +++ b/ld/testsuite/ld-elf/warn2.d @@ -2,7 +2,7 @@ #source: symbol2ref.s #source: symbol2w.s #ld: -T group.ld -#warning: ^[^\\n]*\.[obj]+: warning: function 'Foo' used$ +#warning: ^[^\n]*\.[obj]+: warning: function 'Foo' used$ #readelf: -s #notarget: "sparc64-*-solaris2*" "sparcv9-*-solaris2*" #xfail: d30v-*-* dlx-*-* fr30-*-* frv-*-elf ft32-*-* i860-*-* i960-*-* |