Makefile.in (FLAGS_H): New.

	* Makefile.in (FLAGS_H): New.
	(flags.h): Replace by FLAGS_H.
	* c.opt: Document Var, VarExists, Init and Report attributes.
	* common.opt: Fill the values of the attributes.
	* diagnostic.c (flag_fatal_errors): Do not define.
	* except.c (flag_non_call_exceptions): Do not define.
	* flags.h: Include options.h.  Remove declarations conflicting with
	the automatically defined ones.
	* opts.c: Remove automatically defined variables.
	(handle_option): Perform default initialization.
	(common_handle_option): Do not handle options covered by the
	default initialization.
	* opts.h (struct cl_option): Add flag_var, has_set_value and set_value
	fields.
	(CL_REPORT): New.
	* opts.sh: Generate variable declarations, handle CL_REPORT.
	* toplev.c: Remove automatically defined variables.
	(f_options): Removed.
	(print_switch_values): Use cl_options instead of f_options.
	* toplev.h (version_flag): Declaration removed.

From-SVN: r83105

gcc/ChangeLog

+2004-06-14  Zdenek Dvorak  <rakdver@atrey.karlin.mff.cuni.cz>
+
+	* Makefile.in (FLAGS_H): New.
+	(flags.h): Replace by FLAGS_H.
+	* c.opt: Document Var, VarExists, Init and Report attributes.
+	* common.opt: Fill the values of the attributes.
+	* diagnostic.c (flag_fatal_errors): Do not define.
+	* except.c (flag_non_call_exceptions): Do not define.
+	* flags.h: Include options.h.  Remove declarations conflicting with
+	the automatically defined ones.
+	* opts.c: Remove automatically defined variables.
+	(handle_option): Perform default initialization.
+	(common_handle_option): Do not handle options covered by the
+	default initialization.
+	* opts.h (struct cl_option): Add flag_var, has_set_value and set_value
+	fields.
+	(CL_REPORT): New.
+	* opts.sh: Generate variable declarations, handle CL_REPORT.
+	* toplev.c: Remove automatically defined variables.
+	(f_options): Removed.
+	(print_switch_values): Use cl_options instead of f_options.
+	* toplev.h (version_flag): Declaration removed.
+
 2004-06-14  Ian Lance Taylor  <ian@wasabisystems.com>
 
 	* config/sparc/sparc.h: Correct comment about availability of

gcc/Makefile.in

@@ -692,7 +692,8 @@ DEMANGLE_H = $(srcdir)/../include/demangle.h
 RECOG_H = recog.h
 ALIAS_H = alias.h
 EMIT_RTL_H = emit-rtl.h
-EXPR_H = expr.h insn-config.h function.h $(RTL_H) flags.h $(TREE_H) $(MACHMODE_H) $(EMIT_RTL_H)
+FLAGS_H = flags.h options.h
+EXPR_H = expr.h insn-config.h function.h $(RTL_H) $(FLAGS_H) $(TREE_H) $(MACHMODE_H) $(EMIT_RTL_H)
 OPTABS_H = optabs.h insn-codes.h
 REGS_H = regs.h varray.h $(MACHMODE_H)
 RA_H = ra.h bitmap.h sbitmap.h hard-reg-set.h insn-modes.h
@@ -1330,9 +1331,9 @@ s-crt0:	$(CRT0_S) $(MCRT0_S) $(GCC_PASSES) $(CONFIG_H)
 # C language specific files.
 
 c-errors.o: c-errors.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
-    $(C_TREE_H) flags.h $(DIAGNOSTIC_H) $(TM_P_H)
+    $(C_TREE_H) $(FLAGS_H) $(DIAGNOSTIC_H) $(TM_P_H)
 c-parse.o : c-parse.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
-    $(GGC_H) intl.h $(C_TREE_H) input.h flags.h toplev.h output.h $(CPPLIB_H) \
+    $(GGC_H) intl.h $(C_TREE_H) input.h $(FLAGS_H) toplev.h output.h $(CPPLIB_H) \
     varray.h gt-c-parse.h langhooks.h
 
 srcextra: gcc.srcextra lang.srcextra
@@ -1354,12 +1355,12 @@ c-incpath.o: c-incpath.c c-incpath.h $(CONFIG_H) $(SYSTEM_H) $(CPPLIB_H) \
 		$(MACHMODE_H)
 
 c-decl.o : c-decl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
-    $(RTL_H) $(C_TREE_H) $(GGC_H) $(TARGET_H) flags.h function.h output.h \
+    $(RTL_H) $(C_TREE_H) $(GGC_H) $(TARGET_H) $(FLAGS_H) function.h output.h \
     $(EXPR_H) debug.h toplev.h intl.h $(TM_P_H) tree-inline.h $(TIMEVAR_H) \
     opts.h c-pragma.h gt-c-decl.h cgraph.h $(HASHTAB_H) libfuncs.h except.h \
     $(LANGHOOKS_DEF_H) $(TREE_DUMP_H)
 c-typeck.o : c-typeck.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(C_TREE_H) \
-    $(TARGET_H) flags.h intl.h output.h $(EXPR_H) $(RTL_H) toplev.h $(TM_P_H) \
+    $(TARGET_H) $(FLAGS_H) intl.h output.h $(EXPR_H) $(RTL_H) toplev.h $(TM_P_H) \
     langhooks.h
 c-lang.o : c-lang.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
     $(C_TREE_H) $(C_PRETTY_PRINT_H) $(DIAGNOSTIC_H) \
@@ -1368,23 +1369,23 @@ stub-objc.o : stub-objc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \
     $(GGC_H) $(C_COMMON_H)
 c-lex.o : c-lex.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
     $(RTL_H) debug.h $(C_TREE_H) $(C_COMMON_H) real.h c-incpath.h cppdefault.h \
-    c-pragma.h input.h intl.h flags.h toplev.h output.h \
+    c-pragma.h input.h intl.h $(FLAGS_H) toplev.h output.h \
     $(CPPLIB_H) $(EXPR_H) $(TM_P_H)
 c-ppoutput.o : c-ppoutput.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
     $(C_COMMON_H) $(TREE_H) $(CPPLIB_H) $(srcdir)/../libcpp/internal.h $(TM_P_H) c-pragma.h
 c-objc-common.o : c-objc-common.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
     $(C_TREE_H) $(RTL_H) insn-config.h $(INTEGRATE_H) $(EXPR_H) $(C_TREE_H) \
-    flags.h toplev.h tree-inline.h $(DIAGNOSTIC_H) $(VARRAY_H) \
+    $(FLAGS_H) toplev.h tree-inline.h $(DIAGNOSTIC_H) $(VARRAY_H) \
     langhooks.h $(GGC_H) $(TARGET_H) cgraph.h
 c-aux-info.o : c-aux-info.c  $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
-    $(C_TREE_H) flags.h toplev.h
+    $(C_TREE_H) $(FLAGS_H) toplev.h
 c-convert.o : c-convert.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
-    flags.h toplev.h $(C_COMMON_H) real.h
+    $(FLAGS_H) toplev.h $(C_COMMON_H) real.h
 c-pragma.o: c-pragma.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
     function.h c-pragma.h toplev.h output.h $(GGC_H) $(TM_P_H) $(C_COMMON_H) gt-c-pragma.h
-graph.o: graph.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) toplev.h flags.h output.h \
+graph.o: graph.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) toplev.h $(FLAGS_H) output.h \
     $(RTL_H) function.h hard-reg-set.h $(BASIC_BLOCK_H) graph.h
-sbitmap.o: sbitmap.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) flags.h \
+sbitmap.o: sbitmap.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(FLAGS_H) \
     hard-reg-set.h $(BASIC_BLOCK_H)
 
 COLLECT2_OBJS = collect2.o tlink.o intl.o version.o
@@ -1407,7 +1408,7 @@ tlink.o: tlink.c $(DEMANGLE_H) $(HASHTAB_H) $(CONFIG_H) $(SYSTEM_H) coretypes.h
 # A file used by all variants of C.
 
 c-common.o : c-common.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
-	$(OBSTACK_H) $(C_COMMON_H) flags.h toplev.h output.h c-pragma.h intl.h \
+	$(OBSTACK_H) $(C_COMMON_H) $(FLAGS_H) toplev.h output.h c-pragma.h intl.h \
 	$(GGC_H) $(EXPR_H) $(TM_P_H) builtin-types.def builtin-attrs.def \
 	$(DIAGNOSTIC_H) gt-c-common.h langhooks.h varray.h $(RTL_H) \
 	$(TARGET_H) $(C_TREE_H) tree-iterator.h langhooks.h
@@ -1416,27 +1417,27 @@ c-pretty-print.o : c-pretty-print.c $(C_PRETTY_PRINT_H) \
 	$(DIAGNOSTIC_H)
 
 c-opts.o : c-opts.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H)		\
-        $(TREE_H) c-pragma.h flags.h toplev.h langhooks.h		\
+        $(TREE_H) c-pragma.h $(FLAGS_H) toplev.h langhooks.h		\
         tree-inline.h $(DIAGNOSTIC_H) intl.h debug.h $(C_COMMON_H)	\
         opts.h options.h $(PARAMS_H) $(MKDEPS_H)
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
 		$< $(OUTPUT_OPTION) @TARGET_SYSTEM_ROOT_DEFINE@
 
 c-cppbuiltin.o : c-cppbuiltin.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-	$(TREE_H) version.h $(C_COMMON_H) c-pragma.h flags.h toplev.h langhooks.h \
+	$(TREE_H) version.h $(C_COMMON_H) c-pragma.h $(FLAGS_H) toplev.h langhooks.h \
 	output.h except.h real.h $(TM_P_H)
 
 # A file used by all variants of C and some other languages.
 
-attribs.o : attribs.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) flags.h \
+attribs.o : attribs.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(FLAGS_H) \
 	toplev.h output.h c-pragma.h $(RTL_H) $(GGC_H) $(EXPR_H) $(TM_P_H) \
 	builtin-types.def $(TARGET_H) langhooks.h
 
 c-format.o : c-format.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) langhooks.h \
-	$(C_COMMON_H) flags.h toplev.h intl.h $(DIAGNOSTIC_H)
+	$(C_COMMON_H) $(FLAGS_H) toplev.h intl.h $(DIAGNOSTIC_H)
 
 c-semantics.o : c-semantics.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
-	$(C_TREE_H) flags.h toplev.h output.h c-pragma.h $(RTL_H) $(GGC_H) \
+	$(C_TREE_H) $(FLAGS_H) toplev.h output.h c-pragma.h $(RTL_H) $(GGC_H) \
 	$(EXPR_H) $(PREDICT_H) tree-inline.h
 
 c-dump.o : c-dump.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
@@ -1444,7 +1445,7 @@ c-dump.o : c-dump.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
 
 c-pch.o : c-pch.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(CPPLIB_H) $(TREE_H) \
 	$(C_COMMON_H) output.h toplev.h c-pragma.h $(GGC_H) debug.h \
-	langhooks.h flags.h hosthooks.h version.h $(TARGET_H)
+	langhooks.h $(FLAGS_H) hosthooks.h version.h $(TARGET_H)
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
 	  -DHOST_MACHINE=\"$(host)\" -DTARGET_MACHINE=\"$(target)\" \
 	  $< $(OUTPUT_OPTION)
@@ -1549,27 +1550,27 @@ prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) Makefile prefix.h
 	-DPREFIX=\"$(prefix)\" \
 	  -c $(srcdir)/prefix.c $(OUTPUT_OPTION)
 
-convert.o: convert.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) flags.h \
+convert.o: convert.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(FLAGS_H) \
    convert.h toplev.h langhooks.h
 
 langhooks.o : langhooks.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) toplev.h \
    tree-inline.h $(RTL_H) insn-config.h $(INTEGRATE_H) langhooks.h \
-   $(LANGHOOKS_DEF_H) flags.h $(GGC_H) gt-langhooks.h diagnostic.h
-tree.o : tree.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) flags.h function.h \
+   $(LANGHOOKS_DEF_H) $(FLAGS_H) $(GGC_H) gt-langhooks.h diagnostic.h
+tree.o : tree.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(FLAGS_H) function.h \
    toplev.h $(GGC_H) $(HASHTAB_H) $(TARGET_H) output.h $(TM_P_H) langhooks.h \
    real.h gt-tree.h tree-iterator.h $(BASIC_BLOCK_H) $(TREE_FLOW_H)
 tree-dump.o: tree-dump.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
-   $(C_TREE_H) flags.h langhooks.h toplev.h output.h c-pragma.h $(RTL_H) \
+   $(C_TREE_H) $(FLAGS_H) langhooks.h toplev.h output.h c-pragma.h $(RTL_H) \
    $(GGC_H) $(EXPR_H) $(SPLAY_TREE_H) $(TREE_DUMP_H) tree-iterator.h
 tree-inline.o : tree-inline.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-   $(TREE_H) $(RTL_H) $(EXPR_H) flags.h $(PARAMS_H) input.h insn-config.h \
+   $(TREE_H) $(RTL_H) $(EXPR_H) $(FLAGS_H) $(PARAMS_H) input.h insn-config.h \
    $(INTEGRATE_H) $(VARRAY_H) $(HASHTAB_H) $(SPLAY_TREE_H) toplev.h \
    langhooks.h $(C_COMMON_H) tree-inline.h cgraph.h intl.h function.h \
    $(TREE_GIMPLE_H)
 print-tree.o : print-tree.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
    $(GGC_H) langhooks.h real.h
 stor-layout.o : stor-layout.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
-   flags.h function.h $(EXPR_H) $(RTL_H) toplev.h $(GGC_H) $(TM_P_H) $(TARGET_H) \
+   $(FLAGS_H) function.h $(EXPR_H) $(RTL_H) toplev.h $(GGC_H) $(TM_P_H) $(TARGET_H) \
    langhooks.h
 tree-alias-type.o: tree-alias-type.c tree-alias-type.h $(SYSTEM_H) $(CONFIG_H) \
    $(GGC_H) $(TM_H) coretypes.h $(VARRAY_H)
@@ -1595,13 +1596,13 @@ tree-outof-ssa.o : tree-outof-ssa.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
    tree-pass.h $(TREE_SSA_LIVE_H)
 tree-ssa-dse.o : tree-ssa-dse.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
    $(TM_H) errors.h $(GGC_H) $(TREE_H) $(RTL_H) $(TM_P_H) $(BASIC_BLOCK_H) \
-   $(TREE_FLOW_H) tree-pass.h $(TREE_DUMP_H) domwalk.h flags.h
+   $(TREE_FLOW_H) tree-pass.h $(TREE_DUMP_H) domwalk.h $(FLAGS_H)
 tree-ssa-forwprop.o : tree-ssa-forwprop.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
    $(TM_H) errors.h $(GGC_H) $(TREE_H) $(RTL_H) $(TM_P_H) $(BASIC_BLOCK_H) \
    $(TREE_FLOW_H) tree-pass.h $(TREE_DUMP_H)
 tree-ssa-phiopt.o : tree-ssa-phiopt.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
    $(TM_H) errors.h $(GGC_H) $(TREE_H) $(RTL_H) $(TM_P_H) $(BASIC_BLOCK_H) \
-   $(TREE_FLOW_H) tree-pass.h $(TREE_DUMP_H) langhooks.h flags.h
+   $(TREE_FLOW_H) tree-pass.h $(TREE_DUMP_H) langhooks.h $(FLAGS_H)
 tree-nrv.o : tree-nrv.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
    $(TM_H) $(TREE_H) $(RTL_H) function.h $(BASIC_BLOCK_H) $(EXPR_H) \
    diagnostic.h $(TREE_FLOW_H) $(TIMEVAR_H) $(TREE_DUMP_H) tree-pass.h \
@@ -1613,7 +1614,7 @@ tree-ssa-copy.o : tree-ssa-copy.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
 tree-ssa-dom.o : tree-ssa-dom.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
    $(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) $(GGC_H) output.h diagnostic.h \
    errors.h function.h $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \
-   $(BASIC_BLOCK_H) domwalk.h real.h tree-pass.h flags.h langhooks.h
+   $(BASIC_BLOCK_H) domwalk.h real.h tree-pass.h $(FLAGS_H) langhooks.h
 tree-ssanames.o : tree-ssanames.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
    $(TM_H) $(TREE_H) varray.h $(GGC_H) gt-tree-ssanames.h  $(TREE_FLOW_H)
 tree-phinodes.o : tree-phinodes.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
@@ -1632,14 +1633,14 @@ tree-ssa-copyrename.o : tree-ssa-copyrename.c $(TREE_FLOW_H) $(CONFIG_H) \
 tree-ssa-pre.o : tree-ssa-pre.c $(TREE_FLOW_H) $(CONFIG_H) \
    $(SYSTEM_H) $(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) \
    $(GGC_H) output.h diagnostic.h errors.h toplev.h $(TIMEVAR_H) \
-   $(TM_H) coretypes.h $(TREE_DUMP_H) tree-pass.h flags.h
+   $(TM_H) coretypes.h $(TREE_DUMP_H) tree-pass.h $(FLAGS_H)
 tree-cfg.o : tree-cfg.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
-   $(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) $(GGC_H) flags.h output.h \
+   $(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) $(GGC_H) $(FLAGS_H) output.h \
    diagnostic.h errors.h function.h $(TIMEVAR_H) $(TM_H) coretypes.h \
    $(TREE_DUMP_H) except.h langhooks.h $(CFGLOOP_H) gt-tree-cfg.h tree-pass.h
 tree-tailcall.o : tree-tailcall.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
    $(RTL_H) $(TREE_H) $(TM_P_H) function.h $(TM_H) coretypes.h \
-   $(TREE_DUMP_H) diagnostic.h except.h tree-pass.h flags.h langhooks.h
+   $(TREE_DUMP_H) diagnostic.h except.h tree-pass.h $(FLAGS_H) langhooks.h
 tree-nested.o: tree-nested.c $(CONFIG_H) $(SYSTEM_H) $(TM_H) $(TREE_H) \
    $(RTL_H) $(TM_P_H) function.h tree-dump.h tree-inline.h tree-iterator.h \
    tree-gimple.h cgraph.h $(EXPR_H) langhooks.h $(GGC_H) gt-tree-nested.h
@@ -1647,41 +1648,41 @@ tree-iterator.o : tree-iterator.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) \
    coretypes.h $(GGC_H) tree-iterator.h tree-gimple.h gt-tree-iterator.h
 tree-dfa.o : tree-dfa.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
    $(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) $(GGC_H) output.h diagnostic.h \
-   errors.h tree-inline.h $(HASHTAB_H) flags.h function.h $(TIMEVAR_H) \
+   errors.h tree-inline.h $(HASHTAB_H) $(FLAGS_H) function.h $(TIMEVAR_H) \
    tree-alias-common.h convert.h $(TM_H) coretypes.h langhooks.h \
    $(TREE_DUMP_H) tree-pass.h params.h
 tree-ssa-operands.o : tree-ssa-operands.c $(TREE_FLOW_H) $(CONFIG_H) \
    $(SYSTEM_H) $(TREE_H) $(TM_P_H) $(GGC_H) diagnostic.h \
-   tree-inline.h flags.h function.h $(TM_H) $(TIMEVAR_H) tree-pass.h
+   tree-inline.h $(FLAGS_H) function.h $(TM_H) $(TIMEVAR_H) tree-pass.h
 tree-eh.o : tree-eh.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
