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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8f2989703e7f79685d01193037966faad478055d..d14a5765b32b66e05e667c7524a9e924d0e19cf7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-07  Jakub Jelinek  <jakub@redhat.com>
+
+       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  <hongjiu.lu@intel.com>
 
        * config/i386/i386-protos.h (ix86_schedule): New.

diff --git a/gcc/opts.c b/gcc/opts.c
index bac50b0925fe6df5635180bf9a569f9c15c2b8b1..6e210ea7cebecadc32760078953bd5ae75f9d5bf 100644 (file)
--- 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 7a51a0e3b527bf28f9d1cdf52f859cf7b3948996..bc290f6457c6a792e093e09013231d332421ac6b 100644 (file)
--- 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_MIN_OPTION_CLASS    CL_SAVE
+#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_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.  */