Remove hangover from non-integrated CPP

Neil Booth neil@daikokuya.co.uk
Thu Jul 25 02:10:00 GMT 2002


The front ends don't have to worry about accepting -W switches that
CPP handles.  I'm not sure exactly when this changed, but it's
definitely not necessary now.

This has bootstrapped and regtested; I'll apply it.

Neil.

	* c-decl.c (c_decode_option): No need to handle switches
	cpplib handles.
cp:
	* decl2.c (cxx_decode_option): Similarly.

Index: c-decl.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/c-decl.c,v
retrieving revision 1.341
diff -u -p -r1.341 c-decl.c
--- c-decl.c	22 Jul 2002 10:15:49 -0000	1.341
+++ c-decl.c	25 Jul 2002 06:51:46 -0000
@@ -454,16 +454,13 @@ c_decode_option (argc, argv)
   static const struct {
       /* The name of the option.  */
       const char *option;
-      /* If non-NULL, a flag variable to set to 0 or 1.  If NULL,
-         this means that cpp handles this option.  */
+      /* A pointer to a flag variable to set to 0 or 1.  */
       int *flag;
   } warn_options[] = {
     /* This list is in alphabetical order.  Keep it like that.  */
     { "bad-function-cast", &warn_bad_function_cast },
     { "cast-qual", &warn_cast_qual },
     { "char-subscripts", &warn_char_subscripts },
-    { "comment", NULL },
-    { "comments", NULL },
     { "conversion", &warn_conversion },
     { "div-by-zero", &warn_div_by_zero },
     { "float-equal", &warn_float_equal },
@@ -474,7 +471,6 @@ c_decode_option (argc, argv)
     { "format-y2k", &warn_format_y2k },
     { "implicit-function-declaration", &mesg_implicit_function_declaration },
     { "implicit-int", &warn_implicit_int },
-    { "import", NULL },
     { "long-long", &warn_long_long },
     { "main", &warn_main },
     { "missing-braces", &warn_missing_braces },
@@ -492,8 +488,6 @@ c_decode_option (argc, argv)
     { "sign-compare", &warn_sign_compare },
     { "strict-prototypes", &warn_strict_prototypes },
     { "traditional", &warn_traditional },
-    { "trigraphs", NULL },
-    { "undef", NULL },
     { "write-strings", &flag_const_strings }
   };
 
@@ -694,7 +688,6 @@ c_decode_option (argc, argv)
       size_t i;
       for (i = 0; i < ARRAY_SIZE (warn_options); i++)
 	if (strncmp (p, "-W", 2) == 0 
-	    && warn_options[i].flag
 	    && (strcmp (p+2, warn_options[i].option) == 0
 		|| (strncmp (p+2, "no-", 3) == 0
 		    && strcmp (p+5, warn_options[i].option) == 0)))
Index: cp/decl2.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/decl2.c,v
retrieving revision 1.547
diff -u -p -r1.547 decl2.c
--- cp/decl2.c	23 Jul 2002 13:54:05 -0000	1.547
+++ cp/decl2.c	25 Jul 2002 06:51:47 -0000
@@ -650,14 +650,6 @@ cxx_decode_option (argc, argv)
 	warn_nontemplate_friend = setting;
       else if (!strcmp (p, "deprecated"))
         warn_deprecated = setting;
-      else if (!strcmp (p, "comment"))
-	;			/* cpp handles this one.  */
-      else if (!strcmp (p, "comments"))
-	;			/* cpp handles this one.  */
-      else if (!strcmp (p, "trigraphs"))
-	;			/* cpp handles this one.  */
-      else if (!strcmp (p, "import"))
-	;			/* cpp handles this one.  */
       else if (!strcmp (p, "all"))
 	{
 	  warn_return_type = setting;



More information about the Gcc-patches mailing list