-   $(RTL_H) $(TREE_H) $(TM_H) flags.h function.h except.h langhooks.h \
+   $(RTL_H) $(TREE_H) $(TM_H) $(FLAGS_H) function.h except.h langhooks.h \
    $(GGC_H) tree-pass.h gt-tree-eh.h
 tree-ssa-loop.o : tree-ssa-loop.c $(TREE_FLOW_H) $(CONFIG_H) \
    $(SYSTEM_H) $(RTL_H) $(TREE_H) $(TM_P_H) $(CFGLOOP_H) \
    output.h diagnostic.h $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \
-   tree-pass.h flags.h tree-inline.h
+   tree-pass.h $(FLAGS_H) tree-inline.h
 tree-ssa-alias.o : tree-ssa-alias.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
-   $(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) $(GGC_H) tree-inline.h flags.h \
+   $(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) $(GGC_H) tree-inline.h $(FLAGS_H) \
    function.h $(TIMEVAR_H) tree-alias-common.h convert.h $(TM_H) coretypes.h \
    langhooks.h $(TREE_DUMP_H) tree-pass.h params.h
 tree-optimize.o : tree-optimize.c $(TREE_FLOW_H) $(CONFIG_H) \
    $(SYSTEM_H) $(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) \
-   $(GGC_H) output.h diagnostic.h errors.h flags.h tree-alias-common.h \
+   $(GGC_H) output.h diagnostic.h errors.h $(FLAGS_H) tree-alias-common.h \
    $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) toplev.h function.h \
-   langhooks.h flags.h cgraph.h tree-inline.h tree-mudflap.h $(GGC_H) \
+   langhooks.h $(FLAGS_H) cgraph.h tree-inline.h tree-mudflap.h $(GGC_H) \
    cgraph.h tree-pass.h
 c-gimplify.o : c-gimplify.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) errors.h \
-   $(C_TREE_H) $(C_COMMON_H) diagnostic.h $(TREE_GIMPLE_H) varray.h flags.h \
+   $(C_TREE_H) $(C_COMMON_H) diagnostic.h $(TREE_GIMPLE_H) varray.h $(FLAGS_H) \
    langhooks.h toplev.h rtl.h $(TREE_FLOW_H) langhooks-def.h \
    $(TM_H) coretypes.h $(C_PRETTY_PRINT_H) cgraph.h
 gimplify.o : gimplify.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) errors.h \
    diagnostic.h $(TREE_GIMPLE_H) tree-inline.h varray.h langhooks.h \
    langhooks-def.h $(TREE_FLOW_H) $(TIMEVAR_H) $(TM_H) coretypes.h except.h \
-   flags.h $(RTL_H) function.h $(EXPR_H) output.h $(GGC_H) gt-gimplify.h
+   $(FLAGS_H) $(RTL_H) function.h $(EXPR_H) output.h $(GGC_H) gt-gimplify.h
 gimple-low.o : gimple-low.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) errors.h \
    diagnostic.h $(TREE_GIMPLE_H) tree-inline.h varray.h langhooks.h \
    langhooks-def.h $(TREE_FLOW_H) $(TIMEVAR_H) $(TM_H) coretypes.h except.h \
-   flags.h $(RTL_H) function.h tree-pass.h
+   $(FLAGS_H) $(RTL_H) function.h tree-pass.h
 tree-browser.o : tree-browser.c tree-browser.def $(CONFIG_H) $(SYSTEM_H) \
    $(TREE_H) errors.h tree-inline.h diagnostic.h $(HASHTAB_H) \
    $(TM_H) coretypes.h
@@ -1701,10 +1702,10 @@ tree-pretty-print.o : tree-pretty-print.c $(CONFIG_H) $(SYSTEM_H) \
    errors.h $(TREE_H) diagnostic.h real.h $(HASHTAB_H) $(TREE_FLOW_H) \
    $(TM_H) coretypes.h tree-iterator.h
 fold-const.o : fold-const.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-   $(TREE_H) flags.h real.h toplev.h $(HASHTAB_H) $(EXPR_H) $(RTL_H) $(GGC_H) \
+   $(TREE_H) $(FLAGS_H) real.h toplev.h $(HASHTAB_H) $(EXPR_H) $(RTL_H) $(GGC_H) \
    $(TM_P_H) langhooks.h $(MD5_H)
 diagnostic.o : diagnostic.c $(DIAGNOSTIC_H) real.h \
-   $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) version.h $(TM_P_H) flags.h $(GGC_H) \
+   $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) version.h $(TM_P_H) $(FLAGS_H) $(GGC_H) \
    input.h toplev.h intl.h langhooks.h $(LANGHOOKS_DEF_H)
 opts.o : opts.c opts.h options.h toplev.h $(CONFIG_H) $(SYSTEM_H) \
 	coretypes.h $(TREE_H) $(TM_H) langhooks.h $(GGC_H) $(RTL_H) \
@@ -1714,7 +1715,7 @@ targhooks.o : targhooks.c targhooks.h $(CONFIG_H) $(SYSTEM_H) \
 	output.h toplev.h
 
 toplev.o : toplev.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) version.h $(RTL_H) \
-   function.h flags.h xcoffout.h input.h $(INSN_ATTR_H) output.h $(DIAGNOSTIC_H) \
+   function.h $(FLAGS_H) xcoffout.h input.h $(INSN_ATTR_H) output.h $(DIAGNOSTIC_H) \
    debug.h insn-config.h intl.h $(RECOG_H) Makefile toplev.h \
    dwarf2out.h sdbout.h dbxout.h $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) \
    graph.h $(LOOP_H) except.h $(REGS_H) $(TIMEVAR_H) value-prof.h \
@@ -1726,7 +1727,7 @@ toplev.o : toplev.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) versio
 	  -c $(srcdir)/toplev.c $(OUTPUT_OPTION)
 
 passes.o : passes.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
-   $(RTL_H) function.h flags.h xcoffout.h input.h $(INSN_ATTR_H) output.h \
+   $(RTL_H) function.h $(FLAGS_H) xcoffout.h input.h $(INSN_ATTR_H) output.h \
    $(DIAGNOSTIC_H) debug.h insn-config.h intl.h $(RECOG_H) toplev.h \
    dwarf2out.h sdbout.h dbxout.h $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) \
    graph.h $(LOOP_H) except.h $(REGS_H) $(TIMEVAR_H) value-prof.h \
@@ -1749,192 +1750,192 @@ rtl.o : rtl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) $(RTL_H) real.h \
 print-rtl.o : print-rtl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
     $(RTL_H) $(TREE_H) hard-reg-set.h $(BASIC_BLOCK_H) real.h $(TM_P_H)
 rtlanal.o : rtlanal.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) toplev.h \
-   $(RTL_H) hard-reg-set.h $(TM_P_H) insn-config.h $(RECOG_H) real.h flags.h \
+   $(RTL_H) hard-reg-set.h $(TM_P_H) insn-config.h $(RECOG_H) real.h $(FLAGS_H) \
    $(BASIC_BLOCK_H) $(REGS_H) output.h target.h function.h
 
 errors.o : errors.c $(CONFIG_H) $(SYSTEM_H) errors.h
 	$(CC) -c $(ALL_CFLAGS) -DGENERATOR_FILE $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
 varasm.o : varasm.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(RTL_H) \
-   flags.h function.h $(EXPR_H) hard-reg-set.h $(REGS_H) \
+   $(FLAGS_H) function.h $(EXPR_H) hard-reg-set.h $(REGS_H) \
    output.h c-pragma.h toplev.h xcoffout.h debug.h $(GGC_H) $(TM_P_H) \
    $(HASHTAB_H) $(TARGET_H) langhooks.h gt-varasm.h real.h
 function.o : function.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
    $(TREE_H) $(CFGLAYOUT_H) \
-   flags.h function.h $(EXPR_H) $(OPTABS_H) libfuncs.h $(REGS_H) hard-reg-set.h \
+   $(FLAGS_H) function.h $(EXPR_H) $(OPTABS_H) libfuncs.h $(REGS_H) hard-reg-set.h \
    insn-config.h $(RECOG_H) output.h toplev.h except.h $(HASHTAB_H) $(GGC_H) \
    $(TM_P_H) langhooks.h gt-function.h $(TARGET_H) basic-block.h
-stmt.o : stmt.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) flags.h \
+stmt.o : stmt.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) $(FLAGS_H) \
    function.h insn-config.h hard-reg-set.h $(EXPR_H) libfuncs.h except.h \
    $(LOOP_H) $(RECOG_H) toplev.h output.h varray.h $(GGC_H) $(TM_P_H) \
    langhooks.h $(PREDICT_H) gt-stmt.h $(OPTABS_H) $(TARGET_H)
 except.o : except.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
-   $(TREE_H) flags.h except.h function.h $(EXPR_H) libfuncs.h $(INTEGRATE_H) \
+   $(TREE_H) $(FLAGS_H) except.h function.h $(EXPR_H) libfuncs.h $(INTEGRATE_H) \
    langhooks.h insn-config.h hard-reg-set.h $(BASIC_BLOCK_H) output.h \
    dwarf2asm.h dwarf2out.h toplev.h $(HASHTAB_H) intl.h $(GGC_H) \
    gt-except.h cgraph.h
-expr.o : expr.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) flags.h \
+expr.o : expr.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) $(FLAGS_H) \
    function.h $(REGS_H) $(EXPR_H) $(OPTABS_H) libfuncs.h $(INSN_ATTR_H) insn-config.h \
    $(RECOG_H) output.h typeclass.h hard-reg-set.h toplev.h hard-reg-set.h \
    except.h reload.h $(GGC_H) langhooks.h intl.h $(TM_P_H) real.h $(TARGET_H) \
    tree-iterator.h
 dojump.o : dojump.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
-   flags.h function.h $(EXPR_H) $(OPTABS_H) $(INSN_ATTR_H) insn-config.h \
+   $(FLAGS_H) function.h $(EXPR_H) $(OPTABS_H) $(INSN_ATTR_H) insn-config.h \
    langhooks.h $(GGC_H) gt-dojump.h
 builtins.o : builtins.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H)\
-   $(TREE_GIMPLE_H) flags.h $(TARGET_H) function.h $(REGS_H) $(EXPR_H) $(OPTABS_H) \
+   $(TREE_GIMPLE_H) $(FLAGS_H) $(TARGET_H) function.h $(REGS_H) $(EXPR_H) $(OPTABS_H) \
    insn-config.h $(RECOG_H) output.h typeclass.h hard-reg-set.h toplev.h hard-reg-set.h \
    except.h $(TM_P_H) $(PREDICT_H) libfuncs.h real.h langhooks.h
-calls.o : calls.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) flags.h \
+calls.o : calls.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) $(FLAGS_H) \
    $(EXPR_H) $(OPTABS_H) langhooks.h $(TARGET_H) \
    libfuncs.h $(REGS_H) toplev.h output.h function.h $(TIMEVAR_H) $(TM_P_H) cgraph.h except.h
 expmed.o : expmed.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
-   flags.h insn-config.h $(EXPR_H) $(OPTABS_H) $(RECOG_H) real.h \
+   $(FLAGS_H) insn-config.h $(EXPR_H) $(OPTABS_H) $(RECOG_H) real.h \
    toplev.h $(TM_P_H) langhooks.h
 explow.o : explow.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
-   flags.h hard-reg-set.h insn-config.h $(EXPR_H) $(OPTABS_H) $(RECOG_H) \
+   $(FLAGS_H) hard-reg-set.h insn-config.h $(EXPR_H) $(OPTABS_H) $(RECOG_H) \
    toplev.h function.h $(GGC_H) $(TM_P_H) langhooks.h gt-explow.h
 optabs.o : optabs.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
-   flags.h insn-config.h $(EXPR_H) $(OPTABS_H) libfuncs.h $(RECOG_H) reload.h \
+   $(FLAGS_H) insn-config.h $(EXPR_H) $(OPTABS_H) libfuncs.h $(RECOG_H) reload.h \
    toplev.h $(GGC_H) real.h $(TM_P_H) except.h gt-optabs.h $(BASIC_BLOCK_H) \
    $(TARGET_H)
 dbxout.o : dbxout.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(RTL_H) \
-   flags.h $(REGS_H) debug.h $(TM_P_H) $(TARGET_H) function.h langhooks.h \
+   $(FLAGS_H) $(REGS_H) debug.h $(TM_P_H) $(TARGET_H) function.h langhooks.h \
    insn-config.h reload.h gstab.h xcoffout.h output.h dbxout.h toplev.h \
    $(GGC_H) gt-dbxout.h
 debug.o : debug.c debug.h $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H)
 sdbout.o : sdbout.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) debug.h \
-   $(TREE_H) $(GGC_H) varray.h $(RTL_H) $(REGS_H) flags.h insn-config.h \
+   $(TREE_H) $(GGC_H) varray.h $(RTL_H) $(REGS_H) $(FLAGS_H) insn-config.h \
    output.h toplev.h $(TM_P_H) gsyms.h langhooks.h $(TARGET_H) sdbout.h \
    gt-sdbout.h
 dwarf2out.o : dwarf2out.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-   $(TREE_H) version.h $(RTL_H) dwarf2.h debug.h flags.h insn-config.h reload.h \
+   $(TREE_H) version.h $(RTL_H) dwarf2.h debug.h $(FLAGS_H) insn-config.h reload.h \
    output.h $(DIAGNOSTIC_H) real.h hard-reg-set.h $(REGS_H) $(EXPR_H) \
    libfuncs.h toplev.h dwarf2out.h varray.h $(GGC_H) except.h dwarf2asm.h \
    $(TM_P_H) langhooks.h $(HASHTAB_H) gt-dwarf2out.h $(TARGET_H) cgraph.h \
    $(MD5_H) input.h
-dwarf2asm.o : dwarf2asm.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) flags.h $(RTL_H) \
+dwarf2asm.o : dwarf2asm.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(FLAGS_H) $(RTL_H) \
    $(TREE_H) output.h dwarf2asm.h $(TM_P_H) $(GGC_H) gt-dwarf2asm.h
 vmsdbgout.o : vmsdbgout.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) version.h \
-   $(RTL_H) flags.h output.h vmsdbg.h debug.h langhooks.h function.h $(TARGET_H)
+   $(RTL_H) $(FLAGS_H) output.h vmsdbg.h debug.h langhooks.h function.h $(TARGET_H)
 xcoffout.o : xcoffout.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(RTL_H) \
-   xcoffout.h flags.h toplev.h output.h dbxout.h $(GGC_H) $(TARGET_H)
+   xcoffout.h $(FLAGS_H) toplev.h output.h dbxout.h $(GGC_H) $(TARGET_H)
 emit-rtl.o : emit-rtl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
-   flags.h function.h $(REGS_H) insn-config.h $(RECOG_H) real.h $(GGC_H) \
+   $(FLAGS_H) function.h $(REGS_H) insn-config.h $(RECOG_H) real.h $(GGC_H) \
    $(EXPR_H) $(OBSTACK_H) hard-reg-set.h bitmap.h toplev.h \
    $(HASHTAB_H) $(TM_P_H) debug.h langhooks.h gt-emit-rtl.h
 real.o : real.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) toplev.h $(TM_P_H)
 integrate.o : integrate.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
-   flags.h debug.h $(INTEGRATE_H) insn-config.h $(EXPR_H) real.h $(REGS_H) \
+   $(FLAGS_H) debug.h $(INTEGRATE_H) insn-config.h $(EXPR_H) real.h $(REGS_H) \
    intl.h function.h output.h $(RECOG_H) except.h toplev.h $(LOOP_H) \
    $(PARAMS_H) $(TM_P_H) $(TARGET_H) langhooks.h gt-integrate.h
-jump.o : jump.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) flags.h \
+jump.o : jump.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(FLAGS_H) \
    hard-reg-set.h $(REGS_H) insn-config.h $(RECOG_H) $(EXPR_H) real.h except.h function.h \
    toplev.h $(INSN_ATTR_H) $(TM_P_H) reload.h $(PREDICT_H) $(TIMEVAR_H) \
    $(DIAGNOSTIC_H)
 
 simplify-rtx.o : simplify-rtx.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
-   $(REGS_H) hard-reg-set.h flags.h real.h insn-config.h $(RECOG_H) $(EXPR_H) toplev.h \
+   $(REGS_H) hard-reg-set.h $(FLAGS_H) real.h insn-config.h $(RECOG_H) $(EXPR_H) toplev.h \
    output.h function.h $(GGC_H) $(OBSTACK_H) $(TM_P_H) $(TREE_H) $(TARGET_H)
 cgraph.o : cgraph.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
-   langhooks.h toplev.h flags.h $(GGC_H)  $(TARGET_H) cgraph.h gt-cgraph.h \
+   langhooks.h toplev.h $(FLAGS_H) $(GGC_H)  $(TARGET_H) cgraph.h gt-cgraph.h \
    output.h intl.h
 cgraphunit.o : cgraphunit.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
-   langhooks.h tree-inline.h toplev.h flags.h $(GGC_H)  $(TARGET_H) cgraph.h intl.h \
+   langhooks.h tree-inline.h toplev.h $(FLAGS_H) $(GGC_H)  $(TARGET_H) cgraph.h intl.h \
    function.h
 coverage.o : coverage.c gcov-io.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
-   $(TM_H) $(RTL_H) $(TREE_H) flags.h output.h $(REGS_H) $(EXPR_H) function.h \
+   $(TM_H) $(RTL_H) $(TREE_H) $(FLAGS_H) output.h $(REGS_H) $(EXPR_H) function.h \
    toplev.h $(GGC_H) $(TARGET_H) langhooks.h $(COVERAGE_H) libfuncs.h \
    gt-coverage.h $(HASHTAB_H)
 cselib.o : cselib.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(REGS_H) \
-   hard-reg-set.h flags.h real.h insn-config.h $(RECOG_H) $(EMIT_RTL_H) toplev.h \
+   hard-reg-set.h $(FLAGS_H) real.h insn-config.h $(RECOG_H) $(EMIT_RTL_H) toplev.h \
    output.h function.h cselib.h $(GGC_H) $(TM_P_H) gt-cselib.h $(PARAMS_H) \
    alloc-pool.h
 cse.o : cse.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(REGS_H) \
-   hard-reg-set.h flags.h real.h insn-config.h $(RECOG_H) $(EXPR_H) toplev.h \
+   hard-reg-set.h $(FLAGS_H) real.h insn-config.h $(RECOG_H) $(EXPR_H) toplev.h \
    output.h function.h $(BASIC_BLOCK_H) $(GGC_H) $(TM_P_H) $(TIMEVAR_H) \
    except.h $(TARGET_H) $(PARAMS_H) rtlhooks-def.h
 web.o : web.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(REGS_H) \
-   hard-reg-set.h flags.h $(BASIC_BLOCK_H) function.h output.h toplev.h $(DF_H)
+   hard-reg-set.h $(FLAGS_H) $(BASIC_BLOCK_H) function.h output.h toplev.h $(DF_H)
 gcse.o : gcse.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(REGS_H) \
-   hard-reg-set.h flags.h real.h insn-config.h $(GGC_H) $(RECOG_H) $(EXPR_H) \
+   hard-reg-set.h $(FLAGS_H) real.h insn-config.h $(GGC_H) $(RECOG_H) $(EXPR_H) \
    $(BASIC_BLOCK_H) function.h output.h toplev.h $(TM_P_H) $(PARAMS_H) \
    except.h gt-gcse.h $(TREE_H) cselib.h
 resource.o : resource.c $(CONFIG_H) $(RTL_H) hard-reg-set.h $(SYSTEM_H) coretypes.h \
-   $(TM_H) $(BASIC_BLOCK_H) $(REGS_H) flags.h output.h $(RESOURCE_H) function.h toplev.h \
+   $(TM_H) $(BASIC_BLOCK_H) $(REGS_H) $(FLAGS_H) output.h $(RESOURCE_H) function.h toplev.h \
    $(INSN_ATTR_H) except.h $(PARAMS_H) $(TM_P_H)
 lcm.o : lcm.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(REGS_H) \
