From c9d90c25b150d814720411b026a3a43fc92e38b1 Mon Sep 17 00:00:00 2001 From: manu Date: Mon, 14 Jan 2008 19:21:38 +0000 Subject: [PATCH] 2008-01-14 Manuel Lopez-Ibanez PR c++/24924 * c-opts (c_common_post_options): Do not enable CPP flag_pedantic_errors by default. testsuite/ * g++.dg/cpp/pedantic-errors.C: Delete. * g++.dg/cpp/permissive.C: Delete. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@131530 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/c-opts.c | 9 ++++++++- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/g++.dg/cpp/pedantic-errors.C | 5 ----- gcc/testsuite/g++.dg/cpp/permissive.C | 5 ----- 5 files changed, 20 insertions(+), 11 deletions(-) delete mode 100644 gcc/testsuite/g++.dg/cpp/pedantic-errors.C delete mode 100644 gcc/testsuite/g++.dg/cpp/permissive.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d463d4ea564..676637fcd36 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2008-01-14 Manuel Lopez-Ibanez + + PR c++/24924 + * c-opts (c_common_post_options): Do not enable CPP + flag_pedantic_errors by default. + 2008-01-14 Eric Botcazou PR rtl-optimization/31944 diff --git a/gcc/c-opts.c b/gcc/c-opts.c index 951118c51b5..ee9b7acc713 100644 --- a/gcc/c-opts.c +++ b/gcc/c-opts.c @@ -1102,7 +1102,14 @@ c_common_post_options (const char **pfilename) if (!flag_permissive) { flag_pedantic_errors = 1; - cpp_opts->pedantic_errors = 1; + /* FIXME: For consistency pedantic_errors should have the + same value in the front-end and in CPP. However, this + will break existing applications. The right fix is + disentagle flag_permissive from flag_pedantic_errors, + create a new diagnostic function permerror that is + controlled by flag_permissive and convert most C++ + pedwarns to this new function. + cpp_opts->pedantic_errors = 1; */ } if (!flag_no_inline) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6a6d9b9eda0..f4bb665a415 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2008-01-14 Manuel Lopez-Ibanez + + PR c++/24924 + * g++.dg/cpp/pedantic-errors.C: Delete. + * g++.dg/cpp/permissive.C: Delete. + 2008-01-14 Eric Botcazou * gcc.c-torture/compile/20080114-1.c: New test. diff --git a/gcc/testsuite/g++.dg/cpp/pedantic-errors.C b/gcc/testsuite/g++.dg/cpp/pedantic-errors.C deleted file mode 100644 index 45382b4b9d3..00000000000 --- a/gcc/testsuite/g++.dg/cpp/pedantic-errors.C +++ /dev/null @@ -1,5 +0,0 @@ -/* { dg-do preprocess } */ -/* { dg-options "-std=c++98" } */ - -#if 1 -#endif 1 /* { dg-error "error: extra tokens at end of #endif directive" } */ diff --git a/gcc/testsuite/g++.dg/cpp/permissive.C b/gcc/testsuite/g++.dg/cpp/permissive.C deleted file mode 100644 index cca1a5d4e5f..00000000000 --- a/gcc/testsuite/g++.dg/cpp/permissive.C +++ /dev/null @@ -1,5 +0,0 @@ -/* { dg-do preprocess } */ -/* { dg-options "-std=c++98 -fpermissive" } */ - -#if 1 -#endif 1 /* { dg-warning "warning: extra tokens at end of #endif directive" } */ -- 2.11.0