flags.h (flag_permissive): Do not declare.

2012-05-03  Manuel López-Ibáñez  <manu@gcc.gnu.org>

gcc/
	* flags.h (flag_permissive): Do not declare.
	* diagnostic.c (diagnostic_report_diagnostic): Handle fpermissive
	option specially.
	* toplev.c (flag_permissive): Do not define.
	* c-tree.h (system_header_p): Delete unused.
c-family/
	* c.opt (fpermissive): Add Var(flag_permissive).

From-SVN: r187123

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a310e38c7dd083f96a07e422d31588fc572ce189..8bd41019311ff6b427729e3ff9d49e90fa98eba8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2012-05-03  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+       * flags.h (flag_permissive): Do not declare.
+       * diagnostic.c (diagnostic_report_diagnostic): Handle fpermissive
+       option specially.
+       * toplev.c (flag_permissive): Do not define.
+       * c-tree.h (system_header_p): Delete unused.
+
 2012-05-03  David S. Miller  <davem@davemloft.net>
 
        PR target/52684

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 7bd6ad7afa649219eed024d64328302d09fb69e5..05c2c754983547b9ef64216e6488c29bd7b02db4 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-03  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+       * c.opt (fpermissive): Add Var(flag_permissive).
+
 2012-04-30  Marc Glisse  <marc.glisse@inria.fr>
 
        PR c++/51033

diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index d2cf6ee6caae6c521dc309018581a087fac8a93b..e0c166c8d48f3e7d99c03e1cd26d80fe49099dbf 100644 (file)
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -982,7 +982,7 @@ C ObjC C++ ObjC++
 Look for and use PCH files even when preprocessing
 
 fpermissive
-C++ ObjC++
+C++ ObjC++ Var(flag_permissive)
 Downgrade conformance errors to warnings
 
 fplan9-extensions

diff --git a/gcc/c-tree.h b/gcc/c-tree.h
index db60935d7de462f95d5ba60fcbb03d29c433ec03..468cfe4a278999827f88d58d8312ebb33b5b7325 100644 (file)
--- a/gcc/c-tree.h
+++ b/gcc/c-tree.h
@@ -621,10 +621,6 @@ extern int current_function_returns_null;
 
 extern int current_function_returns_abnormally;
 
-/* Nonzero means we are reading code that came from a system header file.  */
-
-extern int system_header_p;
-
 /* Mode used to build pointers (VOIDmode means ptr_mode).  */
 
 extern enum machine_mode c_default_pointer_mode;

diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index 729e8654298e2f1833925f70e3663190ebbef5d4..1e2712e59b1ca9df87ae52b646a3737b20bed986 100644 (file)
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -542,7 +542,8 @@ diagnostic_report_diagnostic (diagnostic_context *context,
       diagnostic->kind = DK_ERROR;
     }
 
-  if (diagnostic->option_index)
+  if (diagnostic->option_index
+      && diagnostic->option_index != permissive_error_option (context))
     {
       diagnostic_t diag_class = DK_UNSPECIFIED;
 

diff --git a/gcc/flags.h b/gcc/flags.h
index 9791e1b23441616939458373da4c708b21e20f33..48c20e51bd8af95ddbfc363f7379a30643a8ccd7 100644 (file)
--- a/gcc/flags.h
+++ b/gcc/flags.h
@@ -53,9 +53,6 @@ extern void set_Wstrict_aliasing (struct gcc_options *opts, int onoff);
 
 extern bool final_insns_dump_p;
 
-/* Nonzero means make permerror produce warnings instead of errors.  */
-
-extern int flag_permissive;
 \f
 /* Other basic status info about current function.  */
 

diff --git a/gcc/toplev.c b/gcc/toplev.c
index d9aaa429f6507b6a6a2ed128e19448106c3fb868..a2845ab7f598344d3c6798313d8f01a3b2866dce 100644 (file)
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -145,10 +145,6 @@ HOST_WIDE_INT random_seed;
 
 /* -f flags.  */
 
-/* Nonzero means make permerror produce warnings instead of errors.  */
-
-int flag_permissive = 0;
-
 /* When non-NULL, indicates that whenever space is allocated on the
    stack, the resulting stack pointer must not pass this
    address---that is, for stacks that grow downward, the stack pointer