From: Manuel López-Ibáñez Date: Thu, 3 May 2012 22:28:21 +0000 (+0000) Subject: flags.h (flag_permissive): Do not declare. X-Git-Tag: misc/gccgo-go1_1_2~3109 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c3641b0ea030a15cc2b61bdd0d4e200086243e5;p=thirdparty%2Fgcc.git flags.h (flag_permissive): Do not declare. 2012-05-03 Manuel López-Ibáñez 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 a310e38c7dd0..8bd41019311f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2012-05-03 Manuel López-Ibáñez + + * 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 PR target/52684 diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 7bd6ad7afa64..05c2c7549835 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,7 @@ +2012-05-03 Manuel López-Ibáñez + + * c.opt (fpermissive): Add Var(flag_permissive). + 2012-04-30 Marc Glisse PR c++/51033 diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt index d2cf6ee6caae..e0c166c8d48f 100644 --- 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 db60935d7de4..468cfe4a2789 100644 --- 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 729e8654298e..1e2712e59b1c 100644 --- 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 9791e1b23441..48c20e51bd8a 100644 --- 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; /* Other basic status info about current function. */ diff --git a/gcc/toplev.c b/gcc/toplev.c index d9aaa429f650..a2845ab7f598 100644 --- 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