diff options
| author | Andreas Schwab <schwab@gcc.gnu.org> | 2014-07-11 14:49:27 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@gcc.gnu.org> | 2014-07-11 14:49:27 +0000 |
| commit | c786fca61b0531b8b9b60b969c46421042a0bfeb (patch) | |
| tree | 8231224e735977df9cbafd82521db6b2a3b88184 | |
| parent | a78cfa7fc14a35d4f5592ee177404e8b7c74d1e7 (diff) | |
| download | gcc-c786fca61b0531b8b9b60b969c46421042a0bfeb.zip gcc-c786fca61b0531b8b9b60b969c46421042a0bfeb.tar.gz gcc-c786fca61b0531b8b9b60b969c46421042a0bfeb.tar.bz2 | |
re PR preprocessor/61389 (libcpp diagnostics shouldn't talk about ISO C99 for C++ input files)
PR preprocessor/61389
* gcc.dg/cpp/macsyntx.c: Update expected warnings.
* gcc.dg/cpp/sysmac1.c: Likewise.
From-SVN: r212457
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/cpp/macsyntx.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/cpp/sysmac1.c | 4 | ||||
| -rw-r--r-- | libcpp/ChangeLog | 2 |
4 files changed, 12 insertions, 6 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 324db90..dc362c3 100644 --- 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 495921e..146dced 100644 --- 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 cc8469e..54f161e 100644 --- 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 c62478d..490bf4e5 100644 --- 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 |