This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH]: disentangle errors.h vs toplev.h includes
- From: "Kaveh R. Ghazi" <ghazi at caip dot rutgers dot edu>
- To: gcc-patches at gcc dot gnu dot org
- Date: Tue, 24 May 2005 00:06:09 -0400 (EDT)
- Subject: [PATCH]: disentangle errors.h vs toplev.h includes
Currently we have two error routine implementations, the one in
diagnostic.c and the one in errors.c. These files declare functions
like `error' and `fatal', etc. in the respective header files toplev.h
and errors.h. Some programs (mainly the generators) link against
errors.o and others (via libbackend.a) link against diagnostic.o.
The implementations of the error functions are completely different.
The ones in errors.c call vfprintf and therefore follow the standard
printf attribute. However the ones in diagnostic.c use the GCC
specific output routines and therefore must use the internal "diag"
format attributes.
The problem we have is that some files include the wrong header. This
patch attempts to disentangle the mess.
Bootstrapped the default languages plus treelang on
x86_64-unknown-linux-gnu. Okay for mainline after we un-slush?
Thanks,
--Kaveh
2005-05-23 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* basic-block.h, bb-reorder.c, c-gimplify.c, config/darwin.c,
config/rs6000/rs6000-c.c, dominance.c, gimple-low.c, gimplify.c,
lambda-code.c, lambda-trans.c, tree-browser.c, tree-cfg.c,
tree-chrec.c, tree-data-ref.c, tree-dfa.c, tree-eh.c,
tree-if-conv.c, tree-into-ssa.c, tree-loop-linear.c,
tree-mudflap.c, tree-nomudflap.c, tree-outof-ssa.c,
tree-pretty-print.c, tree-scalar-evolution.c, tree-sra.c,
tree-ssa-ccp.c, tree-ssa-copy.c, tree-ssa-dce.c, tree-ssa-dom.c,
tree-ssa-dse.c, tree-ssa-forwprop.c, tree-ssa-live.c,
tree-ssa-operands.c, tree-ssa-phiopt.c, tree-ssa-pre.c,
tree-ssa-propagate.c, tree-ssa-sink.c, tree-ssa-threadupdate.c,
tree-ssa-uncprop.c, tree-ssa.c, tree-vect-analyze.c,
tree-vect-transform.c, tree-vectorizer.c, vec.c: Don't include
errors.h and include toplev.h if necessary.
* rtl.c, varray.c: If we're compiling as a GENERATOR_FILE, include
errors.h otherwise include toplev.h.
* Makefile.in: Update dependencies.
fortran:
* fortran/trans-decl.c: Don't include errors.h.
* fortran/Make-lang.in: Updates dependencies.
java:
* java/verify-glue.c: Don't include errors.h and include toplev.h.
* java/Make-lang.in: Updates dependencies.
treelang:
* treelang/lex.l, treelang/parse.y: Don't include errors.h and
include toplev.h.
* treelang/Make-lang.in: Updates dependencies.
diff -rup orig/egcc-CVS20050522/gcc/Makefile.in egcc-CVS20050522/gcc/Makefile.in
--- orig/egcc-CVS20050522/gcc/Makefile.in 2005-05-21 13:50:29.000000000 -0400
+++ egcc-CVS20050522/gcc/Makefile.in 2005-05-23 22:43:08.000000000 -0400
@@ -1660,32 +1660,32 @@ stor-layout.o : stor-layout.c $(CONFIG_H
toplev.h
tree-ssa.o : tree-ssa.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
$(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) output.h $(DIAGNOSTIC_H) \
- errors.h toplev.h function.h $(TIMEVAR_H) $(TM_H) coretypes.h \
+ toplev.h function.h $(TIMEVAR_H) $(TM_H) coretypes.h \
$(TREE_DUMP_H) langhooks.h tree-pass.h $(BASIC_BLOCK_H) bitmap.h \
$(FLAGS_H) $(GGC_H) hard-reg-set.h $(HASHTAB_H) pointer-set.h \
$(TREE_GIMPLE_H) tree-inline.h $(VARRAY_H)
tree-into-ssa.o : tree-into-ssa.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
$(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) output.h $(DIAGNOSTIC_H) \
- errors.h function.h $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \
+ function.h $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \
langhooks.h domwalk.h tree-pass.h $(GGC_H) $(PARAMS_H) $(BASIC_BLOCK_H) \
bitmap.h $(CFGLOOP_H) $(FLAGS_H) hard-reg-set.h $(HASHTAB_H) \
$(TREE_GIMPLE_H) tree-inline.h $(VARRAY_H)
tree-outof-ssa.o : tree-outof-ssa.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
$(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) output.h $(DIAGNOSTIC_H) \
- errors.h function.h $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \
+ function.h $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \
langhooks.h tree-pass.h $(TREE_SSA_LIVE_H) $(BASIC_BLOCK_H) bitmap.h \
$(FLAGS_H) $(GGC_H) hard-reg-set.h $(HASHTAB_H) $(TREE_GIMPLE_H) \
- tree-inline.h $(VARRAY_H)
+ tree-inline.h $(VARRAY_H) toplev.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) \
+ $(TM_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) \
$(DIAGNOSTIC_H) $(TIMEVAR_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) \
+ $(TM_H) $(GGC_H) $(TREE_H) $(RTL_H) $(TM_P_H) $(BASIC_BLOCK_H) \
$(TREE_FLOW_H) tree-pass.h $(TREE_DUMP_H) $(DIAGNOSTIC_H) $(TIMEVAR_H) \
langhooks.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) \
+ $(TM_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) \
$(DIAGNOSTIC_H) $(TIMEVAR_H)
tree-nrv.o : tree-nrv.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
@@ -1694,26 +1694,26 @@ tree-nrv.o : tree-nrv.c $(CONFIG_H) $(SY
langhooks.h
tree-ssa-copy.o : tree-ssa-copy.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) \
+ function.h $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \
$(BASIC_BLOCK_H) tree-pass.h langhooks.h tree-ssa-propagate.h $(FLAGS_H)
tree-ssa-propagate.o : tree-ssa-propagate.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 \
+ $(DIAGNOSTIC_H) function.h $(TIMEVAR_H) $(TM_H) coretypes.h \
$(TREE_DUMP_H) $(BASIC_BLOCK_H) tree-pass.h langhooks.h \
tree-ssa-propagate.h vec.h gt-tree-ssa-propagate.h $(FLAGS_H) $(VARRAY_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) \
+ 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 \
tree-ssa-propagate.h $(CFGLOOP_H)
tree-ssa-uncprop.o : tree-ssa-uncprop.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 \
+ $(DIAGNOSTIC_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 tree-ssa-propagate.h
tree-ssa-threadupdate.o : tree-ssa-threadupdate.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 $(TM_H) coretypes.h $(TREE_DUMP_H) \
+ $(DIAGNOSTIC_H) function.h $(TM_H) coretypes.h $(TREE_DUMP_H) \
$(BASIC_BLOCK_H) $(FLAGS_H) tree-pass.h $(CFGLOOP_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)
@@ -1723,17 +1723,17 @@ tree-phinodes.o : tree-phinodes.c $(CONF
domwalk.o : domwalk.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
$(TREE_H) $(BASIC_BLOCK_H) $(TREE_FLOW_H) domwalk.h $(GGC_H)
tree-ssa-live.o : tree-ssa-live.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
- $(TREE_H) $(DIAGNOSTIC_H) errors.h function.h $(TIMEVAR_H) \
+ $(TREE_H) $(DIAGNOSTIC_H) function.h $(TIMEVAR_H) \
$(TM_H) coretypes.h $(TREE_DUMP_H) $(TREE_SSA_LIVE_H) $(BASIC_BLOCK_H) \
bitmap.h $(FLAGS_H) $(HASHTAB_H) $(TREE_GIMPLE_H) tree-inline.h \
- $(VARRAY_H)
+ $(VARRAY_H) toplev.h
tree-ssa-copyrename.o : tree-ssa-copyrename.c $(TREE_FLOW_H) $(CONFIG_H) \
$(SYSTEM_H) $(TREE_H) $(DIAGNOSTIC_H) function.h $(TIMEVAR_H) tree-pass.h \
$(TM_H) coretypes.h $(TREE_DUMP_H) $(TREE_SSA_LIVE_H) $(BASIC_BLOCK_H) \
bitmap.h $(FLAGS_H) $(HASHTAB_H) langhooks.h $(TREE_GIMPLE_H) \
tree-inline.h
tree-ssa-pre.o : tree-ssa-pre.c $(TREE_FLOW_H) $(CONFIG_H) \
- $(SYSTEM_H) $(TREE_H) $(GGC_H) $(DIAGNOSTIC_H) errors.h $(TIMEVAR_H) \
+ $(SYSTEM_H) $(TREE_H) $(GGC_H) $(DIAGNOSTIC_H) $(TIMEVAR_H) \
$(TM_H) coretypes.h $(TREE_DUMP_H) tree-pass.h $(FLAGS_H) $(CFGLOOP_H) \
alloc-pool.h $(BASIC_BLOCK_H) bitmap.h $(FIBHEAP_H) $(HASHTAB_H) \
langhooks.h real.h $(TREE_GIMPLE_H) tree-inline.h tree-iterator.h
@@ -1746,7 +1746,7 @@ tree-vrp.o : tree-vrp.c $(CONFIG_H) $(SY
$(CFGLOOP_H) $(SCEV_H) tree-chrec.h $(TIMEVAR_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 \
- $(DIAGNOSTIC_H) errors.h function.h $(TIMEVAR_H) $(TM_H) coretypes.h \
+ $(DIAGNOSTIC_H) function.h $(TIMEVAR_H) $(TM_H) coretypes.h \
$(TREE_DUMP_H) except.h langhooks.h $(CFGLOOP_H) tree-pass.h \
$(CFGLAYOUT_H) $(BASIC_BLOCK_H) hard-reg-set.h $(HASHTAB_H) toplev.h
tree-tailcall.o : tree-tailcall.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
@@ -1754,7 +1754,7 @@ tree-tailcall.o : tree-tailcall.c $(TREE
$(TREE_DUMP_H) $(DIAGNOSTIC_H) except.h tree-pass.h $(FLAGS_H) langhooks.h \
$(BASIC_BLOCK_H) hard-reg-set.h
tree-ssa-sink.o : tree-ssa-sink.c $(TREE_FLOW_H) $(CONFIG_H) \
- $(SYSTEM_H) $(TREE_H) $(GGC_H) $(DIAGNOSTIC_H) errors.h $(TIMEVAR_H) \
+ $(SYSTEM_H) $(TREE_H) $(GGC_H) $(DIAGNOSTIC_H) $(TIMEVAR_H) \
$(TM_H) coretypes.h $(TREE_DUMP_H) tree-pass.h $(FLAGS_H) alloc-pool.h \
$(BASIC_BLOCK_H) bitmap.h $(CFGLOOP_H) $(FIBHEAP_H) $(HASHTAB_H) \
langhooks.h real.h $(TREE_GIMPLE_H) tree-inline.h tree-iterator.h
@@ -1765,24 +1765,24 @@ tree-nested.o: tree-nested.c $(CONFIG_H)
tree-if-conv.o: tree-if-conv.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
$(TREE_H) $(FLAGS_H) $(TIMEVAR_H) $(BASIC_BLOCK_H) $(TREE_FLOW_H) \
$(CFGLOOP_H) $(RTL_H) $(C_COMMON_H) tree-chrec.h $(TREE_DATA_REF_H) \
- $(SCEV_H) tree-pass.h $(DIAGNOSTIC_H) errors.h $(TARGET_H) $(TREE_DUMP_H) \
+ $(SCEV_H) tree-pass.h $(DIAGNOSTIC_H) $(TARGET_H) $(TREE_DUMP_H) \
$(VARRAY_H)
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) pointer-set.h $(FLAGS_H) function.h \
+ tree-inline.h $(HASHTAB_H) pointer-set.h $(FLAGS_H) function.h \
$(TIMEVAR_H) convert.h $(TM_H) coretypes.h langhooks.h $(TREE_DUMP_H) \
tree-pass.h $(PARAMS_H) $(CGRAPH_H) $(BASIC_BLOCK_H) hard-reg-set.h \
$(TREE_GIMPLE_H)
tree-ssa-operands.o : tree-ssa-operands.c $(TREE_FLOW_H) $(CONFIG_H) \
- $(SYSTEM_H) $(TREE_H) $(GGC_H) $(DIAGNOSTIC_H) errors.h tree-inline.h \
- $(FLAGS_H) function.h $(TM_H) $(TIMEVAR_H) tree-pass.h \
+ $(SYSTEM_H) $(TREE_H) $(GGC_H) $(DIAGNOSTIC_H) tree-inline.h \
+ $(FLAGS_H) function.h $(TM_H) $(TIMEVAR_H) tree-pass.h toplev.h \
gt-tree-ssa-operands.h coretypes.h langhooks.h tree-ssa-opfinalize.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 \
$(GGC_H) tree-pass.h coretypes.h $(TIMEVAR_H) $(TM_P_H) \
- $(TREE_DUMP_H) tree-inline.h tree-iterator.h
+ $(TREE_DUMP_H) tree-inline.h tree-iterator.h toplev.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) \
@@ -1834,52 +1834,52 @@ tree-optimize.o : tree-optimize.c $(TREE
function.h langhooks.h $(FLAGS_H) $(CGRAPH_H) tree-inline.h \
tree-mudflap.h $(GGC_H) $(CGRAPH_H) tree-pass.h $(CFGLOOP_H) \
$(BASIC_BLOCK_H) graph.h hard-reg-set.h
-c-gimplify.o : c-gimplify.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) errors.h \
+c-gimplify.o : c-gimplify.c $(CONFIG_H) $(SYSTEM_H) $(TREE_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) $(BASIC_BLOCK_H) \
hard-reg-set.h $(TREE_DUMP_H) tree-inline.h
-gimplify.o : gimplify.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) errors.h \
+gimplify.o : gimplify.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) \
$(DIAGNOSTIC_H) $(TREE_GIMPLE_H) tree-inline.h $(VARRAY_H) langhooks.h \
$(LANGHOOKS_DEF_H) $(TREE_FLOW_H) $(CGRAPH_H) $(TIMEVAR_H) $(TM_H) \
coretypes.h except.h $(FLAGS_H) $(RTL_H) function.h $(EXPR_H) output.h \
- $(GGC_H) gt-gimplify.h $(HASHTAB_H) real.h $(TARGET_H)
-gimple-low.o : gimple-low.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) errors.h \
+ $(GGC_H) gt-gimplify.h $(HASHTAB_H) real.h $(TARGET_H) toplev.h
+gimple-low.o : gimple-low.c $(CONFIG_H) $(SYSTEM_H) $(TREE_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) tree-pass.h \
$(HASHTAB_H) toplev.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) \
+ $(TREE_H) tree-inline.h $(DIAGNOSTIC_H) $(HASHTAB_H) \
$(TM_H) coretypes.h
tree-chrec.o: tree-chrec.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
- errors.h $(GGC_H) $(TREE_H) tree-chrec.h tree-pass.h $(PARAMS_H) \
+ $(GGC_H) $(TREE_H) tree-chrec.h tree-pass.h $(PARAMS_H) \
$(DIAGNOSTIC_H) $(VARRAY_H)
tree-scalar-evolution.o: tree-scalar-evolution.c $(CONFIG_H) $(SYSTEM_H) \
- coretypes.h $(TM_H) errors.h $(GGC_H) $(TREE_H) $(RTL_H) \
+ coretypes.h $(TM_H) $(GGC_H) $(TREE_H) $(RTL_H) \
$(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) \
$(TIMEVAR_H) $(CFGLOOP_H) $(SCEV_H) tree-pass.h $(FLAGS_H) tree-chrec.h
tree-data-ref.o: tree-data-ref.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
- errors.h $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) \
+ $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) \
$(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \
$(TREE_DATA_REF_H) $(SCEV_H) tree-pass.h tree-chrec.h
tree-vect-analyze.o: tree-vect-analyze.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
- $(TM_H) errors.h $(GGC_H) $(OPTABS_H) $(TREE_H) $(BASIC_BLOCK_H) \
+ $(TM_H) $(GGC_H) $(OPTABS_H) $(TREE_H) $(BASIC_BLOCK_H) \
$(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \
tree-vectorizer.h $(TREE_DATA_REF_H) $(SCEV_H) $(EXPR_H) tree-chrec.h
tree-vect-transform.o: tree-vect-transform.c $(CONFIG_H) $(SYSTEM_H) \
- coretypes.h $(TM_H) errors.h $(GGC_H) $(OPTABS_H) $(TREE_H) $(RTL_H) \
+ coretypes.h $(TM_H) $(GGC_H) $(OPTABS_H) $(TREE_H) $(RTL_H) \
$(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) \
$(TIMEVAR_H) $(CFGLOOP_H) $(TARGET_H) tree-pass.h $(EXPR_H) \
tree-vectorizer.h $(TREE_DATA_REF_H) $(SCEV_H) langhooks.h toplev.h \
tree-chrec.h
tree-vectorizer.o: tree-vectorizer.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
- $(TM_H) errors.h $(GGC_H) $(OPTABS_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) \
+ $(TM_H) $(GGC_H) $(OPTABS_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) \
$(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \
tree-pass.h $(EXPR_H) tree-vectorizer.h $(TREE_DATA_REF_H) $(SCEV_H) \
input.h $(TARGET_H) $(CFGLAYOUT_H) toplev.h tree-chrec.h
tree-loop-linear.o: tree-loop-linear.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
- $(TM_H) errors.h $(GGC_H) $(OPTABS_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) \
+ $(TM_H) $(GGC_H) $(OPTABS_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) \
$(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \
tree-pass.h $(TREE_DATA_REF_H) $(SCEV_H) $(EXPR_H) $(LAMBDA_H) \
$(TARGET_H) tree-chrec.h $(VARRAY_H)
@@ -1889,17 +1889,17 @@ tree-stdarg.o: tree-stdarg.c $(CONFIG_H)
tree-gimple.o : tree-gimple.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(EXPR_H) \
$(RTL_H) $(TREE_GIMPLE_H) $(TM_H) coretypes.h bitmap.h $(GGC_H) \
output.h $(TREE_FLOW_H)
-tree-mudflap.o : $(CONFIG_H) errors.h $(SYSTEM_H) $(TREE_H) tree-inline.h \
+tree-mudflap.o : $(CONFIG_H) $(SYSTEM_H) $(TREE_H) tree-inline.h \
$(TREE_GIMPLE_H) $(DIAGNOSTIC_H) $(HASHTAB_H) langhooks.h tree-mudflap.h \
$(TM_H) coretypes.h $(TREE_DUMP_H) tree-pass.h $(CGRAPH_H) $(GGC_H) \
gt-tree-mudflap.h $(BASIC_BLOCK_H) $(FLAGS_H) function.h hard-reg-set.h \
- $(RTL_H) $(TM_P_H) $(TREE_FLOW_H)
-tree-nomudflap.o : $(CONFIG_H) errors.h $(SYSTEM_H) $(TREE_H) tree-inline.h \
+ $(RTL_H) $(TM_P_H) $(TREE_FLOW_H) toplev.h
+tree-nomudflap.o : $(CONFIG_H) $(SYSTEM_H) $(TREE_H) tree-inline.h \
$(C_TREE_H) $(C_COMMON_H) $(TREE_GIMPLE_H) $(DIAGNOSTIC_H) $(HASHTAB_H) \
output.h $(VARRAY_H) langhooks.h tree-mudflap.h $(TM_H) coretypes.h \
- $(GGC_H) gt-tree-mudflap.h tree-pass.h
+ $(GGC_H) gt-tree-mudflap.h tree-pass.h toplev.h
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) \
+ $(TREE_H) $(DIAGNOSTIC_H) real.h $(HASHTAB_H) $(TREE_FLOW_H) \
$(TM_H) coretypes.h tree-iterator.h tree-chrec.h langhooks.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) \
@@ -1948,7 +1948,7 @@ rtl-error.o: rtl-error.c $(SYSTEM_H) cor
$(CONFIG_H)
rtl.o : rtl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) real.h \
- $(GGC_H) errors.h $(BCONFIG_H) insn-notes.def reg-notes.def
+ $(GGC_H) $(BCONFIG_H) insn-notes.def reg-notes.def toplev.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 $(FLAGS_H) \
@@ -2090,16 +2090,16 @@ resource.o : resource.c $(CONFIG_H) $(RT
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) \
$(BASIC_BLOCK_H) $(TM_P_H) function.h output.h
-tree-ssa-dce.o : tree-ssa-dce.c $(CONFIG_H) $(SYSTEM_H) errors.h $(TREE_H) \
+tree-ssa-dce.o : tree-ssa-dce.c $(CONFIG_H) $(SYSTEM_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) $(BASIC_BLOCK_H) \
$(GGC_H) hard-reg-set.h $(OBSTACK_H) $(TREE_GIMPLE_H)
tree-ssa-ccp.o : tree-ssa-ccp.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 \
+ $(DIAGNOSTIC_H) function.h $(TIMEVAR_H) $(TM_H) coretypes.h \
$(TREE_DUMP_H) $(BASIC_BLOCK_H) tree-pass.h langhooks.h \
tree-ssa-propagate.h $(FLAGS_H) $(TARGET_H)
-tree-sra.o : tree-sra.c $(CONFIG_H) $(SYSTEM_H) errors.h $(TREE_H) $(RTL_H) \
+tree-sra.o : tree-sra.c $(CONFIG_H) $(SYSTEM_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) $(EXPR_H) $(BASIC_BLOCK_H) \
@@ -2193,7 +2193,7 @@ loop-unroll.o: loop-unroll.c $(CONFIG_H)
output.h $(EXPR_H) coretypes.h $(TM_H) $(HASHTAB_H) $(RECOG_H) $(VARRAY_H) \
$(OBSTACK_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 errors.h $(OBSTACK_H)
+ hard-reg-set.h $(BASIC_BLOCK_H) et-forest.h $(OBSTACK_H) toplev.h
et-forest.o : et-forest.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
et-forest.h alloc-pool.h $(BASIC_BLOCK_H)
combine.o : combine.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
@@ -2215,9 +2215,9 @@ global.o : global.c $(CONFIG_H) $(SYSTEM
$(FLAGS_H) reload.h function.h $(RECOG_H) $(REGS_H) hard-reg-set.h \
insn-config.h output.h toplev.h $(TM_P_H) $(MACHMODE_H)
varray.o : varray.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(GGC_H) \
- errors.h $(HASHTAB_H) $(BCONFIG_H) $(VARRAY_H)
+ $(HASHTAB_H) $(BCONFIG_H) $(VARRAY_H) toplev.h
vec.o : vec.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) coretypes.h vec.h $(GGC_H) \
- errors.h
+ toplev.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 \
@@ -2309,7 +2309,7 @@ lists.o: lists.c $(CONFIG_H) $(SYSTEM_H)
bb-reorder.o : bb-reorder.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
$(RTL_H) $(FLAGS_H) $(TIMEVAR_H) output.h $(CFGLAYOUT_H) $(FIBHEAP_H) \
$(TARGET_H) function.h $(TM_P_H) $(OBSTACK_H) $(EXPR_H) $(REGS_H) \
- errors.h $(PARAMS_H)
+ $(PARAMS_H) toplev.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) $(PARAMS_H) $(COVERAGE_H) $(FIBHEAP_H)
@@ -2330,9 +2330,9 @@ ifcvt.o : ifcvt.c $(CONFIG_H) $(SYSTEM_H
lambda-mat.o : lambda-mat.c $(LAMBDA_H) $(GGC_H) $(SYSTEM_H) $(CONFIG_H) \
$(TM_H) coretypes.h $(TREE_H) $(VARRAY_H)
lambda-trans.o: lambda-trans.c $(LAMBDA_H) $(GGC_H) $(SYSTEM_H) $(CONFIG_H) \
- $(TM_H) coretypes.h errors.h $(TARGET_H) $(TREE_H) $(VARRAY_H)
+ $(TM_H) coretypes.h $(TARGET_H) $(TREE_H) $(VARRAY_H)
lambda-code.o: lambda-code.c $(LAMBDA_H) $(GGC_H) $(SYSTEM_H) $(CONFIG_H) \
- errors.h $(TM_H) $(OPTABS_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) \
+ $(TM_H) $(OPTABS_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) \
$(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \
$(TREE_DATA_REF_H) $(SCEV_H) $(EXPR_H) coretypes.h $(TARGET_H) \
tree-chrec.h tree-pass.h vec.h
diff -rup orig/egcc-CVS20050522/gcc/basic-block.h egcc-CVS20050522/gcc/basic-block.h
--- orig/egcc-CVS20050522/gcc/basic-block.h 2005-05-19 22:50:22.000000000 -0400
+++ egcc-CVS20050522/gcc/basic-block.h 2005-05-23 20:15:12.000000000 -0400
@@ -29,7 +29,6 @@ Software Foundation, 59 Temple Place - S
#include "hard-reg-set.h"
#include "predict.h"
#include "vec.h"
-#include "errors.h"
#include "function.h"
/* Head of register set linked list. */
diff -rup orig/egcc-CVS20050522/gcc/bb-reorder.c egcc-CVS20050522/gcc/bb-reorder.c
--- orig/egcc-CVS20050522/gcc/bb-reorder.c 2005-05-16 21:56:35.000000000 -0400
+++ egcc-CVS20050522/gcc/bb-reorder.c 2005-05-23 20:34:45.000000000 -0400
@@ -81,8 +81,8 @@
#include "tm_p.h"
#include "obstack.h"
#include "expr.h"
-#include "errors.h"
#include "params.h"
+#include "toplev.h"
/* The number of rounds. In most cases there will only be 4 rounds, but
when partitioning hot and cold basic blocks into separate sections of
diff -rup orig/egcc-CVS20050522/gcc/c-gimplify.c egcc-CVS20050522/gcc/c-gimplify.c
--- orig/egcc-CVS20050522/gcc/c-gimplify.c 2005-04-25 20:32:05.000000000 -0400
+++ egcc-CVS20050522/gcc/c-gimplify.c 2005-05-23 20:35:45.000000000 -0400
@@ -29,7 +29,6 @@ Software Foundation, 59 Temple Place - S
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
-#include "errors.h"
#include "varray.h"
#include "c-tree.h"
#include "c-common.h"
diff -rup orig/egcc-CVS20050522/gcc/config/darwin.c egcc-CVS20050522/gcc/config/darwin.c
--- orig/egcc-CVS20050522/gcc/config/darwin.c 2005-05-03 20:27:04.000000000 -0400
+++ egcc-CVS20050522/gcc/config/darwin.c 2005-05-23 21:17:12.000000000 -0400
@@ -43,7 +43,7 @@ Boston, MA 02111-1307, USA. */
#include "langhooks.h"
#include "target.h"
#include "tm_p.h"
-#include "errors.h"
+#include "toplev.h"
#include "hashtab.h"
/* Darwin supports a feature called fix-and-continue, which is used
diff -rup orig/egcc-CVS20050522/gcc/config/rs6000/rs6000-c.c egcc-CVS20050522/gcc/config/rs6000/rs6000-c.c
--- orig/egcc-CVS20050522/gcc/config/rs6000/rs6000-c.c 2005-05-02 22:14:26.000000000 -0400
+++ egcc-CVS20050522/gcc/config/rs6000/rs6000-c.c 2005-05-23 21:20:14.000000000 -0400
@@ -31,7 +31,7 @@
#include "c-common.h"
#include "c-pragma.h"
#include "c-tree.h"
-#include "errors.h"
+#include "toplev.h"
#include "tm_p.h"
#include "target.h"
#include "langhooks.h"
diff -rup orig/egcc-CVS20050522/gcc/dominance.c egcc-CVS20050522/gcc/dominance.c
--- orig/egcc-CVS20050522/gcc/dominance.c 2005-04-22 20:11:46.000000000 -0400
+++ egcc-CVS20050522/gcc/dominance.c 2005-05-23 20:36:55.000000000 -0400
@@ -41,7 +41,7 @@
#include "hard-reg-set.h"
#include "obstack.h"
#include "basic-block.h"
-#include "errors.h"
+#include "toplev.h"
#include "et-forest.h"
/* Whether the dominators and the postdominators are available. */
diff -rup orig/egcc-CVS20050522/gcc/fortran/Make-lang.in egcc-CVS20050522/gcc/fortran/Make-lang.in
--- orig/egcc-CVS20050522/gcc/fortran/Make-lang.in 2005-05-03 20:27:11.000000000 -0400
+++ egcc-CVS20050522/gcc/fortran/Make-lang.in 2005-05-23 21:13:21.000000000 -0400
@@ -284,7 +284,7 @@ fortran/f95-lang.o: $(GFORTRAN_TRANS_DEP
fortran/convert.o: $(GFORTRAN_TRANS_DEPS)
fortran/trans.o: $(GFORTRAN_TRANS_DEPS)
fortran/trans-decl.o: $(GFORTRAN_TRANS_DEPS) gt-fortran-trans-decl.h \
- cgraph.h $(TARGET_H) function.h errors.h $(FLAGS_H) tree-gimple.h \
+ cgraph.h $(TARGET_H) function.h $(FLAGS_H) tree-gimple.h \
tree-dump.h
fortran/trans-types.o: $(GFORTRAN_TRANS_DEPS) gt-fortran-trans-types.h \
real.h toplev.h $(TARGET_H)
diff -rup orig/egcc-CVS20050522/gcc/fortran/trans-decl.c egcc-CVS20050522/gcc/fortran/trans-decl.c
--- orig/egcc-CVS20050522/gcc/fortran/trans-decl.c 2005-05-10 21:25:34.000000000 -0400
+++ egcc-CVS20050522/gcc/fortran/trans-decl.c 2005-05-23 21:13:37.000000000 -0400
@@ -32,7 +32,6 @@ Software Foundation, 59 Temple Place - S
#include "tm.h"
#include "target.h"
#include "function.h"
-#include "errors.h"
#include "flags.h"
#include "cgraph.h"
#include "gfortran.h"
diff -rup orig/egcc-CVS20050522/gcc/gimple-low.c egcc-CVS20050522/gcc/gimple-low.c
--- orig/egcc-CVS20050522/gcc/gimple-low.c 2005-03-08 21:25:51.000000000 -0500
+++ egcc-CVS20050522/gcc/gimple-low.c 2005-05-23 20:38:04.000000000 -0400
@@ -25,7 +25,6 @@ Software Foundation, 59 Temple Place - S
#include "tm.h"
#include "tree.h"
#include "rtl.h"
-#include "errors.h"
#include "varray.h"
#include "tree-gimple.h"
#include "tree-inline.h"
diff -rup orig/egcc-CVS20050522/gcc/gimplify.c egcc-CVS20050522/gcc/gimplify.c
--- orig/egcc-CVS20050522/gcc/gimplify.c 2005-05-01 21:50:38.000000000 -0400
+++ egcc-CVS20050522/gcc/gimplify.c 2005-05-23 20:39:47.000000000 -0400
@@ -27,7 +27,6 @@ Software Foundation, 59 Temple Place - S
#include "tm.h"
#include "tree.h"
#include "rtl.h"
-#include "errors.h"
#include "varray.h"
#include "tree-gimple.h"
#include "tree-inline.h"
@@ -45,6 +44,7 @@ Software Foundation, 59 Temple Place - S
#include "output.h"
#include "expr.h"
#include "ggc.h"
+#include "toplev.h"
#include "target.h"
static struct gimplify_ctx
diff -rup orig/egcc-CVS20050522/gcc/java/Make-lang.in egcc-CVS20050522/gcc/java/Make-lang.in
--- orig/egcc-CVS20050522/gcc/java/Make-lang.in 2005-05-04 22:01:41.000000000 -0400
+++ egcc-CVS20050522/gcc/java/Make-lang.in 2005-05-23 21:15:37.000000000 -0400
@@ -353,7 +353,7 @@ java/verify.o: java/verify.c $(CONFIG_H)
java/javaop.h java/java-opcodes.h java/java-except.h toplev.h $(SYSTEM_H) \
coretypes.h $(TM_H)
java/verify-glue.o: java/verify-glue.c $(CONFIG_H) $(SYSTEM_H) $(JAVA_TREE_H) \
- coretypes.h $(TM_H) java/verify.h
+ coretypes.h $(TM_H) java/verify.h toplev.h
java/verify-impl.o: java/verify-impl.c $(CONFIG_H) java/verify.h $(SYSTEM_H) \
coretypes.h java/jcf.h $(JAVA_TREE_H)
java/zextract.o: java/zextract.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
diff -rup orig/egcc-CVS20050522/gcc/java/verify-glue.c egcc-CVS20050522/gcc/java/verify-glue.c
--- orig/egcc-CVS20050522/gcc/java/verify-glue.c 2005-04-19 08:55:53.000000000 -0400
+++ egcc-CVS20050522/gcc/java/verify-glue.c 2005-05-23 21:15:23.000000000 -0400
@@ -30,12 +30,12 @@ The Free Software Foundation is independ
#include "coretypes.h"
#include "tm.h"
#include "tree.h"
-#include "errors.h"
#include "parse.h"
#include "verify.h"
#include "java-tree.h"
#include "java-except.h"
+#include "toplev.h"
void *
vfy_alloc (size_t bytes)
diff -rup orig/egcc-CVS20050522/gcc/lambda-code.c egcc-CVS20050522/gcc/lambda-code.c
--- orig/egcc-CVS20050522/gcc/lambda-code.c 2005-05-03 20:27:00.000000000 -0400
+++ egcc-CVS20050522/gcc/lambda-code.c 2005-05-23 20:41:01.000000000 -0400
@@ -23,7 +23,6 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "ggc.h"
#include "tree.h"
#include "target.h"
diff -rup orig/egcc-CVS20050522/gcc/lambda-trans.c egcc-CVS20050522/gcc/lambda-trans.c
--- orig/egcc-CVS20050522/gcc/lambda-trans.c 2004-09-16 12:16:14.000000000 -0400
+++ egcc-CVS20050522/gcc/lambda-trans.c 2005-05-23 20:41:42.000000000 -0400
@@ -23,7 +23,6 @@ Software Foundation, 59 Temple Place - S
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "ggc.h"
#include "tree.h"
#include "target.h"
diff -rup orig/egcc-CVS20050522/gcc/rtl.c egcc-CVS20050522/gcc/rtl.c
--- orig/egcc-CVS20050522/gcc/rtl.c 2005-05-02 22:14:19.000000000 -0400
+++ egcc-CVS20050522/gcc/rtl.c 2005-05-23 21:06:38.000000000 -0400
@@ -33,7 +33,11 @@ Software Foundation, 59 Temple Place - S
#include "rtl.h"
#include "real.h"
#include "ggc.h"
-#include "errors.h"
+#ifdef GENERATOR_FILE
+# include "errors.h"
+#else
+# include "toplev.h"
+#endif
/* Indexed by rtx code, gives number of operands for an rtx with that code.
diff -rup orig/egcc-CVS20050522/gcc/tree-browser.c egcc-CVS20050522/gcc/tree-browser.c
--- orig/egcc-CVS20050522/gcc/tree-browser.c 2004-12-22 20:22:18.000000000 -0500
+++ egcc-CVS20050522/gcc/tree-browser.c 2005-05-23 20:32:03.000000000 -0400
@@ -23,7 +23,6 @@ Software Foundation, 59 Temple Place - S
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "tree.h"
#include "tree-inline.h"
#include "diagnostic.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-cfg.c egcc-CVS20050522/gcc/tree-cfg.c
--- orig/egcc-CVS20050522/gcc/tree-cfg.c 2005-05-19 22:50:23.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-cfg.c 2005-05-23 20:25:36.000000000 -0400
@@ -29,7 +29,6 @@ Boston, MA 02111-1307, USA. */
#include "hard-reg-set.h"
#include "basic-block.h"
#include "output.h"
-#include "errors.h"
#include "flags.h"
#include "function.h"
#include "expr.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-chrec.c egcc-CVS20050522/gcc/tree-chrec.c
--- orig/egcc-CVS20050522/gcc/tree-chrec.c 2005-05-16 21:56:36.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-chrec.c 2005-05-23 20:33:02.000000000 -0400
@@ -28,7 +28,6 @@ Software Foundation, 59 Temple Place - S
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "ggc.h"
#include "tree.h"
#include "diagnostic.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-data-ref.c egcc-CVS20050522/gcc/tree-data-ref.c
--- orig/egcc-CVS20050522/gcc/tree-data-ref.c 2005-05-16 21:56:36.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-data-ref.c 2005-05-23 20:33:43.000000000 -0400
@@ -78,7 +78,6 @@ Software Foundation, 59 Temple Place - S
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "ggc.h"
#include "tree.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-dfa.c egcc-CVS20050522/gcc/tree-dfa.c
--- orig/egcc-CVS20050522/gcc/tree-dfa.c 2005-05-08 22:23:33.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-dfa.c 2005-05-23 20:43:27.000000000 -0400
@@ -31,7 +31,6 @@ Boston, MA 02111-1307, USA. */
#include "hard-reg-set.h"
#include "basic-block.h"
#include "output.h"
-#include "errors.h"
#include "timevar.h"
#include "expr.h"
#include "ggc.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-eh.c egcc-CVS20050522/gcc/tree-eh.c
--- orig/egcc-CVS20050522/gcc/tree-eh.c 2005-05-16 21:56:36.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-eh.c 2005-05-23 20:27:46.000000000 -0400
@@ -36,6 +36,7 @@ Boston, MA 02111-1307, USA. */
#include "timevar.h"
#include "langhooks.h"
#include "ggc.h"
+#include "toplev.h"
/* Nonzero if we are using EH to handle cleanups. */
diff -rup orig/egcc-CVS20050522/gcc/tree-if-conv.c egcc-CVS20050522/gcc/tree-if-conv.c
--- orig/egcc-CVS20050522/gcc/tree-if-conv.c 2005-05-11 22:11:51.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-if-conv.c 2005-05-23 20:46:07.000000000 -0400
@@ -84,7 +84,6 @@ Software Foundation, 59 Temple Place - S
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "tree.h"
#include "c-common.h"
#include "flags.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-into-ssa.c egcc-CVS20050522/gcc/tree-into-ssa.c
--- orig/egcc-CVS20050522/gcc/tree-into-ssa.c 2005-05-17 21:19:48.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-into-ssa.c 2005-05-23 20:48:53.000000000 -0400
@@ -31,7 +31,6 @@ Boston, MA 02111-1307, USA. */
#include "hard-reg-set.h"
#include "basic-block.h"
#include "output.h"
-#include "errors.h"
#include "expr.h"
#include "function.h"
#include "diagnostic.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-loop-linear.c egcc-CVS20050522/gcc/tree-loop-linear.c
--- orig/egcc-CVS20050522/gcc/tree-loop-linear.c 2005-04-24 08:38:47.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-loop-linear.c 2005-05-23 20:49:30.000000000 -0400
@@ -24,7 +24,6 @@ Software Foundation, 59 Temple Place - S
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "ggc.h"
#include "tree.h"
#include "target.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-mudflap.c egcc-CVS20050522/gcc/tree-mudflap.c
--- orig/egcc-CVS20050522/gcc/tree-mudflap.c 2005-05-03 20:27:01.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-mudflap.c 2005-05-23 20:24:03.000000000 -0400
@@ -22,7 +22,6 @@ Software Foundation, 59 Temple Place - S
#include "config.h"
-#include "errors.h"
#include "system.h"
#include "coretypes.h"
#include "tm.h"
@@ -45,6 +44,7 @@ Software Foundation, 59 Temple Place - S
#include "langhooks.h"
#include "ggc.h"
#include "cgraph.h"
+#include "toplev.h"
/* Internal function decls */
diff -rup orig/egcc-CVS20050522/gcc/tree-nomudflap.c egcc-CVS20050522/gcc/tree-nomudflap.c
--- orig/egcc-CVS20050522/gcc/tree-nomudflap.c 2004-09-06 06:08:02.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-nomudflap.c 2005-05-23 20:50:30.000000000 -0400
@@ -21,7 +21,6 @@ Software Foundation, 59 Temple Place - S
#include "config.h"
-#include "errors.h"
#include "system.h"
#include "coretypes.h"
#include "tm.h"
@@ -38,6 +37,7 @@ Software Foundation, 59 Temple Place - S
#include "tree-mudflap.h"
#include "tree-pass.h"
#include "ggc.h"
+#include "toplev.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-outof-ssa.c egcc-CVS20050522/gcc/tree-outof-ssa.c
--- orig/egcc-CVS20050522/gcc/tree-outof-ssa.c 2005-05-09 22:58:42.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-outof-ssa.c 2005-05-23 20:51:25.000000000 -0400
@@ -32,7 +32,6 @@ Boston, MA 02111-1307, USA. */
#include "hard-reg-set.h"
#include "basic-block.h"
#include "output.h"
-#include "errors.h"
#include "expr.h"
#include "function.h"
#include "diagnostic.h"
@@ -46,6 +45,7 @@ Boston, MA 02111-1307, USA. */
#include "tree-dump.h"
#include "tree-ssa-live.h"
#include "tree-pass.h"
+#include "toplev.h"
/* Flags to pass to remove_ssa_form. */
diff -rup orig/egcc-CVS20050522/gcc/tree-pretty-print.c egcc-CVS20050522/gcc/tree-pretty-print.c
--- orig/egcc-CVS20050522/gcc/tree-pretty-print.c 2005-05-03 20:27:01.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-pretty-print.c 2005-05-23 20:52:59.000000000 -0400
@@ -23,7 +23,6 @@ Software Foundation, 59 Temple Place - S
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "tree.h"
#include "diagnostic.h"
#include "real.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-scalar-evolution.c egcc-CVS20050522/gcc/tree-scalar-evolution.c
--- orig/egcc-CVS20050522/gcc/tree-scalar-evolution.c 2005-05-17 21:19:49.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-scalar-evolution.c 2005-05-23 20:53:18.000000000 -0400
@@ -235,7 +235,6 @@ Software Foundation, 59 Temple Place - S
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "ggc.h"
#include "tree.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-sra.c egcc-CVS20050522/gcc/tree-sra.c
--- orig/egcc-CVS20050522/gcc/tree-sra.c 2005-05-03 20:27:01.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-sra.c 2005-05-23 20:53:39.000000000 -0400
@@ -25,7 +25,6 @@ Software Foundation, 59 Temple Place - S
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "ggc.h"
#include "tree.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-ssa-ccp.c egcc-CVS20050522/gcc/tree-ssa-ccp.c
--- orig/egcc-CVS20050522/gcc/tree-ssa-ccp.c 2005-05-17 21:19:49.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-ssa-ccp.c 2005-05-23 20:54:08.000000000 -0400
@@ -199,7 +199,6 @@ Software Foundation, 59 Temple Place - S
#include "ggc.h"
#include "basic-block.h"
#include "output.h"
-#include "errors.h"
#include "expr.h"
#include "function.h"
#include "diagnostic.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-ssa-copy.c egcc-CVS20050522/gcc/tree-ssa-copy.c
--- orig/egcc-CVS20050522/gcc/tree-ssa-copy.c 2005-05-16 21:56:37.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-ssa-copy.c 2005-05-23 20:55:12.000000000 -0400
@@ -29,7 +29,6 @@ Boston, MA 02111-1307, USA. */
#include "ggc.h"
#include "basic-block.h"
#include "output.h"
-#include "errors.h"
#include "expr.h"
#include "function.h"
#include "diagnostic.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-ssa-dce.c egcc-CVS20050522/gcc/tree-ssa-dce.c
--- orig/egcc-CVS20050522/gcc/tree-ssa-dce.c 2005-05-04 22:01:30.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-ssa-dce.c 2005-05-23 20:55:43.000000000 -0400
@@ -47,7 +47,6 @@ Software Foundation, 59 Temple Place - S
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "ggc.h"
/* These RTL headers are needed for basic-block.h. */
diff -rup orig/egcc-CVS20050522/gcc/tree-ssa-dom.c egcc-CVS20050522/gcc/tree-ssa-dom.c
--- orig/egcc-CVS20050522/gcc/tree-ssa-dom.c 2005-05-17 21:19:49.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-ssa-dom.c 2005-05-23 20:56:05.000000000 -0400
@@ -31,7 +31,6 @@ Boston, MA 02111-1307, USA. */
#include "basic-block.h"
#include "cfgloop.h"
#include "output.h"
-#include "errors.h"
#include "expr.h"
#include "function.h"
#include "diagnostic.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-ssa-dse.c egcc-CVS20050522/gcc/tree-ssa-dse.c
--- orig/egcc-CVS20050522/gcc/tree-ssa-dse.c 2005-05-03 20:27:02.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-ssa-dse.c 2005-05-23 20:56:32.000000000 -0400
@@ -22,7 +22,6 @@ Boston, MA 02111-1307, USA. */
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "ggc.h"
#include "tree.h"
#include "rtl.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-ssa-forwprop.c egcc-CVS20050522/gcc/tree-ssa-forwprop.c
--- orig/egcc-CVS20050522/gcc/tree-ssa-forwprop.c 2005-05-19 22:50:23.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-ssa-forwprop.c 2005-05-23 20:57:01.000000000 -0400
@@ -22,7 +22,6 @@ Boston, MA 02111-1307, USA. */
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "ggc.h"
#include "tree.h"
#include "rtl.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-ssa-live.c egcc-CVS20050522/gcc/tree-ssa-live.c
--- orig/egcc-CVS20050522/gcc/tree-ssa-live.c 2005-05-14 20:03:00.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-ssa-live.c 2005-05-23 22:42:53.000000000 -0400
@@ -37,7 +37,7 @@ Boston, MA 02111-1307, USA. */
#include "hashtab.h"
#include "tree-dump.h"
#include "tree-ssa-live.h"
-#include "errors.h"
+#include "toplev.h"
static void live_worklist (tree_live_info_p, int *, int);
static tree_live_info_p new_tree_live_info (var_map);
diff -rup orig/egcc-CVS20050522/gcc/tree-ssa-operands.c egcc-CVS20050522/gcc/tree-ssa-operands.c
--- orig/egcc-CVS20050522/gcc/tree-ssa-operands.c 2005-05-19 22:50:24.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-ssa-operands.c 2005-05-23 22:42:10.000000000 -0400
@@ -26,12 +26,12 @@ Boston, MA 02111-1307, USA. */
#include "flags.h"
#include "function.h"
#include "diagnostic.h"
-#include "errors.h"
#include "tree-flow.h"
#include "tree-inline.h"
#include "tree-pass.h"
#include "ggc.h"
#include "timevar.h"
+#include "toplev.h"
#include "langhooks.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-ssa-phiopt.c egcc-CVS20050522/gcc/tree-ssa-phiopt.c
--- orig/egcc-CVS20050522/gcc/tree-ssa-phiopt.c 2005-04-20 21:42:02.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-ssa-phiopt.c 2005-05-23 20:58:39.000000000 -0400
@@ -22,7 +22,6 @@ Software Foundation, 59 Temple Place - S
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "ggc.h"
#include "tree.h"
#include "rtl.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-ssa-pre.c egcc-CVS20050522/gcc/tree-ssa-pre.c
--- orig/egcc-CVS20050522/gcc/tree-ssa-pre.c 2005-05-18 07:26:22.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-ssa-pre.c 2005-05-23 20:58:57.000000000 -0400
@@ -24,7 +24,6 @@ Boston, MA 02111-1307, USA. */
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "ggc.h"
#include "tree.h"
#include "basic-block.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-ssa-propagate.c egcc-CVS20050522/gcc/tree-ssa-propagate.c
--- orig/egcc-CVS20050522/gcc/tree-ssa-propagate.c 2005-05-16 21:56:37.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-ssa-propagate.c 2005-05-23 20:59:37.000000000 -0400
@@ -30,7 +30,6 @@
#include "ggc.h"
#include "basic-block.h"
#include "output.h"
-#include "errors.h"
#include "expr.h"
#include "function.h"
#include "diagnostic.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-ssa-sink.c egcc-CVS20050522/gcc/tree-ssa-sink.c
--- orig/egcc-CVS20050522/gcc/tree-ssa-sink.c 2005-05-03 20:27:02.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-ssa-sink.c 2005-05-23 20:59:58.000000000 -0400
@@ -23,7 +23,6 @@ Boston, MA 02111-1307, USA. */
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "ggc.h"
#include "tree.h"
#include "basic-block.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-ssa-threadupdate.c egcc-CVS20050522/gcc/tree-ssa-threadupdate.c
--- orig/egcc-CVS20050522/gcc/tree-ssa-threadupdate.c 2005-05-10 21:25:19.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-ssa-threadupdate.c 2005-05-23 21:00:22.000000000 -0400
@@ -29,7 +29,6 @@ Boston, MA 02111-1307, USA. */
#include "ggc.h"
#include "basic-block.h"
#include "output.h"
-#include "errors.h"
#include "expr.h"
#include "function.h"
#include "diagnostic.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-ssa-uncprop.c egcc-CVS20050522/gcc/tree-ssa-uncprop.c
--- orig/egcc-CVS20050522/gcc/tree-ssa-uncprop.c 2005-05-02 22:14:19.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-ssa-uncprop.c 2005-05-23 21:00:42.000000000 -0400
@@ -29,7 +29,6 @@ Boston, MA 02111-1307, USA. */
#include "ggc.h"
#include "basic-block.h"
#include "output.h"
-#include "errors.h"
#include "expr.h"
#include "function.h"
#include "diagnostic.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-ssa.c egcc-CVS20050522/gcc/tree-ssa.c
--- orig/egcc-CVS20050522/gcc/tree-ssa.c 2005-05-08 22:23:33.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-ssa.c 2005-05-23 22:40:37.000000000 -0400
@@ -31,7 +31,6 @@ Boston, MA 02111-1307, USA. */
#include "hard-reg-set.h"
#include "basic-block.h"
#include "output.h"
-#include "errors.h"
#include "expr.h"
#include "function.h"
#include "diagnostic.h"
@@ -45,6 +44,7 @@ Boston, MA 02111-1307, USA. */
#include "hashtab.h"
#include "tree-dump.h"
#include "tree-pass.h"
+#include "toplev.h"
/* Remove the corresponding arguments from the PHI nodes in E's
destination block and redirect it to DEST. Return redirected edge.
diff -rup orig/egcc-CVS20050522/gcc/tree-vect-analyze.c egcc-CVS20050522/gcc/tree-vect-analyze.c
--- orig/egcc-CVS20050522/gcc/tree-vect-analyze.c 2005-05-03 20:27:03.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-vect-analyze.c 2005-05-23 21:02:15.000000000 -0400
@@ -23,7 +23,6 @@ Software Foundation, 59 Temple Place - S
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "ggc.h"
#include "tree.h"
#include "basic-block.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-vect-transform.c egcc-CVS20050522/gcc/tree-vect-transform.c
--- orig/egcc-CVS20050522/gcc/tree-vect-transform.c 2005-05-03 20:27:03.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-vect-transform.c 2005-05-23 21:02:26.000000000 -0400
@@ -23,7 +23,6 @@ Software Foundation, 59 Temple Place - S
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "ggc.h"
#include "tree.h"
#include "target.h"
diff -rup orig/egcc-CVS20050522/gcc/tree-vectorizer.c egcc-CVS20050522/gcc/tree-vectorizer.c
--- orig/egcc-CVS20050522/gcc/tree-vectorizer.c 2005-05-03 20:27:03.000000000 -0400
+++ egcc-CVS20050522/gcc/tree-vectorizer.c 2005-05-23 21:02:45.000000000 -0400
@@ -124,7 +124,6 @@ Software Foundation, 59 Temple Place - S
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "ggc.h"
#include "tree.h"
#include "target.h"
diff -rup orig/egcc-CVS20050522/gcc/treelang/Make-lang.in egcc-CVS20050522/gcc/treelang/Make-lang.in
--- orig/egcc-CVS20050522/gcc/treelang/Make-lang.in 2005-03-16 20:01:05.000000000 -0500
+++ egcc-CVS20050522/gcc/treelang/Make-lang.in 2005-05-23 21:23:51.000000000 -0400
@@ -116,11 +116,12 @@ treelang/spec.o: treelang/spec.c $(CONFI
coretypes.h diagnostic.h $(TREE_H) flags.h toplev.h langhooks.h $(TM_H)
treelang/parse.o: treelang/parse.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
- $(TM_H) diagnostic.h treelang/treelang.h input.h treelang/treetree.h
+ $(TM_H) diagnostic.h treelang/treelang.h input.h treelang/treetree.h \
+ toplev.h
treelang/lex.o: treelang/lex.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
$(TM_H) diagnostic.h $(TREE_H) treelang/treelang.h input.h \
- treelang/parse.h
+ treelang/parse.h toplev.h
# generated files the files from lex and yacc are put into the source
# directory in case someone wants to build but does not have
diff -rup orig/egcc-CVS20050522/gcc/treelang/lex.l egcc-CVS20050522/gcc/treelang/lex.l
--- orig/egcc-CVS20050522/gcc/treelang/lex.l 2005-02-01 22:36:33.000000000 -0500
+++ egcc-CVS20050522/gcc/treelang/lex.l 2005-05-23 21:24:30.000000000 -0400
@@ -37,13 +37,13 @@
#include "coretypes.h"
#include "tm.h"
#include "input.h"
-#include "errors.h"
#include "tree.h"
/* Token defs. */
#include "treelang.h"
#include "parse.h"
#include "treetree.h"
+#include "toplev.h"
extern int option_lexer_trace;
diff -rup orig/egcc-CVS20050522/gcc/treelang/parse.y egcc-CVS20050522/gcc/treelang/parse.y
--- orig/egcc-CVS20050522/gcc/treelang/parse.y 2005-05-02 22:14:46.000000000 -0400
+++ egcc-CVS20050522/gcc/treelang/parse.y 2005-05-23 21:24:26.000000000 -0400
@@ -39,11 +39,11 @@ the GCC compiler. */
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
#include "timevar.h"
#include "treelang.h"
#include "treetree.h"
+#include "toplev.h"
#define YYDEBUG 1
#define YYPRINT(file, type, value) print_token (file, type, value)
diff -rup orig/egcc-CVS20050522/gcc/varray.c egcc-CVS20050522/gcc/varray.c
--- orig/egcc-CVS20050522/gcc/varray.c 2004-11-13 09:18:02.000000000 -0500
+++ egcc-CVS20050522/gcc/varray.c 2005-05-23 21:05:52.000000000 -0400
@@ -31,7 +31,11 @@
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "errors.h"
+#ifdef GENERATOR_FILE
+# include "errors.h"
+#else
+# include "toplev.h"
+#endif
#include "varray.h"
#include "ggc.h"
#include "hashtab.h"
diff -rup orig/egcc-CVS20050522/gcc/vec.c egcc-CVS20050522/gcc/vec.c
--- orig/egcc-CVS20050522/gcc/vec.c 2005-04-21 21:03:27.000000000 -0400
+++ egcc-CVS20050522/gcc/vec.c 2005-05-23 21:10:35.000000000 -0400
@@ -23,9 +23,9 @@ Software Foundation, 59 Temple Place - S
#include "system.h"
#include "ggc.h"
#include "vec.h"
-#include "errors.h"
#include "coretypes.h"
#include "tree.h"
+#include "toplev.h"
struct vec_prefix
{