* opts.h (cl_option): Add comments to fields. Add bit-fields for

	various flags.
	(CL_SEPARATE_NARGS_SHIFT, CL_SEPARATE_NARGS_MASK,
	CL_SEPARATE_ALIAS, CL_NO_DRIVER_ARG, CL_REJECT_DRIVER, CL_SAVE,
	CL_DISABLED, CL_REPOR, CL_REJECT_NEGATIVE, CL_MISSING_OK,
	CL_UINTEGER, CL_NEGATIVE_ALIAS): Remove.
	(CL_JOINED, CL_SEPARATE, CL_UNDOCUMENTED): Update bit positions.
	* opt-functions.awk (flag_init, switch_bit_fields): New.
	(switch_flags): Don't handle flags moved to bit-fields.  Don't
	generate CL_MISSING_OK or CL_SAVE.
	* optc-gen.awk: Update to generate bit-field output as well as
	flags field.
	* gcc.c (driver_wrong_lang_callback): Use cl_reject_driver
	bit-field instead of CL_REJECT_DRIVER flag.
	* opts-common.c (generate_canonical_option,
	decode_cmdline_option): Use bit-fields instead of CL_* flags.
	* opts.c (maybe_default_option): Use cl_reject_negative bit-field
	instead of CL_REJECT_NEGATIVE flag.
	* toplev.c (print_switch_values): Use cl_report bit-field instead
	of CL_REPORT flag.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@171804 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 43 insertions, 18 deletions

diff --git a/gcc/opts.h b/gcc/opts.h
index 491177898c6..15e717da0d9 100644
--- a/gcc/opts.h
+++ b/gcc/opts.h
@@ -53,20 +53,60 @@ enum cl_var_type {
 
 struct cl_option
 {
+  /* Text of the option, including initial '-'.  */
   const char *opt_text;
+  /* Help text for --help, or NULL.  */
   const char *help;
+  /* Error message for missing argument, or NULL.  */
   const char *missing_argument_error;
+  /* Warning to give when this option is used, or NULL.  */
   const char *warn_message;
+  /* Argument of alias target when positive option given, or NULL.  */
   const char *alias_arg;
+  /* Argument of alias target when negative option given, or NULL.  */
   const char *neg_alias_arg;
+  /* Alias target, or N_OPTS if not an alias.  */
   unsigned short alias_target;
+  /* Previous option that is an initial substring of this one, or
+     N_OPTS if none.  */
   unsigned short back_chain;
+  /* Option length, not including initial '-'.  */
   unsigned char opt_len;
+  /* Next option in a sequence marked with Negative, or -1 if none.  */
   int neg_index;
+  /* CL_* flags for this option.  */
   unsigned int flags;
+  /* Disabled in this configuration.  */
+  BOOL_BITFIELD cl_disabled : 1;
+  /* Options marked with CL_SEPARATE take a number of separate
+     arguments (1 to 4) that is one more than the number in this
+     bit-field.  */
+  unsigned int cl_separate_nargs : 2;
+  /* Option is an alias when used with separate argument.  */
+  BOOL_BITFIELD cl_separate_alias : 1;
+  /* Alias to negative form of option.  */
+  BOOL_BITFIELD cl_negative_alias : 1;
+  /* Option takes no argument in the driver.  */
+  BOOL_BITFIELD cl_no_driver_arg : 1;
+  /* Reject this option in the driver.  */
+  BOOL_BITFIELD cl_reject_driver : 1;
+  /* Reject no- form.  */
+  BOOL_BITFIELD cl_reject_negative : 1;
+  /* Missing argument OK (joined).  */
+  BOOL_BITFIELD cl_missing_ok : 1;
+  /* Argument is an integer >=0.  */
+  BOOL_BITFIELD cl_uinteger : 1;
+  /* Report argument with -fverbose-asm  */
+  BOOL_BITFIELD cl_report : 1;
+  /* Offset of field for this option in struct gcc_options, or
+     (unsigned short) -1 if none.  */
   unsigned short flag_var_offset;
+  /* Index in cl_enums of enum used for this option's arguments, for
+     CLVC_ENUM options.  */
   unsigned short var_enum;
+  /* How this option's value is determined and sets a field.  */
   enum cl_var_type var_type;
+  /* Value or bit-mask with which to set a field.  */
   int var_value;
 };
 
@@ -98,24 +138,9 @@ extern const unsigned int cl_lang_count;
    This distinction is important because --help will not list options
    which only have these higher bits set.  */
 
-/* Options marked with CL_SEPARATE take a number of separate arguments
-   (1 to 4) that is one more than the number in this bit-field.  */
-#define CL_SEPARATE_NARGS_SHIFT	17
-#define CL_SEPARATE_NARGS_MASK	(3U << CL_SEPARATE_NARGS_SHIFT)
-
-#define CL_SEPARATE_ALIAS	(1U << 19) /* Option is an alias when used with separate argument.  */
-#define CL_NO_DRIVER_ARG	(1U << 20) /* Option takes no argument in the driver.  */
-#define CL_REJECT_DRIVER	(1U << 21) /* Reject this option in the driver.  */
-#define CL_SAVE			(1U << 22) /* Target-specific option for attribute.  */
-#define CL_DISABLED		(1U << 23) /* Disabled in this configuration.  */
-#define CL_REPORT		(1U << 24) /* Report argument with -fverbose-asm  */
-#define CL_JOINED		(1U << 25) /* If takes joined argument.  */
-#define CL_SEPARATE		(1U << 26) /* If takes a separate argument.  */
-#define CL_REJECT_NEGATIVE	(1U << 27) /* Reject no- form.  */
-#define CL_MISSING_OK		(1U << 28) /* Missing argument OK (joined).  */
-#define CL_UINTEGER		(1U << 29) /* Argument is an integer >=0.  */
-#define CL_UNDOCUMENTED		(1U << 30) /* Do not output with --help.  */
-#define CL_NEGATIVE_ALIAS	(1U << 31) /* Alias to negative form of option.  */
+#define CL_JOINED		(1U << 17) /* If takes joined argument.  */
+#define CL_SEPARATE		(1U << 18) /* If takes a separate argument.  */
+#define CL_UNDOCUMENTED		(1U << 19) /* Do not output with --help.  */
 
 /* Flags for an enumerated option argument.  */
 #define CL_ENUM_CANONICAL	(1 << 0) /* Canonical for this value.  */