From a1fd13d07b453b669c1ce16dd1b24a13766bbdcc Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 7 Oct 2008 23:02:21 +0200 Subject: [PATCH] re PR middle-end/37576 (-v --help ICEs) PR middle-end/37576 * opts.h (CL_SAVE): Move up to flags range. (CL_PARAMS, CL_WARNING, CL_OPTIMIZATION, CL_TARGET, CL_COMMON): Renumber. (CL_MIN_OPTION_CLASS): Set to CL_PARAMS. * opts.c (common_handle_option): Revert last change. From-SVN: r140955 --- gcc/ChangeLog | 9 +++++++++ gcc/opts.c | 3 +-- gcc/opts.h | 14 +++++++------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8f2989703e7..d14a5765b32 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2008-10-07 Jakub Jelinek + + PR middle-end/37576 + * opts.h (CL_SAVE): Move up to flags range. + (CL_PARAMS, CL_WARNING, CL_OPTIMIZATION, CL_TARGET, + CL_COMMON): Renumber. + (CL_MIN_OPTION_CLASS): Set to CL_PARAMS. + * opts.c (common_handle_option): Revert last change. + 2008-10-07 H.J. Lu * config/i386/i386-protos.h (ix86_schedule): New. diff --git a/gcc/opts.c b/gcc/opts.c index bac50b0925f..6e210ea7ceb 100644 --- a/gcc/opts.c +++ b/gcc/opts.c @@ -1459,8 +1459,7 @@ common_handle_option (size_t scode, const char *arg, int value, print_specific_help (0, undoc_mask, all_langs_mask); /* Then display any remaining, non-language options. */ for (i = CL_MIN_OPTION_CLASS; i <= CL_MAX_OPTION_CLASS; i <<= 1) - if (i != CL_SAVE) - print_specific_help (i, undoc_mask, 0); + print_specific_help (i, undoc_mask, 0); exit_after_options = true; break; } diff --git a/gcc/opts.h b/gcc/opts.h index 7a51a0e3b52..bc290f6457c 100644 --- a/gcc/opts.h +++ b/gcc/opts.h @@ -65,14 +65,13 @@ extern const unsigned int cl_options_count; extern const char *const lang_names[]; extern const unsigned int cl_lang_count; -#define CL_SAVE (1 << 17) /* Target-specific option for attribute. */ -#define CL_PARAMS (1 << 18) /* Fake entry. Used to display --param info with --help. */ -#define CL_WARNING (1 << 19) /* Enables an (optional) warning message. */ -#define CL_OPTIMIZATION (1 << 20) /* Enables an (optional) optimization. */ -#define CL_TARGET (1 << 21) /* Target-specific option. */ -#define CL_COMMON (1 << 22) /* Language-independent. */ +#define CL_PARAMS (1 << 17) /* Fake entry. Used to display --param info with --help. */ +#define CL_WARNING (1 << 18) /* Enables an (optional) warning message. */ +#define CL_OPTIMIZATION (1 << 19) /* Enables an (optional) optimization. */ +#define CL_TARGET (1 << 20) /* Target-specific option. */ +#define CL_COMMON (1 << 21) /* Language-independent. */ -#define CL_MIN_OPTION_CLASS CL_SAVE +#define CL_MIN_OPTION_CLASS CL_PARAMS #define CL_MAX_OPTION_CLASS CL_COMMON /* From here on the bits describe attributes of the options. @@ -80,6 +79,7 @@ extern const unsigned int cl_lang_count; This distinction is important because --help will not list options which only have these higher bits set. */ +#define CL_SAVE (1 << 22) /* Target-specific option for attribute. */ #define CL_DISABLED (1 << 23) /* Disabled in this configuration. */ #define CL_REPORT (1 << 24) /* Report argument with -fverbose-asm */ #define CL_JOINED (1 << 25) /* If takes joined argument. */