[committed] fix inconsistencies introduced during merge conflict resolution

[Martin Sebor]

r247652 fixes a number of inconsistencies between the pattern
of diagnostics expected by tests and those actually issued by
GCC, and introduced while resolving merge conflicts.  My best
guess is that I missed them by testing the wrong patch or
the wrong local copy.  The committed diff is attached for
reference.

Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: r247652.diff
Type: text/x-patch
Size: 13047 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/gcc-patches/attachments/20170505/ff6b7717/attachment.bin>