diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cppmacro.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/cpp/mi6.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/cpp/redef2.c | 6 |
4 files changed, 12 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0217226..a84ebf9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2001-11-23 Neil Booth <neil@daikokuya.demon.co.uk> + + * cppmacro.c (warn_of_redefinition): Warn regardless of -pedantic. + * gcc.dg/cpp/mi6.c, gcc.dg/cpp/redef2.c: Update. + 2001-11-22 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * cris.h: Revert thinko in last patch. diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c index 17dfe15..403920c 100644 --- a/gcc/cppmacro.c +++ b/gcc/cppmacro.c @@ -1124,9 +1124,6 @@ warn_of_redefinition (pfile, node, macro2) if (node->flags & NODE_WARN) return 1; - if (! CPP_PEDANTIC (pfile)) - return 0; - /* Redefinition of a macro is allowed if and only if the old and new definitions are the same. (6.10.3 paragraph 2). */ macro1 = node->value.macro; diff --git a/gcc/testsuite/gcc.dg/cpp/mi6.c b/gcc/testsuite/gcc.dg/cpp/mi6.c index f355900..aa1c8ed 100644 --- a/gcc/testsuite/gcc.dg/cpp/mi6.c +++ b/gcc/testsuite/gcc.dg/cpp/mi6.c @@ -29,10 +29,15 @@ /* Define the macro guard, and redefine the macros to something that forces compilation of the conditional blocks. */ #define guard +#undef EMPTYL #define EMPTYL 1 || +#undef EMPTYR #define EMPTYR || 1 +#undef NOT #define NOT +#undef DEFINED #define DEFINED 0 +#undef NOT_DEFINED #define NOT_DEFINED 1 #define VAR five diff --git a/gcc/testsuite/gcc.dg/cpp/redef2.c b/gcc/testsuite/gcc.dg/cpp/redef2.c index 7001d67..b0068d9 100644 --- a/gcc/testsuite/gcc.dg/cpp/redef2.c +++ b/gcc/testsuite/gcc.dg/cpp/redef2.c @@ -1,7 +1,7 @@ /* Test for redefining macros with significant differences. */ /* { dg-do preprocess } - { dg-options "-ansi -pedantic -Wall -fno-show-column" } */ + { dg-options "-ansi -Wall -fno-show-column" } */ #define mac(a, b) (a) + (b) #define mac(a, b) (a) * (b) @@ -28,6 +28,4 @@ { dg-warning "previous" "prev def mac" { target *-*-* } 8 } { dg-warning "previous" "prev def ro" { target *-*-* } 11 } { dg-warning "previous" "prev def va" { target *-*-* } 14 } - - { dg-warning "named var" "named variadic" { target *-*-* } 14 } - { dg-warning "anonymous var" "anon variadic" { target *-*-* } 15 } */ +*/ |