-   hard-reg-set.h flags.h real.h insn-config.h $(INSN_ATTR_H) $(RECOG_H) $(EXPR_H) \
+   hard-reg-set.h $(FLAGS_H) real.h insn-config.h $(INSN_ATTR_H) $(RECOG_H) $(EXPR_H) \
    $(BASIC_BLOCK_H) $(TM_P_H) $(DF_H) function.h
 tree-ssa-dce.o : tree-ssa-dce.c $(CONFIG_H) system.h errors.h $(TREE_H) \
     $(RTL_H) $(TM_P_H) $(TREE_FLOW_H) diagnostic.h $(TIMEVAR_H) $(TM_H) \
-    coretypes.h $(TREE_DUMP_H) tree-pass.h flags.h
+    coretypes.h $(TREE_DUMP_H) tree-pass.h $(FLAGS_H)
 tree-ssa-ccp.o : tree-ssa-ccp.c $(CONFIG_H) system.h errors.h $(TREE_H) \
     $(RTL_H) $(TM_P_H) $(TREE_FLOW_H) diagnostic.h tree-inline.h \
     $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) $(TREE_GIMPLE_H) \
-    $(EXPR_H) tree-pass.h flags.h langhooks.h
+    $(EXPR_H) tree-pass.h $(FLAGS_H) langhooks.h
 tree-sra.o : tree-sra.c $(CONFIG_H) system.h errors.h $(TREE_H) $(RTL_H) \
     $(TM_P_H) $(TREE_FLOW_H) diagnostic.h tree-inline.h \
     $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) $(TREE_GIMPLE_H) \
-    langhooks.h tree-pass.h flags.h
+    langhooks.h tree-pass.h $(FLAGS_H)
 tree-complex.o : tree-complex.c $(CONFIG_H) system.h $(TREE_H) \
     $(TM_H) $(TREE_FLOW_H) $(TREE_GIMPLE_H) tree-iterator.h tree-pass.h \
-    flags.h
+    $(FLAGS_H)
 df.o : df.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
    insn-config.h $(RECOG_H) function.h $(REGS_H) alloc-pool.h hard-reg-set.h \
    $(BASIC_BLOCK_H) $(DF_H)
 var-tracking.o : var-tracking.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-   $(RTL_H) $(TREE_H) hard-reg-set.h insn-config.h reload.h flags.h \
+   $(RTL_H) $(TREE_H) hard-reg-set.h insn-config.h reload.h $(FLAGS_H) \
    $(BASIC_BLOCK_H) output.h sbitmap.h alloc-pool.h $(FIBHEAP_H) $(HASHTAB_H)
 conflict.o : conflict.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(OBSTACK_H) \
    $(HASHTAB_H) $(RTL_H) hard-reg-set.h $(BASIC_BLOCK_H)
 profile.o : profile.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
-   $(TREE_H) flags.h output.h $(REGS_H) $(EXPR_H) function.h \
+   $(TREE_H) $(FLAGS_H) output.h $(REGS_H) $(EXPR_H) function.h \
    toplev.h $(BASIC_BLOCK_H) $(COVERAGE_H) $(TREE_FLOW_H) value-prof.h
 tree-profile.o : tree-profile.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
-   $(TM_H) $(RTL_H) $(TREE_H) flags.h output.h $(REGS_H) $(EXPR_H) function.h \
+   $(TM_H) $(RTL_H) $(TREE_H) $(FLAGS_H) output.h $(REGS_H) $(EXPR_H) function.h \
    toplev.h $(BASIC_BLOCK_H) $(COVERAGE_H) $(TREE_H) value-prof.h \
    tree-pass.h $(TREE_FLOW_H) $(TIMEVAR_H)
 rtl-profile.o : tree-profile.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
-   $(TM_H) $(RTL_H) $(TREE_H) flags.h output.h $(REGS_H) $(EXPR_H) function.h \
+   $(TM_H) $(RTL_H) $(TREE_H) $(FLAGS_H) output.h $(REGS_H) $(EXPR_H) function.h \
    toplev.h $(BASIC_BLOCK_H) $(COVERAGE_H) $(TREE_FLOW_H) value-prof.h
 value-prof.o : value-prof.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
-   $(BASIC_BLOCK_H) hard-reg-set.h value-prof.h $(EXPR_H) output.h flags.h \
+   $(BASIC_BLOCK_H) hard-reg-set.h value-prof.h $(EXPR_H) output.h $(FLAGS_H) \
    $(RECOG_H) insn-config.h $(OPTABS_H) $(REGS_H)
-loop.o : loop.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) flags.h $(LOOP_H) \
+loop.o : loop.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(FLAGS_H) $(LOOP_H) \
    insn-config.h $(REGS_H) hard-reg-set.h $(RECOG_H) $(EXPR_H) \
    real.h $(PREDICT_H) $(BASIC_BLOCK_H) function.h $(CFGLOOP_H) \
    toplev.h varray.h except.h cselib.h $(OPTABS_H) $(TM_P_H) $(GGC_H)
 loop-doloop.o : loop-doloop.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-   $(RTL_H) flags.h $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) $(TM_P_H) \
+   $(RTL_H) $(FLAGS_H) $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) $(TM_P_H) \
    toplev.h $(CFGLOOP_H) output.h $(PARAMS_H)
 unroll.o : unroll.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) insn-config.h \
-   function.h $(INTEGRATE_H) $(REGS_H) $(RECOG_H) flags.h $(EXPR_H) $(LOOP_H) toplev.h \
+   function.h $(INTEGRATE_H) $(REGS_H) $(RECOG_H) $(FLAGS_H) $(EXPR_H) $(LOOP_H) toplev.h \
    hard-reg-set.h varray.h $(BASIC_BLOCK_H) $(TM_P_H) $(PREDICT_H) $(PARAMS_H) \
    $(CFGLOOP_H)
 alloc-pool.o : alloc-pool.c $(CONFIG_H) $(SYSTEM_H) alloc-pool.h $(HASHTAB_H)
 flow.o : flow.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
-   flags.h insn-config.h $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h toplev.h \
+   $(FLAGS_H) insn-config.h $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h toplev.h \
    $(RECOG_H) function.h except.h $(EXPR_H) $(GGC_H) $(TM_P_H)
-cfg.o : cfg.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) flags.h insn-config.h \
+cfg.o : cfg.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(FLAGS_H) insn-config.h \
    $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h toplev.h $(RECOG_H) \
    function.h except.h $(GGC_H) $(TM_P_H) alloc-pool.h $(TIMEVAR_H) 
 cfghooks.o: cfghooks.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
    $(BASIC_BLOCK_H) $(CFGLAYOUT_H) $(TREE_FLOW_H) $(TIMEVAR_H) toplev.h
-cfgrtl.o : cfgrtl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) flags.h \
+cfgrtl.o : cfgrtl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(FLAGS_H) \
    insn-config.h $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h toplev.h $(RECOG_H) \
    function.h except.h $(GGC_H) $(TM_P_H) insn-config.h $(EXPR_H)
 cfganal.o : cfganal.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
    $(BASIC_BLOCK_H) hard-reg-set.h insn-config.h $(RECOG_H) $(GGC_H) $(TM_P_H)
-cfgbuild.o : cfgbuild.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) flags.h \
+cfgbuild.o : cfgbuild.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(FLAGS_H) \
    insn-config.h $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h toplev.h $(RECOG_H) \
    function.h except.h $(GGC_H)
 cfgcleanup.o : cfgcleanup.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-   $(RTL_H) $(TIMEVAR_H) $(BASIC_BLOCK_H) hard-reg-set.h output.h flags.h \
+   $(RTL_H) $(TIMEVAR_H) $(BASIC_BLOCK_H) hard-reg-set.h output.h $(FLAGS_H) \
    $(RECOG_H) toplev.h $(GGC_H) insn-config.h cselib.h $(TARGET_H) $(TM_P_H) \
    $(PARAMS_H) $(REGS_H) $(EMIT_RTL_H)
 cfgloop.o : cfgloop.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) coretypes.h $(TM_H) \
-   $(BASIC_BLOCK_H) hard-reg-set.h $(CFGLOOP_H) flags.h
+   $(BASIC_BLOCK_H) hard-reg-set.h $(CFGLOOP_H) $(FLAGS_H)
 cfgloopanal.o : cfgloopanal.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) \
    $(BASIC_BLOCK_H) hard-reg-set.h $(CFGLOOP_H) $(EXPR_H) coretypes.h $(TM_H)
 loop-iv.o : loop-iv.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(GGC_H) \
@@ -1953,26 +1954,26 @@ loop-unroll.o: loop-unroll.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(TM_H) \
 dominance.o : dominance.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
    hard-reg-set.h $(BASIC_BLOCK_H) et-forest.h
 et-forest.o : et-forest.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) et-forest.h alloc-pool.h
-combine.o : combine.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) flags.h \
+combine.o : combine.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(FLAGS_H) \
    function.h insn-config.h $(INSN_ATTR_H) $(REGS_H) $(EXPR_H) rtlhooks-def.h \
    $(BASIC_BLOCK_H) $(RECOG_H) real.h hard-reg-set.h toplev.h $(TM_P_H) $(TREE_H) $(TARGET_H)
 regclass.o : regclass.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
-   hard-reg-set.h flags.h $(BASIC_BLOCK_H) $(REGS_H) insn-config.h $(RECOG_H) reload.h \
+   hard-reg-set.h $(FLAGS_H) $(BASIC_BLOCK_H) $(REGS_H) insn-config.h $(RECOG_H) reload.h \
    real.h toplev.h function.h output.h $(GGC_H) $(TM_P_H) $(EXPR_H) $(TIMEVAR_H)
 local-alloc.o : local-alloc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
-   flags.h $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h insn-config.h $(RECOG_H) \
+   $(FLAGS_H) $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h insn-config.h $(RECOG_H) \
    output.h function.h $(INSN_ATTR_H) toplev.h  except.h $(TM_P_H)
-bitmap.o : bitmap.c $(CONFIG_H) $(SYSTEM_H)  coretypes.h $(GTM_H) $(RTL_H) flags.h \
+bitmap.o : bitmap.c $(CONFIG_H) $(SYSTEM_H)  coretypes.h $(GTM_H) $(RTL_H) $(FLAGS_H) \
    $(BASIC_BLOCK_H) $(REGS_H) $(GGC_H)
 	$(CC) -c $(ALL_CFLAGS) -DGENERATOR_FILE $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
-global.o : global.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) flags.h \
+global.o : global.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(FLAGS_H) \
    reload.h function.h $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h insn-config.h output.h \
    toplev.h $(TM_P_H)
 varray.o : varray.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) varray.h $(GGC_H) errors.h \
    $(HASHTAB_H)
 ra.o : ra.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TM_P_H) insn-config.h \
    $(RECOG_H) $(INTEGRATE_H) function.h $(REGS_H) $(OBSTACK_H) hard-reg-set.h \
-   $(BASIC_BLOCK_H) $(DF_H) $(EXPR_H) output.h toplev.h flags.h reload.h $(RA_H)
+   $(BASIC_BLOCK_H) $(DF_H) $(EXPR_H) output.h toplev.h $(FLAGS_H) reload.h $(RA_H)
 ra-build.o : ra-build.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TM_P_H) \
    insn-config.h $(RECOG_H) function.h $(REGS_H) hard-reg-set.h \
    $(BASIC_BLOCK_H) $(DF_H) output.h $(GGC_H) $(RA_H) gt-ra-build.h reload.h
@@ -1984,92 +1985,92 @@ ra-debug.o : ra-debug.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
 ra-rewrite.o : ra-rewrite.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
    $(TM_P_H) function.h $(REGS_H) hard-reg-set.h $(BASIC_BLOCK_H) $(DF_H) $(EXPR_H) \
    output.h except.h $(RA_H) reload.h insn-config.h
-reload.o : reload.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) flags.h output.h \
+reload.o : reload.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(FLAGS_H) output.h \
    $(EXPR_H) $(OPTABS_H) reload.h $(RECOG_H) hard-reg-set.h insn-config.h \
    $(REGS_H) function.h real.h toplev.h $(TM_P_H) $(PARAMS_H)
-reload1.o : reload1.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) real.h flags.h \
+reload1.o : reload1.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) real.h $(FLAGS_H) \
    $(EXPR_H) $(OPTABS_H) reload.h $(REGS_H) hard-reg-set.h insn-config.h \
    $(BASIC_BLOCK_H) $(RECOG_H) output.h function.h toplev.h $(TM_P_H) \
    except.h $(TREE_H)
 rtlhooks.o :  rtlhooks.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
    rtlhooks-def.h $(EXPR_H)
-postreload.o : postreload.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) real.h flags.h \
+postreload.o : postreload.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) real.h $(FLAGS_H) \
    $(EXPR_H) $(OPTABS_H) reload.h $(REGS_H) hard-reg-set.h insn-config.h \
    $(BASIC_BLOCK_H) $(RECOG_H) output.h function.h toplev.h cselib.h $(TM_P_H) \
    except.h $(TREE_H)
 caller-save.o : caller-save.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
-   flags.h $(REGS_H) hard-reg-set.h insn-config.h $(BASIC_BLOCK_H) function.h \
+   $(FLAGS_H) $(REGS_H) hard-reg-set.h insn-config.h $(BASIC_BLOCK_H) function.h \
    $(RECOG_H) reload.h $(EXPR_H) toplev.h $(TM_P_H)
 bt-load.o : bt-load.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) except.h \
    $(BASIC_BLOCK_H) $(RTL_H) hard-reg-set.h $(REGS_H) $(OBSTACK_H) $(TM_P_H) \
-   $(FIBHEAP_H) output.h $(TARGET_H) $(EXPR_H) flags.h $(INSN_ATTR_H)
+   $(FIBHEAP_H) output.h $(TARGET_H) $(EXPR_H) $(FLAGS_H) $(INSN_ATTR_H)
 reorg.o : reorg.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) conditions.h \
    hard-reg-set.h $(BASIC_BLOCK_H) $(REGS_H) insn-config.h $(INSN_ATTR_H) except.h \
-   $(RECOG_H) function.h flags.h output.h $(EXPR_H) toplev.h $(PARAMS_H) $(TM_P_H)
-alias.o : alias.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) flags.h \
+   $(RECOG_H) function.h $(FLAGS_H) output.h $(EXPR_H) toplev.h $(PARAMS_H) $(TM_P_H)
+alias.o : alias.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(FLAGS_H) \
    hard-reg-set.h $(BASIC_BLOCK_H) $(REGS_H) toplev.h output.h $(ALIAS_H) $(EMIT_RTL_H) \
    $(GGC_H) function.h cselib.h $(TREE_H) $(TM_P_H) langhooks.h $(TARGET_H) \
    gt-alias.h $(TIMEVAR_H) cgraph.h
 regmove.o : regmove.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) insn-config.h \
-   $(RECOG_H) output.h $(REGS_H) hard-reg-set.h flags.h function.h \
+   $(RECOG_H) output.h $(REGS_H) hard-reg-set.h $(FLAGS_H) function.h \
    $(EXPR_H) $(BASIC_BLOCK_H) toplev.h $(TM_P_H) except.h reload.h
 ddg.o : ddg.c $(DDG_H) $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TARGET_H) \
-   toplev.h $(RTL_H) $(TM_P_H) $(BASIC_BLOCK_H) regs.h function.h flags.h \
+   toplev.h $(RTL_H) $(TM_P_H) $(BASIC_BLOCK_H) regs.h function.h $(FLAGS_H) \
    insn-config.h insn-attr.h except.h $(RECOG_H) $(SCHED_INT_H) \
    $(CFGLAYOUT_H) $(CFGLOOP_H) $(EXPR_H)
 modulo-sched.o : modulo-sched.c $(DDG_H) $(CONFIG_H) \
    $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TARGET_H) \
-   toplev.h $(RTL_H) $(TM_P_H) $(BASIC_BLOCK_H) regs.h function.h flags.h \
+   toplev.h $(RTL_H) $(TM_P_H) $(BASIC_BLOCK_H) regs.h function.h $(FLAGS_H) \
    insn-config.h insn-attr.h except.h $(RECOG_H) $(SCHED_INT_H) \
    $(CFGLAYOUT_H) $(CFGLOOP_H) $(EXPR_H) params.h $(COVERAGE_H)
 haifa-sched.o : haifa-sched.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
-   $(SCHED_INT_H) $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h flags.h insn-config.h function.h \
+   $(SCHED_INT_H) $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h $(FLAGS_H) insn-config.h function.h \
    $(INSN_ATTR_H) toplev.h $(RECOG_H) except.h $(TM_P_H) $(TARGET_H)
 sched-deps.o : sched-deps.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
-   $(SCHED_INT_H) $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h flags.h insn-config.h function.h \
+   $(SCHED_INT_H) $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h $(FLAGS_H) insn-config.h function.h \
    $(INSN_ATTR_H) toplev.h $(RECOG_H) except.h cselib.h $(PARAMS_H) $(TM_P_H)
 sched-rgn.o : sched-rgn.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
-   $(SCHED_INT_H) $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h flags.h insn-config.h function.h \
+   $(SCHED_INT_H) $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h $(FLAGS_H) insn-config.h function.h \
    $(INSN_ATTR_H) toplev.h $(RECOG_H) except.h $(PARAMS_H) $(TM_P_H) $(TARGET_H)
 sched-ebb.o : sched-ebb.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
-   $(SCHED_INT_H) $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h flags.h insn-config.h function.h \
+   $(SCHED_INT_H) $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h $(FLAGS_H) insn-config.h function.h \
    $(INSN_ATTR_H) toplev.h $(RECOG_H) except.h $(TM_P_H) $(PARAMS_H)
 sched-vis.o : sched-vis.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
    $(SCHED_INT_H) hard-reg-set.h $(BASIC_BLOCK_H) $(INSN_ATTR_H) $(REGS_H) $(TM_P_H) \
    $(TARGET_H) real.h
 final.o : final.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
-   flags.h intl.h $(REGS_H) $(RECOG_H) conditions.h insn-config.h $(INSN_ATTR_H) \
+   $(FLAGS_H) intl.h $(REGS_H) $(RECOG_H) conditions.h insn-config.h $(INSN_ATTR_H) \
    function.h real.h output.h hard-reg-set.h except.h debug.h xcoffout.h \
    toplev.h reload.h dwarf2out.h $(BASIC_BLOCK_H) $(TM_P_H) $(TARGET_H) \
    $(EXPR_H)
 recog.o : recog.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) function.h \
-   $(BASIC_BLOCK_H) $(REGS_H) $(RECOG_H) $(EXPR_H) hard-reg-set.h flags.h insn-config.h \
+   $(BASIC_BLOCK_H) $(REGS_H) $(RECOG_H) $(EXPR_H) hard-reg-set.h $(FLAGS_H) insn-config.h \
    $(INSN_ATTR_H) real.h toplev.h output.h reload.h $(TM_P_H)
 reg-stack.o : reg-stack.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
-   $(RECOG_H) $(REGS_H) hard-reg-set.h flags.h insn-config.h toplev.h reload.h \
+   $(RECOG_H) $(REGS_H) hard-reg-set.h $(FLAGS_H) insn-config.h toplev.h reload.h \
    varray.h function.h $(TM_P_H) $(GGC_H) gt-reg-stack.h basic-block.h
 sreal.o: sreal.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) sreal.h
 predict.o: predict.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
