aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Booth <neil@daikokuya.co.uk>2002-07-25 06:56:11 +0000
committerNeil Booth <neil@gcc.gnu.org>2002-07-25 06:56:11 +0000
commit2d6154445d0705b6acce6a62d02bacf28f363d3a (patch)
treede4b40d91b951d22107e5e25e130009b49de591e
parentc82efc81c00e7fd369092b29530d76292439bf1b (diff)
downloadgcc-2d6154445d0705b6acce6a62d02bacf28f363d3a.zip
gcc-2d6154445d0705b6acce6a62d02bacf28f363d3a.tar.gz
gcc-2d6154445d0705b6acce6a62d02bacf28f363d3a.tar.bz2
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
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/c-decl.c9
-rw-r--r--gcc/cp/decl2.c8
3 files changed, 6 insertions, 16 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2562899..efb68c0 100644
--- 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 f4f9957..6187443 100644
--- 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 66922b1..30f7188 100644
--- 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;