diff options
| author | Jason Merrill <jason@redhat.com> | 2010-11-01 23:29:52 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2010-11-01 23:32:03 -0400 |
| commit | d29b209e37cb85fdf1cb1d8e0ae263cc3c59312b (patch) | |
| tree | 0e6b797a6c1a23c50603805706926a5eaa2184f1 /gcc/opts-common.c | |
| parent | 2450a78a38a727e7ec673b132315c8379db3b27d (diff) | |
| parent | c0000147b2aef6b69e2c6b6d29a9963910f6da98 (diff) | |
| download | gcc-constexpr.tar.gz | |
Merge remote branch 'trunk' into constexprconstexpr
Diffstat (limited to 'gcc/opts-common.c')
| -rw-r--r-- | gcc/opts-common.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gcc/opts-common.c b/gcc/opts-common.c index 553e8b19b89..ab4b1b26f8f 100644 --- a/gcc/opts-common.c +++ b/gcc/opts-common.c @@ -24,7 +24,7 @@ along with GCC; see the file COPYING3. If not see #include "opts.h" #include "flags.h" #include "diagnostic.h" -#include "tm.h" /* For SWITCH_TAKES_ARG, WORD_SWITCH_TAKES_ARG and +#include "tm.h" /* For WORD_SWITCH_TAKES_ARG and TARGET_OPTION_TRANSLATE_TABLE. */ static void prune_options (struct cl_decoded_option **, unsigned int *); @@ -507,13 +507,10 @@ decode_cmdline_option (const char **argv, unsigned int lang_mask, { /* Skip the correct number of arguments for options handled through specs. */ - const char *popt = argv[0] + 1; - int c = *popt; + const char *popt ATTRIBUTE_UNUSED = argv[0] + 1; gcc_assert (result == 1); - if (SWITCH_TAKES_ARG (c) > (popt[1] != 0)) - result += SWITCH_TAKES_ARG (c) - (popt[1] != 0); - else if (WORD_SWITCH_TAKES_ARG (popt)) + if (WORD_SWITCH_TAKES_ARG (popt)) result += WORD_SWITCH_TAKES_ARG (popt); if (result > 1) for (i = 1; i < result; i++) |