-   flags.h insn-config.h $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h toplev.h \
+   $(FLAGS_H) insn-config.h $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h toplev.h \
    $(RECOG_H) function.h except.h $(EXPR_H) $(TM_P_H) $(PREDICT_H) sreal.h \
    $(PARAMS_H) $(TARGET_H) $(CFGLOOP_H) $(COVERAGE_H)
 lists.o: lists.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) toplev.h $(RTL_H) $(GGC_H)
 bb-reorder.o : bb-reorder.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-   $(RTL_H) $(BASIC_BLOCK_H) flags.h timevar.h output.h $(CFGLAYOUT_H) $(FIBHEAP_H) \
+   $(RTL_H) $(BASIC_BLOCK_H) $(FLAGS_H) timevar.h output.h $(CFGLAYOUT_H) $(FIBHEAP_H) \
    $(TARGET_H)
 tracer.o : tracer.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $(TREE_H) \
-   $(BASIC_BLOCK_H) hard-reg-set.h output.h $(CFGLAYOUT_H) flags.h timevar.h \
+   $(BASIC_BLOCK_H) hard-reg-set.h output.h $(CFGLAYOUT_H) $(FLAGS_H) timevar.h \
    $(PARAMS_H) $(COVERAGE_H)
 cfglayout.o : cfglayout.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
    $(RTL_H) $(TREE_H) insn-config.h $(BASIC_BLOCK_H) hard-reg-set.h output.h \
    function.h $(CFGLAYOUT_H) $(CFGLOOP_H) $(TARGET_H) gt-cfglayout.h $(GGC_H)
-timevar.o : timevar.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TIMEVAR_H) flags.h \
+timevar.o : timevar.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TIMEVAR_H) $(FLAGS_H) \
    intl.h toplev.h
 regrename.o : regrename.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
    insn-config.h $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h $(RECOG_H) function.h \
-   $(RESOURCE_H) $(OBSTACK_H) flags.h $(TM_P_H)
+   $(RESOURCE_H) $(OBSTACK_H) $(FLAGS_H) $(TM_P_H)
 ifcvt.o : ifcvt.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
-   $(REGS_H) toplev.h flags.h insn-config.h function.h $(RECOG_H) $(TARGET_H) \
+   $(REGS_H) toplev.h $(FLAGS_H) insn-config.h function.h $(RECOG_H) $(TARGET_H) \
    $(BASIC_BLOCK_H) $(EXPR_H) output.h except.h $(TM_P_H) real.h $(OPTABS_H) \
    $(CFGLOOP_H)
 params.o : params.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(PARAMS_H) toplev.h
@@ -2145,7 +2146,7 @@ s-conditions : $(md_file) genconditions$(build_exeext)
 
 insn-conditions.o : insn-conditions.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
   $(GTM_H) $(RTL_H) $(TM_P_H) $(REGS_H) function.h $(RECOG_H) real.h output.h \
-  flags.h hard-reg-set.h $(RESOURCE_H) toplev.h reload.h gensupport.h \
+  $(FLAGS_H) hard-reg-set.h $(RESOURCE_H) toplev.h reload.h gensupport.h \
   insn-constants.h
 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) insn-conditions.c
 
@@ -2172,7 +2173,7 @@ s-constants : $(md_file) genconstants$(build_exeext)
 
 insn-emit.o : insn-emit.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
   $(RTL_H) $(EXPR_H) real.h output.h insn-config.h $(OPTABS_H) reload.h \
-  $(RECOG_H) toplev.h function.h flags.h hard-reg-set.h $(RESOURCE_H) $(TM_P_H)
+  $(RECOG_H) toplev.h function.h $(FLAGS_H) hard-reg-set.h $(RESOURCE_H) $(TM_P_H)
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-emit.c \
 	  $(OUTPUT_OPTION)
 
@@ -2183,7 +2184,7 @@ s-emit : $(md_file) genemit$(build_exeext)
 	$(STAMP) s-emit
 
 insn-recog.o : insn-recog.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-  $(RTL_H) insn-config.h $(RECOG_H) real.h output.h flags.h  function.h \
+  $(RTL_H) insn-config.h $(RECOG_H) real.h output.h $(FLAGS_H)  function.h \
   hard-reg-set.h $(RESOURCE_H) $(TM_P_H) toplev.h reload.h
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-recog.c \
 	  $(OUTPUT_OPTION)
@@ -2195,7 +2196,7 @@ s-recog : $(md_file) genrecog$(build_exeext)
 	$(STAMP) s-recog
 
 insn-opinit.o : insn-opinit.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-  $(RTL_H) insn-config.h flags.h $(RECOG_H) $(EXPR_H) $(OPTABS_H) reload.h
+  $(RTL_H) insn-config.h $(FLAGS_H) $(RECOG_H) $(EXPR_H) $(OPTABS_H) reload.h
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-opinit.c \
 	  $(OUTPUT_OPTION)
 
@@ -2230,7 +2231,7 @@ s-peep : $(md_file) genpeep$(build_exeext)
 
 insn-attrtab.o : insn-attrtab.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
   $(RTL_H) $(REGS_H) real.h output.h $(INSN_ATTR_H) insn-config.h toplev.h \
-  $(RECOG_H) $(TM_P_H) flags.h
+  $(RECOG_H) $(TM_P_H) $(FLAGS_H)
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-attrtab.c \
 	  $(OUTPUT_OPTION)
 
@@ -2249,7 +2250,7 @@ s-attrtab : $(md_file) genattrtab$(build_exeext)
 insn-output.o : insn-output.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
   $(RTL_H) $(GGC_H) $(REGS_H) real.h conditions.h hard-reg-set.h \
   insn-config.h $(INSN_ATTR_H) $(EXPR_H) output.h $(RECOG_H) function.h \
-  toplev.h flags.h insn-codes.h $(TM_P_H) $(TARGET_H)
+  toplev.h $(FLAGS_H) insn-codes.h $(TM_P_H) $(TARGET_H)
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-output.c \
 	  $(OUTPUT_OPTION)
 
@@ -2537,7 +2538,7 @@ print-rtl1.o: $(srcdir)/print-rtl.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h \
 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) print-rtl1.c $(OUTPUT_OPTION)
 
 $(BUILD_PREFIX_1)bitmap.o: $(srcdir)/bitmap.c $(BCONFIG_H) coretypes.h $(GTM_H) $(SYSTEM_H) \
-  $(RTL_H) flags.h $(BASIC_BLOCK_H) $(REGS_H) $(GGC_H)
+  $(RTL_H) $(FLAGS_H) $(BASIC_BLOCK_H) $(REGS_H) $(GGC_H)
 	rm -f $(BUILD_PREFIX)bitmap.c
 	sed -e 's/config[.]h/bconfig.h/' $(srcdir)/bitmap.c > $(BUILD_PREFIX)bitmap.c
 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(BUILD_PREFIX)bitmap.c $(OUTPUT_OPTION)

gcc/c.opt

@@ -36,7 +36,14 @@
 ; "JoinedOrMissing" instead of "Joined".  If the argument to a switch
 ; is a non-negative integer, you can specify "UInteger" and the switch
 ; decoder will convert the argument for you, or complain to the user
-; if the argument is invalid.
+; if the argument is invalid.  "Var(name,set)" creates an integer
+; variable "name".  The variable is declared and initialized to value
+; given by "Init(value)" (or zero if this property is not defined).
+; When the option is passed to compiler, this variable is set to "set"
+; if value passed through the flag is nonzero, !"set" if value is zero,
+; or to value if "set" is omitted.  If "VarExists"  is specified, the
+; declaration for the variable is not created.  If "Report" is specified,
+; the flag is output with -fverbose-asm.
 
 ; The third field is the help text to output with --help.  This is
 ; automatically line-wrapped on output.  Normally the switch is output

gcc/common.opt

 ; Options for the language- and target-independent parts of the compiler.
+
 ; Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 ;
 ; This file is part of GCC.
@@ -53,23 +54,23 @@ Common RejectNegative
 This switch is deprecated; use -Wextra instead
 
 Waggregate-return
-Common
+Common Var(warn_aggregate_return)
 Warn about returning structures, unions or arrays
 
 Wcast-align
-Common
+Common Var(warn_cast_align)
 Warn about pointer casts which increase alignment
 
 Wdeprecated-declarations
-Common
+Common Var(warn_deprecated_decl) Init(1)
 Warn about uses of __attribute__((deprecated)) declarations
 
 Wdisabled-optimization
-Common
+Common Var(warn_disabled_optimization)
 Warn when an optimization pass is disabled
 
 Werror
-Common
+Common Var(warnings_are_errors)
 Treat all warnings as errors
 
 Wextra
@@ -77,11 +78,11 @@ Common
 Print extra (possibly unwanted) warnings
 
 Wfatal-errors
-Common
+Common Var(flag_fatal_errors)
 Exit on the first error occurred
 
 Winline
-Common
+Common Var(warn_inline)
 Warn when an inlined function cannot be inlined
 
 Wlarger-than-
@@ -89,19 +90,19 @@ Common RejectNegative Joined UInteger
 -Wlarger-than-<number>	Warn if an object is larger than <number> bytes
 
 Wmissing-noreturn
-Common
+Common Var(warn_missing_noreturn)
 Warn about functions which might be candidates for __attribute__((noreturn))
 
 Wpacked
-Common
+Common Var(warn_packed)
 Warn when the packed attribute has no effect on struct layout
 
 Wpadded
-Common
+Common Var(warn_padded)
 Warn when padding is required to align structure members
 
 Wshadow
-Common
+Common Var(warn_shadow)
 Warn when one local variable shadows another
 
 Wstrict-aliasing
@@ -113,27 +114,27 @@ Common Joined UInteger
 Warn about code which might break strict aliasing rules
 
 Wswitch
-Common
+Common Var(warn_switch)
 Warn about enumerated switches, with no default, missing a case
 
 Wswitch-default
-Common
+Common Var(warn_switch_default)
 Warn about enumerated switches missing a \"default:\" statement
 
 Wswitch-enum
-Common
+Common Var(warn_switch_enum)
 Warn about all enumerated switches missing a specific case
 
 Wsystem-headers
-Common
+Common Var(warn_system_headers)
 Do not suppress warnings from system headers
 
 Wuninitialized
-Common
+Common Var(warn_uninitialized)
 Warn about uninitialized automatic variables
 
 Wunreachable-code
-Common
+Common Var(warn_notreached)
 Warn about code that will never be executed
 
 Wunused
@@ -141,23 +142,23 @@ Common
 Enable all -Wunused- warnings
 
 Wunused-function
-Common
+Common Var(warn_unused_function)
 Warn when a function is unused
 
 Wunused-label
-Common
+Common Var(warn_unused_label)
 Warn when a label is unused
 
 Wunused-parameter
-Common
+Common Var(warn_unused_parameter)
 Warn when a function parameter is unused
 
 Wunused-value
-Common
+Common Var(warn_unused_value)
 Warn when an expression value is unused
 
 Wunused-variable
-Common
+Common Var(warn_unused_variable)
 Warn when a variable is unused
 
 aux-info
@@ -182,80 +183,80 @@ Common Separate
 -dumpbase <file>	Set the file basename to be used for dumps
 
 fPIC
-Common
+Common Report Var(flag_pic,2)
 
 fPIE
-Common
+Common Report Var(flag_pie,2)
 
 fabi-version=
-Common Joined UInteger
+Common Joined UInteger Var(flag_abi_version) Init(2)
 
 falign-functions
-Common
+Common Report Var(align_functions,0)
 Align the start of functions
 
 falign-functions=
 Common RejectNegative Joined UInteger
 
 falign-jumps
-Common
+Common Report Var(align_jumps,0)
 Align labels which are only reached by jumping
 
 falign-jumps=
 Common RejectNegative Joined UInteger
 
 falign-labels
-Common
+Common Report Var(align_labels,0)
 Align all labels
 
 falign-labels=
 Common RejectNegative Joined UInteger
 
 falign-loops
-Common
+Common Report Var(align_loops)
 Align the start of loops
 
 falign-loops=
 Common RejectNegative Joined UInteger
 
 fargument-alias
-Common
+Common Report Var(flag_argument_noalias,0)
 Specify that arguments may alias each other and globals
 
 fargument-noalias
-Common
+Common Report Var(flag_argument_noalias,1) VarExists
 Assume arguments may alias globals but not each other
 
 fargument-noalias-global
-Common
+Common Report Var(flag_argument_noalias,2) VarExists
 Assume arguments alias neither each other nor globals
 
 fasynchronous-unwind-tables
-Common
+Common Report Var(flag_asynchronous_unwind_tables)
 Generate unwind tables that are exact at each instruction boundary
 
 fbounds-check
-Common
+Common Report Var(flag_bounds_check)
 Generate code to check bounds before indexing arrays
 
 fbranch-count-reg
-Common
+Common Report Var(flag_branch_on_count_reg) Init(1)
 Replace add, compare, branch with branch on count register
 
 fbranch-probabilities
-Common
+Common Report Var(flag_branch_probabilities)
 Use profiling information for branch probabilities
 
 fbranch-target-load-optimize
-Common
+Common Report Var(flag_branch_target_load_optimize)
 Perform branch target load optimization before prologue / epilogue threading
 
 fbranch-target-load-optimize2
-Common
+Common Report Var(flag_branch_target_load_optimize2)
 Perform branch target load optimization after prologue / epilogue threading
 
 fbtr-bb-exclusive
-Common
+Common Report Var(flag_btr_bb_exclusive)
 Restrict target load migration not to re-use registers in any basic block
 
 fcall-saved-
@@ -267,43 +268,43 @@ Common Joined RejectNegative
 -fcall-used-<register>	Mark <register> as being corrupted by function calls
 
 fcaller-saves
-Common
+Common Report Var(flag_caller_saves)
 Save registers around function calls
 
 fcommon
-Common
+Common Report Var(flag_no_common,0)
 Do not put uninitialized globals in the common section
 
 fcprop-registers
-Common
+Common Report Var(flag_cprop_registers)
 Perform a register copy-propagation optimization pass
 
 fcrossjumping
-Common
+Common Report Var(flag_crossjumping)
 Perform cross-jumping optimization
 
 fcse-follow-jumps
-Common
+Common Report Var(flag_cse_follow_jumps)
 When running CSE, follow jumps to their targets
 
 fcse-skip-blocks
-Common
+Common Report Var(flag_cse_skip_blocks)
 When running CSE, follow conditional jumps
 
 fdata-sections
-Common
+Common Report Var(flag_data_sections)
 Place data items into their own section
 
 fdefer-pop
-Common
+Common Report Var(flag_defer_pop)
 Defer popping functions args from stack until later
 
 fdelayed-branch
-Common
+Common Report Var(flag_delayed_branch)
 Attempt to fill delay slots of branch instructions
 
 fdelete-null-pointer-checks
-Common
+Common Report Var(flag_delete_null_pointer_checks)
 Delete useless null pointer checks
 
 fdiagnostics-show-location=
@@ -315,34 +316,34 @@ Common Joined RejectNegative
 -fdump-<type>	Dump various compiler internals to a file
 
 fdump-unnumbered
-Common
+Common Report Var(flag_dump_unnumbered) VarExists
 Suppress output of instruction numbers and line number notes in debugging dumps
 
 feliminate-dwarf2-dups
-Common
+Common Report Var(flag_eliminate_dwarf2_dups)
 Perform DWARF2 duplicate elimination
 
 feliminate-unused-debug-symbols
-Common
+Common Report Var(flag_debug_only_used_symbols)
 Perform unused type elimination in debug info
 
 feliminate-unused-debug-types
-Common
+Common Report Var(flag_eliminate_unused_debug_types) Init(1)
 Perform unused type elimination in debug info
 
 fexceptions
-Common
+Common Report Var(flag_exceptions)
 Enable exception handling
 
 fexpensive-optimizations
-Common
+Common Report Var(flag_expensive_optimizations)
 Perform a number of minor, expensive optimizations
 
 ffast-math
 Common
 
 ffinite-math-only
-Common
+Common Report Var(flag_finite_math_only)
 Assume no NaNs or infinities are generated
 
 ffixed-
@@ -350,73 +351,73 @@ Common Joined RejectNegative
 -ffixed-<register>	Mark <register> as being unavailable to the compiler
 
 ffloat-store
-Common
+Common Report Var(flag_float_store)
 Do not store floats in registers
 
 fforce-addr
-Common
+Common Report Var(flag_force_addr)
 Copy memory address constants into registers before use
 
 fforce-mem
-Common
+Common Report Var(flag_force_mem)
 Copy memory operands into registers before use
 
 ffunction-cse
-Common
+Common Report Var(flag_no_function_cse,0)
 Allow function addresses to be held in registers
 
 ffunction-sections
-Common
+Common Report Var(flag_function_sections)
 Place each function into its own section
 
 fgcse
-Common
+Common Report Var(flag_gcse)
 Perform global common subexpression elimination
 
 fgcse-lm
-Common
+Common Report Var(flag_gcse_lm) Init(1)
 Perform enhanced load motion during global common subexpression elimination
 
 fgcse-sm
-Common
+Common Report Var(flag_gcse_sm) Init(1)
 Perform store motion after global common subexpression elimination
 
 fgcse-las
-Common
+Common Report Var(flag_gcse_las) Init(1)
 Perform redundant load after store elimination in global common subexpression
 elimination
 
 fgcse-after-reload
-Common
+Common Report Var(flag_gcse_after_reload)
 Perform global common subexpression elimination after register allocation
 has finished.
 
 fguess-branch-probability
-Common
+Common Report Var(flag_guess_branch_prob)
 Enable guessing of branch probabilities
 
 fident
-Common
+Common Report Var(flag_no_ident,0)
 Process #ident directives
 
 fif-conversion
-Common
+Common Report Var(flag_if_conversion)
 Perform conversion of conditional jumps to branchless equivalents
 
 fif-conversion2
-Common
+Common Report Var(flag_if_conversion2)
 Perform conversion of conditional jumps to conditional execution
 
 finhibit-size-directive
-Common
+Common Report Var(flag_inhibit_size_directive)
 Do not generate .size directives
 
 finline
-Common
+Common Report Var(flag_no_inline,0) Init(2)
 Pay attention to the \"inline\" keyword
 
 finline-functions
-Common
+Common Report Var(flag_inline_functions)
 Integrate simple functions into their callers
 
 finline-limit-
@@ -427,39 +428,39 @@ Common RejectNegative Joined UInteger
 -finline-limit=<number>	Limit the size of inlined functions to <number>
 
 finstrument-functions
-Common
+Common Report Var(flag_instrument_function_entry_exit)
 Instrument function entry and exit with profiling calls
 
 fkeep-inline-functions
-Common
+Common Report Var(flag_keep_inline_functions)
 Generate code for functions even if they are fully inlined
 
 fkeep-static-consts
-Common
+Common Report Var(flag_keep_static_consts) Init(1)
 Emit static const variables even if they are not used
 
 fleading-underscore
-Common
+Common Report Var(flag_leading_underscore) Init(-1)
 Give external symbols a leading underscore
 
 floop-optimize
-Common
+Common Report Var(flag_loop_optimize)
 Perform loop optimizations
 
 fmath-errno
-Common
+Common Report Var(flag_errno_math) Init(1)
 Set errno after built-in math functions
 
 fmem-report
-Common
+Common Report Var(mem_report)
 Report on permanent memory allocation
 
 fmerge-all-constants
-Common
+Common Report Var(flag_merge_constants,2) Init(1)
 Attempt to merge identical constants and constant variables
 
 fmerge-constants
-Common
+Common Report Var(flag_merge_constants,1) VarExists
 Attempt to merge identical constants across compilation units
 
 fmessage-length=
