re PR preprocessor/61389 (libcpp diagnostics shouldn't talk about ISO C99 for C+...

PR preprocessor/61389
* gcc.dg/cpp/macsyntx.c: Update expected warnings.
* gcc.dg/cpp/sysmac1.c: Likewise.

From-SVN: r212457

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 324db9063630a1bdc446f3dc6f5d33bf458b0534..dc362c3bebb5df3ab3cb88504e58dafb1e68220b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2014-07-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+       PR preprocessor/61389
+       * gcc.dg/cpp/macsyntx.c: Update expected warnings.
+       * gcc.dg/cpp/sysmac1.c: Likewise.
+
 2014-07-11  Richard Biener  <rguenther@suse.de>
 
        PR middle-end/61473

diff --git a/gcc/testsuite/gcc.dg/cpp/macsyntx.c b/gcc/testsuite/gcc.dg/cpp/macsyntx.c
index 495921efa140747f0838b66a4a81dfa3d9036792..146dcedab5fcaee8427f68fe8d095b681833512a 100644 (file)
--- a/gcc/testsuite/gcc.dg/cpp/macsyntx.c
+++ b/gcc/testsuite/gcc.dg/cpp/macsyntx.c
@@ -51,15 +51,15 @@ one(ichi\
 two(ichi)                      /* { dg-error "requires 2" } */
 var0()                         /* OK.  */
 var0(ichi)                     /* OK.  */
-var1()                         /* { dg-warning "rest arguments to be used" } */
-var1(ichi)                     /* { dg-warning "rest arguments to be used" } */
+var1()                         /* { dg-warning "requires at least one" } */
+var1(ichi)                     /* { dg-warning "requires at least one" } */
 var1(ichi, ni)                 /* OK.  */
 
 /* This tests two oddities of GNU rest args - omitting a comma is OK,
    and backtracking a token on pasting an empty rest args.  */
 #define rest(x, y...) x ## y   /* { dg-warning "ISO C" } */
 rest(ichi,)                    /* OK.  */
-rest(ichi)                     /* { dg-warning "rest arguments to be used" } */
+rest(ichi)                     /* { dg-warning "requires at least one" } */
 #if 23 != rest(2, 3)           /* OK, no warning.  */
 #error 23 != 23 !!
 #endif

diff --git a/gcc/testsuite/gcc.dg/cpp/sysmac1.c b/gcc/testsuite/gcc.dg/cpp/sysmac1.c
index cc8469e18c71dc722e12d61b85185a0fb0c1b097..54f161e020fee69516e1f1724772ab4a602564e2 100644 (file)
--- a/gcc/testsuite/gcc.dg/cpp/sysmac1.c
+++ b/gcc/testsuite/gcc.dg/cpp/sysmac1.c
@@ -22,5 +22,5 @@
 (str);                         /* { dg-warning "used with arguments" } */
 (sys_str);                     /* { dg-bogus "used with arguments" } */
 
-foo (one_arg);                 /* { dg-warning "requires rest arguments" } */
-sys_foo (one_arg);             /* { dg-bogus "requires rest arguments" } */
+foo (one_arg);                 /* { dg-warning "requires at least one" } */
+sys_foo (one_arg);             /* { dg-bogus "requires at least one" } */

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index c62478d6044fe08d6f0af9738e305c6e9eeb3347..490bf4e50d15d0fa622c9237af1eba771786e316 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,7 +1,7 @@
 2014-07-10  Edward Smith-Rowland  <3dw4rd@verizon.net>
            Jonathan Wakely  <jwakely@redhat.com>
 
-       PR CPP/61389
+       PR preprocessor/61389
        * macro.c (_cpp_arguments_ok, parse_params, create_iso_definition):
        Warning messages mention C++11 in c++ mode and C99 in c mode.
        * lex.c (lex_identifier_intern, lex_identifier): Ditto