c-decl.c (c_decode_option): No need to handle switches cpplib handles.

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

From-SVN: r55737

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 25628997ce97bb4a46a0e447a82637e50bc00eb3..efb68c087c04dedb68d4075ac968481784f81893 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-25  Neil Booth  <neil@daikokuya.co.uk>
+
+       * c-decl.c (c_decode_option): No need to handle switches
+       cpplib handles.
+
 2002-07-24  Zack Weinberg  <zack@codesourcery.com>
 
        * defaults.h (ASM_OUTPUT_TYPE_DIRECTIVE, ASM_OUTPUT_SIZE_DIRECTIVE,

diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index f4f995704b6a292f493b693119322f519f09f259..61874438b0cbd4c9e8df6714a37f6cc1fb88e7ec 100644 (file)
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -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)))

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 66922b19de30f3e1a8c671bf539a96338522ebca..30f718871d852e7a3915deb3ccc67df37fc077f0 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -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;