@@ -467,91 +468,91 @@ Common RejectNegative Joined UInteger
 -fmessage-length=<number>	Limit diagnostics to <number> characters per line.  0 suppresses line-wrapping
 
 fmodulo-sched
-Common
+Common Report Var(flag_modulo_sched)
 Perform SMS based modulo scheduling before the first scheduling pass
 
 fmove-all-movables
-Common
+Common Report Var(flag_move_all_movables)
 Force all loop invariant computations out of loops
 
 fmudflap
-Common RejectNegative
+Common RejectNegative Report Var(flag_mudflap)
 Add mudflap bounds-checking instrumentation for single-threaded program.
 
 fmudflapth
-Common RejectNegative
+Common RejectNegative Report Var(flag_mudflap_threads)
 Add mudflap bounds-checking instrumentation for multi-threaded program.
 
 fmudflapir
-Common RejectNegative
+Common RejectNegative Report Var(flag_mudflap_ignore_reads)
 Ignore read operations when inserting mudflap instrumentation.
 
 fnew-ra
-Common
+Common Report Var(flag_new_regalloc)
 Use graph-coloring register allocation
 
 fnon-call-exceptions
-Common
+Common Report Var(flag_non_call_exceptions)
 Support synchronous non-call exceptions
 
 fold-unroll-loops
-Common
+Common Report Var(flag_old_unroll_loops)
 Perform loop unrolling when iteration count is known
 
 fold-unroll-all-loops
-Common
+Common Report Var(flag_old_unroll_all_loops)
 Perform loop unrolling for all loops
 
 fomit-frame-pointer
-Common
+Common Report Var(flag_omit_frame_pointer)
 When possible do not generate stack frames
 
 foptimize-register-move
-Common
+Common Report Var(flag_regmove)
 Do the full register move optimization pass
 
 foptimize-sibling-calls
-Common
+Common Report Var(flag_optimize_sibling_calls)
 Optimize sibling and tail recursive calls
 
 fpack-struct
-Common
+Common Report Var(flag_pack_struct)
 Pack structure members together without holes
 
 fpcc-struct-return
-Common
+Common Report Var(flag_pcc_struct_return,1) VarExists
 Return small aggregates in memory, not registers
 
 fpeel-loops
-Common
+Common Report Var(flag_peel_loops)
 Perform loop peeling
 
 fpeephole
-Common
+Common Report Var(flag_no_peephole,0)
 Enable machine specific peephole optimizations
 
 fpeephole2
-Common
+Common Report Var(flag_peephole2)
 Enable an RTL peephole pass before sched2
 
 fpic
-Common
+Common Report Var(flag_pic,1) VarExists
 Generate position-independent code if possible
 
 fpie
-Common
+Common Report Var(flag_pie,1) VarExists
 Generate position-independent code for executables if possible
 
 fprefetch-loop-arrays
-Common
+Common Report Var(flag_prefetch_loop_arrays)
 Generate prefetch instructions, if available, for arrays in loops
 
 fprofile
-Common
+Common Report Var(profile_flag)
 Enable basic program profiling code
 
 fprofile-arcs
-Common
+Common Report Var(profile_arc_flag)
 Insert arc-based program profiling code
 
 fprofile-generate
@@ -563,7 +564,7 @@ Common
 Enable common options for performing profile feedback directed optimizations
 
 fprofile-values
-Common
+Common Report Var(flag_profile_values)
 Insert code to profile values of expressions
 
 frandom-seed
@@ -574,59 +575,59 @@ Common Joined RejectNegative
 -frandom-seed=<string>	Make compile reproducible using <string>
 
 freduce-all-givs
-Common
+Common Report Var(flag_reduce_all_givs)
 Strength reduce all loop general induction variables
 
 freg-struct-return
-Common
+Common Report Var(flag_pcc_struct_return,0) VarExists
 Return small aggregates in registers
 
 fregmove
-Common
+Common Report Var(flag_regmove)
 Enables a register move optimization
 
 frename-registers
-Common
+Common Report Var(flag_rename_registers)
 Perform a register renaming optimization pass
 
 freorder-blocks
-Common
+Common Report Var(flag_reorder_blocks)
 Reorder basic blocks to improve code placement
 
 freorder-blocks-and-partition
-Common
+Common Report Var(flag_reorder_blocks_and_partition)
 Reorder basic blocks and partition into hot and cold sections
 
 freorder-functions
-Common
+Common Report Var(flag_reorder_functions)
 Reorder functions to improve code placement
 
 frerun-cse-after-loop
-Common
+Common Report Var(flag_rerun_cse_after_loop)
 Add a common subexpression elimination pass after loop optimizations
 
 frerun-loop-opt
-Common
+Common Report Var(flag_rerun_loop_opt)
 Run the loop optimizer twice
 
 frounding-math
-Common
+Common Report Var(flag_rounding_math)
 Disable optimizations that assume default FP rounding behavior
 
 fsched-interblock
-Common
+Common Report Var(flag_schedule_interblock) Init(1)
 Enable scheduling across basic blocks
 
 fsched-spec
-Common
+Common Report Var(flag_schedule_speculative) Init(1)
 Allow speculative motion of non-loads
 
 fsched-spec-load
-Common
+Common Report Var(flag_schedule_speculative_load)
 Allow speculative motion of some loads
 
 fsched-spec-load-dangerous
-Common
+Common Report Var(flag_schedule_speculative_load_dangerous)
 Allow speculative motion of more loads
 
 fsched-verbose=
@@ -634,23 +635,23 @@ Common RejectNegative Joined
 -fsched-verbose=<number>	Set the verbosity level of the scheduler
 
 fsched2-use-superblocks
-Common
+Common Report Var(flag_sched2_use_superblocks)
 If scheduling post reload, do superblock scheduling
 
 fsched2-use-traces
-Common
+Common Report Var(flag_sched2_use_traces)
 If scheduling post reload, do trace scheduling
 
 fschedule-insns
-Common
+Common Report Var(flag_schedule_insns)
 Reschedule instructions before register allocation
 
 fschedule-insns2
-Common
+Common Report Var(flag_schedule_insns_after_reload)
 Reschedule instructions after register allocation
 
 fsched-stalled-insns
-Common
+Common Report Var(flag_sched_stalled_insns)
 Allow premature scheduling of queued insns
 
 fsched-stalled-insns=
@@ -658,7 +659,7 @@ Common RejectNegative Joined UInteger
 -fsched-stalled-insns=<number>       Set number of queued insns that can be prematurely scheduled
 
 fsched-stalled-insns-dep
-Common
+Common Report Var(flag_sched_stalled_insns_dep,1) Init(1)
 Set dependence distance checking in premature scheduling of queued insns
 
 fsched-stalled-insns-dep=
@@ -666,19 +667,19 @@ Common RejectNegative Joined UInteger
 -fsched-stalled-insns-dep=<number>   Set dependence distance checking in premature scheduling of queued insns
 
 fshared-data
-Common
+Common Report Var(flag_shared_data)
 Mark data as shared rather than private
 
 fsignaling-nans
-Common
+Common Report Var(flag_signaling_nans)
 Disable optimizations observable by IEEE signaling NaNs
 
 fsingle-precision-constant
-Common
+Common Report Var(flag_single_precision_constant)
 Convert floating point constants to single precision constants
 
 fstack-check
-Common
+Common Report Var(flag_stack_check)
 Insert stack checking code into the program
 
 fstack-limit
@@ -693,27 +694,27 @@ Common RejectNegative Joined
 -fstack-limit-symbol=<name>	Trap if the stack goes past symbol <name>
 
 fstrength-reduce
-Common
+Common Report Var(flag_strength_reduce)
 Perform strength reduction optimizations
 
 fstrict-aliasing
-Common
+Common Report Var(flag_strict_aliasing)
 Assume strict aliasing rules apply
 
 fsyntax-only
-Common
+Common Report Var(flag_syntax_only)
 Check for syntax errors, then stop
 
 ftest-coverage
-Common
+Common Report Var(flag_test_coverage)
 Create data files needed by \"gcov\"
 
 fthread-jumps
-Common
+Common Report Var(flag_thread_jumps)
 Perform jump threading optimizations
 
 ftime-report
-Common
+Common Report Var(time_report)
 Report the time taken by each compiler pass
 
 ftls-model=
@@ -721,114 +722,114 @@ Common Joined RejectNegative
 -ftls-model=[global-dynamic|local-dynamic|initial-exec|local-exec]	Set the default thread-local storage code generation model
 
 ftracer
-Common
+Common Report Var(flag_tracer)
 Perform superblock formation via tail duplication
 
 ftrapping-math
-Common
+Common Report Var(flag_trapping_math)
 Assume floating-point operations can trap
 
 ftrapv
-Common
+Common Report Var(flag_trapv)
 Trap for signed overflow in addition, subtraction and multiplication
 
 ftree-based-profiling
-Common
+Common Report Var(flag_tree_based_profiling)
 Use tree-ssa based implementation of profiling
 
 ftree-ccp
-Common
+Common Report Var(flag_tree_ccp)
 Enable SSA-CCP optimization on trees
 
 ftree-ch
-Common
+Common Report Var(flag_tree_ch)
 Enable loop header copying on trees
 
 ftree-combine-temps
-Common
+Common Report Var(flag_tree_combine_temps)
 Coalesce memory temporaries in the SSA->normal pass
 
 ftree-copyrename
-Common
+Common Report Var(flag_tree_copyrename)
 Replace SSA temporaries with better names in copies.
 
 ftree-dce
-Common
+Common Report Var(flag_tree_dce)
 Enable SSA dead code elimination optimization on trees
 
 ftree-dominator-opts
-Common
+Common Report Var(flag_tree_dom)
 Enable dominator optimizations
 
 ftree-dse
-Common
+Common Report Var(flag_tree_dse)
 Enable dead store elimination
 
 ftree-points-to=
 Common Joined RejectNegative
 
 ftree-pre
-Common
+Common Report Var(flag_tree_pre)
 Enable SSA-PRE optimization on trees
 
 ftree-sra
-Common
+Common Report Var(flag_tree_sra)
 Perform scalar replacement of aggregates
 
 ftree-ter
-Common
+Common Report Var(flag_tree_ter)
 Replace temporary expressions in the SSA->normal pass
 
 ftree-lrs
-Common
+Common Report Var(flag_tree_live_range_split)
 Perform live range splitting during the SSA->normal pass.
 
 funit-at-a-time
-Common
+Common Report Var(flag_unit_at_a_time)
 Compile whole compilation unit at a time
 
 funroll-loops
-Common
+Common Report Var(flag_unroll_loops)
 Perform loop unrolling when iteration count is known
 
 funroll-all-loops
-Common
+Common Report Var(flag_unroll_all_loops)
 Perform loop unrolling for all loops
 
 funsafe-math-optimizations
-Common
+Common Report Var(flag_unsafe_math_optimizations)
 Allow math optimizations that may violate IEEE or ISO standards
 
 funswitch-loops
-Common
+Common Report Var(flag_unswitch_loops)
 Perform loop unswitching
 
 funwind-tables
-Common
+Common Report Var(flag_unwind_tables)
 Just generate unwind tables for exception handling
 
 fvar-tracking
-Common
+Common Report Var(flag_var_tracking) VarExists
 Perform variable tracking
 
 fverbose-asm
-Common
+Common Report Var(flag_verbose_asm)
 Add extra commentary to assembler output
 
 fvpt
-Common
+Common Report Var(flag_value_profile_transformations)
 Use expression value profiles in optimizations
 
 fweb
-Common
+Common Report Var(flag_web) VarExists
 Construct webs and split unrelated uses of single variable
 
 fwrapv
-Common
+Common Report Var(flag_wrapv)
 Assume signed arithmetic overflow wraps around
 
 fzero-initialized-in-bss
-Common
+Common Report Var(flag_zero_initialized_in_bss) Init(1)
 Put zero initialized data in the bss section
 
 g
@@ -875,11 +876,11 @@ Common Joined Separate
 -o <file>	Place output into <file>
 
 p
-Common
+Common Var(profile_flag)
 Enable function profiling
 
 pedantic
-Common
+Common Var(pedantic)
 Issue warnings needed for strict compliance to the standard
 
 pedantic-errors
@@ -887,15 +888,15 @@ Common
 Like -pedantic but issue them as errors
 
 quiet
-Common
+Common Var(quiet_flag)
 Do not display functions compiled or elapsed time
 
 version
-Common
+Common Var(version_flag)
 Display the compiler's version
 
 w
-Common
+Common Var(inhibit_warnings)
 Suppress warnings
 
 ; This comment is to ensure we retain the blank line above.

gcc/diagnostic.c

@@ -68,7 +68,6 @@ diagnostic_context *global_dc = &global_diagnostic_context;
 with preprocessed source if appropriate.\n\
 See %s for instructions.\n"
 
-int flag_fatal_errors = 0;
 
 /* Return a malloc'd string containing MSG formatted a la printf.  The
    caller is responsible for freeing the memory.  */

gcc/except.c

@@ -82,9 +82,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #endif
 
 
-/* Nonzero means enable synchronous exceptions for non-call instructions.  */
-int flag_non_call_exceptions;
-
 /* Protect cleanup actions with must-not-throw regions, with a call
    to the given failure handler.  */
 tree (*lang_protect_cleanup_actions) (void);

gcc/flags.h

@@ -23,6 +23,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #ifndef GCC_FLAGS_H
 #define GCC_FLAGS_H
 
+#include "options.h"
+
 enum debug_info_type
 {
   NO_DEBUG,	    /* Write no debug info.  */
@@ -78,80 +80,26 @@ extern int quiet_flag;
 
 extern int mem_report;
 
-/* Don't print warning messages.  -w.  */
-
-extern bool inhibit_warnings;
-
-/* Don't suppress warnings from system headers.  -Wsystem-headers.  */
-
-extern bool warn_system_headers;
-
 /* Do print extra warnings (such as for uninitialized variables).
    -W/-Wextra.  */
 
 extern bool extra_warnings;
 
-/* If -Werror.  */
-
-extern bool warnings_are_errors;
-
 /* Nonzero to warn about unused variables, functions et.al.  Use
    set_Wunused() to update the -Wunused-* flags that correspond to the
    -Wunused option.  */
 
 extern void set_Wunused (int setting);
 
-extern bool warn_unused_function;
-extern bool warn_unused_label;
-extern bool warn_unused_parameter;
-extern bool warn_unused_variable;
-extern bool warn_unused_value;
-
-/* Nonzero to warn about code which is never reached.  */
-
-extern bool warn_notreached;
-
-/* Nonzero means warn if inline function is too large.  */
-
-extern bool warn_inline;
-
 /* Nonzero to warn about variables used before they are initialized.  */
 
 extern int warn_uninitialized;
 
-/* Nonzero means warn about all declarations which shadow others.  */
-
-extern bool warn_shadow;
-
-/* Warn if a switch on an enum, that does not have a default case,
-   fails to have a case for every enum value.  */
-
-extern bool warn_switch;
-
-/* Warn if a switch does not have a default case.  */
-
-extern bool warn_switch_default;
-
-/* Warn if a switch on an enum fails to have a case for every enum
-   value (regardless of the presence or otherwise of a default case).  */
-
-extern bool warn_switch_enum;
-
 /* Nonzero means warn about function definitions that default the return type
    or that use a null return and have a return-type other than void.  */
 
 extern int warn_return_type;
 
-/* Warn about functions which might be candidates for attribute noreturn.  */
-
-extern bool warn_missing_noreturn;
-
-/* Nonzero means warn about pointer casts that increase the required
-   alignment of the target type (and might therefore lead to a crash
-   due to a misaligned access).  */
-
-extern bool warn_cast_align;
-
 /* Nonzero means warn about any objects definitions whose size is larger
    than N bytes.  Also want about function definitions whose returned
    values are larger than N bytes. The value N is in `larger_than_size'.  */
@@ -159,28 +107,6 @@ extern bool warn_cast_align;
 extern bool warn_larger_than;
 extern HOST_WIDE_INT larger_than_size;
 
-/* Warn if a function returns an aggregate,
-   since there are often incompatible calling conventions for doing this.  */
-
-extern bool warn_aggregate_return;
-
-/* Warn if packed attribute on struct is unnecessary and inefficient.  */
-
-extern bool warn_packed;
-
-/* Warn when gcc pads a structure to an alignment boundary.  */
-
-extern bool warn_padded;
-
-/* Warn when an optimization pass is disabled.  */
-
-extern bool warn_disabled_optimization;
-
-/* Nonzero means warn about uses of __attribute__((deprecated)) 
-   declarations.  */
-
-extern bool warn_deprecated_decl;
-
 /* Nonzero means warn about constructs which might not be strict
    aliasing safe.  */
 

gcc/opts.c

@@ -46,86 +46,19 @@ bool g_switch_set;
 /* True if we should exit after parsing options.  */
 bool exit_after_options;
 
-/* If -version.  */
-bool version_flag;
-
 /* Print various extra warnings.  -W/-Wextra.  */
 bool extra_warnings;
 
-/* Don't print warning messages.  -w.  */
-bool inhibit_warnings;
-
-/* Treat warnings as errors.  -Werror.  */
-bool warnings_are_errors;
-
-/* Warn if a function returns an aggregate, since there are often
-   incompatible calling conventions for doing this.  */
-bool warn_aggregate_return;
-
-/* Nonzero means warn about pointer casts that increase the required
-   alignment of the target type (and might therefore lead to a crash
-   due to a misaligned access).  */
-bool warn_cast_align;
-
-/* Nonzero means warn about uses of __attribute__((deprecated))
-   declarations.  */
-bool warn_deprecated_decl = true;
-
-/* Warn when an optimization pass is disabled.  */
-bool warn_disabled_optimization;
-
-/* Nonzero means warn if inline function is too large.  */
-bool warn_inline;
-
 /* True to warn about any objects definitions whose size is larger
    than N bytes.  Also want about function definitions whose returned
    values are larger than N bytes, where N is `larger_than_size'.  */
 bool warn_larger_than;
 HOST_WIDE_INT larger_than_size;
 
-/* Warn about functions which might be candidates for attribute noreturn.  */
-bool warn_missing_noreturn;
-
-/* True to warn about code which is never reached.  */
-bool warn_notreached;
-
-/* Warn if packed attribute on struct is unnecessary and inefficient.  */
-bool warn_packed;
-
-/* Warn when gcc pads a structure to an alignment boundary.  */
-bool warn_padded;
-
-/* True means warn about all declarations which shadow others.  */
-bool warn_shadow;
-
 /* Nonzero means warn about constructs which might not be
    strict-aliasing safe.  */
 int warn_strict_aliasing;
 
-/* True to warn if a switch on an enum, that does not have a default
-   case, fails to have a case for every enum value.  */
-bool warn_switch;
-
-/* Warn if a switch does not have a default case.  */
-bool warn_switch_default;
-
-/* Warn if a switch on an enum fails to have a case for every enum
-   value (regardless of the presence or otherwise of a default case).  */
-bool warn_switch_enum;
-
-/* Don't suppress warnings from system headers.  -Wsystem-headers.  */
-bool warn_system_headers;
-
-/* True to warn about variables used before they are initialized.  */
-int warn_uninitialized;
-
-/* True to warn about unused variables, functions et.al.  */
-bool warn_unused_function;
-bool warn_unused_label;
-bool warn_unused_parameter;
-bool warn_unused_variable;
-bool warn_unused_value;
-
 /* Hack for cooperation between set_Wunused and set_Wextra.  */
 static bool maybe_warn_unused_parameter;
 
@@ -420,6 +353,19 @@ handle_option (const char **argv, unsigned int lang_mask)
 	}
     }
 
+  if (option->flag_var)
+    {
+      if (option->has_set_value)
+	{
+	  if (value)
+	    *option->flag_var = option->set_value;
+	  else
+	    *option->flag_var = !option->set_value;
+	}
+      else
+	*option->flag_var = value;
+    }
+  
   if (option->flags & lang_mask)
     if (lang_hooks.handle_option (opt_index, arg, value) == 0)
       result = 0;
@@ -691,18 +637,17 @@ decode_options (unsigned int argc, const char **argv)
 }
 
 /* Handle target- and language-independent options.  Return zero to
-   generate an "unknown option" message.  */
+   generate an "unknown option" message.  Only options that need
+   extra handling need to be listed here; if you simply want
+   VALUE assigned to a variable, it happens automatically.  */
+
 static int
-common_handle_option (size_t scode, const char *arg,
-		      int value ATTRIBUTE_UNUSED)
+common_handle_option (size_t scode, const char *arg, int value)
 {
   enum opt_code code = (enum opt_code) scode;
 
   switch (code)
     {
-    default:
-      abort ();
-
     case OPT__help:
       print_help ();
       exit_after_options = true;
@@ -737,112 +682,24 @@ common_handle_option (size_t scode, const char *arg,
       set_Wextra (value);
       break;
 
-    case OPT_Waggregate_return:
-      warn_aggregate_return = value;
-      break;
-
-    case OPT_Wcast_align:
-      warn_cast_align = value;
-      break;
-
-    case OPT_Wdeprecated_declarations:
-      warn_deprecated_decl = value;
-      break;
-
-    case OPT_Wdisabled_optimization:
-      warn_disabled_optimization = value;
-      break;
-
-    case OPT_Werror:
-      warnings_are_errors = value;
-      break;
-
     case OPT_Wextra:
       set_Wextra (value);
       break;
 
-    case OPT_Wfatal_errors:
-      flag_fatal_errors = value;
-      break;
-
-    case OPT_Winline:
-      warn_inline = value;
-      break;
-
     case OPT_Wlarger_than_:
       larger_than_size = value;
       warn_larger_than = value != -1;
       break;
 
-    case OPT_Wmissing_noreturn:
-      warn_missing_noreturn = value;
-      break;
-
-    case OPT_Wpacked:
-      warn_packed = value;
-      break;
-
-    case OPT_Wpadded:
-      warn_padded = value;
-      break;
-
-    case OPT_Wshadow:
-      warn_shadow = value;
-      break;
-
     case OPT_Wstrict_aliasing:
     case OPT_Wstrict_aliasing_:
       warn_strict_aliasing = value;
       break;
 
-    case OPT_Wswitch:
-      warn_switch = value;
-      break;
-
-    case OPT_Wswitch_default:
-      warn_switch_default = value;
-      break;
-
-    case OPT_Wswitch_enum:
-      warn_switch_enum = value;
-      break;
-
-    case OPT_Wsystem_headers:
-      warn_system_headers = value;
-      break;
-
-    case OPT_Wuninitialized:
-      warn_uninitialized = value;
-      break;
-
-    case OPT_Wunreachable_code:
-      warn_notreached = value;
-      break;
-
     case OPT_Wunused:
       set_Wunused (value);
       break;
 
-    case OPT_Wunused_function:
-      warn_unused_function = value;
-      break;
-
-    case OPT_Wunused_label:
-      warn_unused_label = value;
-      break;
-
-    case OPT_Wunused_parameter:
-      warn_unused_parameter = value;
-      break;
-
-    case OPT_Wunused_value:
-      warn_unused_value = value;
-      break;
-
-    case OPT_Wunused_variable:
-      warn_unused_variable = value;
-      break;
-
     case OPT_aux_info:
     case OPT_aux_info_:
       aux_info_file_name = arg;
@@ -870,89 +727,24 @@ common_handle_option (size_t scode, const char *arg,
       dump_base_name = arg;
       break;
 
-    case OPT_fPIC:
-      flag_pic = value + value;
-      break;
-
-    case OPT_fPIE:
-      flag_pie = value + value;
-      break;
-
-    case OPT_fabi_version_:
-      flag_abi_version = value;
-      break;
-
-    case OPT_falign_functions:
-      align_functions = !value;
-      break;
-
     case OPT_falign_functions_:
       align_functions = value;
       break;
 
-    case OPT_falign_jumps:
-      align_jumps = !value;
-      break;
-
     case OPT_falign_jumps_:
       align_jumps = value;
       break;
 
-    case OPT_falign_labels:
-      align_labels = !value;
-      break;
-
     case OPT_falign_labels_:
       align_labels = value;
       break;
 
-    case OPT_falign_loops:
-      align_loops = !value;
-      break;
-
     case OPT_falign_loops_:
       align_loops = value;
       break;
 
-    case OPT_fargument_alias:
-      flag_argument_noalias = !value;
-      break;
-
-    case OPT_fargument_noalias:
-      flag_argument_noalias = value;
-      break;
-
-    case OPT_fargument_noalias_global:
-      flag_argument_noalias = value + value;
-      break;
-
-    case OPT_fasynchronous_unwind_tables:
-      flag_asynchronous_unwind_tables = value;
-      break;
-
-    case OPT_fbounds_check:
-      flag_bounds_check = value;
-      break;
-
-    case OPT_fbranch_count_reg:
-      flag_branch_on_count_reg = value;
-      break;
-
     case OPT_fbranch_probabilities:
       flag_branch_probabilities_set = true;
-      flag_branch_probabilities = value;
-      break;
-
-    case OPT_fbranch_target_load_optimize:
-      flag_branch_target_load_optimize = value;
-      break;
-
-    case OPT_fbranch_target_load_optimize2:
-      flag_branch_target_load_optimize2 = value;
-      break;
-
-    case OPT_fbtr_bb_exclusive:
-      flag_btr_bb_exclusive = value;
       break;
 
     case OPT_fcall_used_:
@@ -963,46 +755,6 @@ common_handle_option (size_t scode, const char *arg,
       fix_register (arg, 0, 0);
       break;
 
-    case OPT_fcaller_saves:
-      flag_caller_saves = value;
-      break;
-
-    case OPT_fcommon:
-      flag_no_common = !value;
-      break;
-
-    case OPT_fcprop_registers:
-      flag_cprop_registers = value;
-      break;
-
-    case OPT_fcrossjumping:
-      flag_crossjumping = value;
-      break;
-
-    case OPT_fcse_follow_jumps:
-      flag_cse_follow_jumps = value;
-      break;
-
-    case OPT_fcse_skip_blocks:
-      flag_cse_skip_blocks = value;
-      break;
-
-    case OPT_fdata_sections:
-      flag_data_sections = value;
-      break;
-
-    case OPT_fdefer_pop:
-      flag_defer_pop = value;
-      break;
-
-    case OPT_fdelayed_branch:
-      flag_delayed_branch = value;
-      break;
-
-    case OPT_fdelete_null_pointer_checks:
-      flag_delete_null_pointer_checks = value;
-      break;
-
     case OPT_fdiagnostics_show_location_:
       if (!strcmp (arg, "once"))
 	diagnostic_prefixing_rule (global_dc) = DIAGNOSTICS_SHOW_PREFIX_ONCE;
@@ -1018,110 +770,14 @@ common_handle_option (size_t scode, const char *arg,
 	return 0;
       break;
 
-    case OPT_fdump_unnumbered:
-      flag_dump_unnumbered = value;
-      break;
-
-    case OPT_feliminate_dwarf2_dups:
-      flag_eliminate_dwarf2_dups = value;
-      break;
-
-    case OPT_feliminate_unused_debug_types:
-      flag_eliminate_unused_debug_types = value;
-      break;
-
-    case OPT_feliminate_unused_debug_symbols:
-      flag_debug_only_used_symbols = value;
-      break;
-
-    case OPT_fexceptions:
-      flag_exceptions = value;
-      break;
-
-    case OPT_fexpensive_optimizations:
-      flag_expensive_optimizations = value;
-      break;
-
     case OPT_ffast_math:
       set_fast_math_flags (value);
       break;
 
-    case OPT_ffinite_math_only:
-      flag_finite_math_only = value;
-      break;
-
     case OPT_ffixed_:
       fix_register (arg, 1, 1);
       break;
 
-    case OPT_ffunction_cse:
-      flag_no_function_cse = !value;
-      break;
-
-    case OPT_ffloat_store:
-      flag_float_store = value;
-      break;
-
-    case OPT_fforce_addr:
-      flag_force_addr = value;
-      break;
-
-    case OPT_fforce_mem:
-      flag_force_mem = value;
-      break;
-
-    case OPT_ffunction_sections:
-      flag_function_sections = value;
-      break;
-
-    case OPT_fgcse:
-      flag_gcse = value;
-      break;
-
-    case OPT_fgcse_lm:
-      flag_gcse_lm = value;
-      break;
-
-    case OPT_fgcse_sm:
-      flag_gcse_sm = value;
-      break;
-
-    case OPT_fgcse_after_reload:
-      flag_gcse_after_reload = value;
-      break;
-
-    case OPT_fgcse_las:
-      flag_gcse_las = value;
-      break;
-
-    case OPT_fguess_branch_probability:
-      flag_guess_branch_prob = value;
-      break;
-
-    case OPT_fident:
-      flag_no_ident = !value;
-      break;
-
-    case OPT_fif_conversion:
-      flag_if_conversion = value;
-      break;
-
-    case OPT_fif_conversion2:
-      flag_if_conversion2 = value;
-      break;
-
-    case OPT_finhibit_size_directive:
-      flag_inhibit_size_directive = value;
-      break;
-
-    case OPT_finline:
-      flag_no_inline = !value;
-      break;
-
-    case OPT_finline_functions:
-      flag_inline_functions = value;
-      break;
-
     case OPT_finline_limit_:
     case OPT_finline_limit_eq:
       set_param_value ("max-inline-insns-single", value / 2);
@@ -1129,131 +785,16 @@ common_handle_option (size_t scode, const char *arg,
       set_param_value ("max-inline-insns-rtl", value);
       break;
 
-    case OPT_finstrument_functions:
-      flag_instrument_function_entry_exit = value;
-      break;
-
-    case OPT_fkeep_inline_functions:
-      flag_keep_inline_functions =value;
-      break;
-
-    case OPT_fkeep_static_consts:
-      flag_keep_static_consts = value;
-      break;
-
-    case OPT_fleading_underscore:
-      flag_leading_underscore = value;
-      break;
-
-    case OPT_floop_optimize:
-      flag_loop_optimize = value;
-      break;
-
-    case OPT_fmath_errno:
-      flag_errno_math = value;
-      break;
-
-    case OPT_fmem_report:
-      mem_report = value;
-      break;
-
-    case OPT_fmerge_all_constants:
-      flag_merge_constants = value + value;
-      break;
-
-    case OPT_fmerge_constants:
-      flag_merge_constants = value;
-      break;
-
     case OPT_fmessage_length_:
       pp_set_line_maximum_length (global_dc->printer, value);
       break;
 
-    case OPT_fmove_all_movables:
-      flag_move_all_movables = value;
-      break;
-
-    case OPT_fmudflap:
-      flag_mudflap = value;
-      break;
-
-    case OPT_fmudflapth:
-      flag_mudflap = value;
-      flag_mudflap_threads = value;
-      break;
-
-    case OPT_fmudflapir:
-      flag_mudflap_ignore_reads = value;
-      break;
-
-    case OPT_fnew_ra:
-      flag_new_regalloc = value;
-      break;
-
-    case OPT_fnon_call_exceptions:
-      flag_non_call_exceptions = value;
-      break;
-
-    case OPT_fold_unroll_all_loops:
-      flag_old_unroll_all_loops = value;
-      break;
-
-    case OPT_fold_unroll_loops:
-      flag_old_unroll_loops = value;
-      break;
-
-    case OPT_fomit_frame_pointer:
-      flag_omit_frame_pointer = value;
-      break;
-
-    case OPT_foptimize_register_move:
-      flag_regmove = value;
-      break;
-
-    case OPT_foptimize_sibling_calls:
-      flag_optimize_sibling_calls = value;
-      break;
-
-    case OPT_fpack_struct:
-      flag_pack_struct = value;
-      break;
-
     case OPT_fpeel_loops:
       flag_peel_loops_set = true;
-      flag_peel_loops = value;
-      break;
-
-    case OPT_fpcc_struct_return:
-      flag_pcc_struct_return = value;
-      break;
-
-    case OPT_fpeephole:
-      flag_no_peephole = !value;
-      break;
-
-    case OPT_fpeephole2:
-      flag_peephole2 = value;
-      break;
-
-    case OPT_fpic:
-      flag_pic = value;
-      break;
-
-    case OPT_fpie:
-      flag_pie = value;
-      break;
-
-    case OPT_fprefetch_loop_arrays:
-      flag_prefetch_loop_arrays = value;
-      break;
-
-    case OPT_fprofile:
-      profile_flag = value;
       break;
 
     case OPT_fprofile_arcs:
       profile_arc_flag_set = true;
-      profile_arc_flag = value;
       break;
 
     case OPT_fprofile_use:
@@ -1282,12 +823,10 @@ common_handle_option (size_t scode, const char *arg,
 
     case OPT_fprofile_values:
       flag_profile_values_set = true;
-      flag_profile_values = value;
       break;
 
     case OPT_fvpt:
       flag_value_profile_transformations_set = value;
-      flag_value_profile_transformations = value;
       break;
 
     case OPT_frandom_seed:
@@ -1301,62 +840,6 @@ common_handle_option (size_t scode, const char *arg,
       flag_random_seed = arg;
       break;
 
-    case OPT_freduce_all_givs:
-      flag_reduce_all_givs = value;
-      break;
-
-    case OPT_freg_struct_return:
-      flag_pcc_struct_return = !value;
-      break;
-
-    case OPT_fregmove:
-      flag_regmove = value;
-      break;
-
-    case OPT_frename_registers:
-      flag_rename_registers = value;
-      break;
-
-    case OPT_freorder_blocks:
-      flag_reorder_blocks = value;
-      break;
-
-    case OPT_freorder_blocks_and_partition:
-      flag_reorder_blocks_and_partition = value;
-      break;
-  
-    case OPT_freorder_functions:
-      flag_reorder_functions = value;
-      break;
-
-    case OPT_frerun_cse_after_loop:
-      flag_rerun_cse_after_loop = value;
-      break;
-
-    case OPT_frerun_loop_opt:
-      flag_rerun_loop_opt = value;
-      break;
-
-    case OPT_frounding_math:
-      flag_rounding_math = value;
-      break;
-
-    case OPT_fsched_interblock:
-      flag_schedule_interblock = value;
-      break;
-
-    case OPT_fsched_spec:
-      flag_schedule_speculative = value;
-      break;
-
-    case OPT_fsched_spec_load:
-      flag_schedule_speculative_load = value;
-      break;
-
-    case OPT_fsched_spec_load_dangerous:
-      flag_schedule_speculative_load_dangerous = value;
-      break;
-
     case OPT_fsched_verbose_:
 #ifdef INSN_SCHEDULING
       fix_sched_param ("verbose", arg);
@@ -1365,57 +848,15 @@ common_handle_option (size_t scode, const char *arg,
       return 0;
 #endif
 
-    case OPT_fsched2_use_superblocks:
-      flag_sched2_use_superblocks = value;
-      break;
-
-    case OPT_fsched2_use_traces:
-      flag_sched2_use_traces = value;
-      break;
-
-    case OPT_fschedule_insns:
-      flag_schedule_insns = value;
-      break;
-
-    case OPT_fschedule_insns2:
-      flag_schedule_insns_after_reload = value;
-      break;
-
-    case OPT_fsched_stalled_insns:
-      flag_sched_stalled_insns = value;
-      break;
-
     case OPT_fsched_stalled_insns_:
       flag_sched_stalled_insns = value;
       if (flag_sched_stalled_insns == 0)
 	flag_sched_stalled_insns = -1;
       break;
 
-    case OPT_fsched_stalled_insns_dep:
-      flag_sched_stalled_insns_dep = 1;
-      break;
-
     case OPT_fsched_stalled_insns_dep_:
       flag_sched_stalled_insns_dep = value;
       break;
-    case OPT_fmodulo_sched:
-      flag_modulo_sched = 1;
-      break;
-    case OPT_fshared_data:
-      flag_shared_data = value;
-      break;
-
-    case OPT_fsignaling_nans:
-      flag_signaling_nans = value;
-      break;
-
-    case OPT_fsingle_precision_constant:
-      flag_single_precision_constant = value;
-      break;
-
-    case OPT_fstack_check:
-      flag_stack_check = value;
-      break;
 
     case OPT_fstack_limit:
       /* The real switch is -fno-stack-limit.  */
@@ -1438,30 +879,6 @@ common_handle_option (size_t scode, const char *arg,
       stack_limit_rtx = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (arg));
       break;
 
-    case OPT_fstrength_reduce:
-      flag_strength_reduce = value;
-      break;
-
-    case OPT_fstrict_aliasing:
-      flag_strict_aliasing = value;
-      break;
-
-    case OPT_fsyntax_only:
-      flag_syntax_only = value;
-      break;
-
-    case OPT_ftest_coverage:
-      flag_test_coverage = value;
-      break;
-
-    case OPT_fthread_jumps:
-      flag_thread_jumps = value;
-      break;
-
-    case OPT_ftime_report:
-      time_report = value;
-      break;
-
     case OPT_ftls_model_:
       if (!strcmp (arg, "global-dynamic"))
 	flag_tls_default = TLS_MODEL_GLOBAL_DYNAMIC;
@@ -1477,59 +894,6 @@ common_handle_option (size_t scode, const char *arg,
 
     case OPT_ftracer:
       flag_tracer_set = true;
-      flag_tracer = value;
-      break;
-
-    case OPT_ftrapping_math:
-      flag_trapping_math = value;
-      break;
-
-    case OPT_ftrapv:
-      flag_trapv = value;
-      break;
-
-    case OPT_ftree_based_profiling:
-      flag_tree_based_profiling = value;
-      break;
-
-    case OPT_ftree_ccp:
-      flag_tree_ccp = value;
-      break;
-
-    case OPT_ftree_dce:
-      flag_tree_dce = value;
-      break;
-
-    case OPT_ftree_combine_temps:
-      flag_tree_combine_temps = value;
-      break;
-
-    case OPT_ftree_ter:
-      flag_tree_ter = value;
-      break;
-
-    case OPT_ftree_lrs:
-      flag_tree_live_range_split = value;
-      break;
-
-    case OPT_ftree_dominator_opts:
-      flag_tree_dom = value;
-      break;
-
-    case OPT_ftree_copyrename:
-      flag_tree_copyrename = value;
-      break;
-
-    case OPT_ftree_ch:
-      flag_tree_ch = value;
-      break;
-
-    case OPT_ftree_dse:
-      flag_tree_dse = value;
-      break;
-
-    case OPT_ftree_sra:
-      flag_tree_sra = value;
       break;
 
     case OPT_ftree_points_to_:
@@ -1548,53 +912,8 @@ common_handle_option (size_t scode, const char *arg,
 	}
       break;
 
-    case OPT_ftree_pre:
-      flag_tree_pre = value;
-      break;
-
-    case OPT_funit_at_a_time:
-      flag_unit_at_a_time = value;
-      break;
-
-    case OPT_funroll_all_loops:
-      flag_unroll_all_loops = value;
-      break;
-
     case OPT_funroll_loops:
       flag_unroll_loops_set = true;
-      flag_unroll_loops = value;
-      break;
-
-    case OPT_funsafe_math_optimizations:
-      flag_unsafe_math_optimizations = value;
-      break;
-
-    case OPT_funswitch_loops:
-      flag_unswitch_loops = value;
-      break;
-
-    case OPT_funwind_tables:
-      flag_unwind_tables = value;
-      break;
-
-    case OPT_fvar_tracking:
-      flag_var_tracking = value;
-      break;
-
-    case OPT_fverbose_asm:
-      flag_verbose_asm = value;
-      break;
-
-    case OPT_fweb:
-      flag_web = value;
-      break;
-      
-    case OPT_fwrapv:
-      flag_wrapv = value;
-      break;
-
-    case OPT_fzero_initialized_in_bss:
-      flag_zero_initialized_in_bss = value;
       break;
 
     case OPT_g:
@@ -1635,29 +954,17 @@ common_handle_option (size_t scode, const char *arg,
       asm_file_name = arg;
       break;
 
-    case OPT_p:
-      profile_flag = 1;
-      break;
-
-    case OPT_pedantic:
-      pedantic = 1;
-      break;
-
     case OPT_pedantic_errors:
       flag_pedantic_errors = pedantic = 1;
       break;
 
-    case OPT_quiet:
-      quiet_flag = 1;
-      break;
-
-    case OPT_version:
-      version_flag = 1;
-      break;
+    default:
+      /* If the flag was handled in a standard way, assume the lack of
+	 processing here is intentional.  */
+      if (cl_options[scode].flag_var)
+	break;
 
-    case OPT_w:
-      inhibit_warnings = true;
-      break;      
+      abort ();
     }
 
   return 1;

gcc/opts.h

@@ -31,12 +31,16 @@ struct cl_option
   unsigned short back_chain;
   unsigned char opt_len;
   unsigned int flags;
+  int *flag_var;
+  int has_set_value;
+  int set_value;
 };
 
 extern const struct cl_option cl_options[];
 extern const unsigned int cl_options_count;
 extern const char *const lang_names[];
 
+#define CL_REPORT		(1 << 23) /* Report argument with -fverbose-asm  */
 #define CL_JOINED		(1 << 24) /* If takes joined argument.  */
 #define CL_SEPARATE		(1 << 25) /* If takes a separate argument.  */
 #define CL_REJECT_NEGATIVE	(1 << 26) /* Reject no- form.  */

gcc/opts.sh

@@ -66,9 +66,43 @@ ${AWK} '
         if (flags ~ " RejectNegative ") result = result " | CL_REJECT_NEGATIVE"
         if (flags ~ " UInteger ") result = result " | CL_UINTEGER"
         if (flags ~ " Undocumented ") result = result " | CL_UNDOCUMENTED"
+        if (flags ~ " Report ") result = result " | CL_REPORT"
 	sub( "^0 \\| ", "", result )
 	return result
     }
+    function var_args(flags)
+    {
+	if (flags !~ "Var\\(")
+	  return "";
+	sub(".*Var\\(", "", flags);
+	sub(").*", "", flags);
+
+	return flags;
+    }
+    function var_name(flags)
+    {
+	s = var_args(flags);
+	if (s == "")
+	  return "";
+	sub( ",.*", "", s);
+	return s;
+    }
+    function var_set(flags)
+    {
+	s = var_args(flags);
+	if (s !~ ",")
+	  return "0, 0";
+	sub( "[^,]*,", "", s);
+	return "1, " s;
+    }
+    function var_ref(flags)
+    {
+	name = var_name(flags);
+	if (name == "")
+	  return "0";
+	else
+	  return "&" name;
+    }
 
     BEGIN {
 	FS = "\034"
@@ -101,9 +135,38 @@ ${AWK} '
 	print "#include <intl.h>"			>> c_file
 	print "#include \"" realh_file "\""		>> c_file
 	print "#include \"opts.h\"\n"			>> c_file
-	print "const char * const lang_names[] =\n{"	>> c_file
 
 	print "/* This file is auto-generated by opts.sh.  */\n" > h_file
+	print "#ifndef OPTIONS_H"			>> h_file
+	print "#define OPTIONS_H\n"			>> h_file
+
+	for (i = 0; i < n_opts; i++) {
+	    name = var_name(flags[i]);
+	    if (name == "")
+	       continue;
+
+	    printf ("/* Set by -%s.\n   %s  */\nextern int %s;\n\n",
+	      opts[i], help[i], name)		>> h_file
+
+	    if (flags[i] ~ "VarExists")
+	      continue;
+
+	    if (flags[i] ~ "Init\\(")
+	      {
+		init = flags[i];
+		sub(".*Init\\(","",init);
+		sub("\\).*","",init);
+		init = " = " init;
+	      }
+	    else
+	      init = "";
+
+	    printf ("/* Set by -%s.\n   %s  */\nint %s%s;\n\n",
+		    opts[i], help[i], name,init)	>> c_file
+	    }
+
+
+	print "const char * const lang_names[] =\n{"	>> c_file
 	for (i = 0; i < n_langs; i++) {
 	    macros[i] = "CL_" langs[i]
 	    gsub( "[^A-Za-z0-9_]", "X", macros[i] )
@@ -114,6 +177,7 @@ ${AWK} '
 
 	print "  0\n};\n"				>> c_file
 	print "const unsigned int cl_options_count = N_OPTS;\n" >> c_file
+
 	print "const struct cl_option cl_options[] =\n{" >> c_file
 
 	print "\nenum opt_code\n{"			>> h_file
@@ -159,12 +223,14 @@ ${AWK} '
 	    	hlp = "N_(\"" help[i] "\")";
 
 	    printf("  %s,%s/* -%s */\n", enum, s, opts[i]) >> h_file
-	    printf("  { \"-%s\",\n    %s,\n    %s, %u, %s }%s\n",
+	    printf("  { \"-%s\",\n    %s,\n    %s, %u, %s, %s, %s }%s\n",
 		   opts[i], hlp, back_chain[i], len,
-		   switch_flags(flags[i]), comma)	>> c_file
+		   switch_flags(flags[i]),
+		   var_ref(flags[i]), var_set(flags[i]), comma)	>> c_file
 	}
 
-	print "  N_OPTS\n};"				>> h_file
+	print "  N_OPTS\n};\n"				>> h_file
+	print "#endif /* OPTIONS_H */"			>> h_file
 	print "};"					>> c_file
     }
 '

gcc/toplev.c

@@ -226,83 +226,11 @@ tree current_function_func_begin_label;
 
 tree current_file_decl;
 
-/* Nonzero if doing dwarf2 duplicate elimination.  */
-
-int flag_eliminate_dwarf2_dups = 0;
-
-/* Nonzero if doing unused type elimination.  */
-
-int flag_eliminate_unused_debug_types = 1;
-
-/* Nonzero means emit debugging information only for symbols which are used.  */
-int flag_debug_only_used_symbols = 0;
-
-/* Nonzero if generating code to do profiling.  */
-
-int profile_flag = 0;
-
-/* Nonzero if generating code to profile program flow graph arcs.  */
-
-int profile_arc_flag = 0;
-
-/* Nonzero if value histograms should be measured.  */
-
-int flag_profile_values = 0;
-
-/* Nonzero if value histograms should be used to optimize code.  */
-int flag_value_profile_transformations = 0;
-
-/* Nonzero if generating info for gcov to calculate line test coverage.  */
-
-int flag_test_coverage = 0;
-
-/* Nonzero indicates that branch taken probabilities should be calculated.  */
-
-int flag_branch_probabilities = 0;
-
-/* Nonzero if basic blocks should be reordered.  */
-
-int flag_reorder_blocks = 0;
-
-/* Nonzero if blocks should be partitioned into hot and cold sections in
-   addition to being reordered.  */
-
-int flag_reorder_blocks_and_partition = 0;
-
-/* Nonzero if functions should be reordered.  */
-
-int flag_reorder_functions = 0;
-
-/* Nonzero if registers should be renamed.  When
-   flag_rename_registers == AUTODETECT_FLAG_VAR_TRACKING it will be set
-   according to optimize and default_debug_hooks in process_options (),
-   but we do not do this yet because it triggers aborts in flow.c.  */
-int flag_rename_registers = 0;
-int flag_cprop_registers = 0;
-
-/* Nonzero for -pedantic switch: warn about anything
-   that standard spec forbids.  */
-
-int pedantic = 0;
-
 /* Temporarily suppress certain warnings.
    This is set while reading code from a system header file.  */
 
 int in_system_header = 0;
 
-/* Don't print functions as they are compiled.  -quiet.  */
-
-int quiet_flag = 0;
-
-/* Print times taken by the various passes.  -ftime-report.  */
-
-int time_report = 0;
-
-/* Print memory still in use at end of compilation (which may have little
-   to do with peak memory consumption).  -fmem-report.  */
-
-int mem_report = 0;
-
 /* Nonzero means to collect statistics which might be expensive
    and to print them when we are done.  */
 int flag_detailed_statistics = 0;
@@ -326,12 +254,6 @@ int flag_signed_char;
 
 int flag_short_enums;
 
-/* Nonzero for -fcaller-saves: allocate values in regs that need to
-   be saved across function calls, if that produces overall better code.
-   Optional now, so people can test it.  */
-
-int flag_caller_saves = 0;
-
 /* Nonzero if structures and unions should be returned in memory.
 
    This should only be defined if compatibility with another compiler or
@@ -345,264 +267,23 @@ int flag_caller_saves = 0;
 
 int flag_pcc_struct_return = DEFAULT_PCC_STRUCT_RETURN;
 
-/* Nonzero for -fforce-mem: load memory value into a register
-   before arithmetic on it.  This makes better cse but slower compilation.  */
-
-int flag_force_mem = 0;
-
-/* Nonzero for -fforce-addr: load memory address into a register before
-   reference to memory.  This makes better cse but slower compilation.  */
-
-int flag_force_addr = 0;
-
-/* Nonzero for -fdefer-pop: don't pop args after each function call;
-   instead save them up to pop many calls' args with one insns.  */
-
-int flag_defer_pop = 0;
-
-/* Nonzero for -ffloat-store: don't allocate floats and doubles
-   in extended-precision registers.  */
-
-int flag_float_store = 0;
-
-/* Nonzero for -fcse-follow-jumps:
-   have cse follow jumps to do a more extensive job.  */
-
-int flag_cse_follow_jumps;
-
-/* Nonzero for -fcse-skip-blocks:
-   have cse follow a branch around a block.  */
-int flag_cse_skip_blocks;
-
-/* Nonzero for -fexpensive-optimizations:
-   perform miscellaneous relatively-expensive optimizations.  */
-int flag_expensive_optimizations;
-
-/* Nonzero for -fthread-jumps:
-   have jump optimize output of loop.  */
-
-int flag_thread_jumps;
-
-/* Nonzero enables strength-reduction in loop.c.  */
-
-int flag_strength_reduce = 0;
-
-/* Nonzero enables loop unrolling in unroll.c.  Only loops for which the
-   number of iterations can be calculated at compile-time (UNROLL_COMPLETELY,
-   UNROLL_MODULO) or at run-time (preconditioned to be UNROLL_MODULO) are
-   unrolled.  */
-
-int flag_old_unroll_loops;
-
-/* Nonzero enables loop unrolling in unroll.c.  All loops are unrolled.
-   This is generally not a win.  */
-
-int flag_old_unroll_all_loops;
-
-/* Enables unrolling of simple loops in loop-unroll.c.  */
-int flag_unroll_loops;
-
-/* Enables unrolling of all loops in loop-unroll.c.  */
-int flag_unroll_all_loops;
-
-/* Nonzero enables loop peeling.  */
-int flag_peel_loops;
-
-/* Nonzero enables loop unswitching.  */
-int flag_unswitch_loops;
-
-/* Nonzero enables prefetch optimizations for arrays in loops.  */
-
-int flag_prefetch_loop_arrays;
-
-/* Nonzero forces all invariant computations in loops to be moved
-   outside the loop.  */
-
-int flag_move_all_movables = 0;
-
-/* Nonzero forces all general induction variables in loops to be
-   strength reduced.  */
-
-int flag_reduce_all_givs = 0;
-
-/* Nonzero to perform full register move optimization passes.  This is the
-   default for -O2.  */
-
-int flag_regmove = 0;
-
-/* Nonzero means don't put addresses of constant functions in registers.
-   Used for compiling the Unix kernel, where strange substitutions are
-   done on the assembly output.  */
-
-int flag_no_function_cse = 0;
-
-/* Nonzero for -fomit-frame-pointer:
-   don't make a frame pointer in simple functions that don't require one.  */
-
-int flag_omit_frame_pointer = 0;
-
-/* Nonzero means place each function into its own section on those platforms
-   which support arbitrary section names and unlimited numbers of sections.  */
-
-int flag_function_sections = 0;
-
-/* ... and similar for data.  */
-
-int flag_data_sections = 0;
-
-/* Nonzero to inhibit use of define_optimization peephole opts.  */
-
-int flag_no_peephole = 0;
-
-/* Nonzero allows GCC to optimize sibling and tail recursive calls.  */
-
-int flag_optimize_sibling_calls = 0;
-
-/* Nonzero means the front end generally wants `errno' maintained by math
-   operations, like built-in SQRT.  */
-
-int flag_errno_math = 1;
-
-/* Nonzero means that unsafe floating-point math optimizations are allowed
-   for the sake of speed.  IEEE compliance is not guaranteed, and operations
-   are allowed to assume that their arguments and results are "normal"
-   (e.g., nonnegative for SQRT).  */
-
-int flag_unsafe_math_optimizations = 0;
-
-/* Nonzero means that no NaNs or +-Infs are expected.  */
-
-int flag_finite_math_only = 0;
-
-/* Zero means that floating-point math operations cannot generate a
-   (user-visible) trap.  This is the case, for example, in nonstop
-   IEEE 754 arithmetic.  Trapping conditions include division by zero,
-   overflow, underflow, invalid and inexact, but does not include
-   operations on signaling NaNs (see below).  */
-
-int flag_trapping_math = 1;
-
-/* Nonzero means disable transformations that assume default floating
-   point rounding behavior.  */
-
-int flag_rounding_math = 0;
-
-/* Nonzero means disable transformations observable by signaling NaNs.
-   This option implies that any operation on an IEEE signaling NaN can
-   generate a (user-visible) trap.  */
-
-int flag_signaling_nans = 0;
-
 /* 0 means straightforward implementation of complex divide acceptable.
    1 means wide ranges of inputs must work for complex divide.
    2 means C99-like requirements for complex divide (not yet implemented).  */
 
 int flag_complex_divide_method = 0;
 
-/* Nonzero means just do syntax checking; don't output anything.  */
-
-int flag_syntax_only = 0;
-
 /* Nonzero means performs web construction pass.  When flag_web ==
    AUTODETECT_FLAG_VAR_TRACKING it will be set according to optimize
    and default_debug_hooks in process_options ().  */
 
 int flag_web = AUTODETECT_FLAG_VAR_TRACKING;
 
-/* Nonzero means perform loop optimizer.  */
-
-int flag_loop_optimize;
-
-/* Nonzero means perform crossjumping.  */
-
-int flag_crossjumping;
-
-/* Nonzero means perform if conversion.  */
-
-int flag_if_conversion;
-
-/* Nonzero means perform if conversion after reload.  */
-
-int flag_if_conversion2;
-
-/* Nonzero means to use global dataflow analysis to eliminate
-   useless null pointer tests.  */
-
-int flag_delete_null_pointer_checks;
-
-/* Nonzero means perform global CSE.  */
-
-int flag_gcse = 0;
-
-/* Nonzero means to do the enhanced load motion during gcse, which trys
-   to hoist loads by not killing them when a store to the same location
-   is seen.  */
-
-int flag_gcse_lm = 1;
-
-/* Nonzero means to perform store motion after gcse, which will try to
-   move stores closer to the exit block.  Its not very effective without
-   flag_gcse_lm.  */
-
-int flag_gcse_sm = 1;
-
-/* Nonzero if we want to perform redundant load after store elimination
-   in gcse.  */
-
-int flag_gcse_las = 1;
-
-/* Nonzero means perform global cse after register allocation.  */
-int flag_gcse_after_reload = 0;
-
-/* Perform target register optimization before prologue / epilogue
-   threading.  */
-
-int flag_branch_target_load_optimize = 0;
-
-/* Perform target register optimization after prologue / epilogue
-   threading and jump2.  */
-
-int flag_branch_target_load_optimize2 = 0;
-
-/* For the bt-load pass, nonzero means don't re-use branch target registers
-   in any basic block.  */
-
-int flag_btr_bb_exclusive;
-
-/* Nonzero means to rerun cse after loop optimization.  This increases
-   compilation time about 20% and picks up a few more common expressions.  */
-
-int flag_rerun_cse_after_loop;
-
-/* Nonzero means to run loop optimizations twice.  */
-
-int flag_rerun_loop_opt;
-
-/* Nonzero for -finline-functions: ok to inline functions that look like
-   good inline candidates.  */
-
-int flag_inline_functions;
-
-/* Nonzero for -fkeep-inline-functions: even if we make a function
-   go inline everywhere, keep its definition around for debugging
-   purposes.  */
-
-int flag_keep_inline_functions;
-
-/* Nonzero means that functions will not be inlined.  */
-
-int flag_no_inline = 2;
-
 /* Nonzero means that we don't want inlining by virtue of -fno-inline,
    not just because the tree inliner turned us off.  */
 
 int flag_really_no_inline = 2;
 
-/* Nonzero means that we should emit static const variables
-   regardless of whether or not optimization is turned on.  */
-
-int flag_keep_static_consts = 1;
-
 /* Nonzero means we should be saving declaration info into a .X file.  */
 
 int flag_gen_aux_info = 0;
@@ -611,26 +292,6 @@ int flag_gen_aux_info = 0;
 
 const char *aux_info_file_name;
 
-/* Nonzero means make the text shared if supported.  */
-
-int flag_shared_data;
-
-/* Nonzero means schedule into delayed branch slots if supported.  */
-
-int flag_delayed_branch;
-
-/* Nonzero if we are compiling pure (sharable) code.
-   Value is 1 if we are doing "small" pic; value is 2 if we're doing
-   "large" pic.  */
-
-int flag_pic;
-
-/* Nonzero if we are compiling position independent code for executable.
-   The value is 1 if we are doing "small" pic; value is 2 if we're doing
-   "large" pic.  */
-
-int flag_pie;
-
 /* Nonzero if we are compiling code for a shared library, zero for
    executable.  */
 
@@ -640,98 +301,11 @@ int flag_shlib;
 
 enum tls_model flag_tls_default = TLS_MODEL_GLOBAL_DYNAMIC;
 
-/* Nonzero means generate extra code for exception handling and enable
-   exception handling.  */
-
-int flag_exceptions;
-
-/* Nonzero means generate frame unwind info table when supported.  */
-
-int flag_unwind_tables = 0;
-
-/* Nonzero means generate frame unwind info table exact at each insn
-   boundary.  */
-
-int flag_asynchronous_unwind_tables = 0;
-
-/* Nonzero means don't place uninitialized global data in common storage
-   by default.  */
-
-int flag_no_common;
-
 /* Nonzero means change certain warnings into errors.
    Usually these are warnings about failure to conform to some standard.  */
 
 int flag_pedantic_errors = 0;
 
-/* flag_schedule_insns means schedule insns within basic blocks (before
-   local_alloc).
-   flag_schedule_insns_after_reload means schedule insns after
-   global_alloc.  */
-
-int flag_schedule_insns = 0;
-int flag_schedule_insns_after_reload = 0;
-
-/* When flag_schedule_insns_after_reload is set, use EBB scheduler.  */
-int flag_sched2_use_superblocks = 0;
-
-/* When flag_schedule_insns_after_reload is set, construct traces and EBB
-   scheduler.  */
-int flag_sched2_use_traces = 0;
-
-/* The following flags have effect only for scheduling before register
-   allocation:
-
-   flag_schedule_interblock means schedule insns across basic blocks.
-   flag_schedule_speculative means allow speculative motion of non-load insns.
-   flag_schedule_speculative_load means allow speculative motion of some
-   load insns.
-   flag_schedule_speculative_load_dangerous allows speculative motion of more
-   load insns.  */
-
-int flag_schedule_interblock = 1;
-int flag_schedule_speculative = 1;
-int flag_schedule_speculative_load = 0;
-int flag_schedule_speculative_load_dangerous = 0;
-
-/* The following flags have an effect during scheduling after register
-   allocation:
-
-   flag_sched_stalled_insns means that insns can be moved prematurely from the queue
-   of stalled insns into the ready list.
-
-   flag_sched_stalled_insns_dep controls how many insn groups will be examined
-   for a dependency on a stalled insn that is candidate for premature removal
-   from the queue of stalled insns into the ready list (has an effect only if
-   the flag 'sched_stalled_insns' is set).  */
-
-int flag_sched_stalled_insns = 0;
-int flag_sched_stalled_insns_dep = 1;
-
-/* The following flag controls the module scheduling activation.  */
-int flag_modulo_sched = 0;
-
-int flag_single_precision_constant;
-
-/* flag_branch_on_count_reg means try to replace add-1,compare,branch tupple
-   by a cheaper branch on a count register.  */
-int flag_branch_on_count_reg = 1;
-
-/* -finhibit-size-directive inhibits output of .size for ELF.
-   This is used only for compiling crtstuff.c,
-   and it may be extended to other effects
-   needed for crtstuff.c on other systems.  */
-int flag_inhibit_size_directive = 0;
-
-/* -fverbose-asm causes extra commentary information to be produced in
-   the generated assembly code (to make it more readable).  This option
-   is generally only of use to those who actually need to read the
-   generated assembly code (perhaps while debugging the compiler itself).
-   -fno-verbose-asm, the default, causes the extra information
-   to be omitted and is useful when comparing two assembler files.  */
-
-int flag_verbose_asm = 0;
-
 /* -dA causes debug commentary information to be produced in
    the generated assembly code (to make it more readable).  This option
    is generally only of use to those who actually need to read the
@@ -745,16 +319,6 @@ int flag_debug_asm = 0;
 
 int flag_dump_rtl_in_asm = 0;
 
-/* Nonzero means put zero initialized data in the bss section.  */
-int flag_zero_initialized_in_bss = 1;
-
-/* Tag all structures with __attribute__(packed).  */
-int flag_pack_struct = 0;
-
-/* Emit code to check for stack overflow; also may cause large objects
-   to be allocated dynamically.  */
-int flag_stack_check;
-
 /* When non-NULL, indicates that whenever space is allocated on the
    stack, the resulting stack pointer must not pass this
    address---that is, for stacks that grow downward, the stack pointer
@@ -764,108 +328,14 @@ int flag_stack_check;
    the support provided depends on the backend.  */
 rtx stack_limit_rtx;
 
-/* 0 if pointer arguments may alias each other.  True in C.
-   1 if pointer arguments may not alias each other but may alias
-   global variables.
-   2 if pointer arguments may not alias each other and may not
-   alias global variables.  True in Fortran.
-   This defaults to 0 for C.  */
-int flag_argument_noalias = 0;
-
-/* Nonzero if we should do (language-dependent) alias analysis.
-   Typically, this analysis will assume that expressions of certain
-   types do not alias expressions of certain other types.  Only used
-   if alias analysis (in general) is enabled.  */
-int flag_strict_aliasing = 0;
-
-/* Instrument functions with calls at entry and exit, for profiling.  */
-int flag_instrument_function_entry_exit = 0;
-
-/* Nonzero means ignore `#ident' directives.  0 means handle them.
-   On SVR4 targets, it also controls whether or not to emit a
-   string identifying the compiler.  */
-
-int flag_no_ident = 0;
-
-/* This will perform a peephole pass before sched2.  */
-int flag_peephole2 = 0;
-
-/* This will try to guess branch probabilities.  */
-int flag_guess_branch_prob = 0;
-
-/* -fcheck-bounds causes gcc to generate array bounds checks.
-   For C, C++, ObjC: defaults to off.
-   For Java: defaults to on.
-   For Fortran: defaults to off.  */
-int flag_bounds_check = 0;
-
-/* Mudflap bounds-checking transform.  */
-int flag_mudflap = 0;
-int flag_mudflap_threads = 0;
-int flag_mudflap_ignore_reads = 0;
-
-/* This will attempt to merge constant section constants, if 1 only
-   string constants and constants from constant pool, if 2 also constant
-   variables.  */
-int flag_merge_constants = 1;
-
 /* If one, renumber instruction UIDs to reduce the number of
    unused UIDs if there are a lot of instructions.  If greater than
    one, unconditionally renumber instruction UIDs.  */
 int flag_renumber_insns = 1;
 
-/* If nonzero, use the graph coloring register allocator.  */
-int flag_new_regalloc = 0;
-
-/* If nonzero, use tree-based instead of rtl-based profiling.  */
-int flag_tree_based_profiling = 0;
-
-/* Enable SSA-GVN on trees.  */
-int flag_tree_gvn = 0;
-
-/* Enable the SSA-PRE tree optimization.  */
-int flag_tree_pre = 0;
-
 /* Enable points-to analysis on trees.  */
 enum pta_type flag_tree_points_to = PTA_NONE;
 
-/* Enable SSA-CCP on trees.  */
-int flag_tree_ccp = 0;
-
-/* Enable SSA-DCE on trees.  */
-int flag_tree_dce = 0;
-
-/* Enable loop header copying on tree-ssa.  */
-int flag_tree_ch = 0;
-
-/* Enable scalar replacement of aggregates.  */
-int flag_tree_sra = 0;
-
-/* Enable SSA->normal pass memory location coalescing.  */
-int flag_tree_combine_temps = 0;
-
-/* Enable SSA->normal pass expression replacement.  */
-int flag_tree_ter = 0;
-
-/* Enable SSA->normal live range splitting.  */
-int flag_tree_live_range_split = 0;
-
-/* Enable dominator optimizations.  */
-int flag_tree_dom = 0;
-
-/* Enable copy rename optimization.  */
-int flag_tree_copyrename = 0;
-
-/* Enable dead store elimination.  */
-int flag_tree_dse = 0;
-
-/* Nonzero if we perform superblock formation.  */
-int flag_tracer = 0;
-
-/* Nonzero if we perform whole unit at a time compilation.  */
-
-int flag_unit_at_a_time = 0;
-
 /* Nonzero if we should track variables.  When
    flag_var_tracking == AUTODETECT_FLAG_VAR_TRACKING it will be set according
    to optimize, debug_info_level and debug_hooks in process_options ().  */
@@ -876,16 +346,12 @@ int flag_var_tracking = AUTODETECT_FLAG_VAR_TRACKING;
    For each variable, there is an _log variant which is the power
    of two not less than the variable, for .align output.  */
 
-int align_loops;
 int align_loops_log;
 int align_loops_max_skip;
-int align_jumps;
 int align_jumps_log;
 int align_jumps_max_skip;
-int align_labels;
 int align_labels_log;
 int align_labels_max_skip;
-int align_functions;
 int align_functions_log;
 
 /* Like align_functions_log above, but used by front-ends to force the
@@ -900,35 +366,9 @@ typedef struct
 }
 lang_independent_options;
 
-/* Nonzero if signed arithmetic overflow should trap.  */
-int flag_trapv = 0;
-
-/* Nonzero if signed arithmetic overflow should wrap around.  */
-int flag_wrapv = 0;
-
 /* Nonzero if subexpressions must be evaluated from left-to-right.  */
 int flag_evaluation_order = 0;
 
-/* Add or remove a leading underscore from user symbols.  */
-int flag_leading_underscore = -1;
-
-/*  The version of the C++ ABI in use.  The following values are
-    allowed:
-
-    0: The version of the ABI believed most conformant with the
-       C++ ABI specification.  This ABI may change as bugs are
-       discovered and fixed.  Therefore, 0 will not necessarily
-       indicate the same ABI in different versions of G++.
-
-    1: The version of the ABI first used in G++ 3.2.
-
-    2: The version of the ABI first used in G++ 3.4.
-
-    Additional positive integers will be assigned as new versions of
-    the ABI become the default version of the ABI.  */
-
-int flag_abi_version = 2;
-
 /* The user symbol prefix after having resolved same.  */
 const char *user_label_prefix;
 
@@ -940,152 +380,6 @@ static const param_info lang_independent_params[] = {
   { NULL, 0, NULL }
 };
 
-/* Table of language-independent -f options.
-   STRING is the option name.  VARIABLE is the address of the variable.
-   ON_VALUE is the value to store in VARIABLE
-    if `-fSTRING' is seen as an option.
-   (If `-fno-STRING' is seen as an option, the opposite value is stored.)  */
-
-static const lang_independent_options f_options[] =
-{
-  {"eliminate-dwarf2-dups", &flag_eliminate_dwarf2_dups, 1 },
-  {"eliminate-unused-debug-symbols", &flag_debug_only_used_symbols, 1 },
-  {"eliminate-unused-debug-types", &flag_eliminate_unused_debug_types, 1 },
-  {"float-store", &flag_float_store, 1 },
-  {"defer-pop", &flag_defer_pop, 1 },
-  {"omit-frame-pointer", &flag_omit_frame_pointer, 1 },
-  {"optimize-sibling-calls", &flag_optimize_sibling_calls, 1 },
-  {"tracer", &flag_tracer, 1 },
-  {"unit-at-a-time", &flag_unit_at_a_time, 1 },
-  {"cse-follow-jumps", &flag_cse_follow_jumps, 1 },
-  {"cse-skip-blocks", &flag_cse_skip_blocks, 1 },
-  {"expensive-optimizations", &flag_expensive_optimizations, 1 },
-  {"thread-jumps", &flag_thread_jumps, 1 },
-  {"strength-reduce", &flag_strength_reduce, 1 },
-  {"unroll-loops", &flag_unroll_loops, 1 },
-  {"unroll-all-loops", &flag_unroll_all_loops, 1 },
-  {"old-unroll-loops", &flag_old_unroll_loops, 1 },
-  {"old-unroll-all-loops", &flag_old_unroll_all_loops, 1 },
-  {"peel-loops", &flag_peel_loops, 1 },
-  {"unswitch-loops", &flag_unswitch_loops, 1 },
-  {"prefetch-loop-arrays", &flag_prefetch_loop_arrays, 1 },
-  {"move-all-movables", &flag_move_all_movables, 1 },
-  {"reduce-all-givs", &flag_reduce_all_givs, 1 },
-  {"peephole", &flag_no_peephole, 0 },
-  {"force-mem", &flag_force_mem, 1 },
-  {"force-addr", &flag_force_addr, 1 },
-  {"function-cse", &flag_no_function_cse, 0 },
-  {"inline-functions", &flag_inline_functions, 1 },
-  {"keep-inline-functions", &flag_keep_inline_functions, 1 },
-  {"inline", &flag_no_inline, 0 },
-  {"keep-static-consts", &flag_keep_static_consts, 1 },
-  {"syntax-only", &flag_syntax_only, 1 },
-  {"shared-data", &flag_shared_data, 1 },
-  {"caller-saves", &flag_caller_saves, 1 },
-  {"pcc-struct-return", &flag_pcc_struct_return, 1 },
-  {"reg-struct-return", &flag_pcc_struct_return, 0 },
-  {"delayed-branch", &flag_delayed_branch, 1 },
-  {"web", &flag_web, 1},
-  {"gcse", &flag_gcse, 1 },
-  {"gcse-lm", &flag_gcse_lm, 1 },
-  {"gcse-sm", &flag_gcse_sm, 1 },
-  {"gcse-las", &flag_gcse_las, 1 },
-  {"gcse-after-reload", &flag_gcse_after_reload, 1},
-  {"branch-target-load-optimize", &flag_branch_target_load_optimize, 1 },
-  {"branch-target-load-optimize2", &flag_branch_target_load_optimize2, 1 },
-  {"btr-bb-exclusive", &flag_btr_bb_exclusive, 1 },
-  {"loop-optimize", &flag_loop_optimize, 1 },
-  {"crossjumping", &flag_crossjumping, 1 },
-  {"if-conversion", &flag_if_conversion, 1 },
-  {"if-conversion2", &flag_if_conversion2, 1 },
-  {"rerun-cse-after-loop", &flag_rerun_cse_after_loop, 1 },
-  {"rerun-loop-opt", &flag_rerun_loop_opt, 1 },
-  {"delete-null-pointer-checks", &flag_delete_null_pointer_checks, 1 },
-  {"schedule-insns", &flag_schedule_insns, 1 },
-  {"schedule-insns2", &flag_schedule_insns_after_reload, 1 },
-  {"sched-interblock",&flag_schedule_interblock, 1 },
-  {"sched-spec",&flag_schedule_speculative, 1 },
-  {"sched-spec-load",&flag_schedule_speculative_load, 1 },
-  {"sched-spec-load-dangerous",&flag_schedule_speculative_load_dangerous, 1 },
-  {"sched-stalled-insns", &flag_sched_stalled_insns, 0 },
-  {"sched-stalled-insns-dep", &flag_sched_stalled_insns_dep, 1 },
-  {"sched2-use-superblocks", &flag_sched2_use_superblocks, 1 },
-  {"sched2-use-traces", &flag_sched2_use_traces, 1 },
-  {"modulo-sched", &flag_modulo_sched, 1 },
-  {"branch-count-reg",&flag_branch_on_count_reg, 1 },
-  {"pic", &flag_pic, 1 },
-  {"PIC", &flag_pic, 2 },
-  {"pie", &flag_pie, 1 },
-  {"PIE", &flag_pie, 2 },
-  {"exceptions", &flag_exceptions, 1 },
-  {"unwind-tables", &flag_unwind_tables, 1 },
-  {"asynchronous-unwind-tables", &flag_asynchronous_unwind_tables, 1 },
-  {"non-call-exceptions", &flag_non_call_exceptions, 1 },
-  {"profile-arcs", &profile_arc_flag, 1 },
-  {"profile-values", &flag_profile_values, 1 },
-  {"vpt", &flag_value_profile_transformations, 1 },
-  {"test-coverage", &flag_test_coverage, 1 },
-  {"branch-probabilities", &flag_branch_probabilities, 1 },
-  {"profile", &profile_flag, 1 },
-  {"tree-based-profiling", &flag_tree_based_profiling, 1 },
-  {"reorder-blocks", &flag_reorder_blocks, 1 },
-  {"reorder-blocks-and-partition", &flag_reorder_blocks_and_partition, 1},
-  {"reorder-functions", &flag_reorder_functions, 1 },
-  {"rename-registers", &flag_rename_registers, 1 },
-  {"cprop-registers", &flag_cprop_registers, 1 },
-  {"common", &flag_no_common, 0 },
-  {"inhibit-size-directive", &flag_inhibit_size_directive, 1 },
-  {"function-sections", &flag_function_sections, 1 },
-  {"data-sections", &flag_data_sections, 1 },
-  {"verbose-asm", &flag_verbose_asm, 1 },
-  {"regmove", &flag_regmove, 1 },
-  {"optimize-register-move", &flag_regmove, 1 },
-  {"pack-struct", &flag_pack_struct, 1 },
-  {"stack-check", &flag_stack_check, 1 },
-  {"argument-alias", &flag_argument_noalias, 0 },
-  {"argument-noalias", &flag_argument_noalias, 1 },
-  {"argument-noalias-global", &flag_argument_noalias, 2 },
-  {"strict-aliasing", &flag_strict_aliasing, 1 },
-  {"align-loops", &align_loops, 0 },
-  {"align-jumps", &align_jumps, 0 },
-  {"align-labels", &align_labels, 0 },
-  {"align-functions", &align_functions, 0 },
-  {"merge-constants", &flag_merge_constants, 1 },
-  {"merge-all-constants", &flag_merge_constants, 2 },
-  {"dump-unnumbered", &flag_dump_unnumbered, 1 },
-  {"instrument-functions", &flag_instrument_function_entry_exit, 1 },
-  {"zero-initialized-in-bss", &flag_zero_initialized_in_bss, 1 },
-  {"leading-underscore", &flag_leading_underscore, 1 },
-  {"ident", &flag_no_ident, 0 },
-  { "peephole2", &flag_peephole2, 1 },
-  {"finite-math-only", &flag_finite_math_only, 1 },
-  { "guess-branch-probability", &flag_guess_branch_prob, 1 },
-  {"math-errno", &flag_errno_math, 1 },
-  {"trapping-math", &flag_trapping_math, 1 },
-  {"rounding-math", &flag_rounding_math, 1 },
-  {"unsafe-math-optimizations", &flag_unsafe_math_optimizations, 1 },
-  {"signaling-nans", &flag_signaling_nans, 1 },
-  {"bounds-check", &flag_bounds_check, 1 },
-  {"single-precision-constant", &flag_single_precision_constant, 1 },
-  {"time-report", &time_report, 1 },
-  {"mem-report", &mem_report, 1 },
-  { "trapv", &flag_trapv, 1 },
-  { "wrapv", &flag_wrapv, 1 },
-  { "new-ra", &flag_new_regalloc, 1 },
-  { "var-tracking", &flag_var_tracking, 1},
-  { "tree-gvn", &flag_tree_gvn, 1 },
-  { "tree-pre", &flag_tree_pre, 1 },
-  { "tree-ccp", &flag_tree_ccp, 1 },
-  { "tree-dce", &flag_tree_dce, 1 },
-  { "tree-dominator-opts", &flag_tree_dom, 1 },
-  { "tree-copyrename", &flag_tree_copyrename, 1 },
-  { "tree-dse", &flag_tree_dse, 1 },
-  { "tree-combine-temps", &flag_tree_combine_temps, 1 },
-  { "tree-ter", &flag_tree_ter, 1 },
-  { "tree-lrs", &flag_tree_live_range_split, 1 },
-  { "tree-ch", &flag_tree_ch, 1 }
-};
-
 /* Here is a table, controlled by the tm.h file, listing each -m switch
    and which bits in `target_switches' it should set or clear.
    If VALUE is positive, it is bits to set.
@@ -1997,10 +1291,26 @@ print_switch_values (FILE *file, int pos, int max,
   pos = print_single_switch (file, 0, max, indent, *indent ? " " : "", term,
 			     _("options enabled: "), "");
 
-  for (j = 0; j < ARRAY_SIZE (f_options); j++)
-    if (*f_options[j].variable == f_options[j].on_value)
+  for (j = 0; j < cl_options_count; j++)
+    {
+      if (!cl_options[j].flag_var
+	  || !(cl_options[j].flags & CL_REPORT))
+	continue;
+
+      if (cl_options[j].has_set_value)
+	{
+	  if (*cl_options[j].flag_var != cl_options[j].set_value)
+	    continue;
+	}
+      else
+	{
+	  if (!*cl_options[j].flag_var)
+	    continue;
+	}
+      
       pos = print_single_switch (file, pos, max, indent, sep, term,
-				 "-f", f_options[j].string);
+				 "", cl_options[j].opt_text);
+    }
 
   /* Print target specific options.  */
 

gcc/toplev.h

@@ -104,7 +104,6 @@ extern const char *aux_base_name;
 extern const char *aux_info_file_name;
 extern const char *asm_file_name;
 extern bool exit_after_options;
-extern bool version_flag;
 
 extern int target_flags_explicit;