From 8713b7e4f5f8cb2bf3c046dda4000c448500b746 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Thu, 23 Apr 2009 10:44:00 +0000 Subject: [PATCH] cuintp.c: Clean up include directives. * gcc-interface/cuintp.c: Clean up include directives. * gcc-interface/targtyps.c: Likewise. * gcc-interface/decl.c: Likewise. * gcc-interface/misc.c: Likewise. * gcc-interface/trans.c: Likewise. * gcc-interface/utils.c: Likewise. * gcc-interface/utils2.c: Likewise. * gcc-interface/Make-lang.in: Adjust dependencies accordingly. From-SVN: r146643 --- gcc/ada/ChangeLog | 11 ++++++ gcc/ada/gcc-interface/Make-lang.in | 78 ++++++++++++++++++-------------------- gcc/ada/gcc-interface/cuintp.c | 5 ++- gcc/ada/gcc-interface/decl.c | 3 -- gcc/ada/gcc-interface/misc.c | 18 +++------ gcc/ada/gcc-interface/targtyps.c | 3 +- gcc/ada/gcc-interface/trans.c | 12 +----- gcc/ada/gcc-interface/utils.c | 9 ++--- gcc/ada/gcc-interface/utils2.c | 9 ++--- 9 files changed, 66 insertions(+), 82 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index ff04732..ea9a037 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,16 @@ 2009-04-23 Eric Botcazou + * gcc-interface/cuintp.c: Clean up include directives. + * gcc-interface/targtyps.c: Likewise. + * gcc-interface/decl.c: Likewise. + * gcc-interface/misc.c: Likewise. + * gcc-interface/trans.c: Likewise. + * gcc-interface/utils.c: Likewise. + * gcc-interface/utils2.c: Likewise. + * gcc-interface/Make-lang.in: Adjust dependencies accordingly. + +2009-04-23 Eric Botcazou + * gcc-interface/ada-tree.h (union lang_tree_node): Use standard idiom. (SET_TYPE_LANG_SPECIFIC): Likewise. Fix formatting. (SET_DECL_LANG_SPECIFIC): Likewise. diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index 5973262..f248193 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -1143,69 +1143,63 @@ ada/raise.o : ada/raise.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h ada/raise.h $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) \ $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) -# Need to keep the frame pointer in this file to pop the stack properly on -# some targets. -ada/tracebak.o : ada/tracebak.c $(CONFIG_H) $(SYSTEM_H) +# Need to keep the frame pointer to unwind the stack properly for some targets. +ada/tracebak.o : ada/tracebak.c $(CONFIG_H) $(SYSTEM_H) $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ -fno-omit-frame-pointer $< $(OUTPUT_OPTION) -ada/cuintp.o : ada/gcc-interface/cuintp.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ - $(TREE_H) ada/gcc-interface/ada.h ada/types.h ada/uintp.h ada/atree.h ada/stringt.h \ - ada/elists.h ada/nlists.h ada/fe.h ada/gcc-interface/gigi.h +ada/cuintp.o : ada/gcc-interface/cuintp.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ + $(TM_H) $(TREE_H) ada/gcc-interface/ada.h ada/types.h ada/uintp.h \ + ada/atree.h ada/elists.h ada/nlists.h ada/stringt.h ada/fe.h $(ADA_TREE_H) \ + ada/gcc-interface/gigi.h $(CC) -c $(ALL_CFLAGS) -I.. $(ALL_CPPFLAGS) $< -o $@ ada/decl.o : ada/gcc-interface/decl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ - $(TM_H) $(TREE_H) $(FLAGS_H) toplev.h convert.h $(TARGET_H) \ - ada/gcc-interface/ada.h ada/types.h ada/atree.h \ - ada/nlists.h ada/elists.h ada/uintp.h ada/sinfo.h ada/einfo.h ada/snames.h \ - ada/namet.h ada/stringt.h ada/repinfo.h ada/fe.h $(ADA_TREE_H) \ - ada/gcc-interface/gigi.h \ - $(EXPR_H) gt-ada-decl.h + $(TM_H) $(TREE_H) $(FLAGS_H) toplev.h $(TARGET_H) $(EXPR_H) \ + $(TREE_INLINE_H) ada/gcc-interface/ada.h ada/types.h ada/atree.h \ + ada/elists.h ada/namet.h ada/nlists.h ada/repinfo.h ada/snames.h \ + ada/stringt.h ada/uintp.h ada/fe.h ada/sinfo.h ada/einfo.h $(ADA_TREE_H) \ + ada/gcc-interface/gigi.h gt-ada-decl.h $(CC) -c $(ALL_CFLAGS) -I.. $(ALL_CPPFLAGS) $< -o $@ ada/misc.o : ada/gcc-interface/misc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ - $(TM_H) $(TREE_H) \ - $(RTL_H) $(EXPR_H) insn-codes.h insn-flags.h insn-config.h recog.h \ - $(FLAGS_H) $(DIAGNOSTIC_H) output.h except.h $(TM_P_H) langhooks.h debug.h \ - $(LANGHOOKS_DEF_H) libfuncs.h $(OPTABS_H) ada/gcc-interface/ada.h \ - ada/types.h \ - ada/atree.h ada/nlists.h ada/elists.h ada/sinfo.h ada/einfo.h ada/namet.h \ - ada/stringt.h ada/uintp.h ada/fe.h $(ADA_TREE_H) ada/gcc-interface/gigi.h \ - ada/adadecode.h opts.h options.h $(TARGET_H) $(REAL_H) + $(TM_H) $(TREE_H) $(DIAGNOSTIC_H) $(TARGET_H) $(EXPR_H) libfuncs.h \ + $(FLAGS_H) debug.h $(CGRAPH_H) $(OPTABS_H) toplev.h except.h langhooks.h \ + $(LANGHOOKS_DEF_H) opts.h options.h $(TREE_INLINE_H) \ + ada/gcc-interface/ada.h ada/adadecode.h ada/types.h ada/atree.h \ + ada/elists.h ada/namet.h ada/nlists.h ada/stringt.h ada/uintp.h ada/fe.h \ + ada/sinfo.h ada/einfo.h $(ADA_TREE_H) ada/gcc-interface/gigi.h $(CC) -c $(ALL_CFLAGS) -I.. $(ALL_CPPFLAGS) $< -o $@ ada/targtyps.o : ada/gcc-interface/targtyps.c $(CONFIG_H) $(SYSTEM_H) \ - coretypes.h $(TM_H) \ - $(TREE_H) ada/gcc-interface/ada.h ada/types.h ada/atree.h ada/nlists.h \ - ada/elists.h \ - ada/uintp.h ada/sinfo.h ada/einfo.h ada/namet.h ada/snames.h ada/stringt.h \ - ada/urealp.h ada/fe.h $(ADA_TREE_H) ada/gcc-interface/gigi.h + coretypes.h $(TM_H) $(TREE_H) ada/gcc-interface/ada.h ada/types.h \ + ada/atree.h ada/elists.h ada/namet.h ada/nlists.h ada/snames.h \ + ada/stringt.h ada/uintp.h ada/urealp.h ada/fe.h ada/sinfo.h ada/einfo.h \ + $(ADA_TREE_H) ada/gcc-interface/gigi.h $(CC) -c $(ALL_CFLAGS) -I.. $(ALL_CPPFLAGS) $< -o $@ ada/trans.o : ada/gcc-interface/trans.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ - $(TM_H) \ - $(TREE_H) $(RTL_H) $(EXPR_H) $(FLAGS_H) $(FUNCTION_H) \ - ada/gcc-interface/ada.h except.h \ - ada/types.h ada/atree.h ada/nlists.h ada/elists.h ada/uintp.h ada/sinfo.h \ - ada/einfo.h ada/namet.h ada/snames.h ada/stringt.h ada/urealp.h ada/fe.h \ - $(ADA_TREE_H) ada/gcc-interface/gigi.h gt-ada-trans.h tree-iterator.h + $(TM_H) $(TREE_H) $(FLAGS_H) $(EXPR_H) output.h tree-iterator.h \ + $(GIMPLE_H) ada/gcc-interface/ada.h ada/adadecode.h ada/types.h \ + ada/atree.h ada/elists.h ada/namet.h ada/nlists.h ada/snames.h \ + ada/stringt.h ada/uintp.h ada/urealp.h ada/fe.h ada/sinfo.h ada/einfo.h \ + $(ADA_TREE_H) ada/gcc-interface/gigi.h gt-ada-trans.h $(CC) -c $(ALL_CFLAGS) -I.. $(ALL_CPPFLAGS) $< -o $@ ada/utils.o : ada/gcc-interface/utils.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ - $(TM_H) \ - $(TREE_H) $(FLAGS_H) $(EXPR_H) convert.h defaults.h langhooks.h \ - ada/gcc-interface/ada.h ada/types.h \ - ada/atree.h ada/nlists.h ada/elists.h ada/sinfo.h \ - ada/einfo.h ada/namet.h ada/stringt.h ada/uintp.h ada/fe.h $(ADA_TREE_H) \ - ada/gcc-interface/gigi.h gt-ada-utils.h \ - gtype-ada.h $(TARGET_H) tree-iterator.h + $(TM_H) $(TREE_H) $(FLAGS_H) toplev.h $(RTL_H) output.h debug.h convert.h \ + $(TARGET_H) function.h langhooks.h pointer-set.h $(CGRAPH_H) \ + $(TREE_DUMP_H) $(TREE_INLINE_H) tree-iterator.h $(GIMPLE_H) \ + ada/gcc-interface/ada.h ada/types.h ada/atree.h ada/elists.h ada/namet.h \ + ada/nlists.h ada/stringt.h ada/uintp.h ada/fe.h ada/sinfo.h ada/einfo.h \ + $(ADA_TREE_H) ada/gcc-interface/gigi.h gt-ada-utils.h gtype-ada.h $(CC) -c $(ALL_CFLAGS) -I.. $(ALL_CPPFLAGS) $< -o $@ ada/utils2.o : ada/gcc-interface/utils2.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ - $(TM_H) $(TREE_H) $(FLAGS_H) ada/gcc-interface/ada.h ada/types.h \ - ada/atree.h ada/nlists.h ada/elists.h ada/sinfo.h ada/einfo.h ada/namet.h \ - ada/snames.h ada/stringt.h ada/uintp.h ada/fe.h $(ADA_TREE_H) \ - ada/gcc-interface/gigi.h + $(TM_H) $(TREE_H) $(FLAGS_H) output.h $(TREE_INLINE_H) \ + ada/gcc-interface/ada.h ada/types.h ada/atree.h ada/elists.h ada/namet.h \ + ada/nlists.h ada/snames.h ada/stringt.h ada/uintp.h ada/fe.h ada/sinfo.h \ + ada/einfo.h $(ADA_TREE_H) ada/gcc-interface/gigi.h $(CC) -c $(ALL_CFLAGS) -I.. $(ALL_CPPFLAGS) $< -o $@ # diff --git a/gcc/ada/gcc-interface/cuintp.c b/gcc/ada/gcc-interface/cuintp.c index 90ea342..9b42040 100644 --- a/gcc/ada/gcc-interface/cuintp.c +++ b/gcc/ada/gcc-interface/cuintp.c @@ -6,7 +6,7 @@ * * * C Implementation File * * * - * Copyright (C) 1992-2008, Free Software Foundation, Inc. * + * Copyright (C) 1992-2009, Free Software Foundation, Inc. * * * * GNAT is free software; you can redistribute it and/or modify it under * * terms of the GNU General Public License as published by the Free Soft- * @@ -31,6 +31,7 @@ #include "coretypes.h" #include "tm.h" #include "tree.h" + #include "ada.h" #include "types.h" #include "uintp.h" @@ -39,8 +40,8 @@ #include "nlists.h" #include "stringt.h" #include "fe.h" -#include "gigi.h" #include "ada-tree.h" +#include "gigi.h" /* Universal integers are represented by the Uint type which is an index into the Uints_Ptr table containing Uint_Entry values. A Uint_Entry contains an diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index 85d7783..35899d2 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -30,9 +30,7 @@ #include "tree.h" #include "flags.h" #include "toplev.h" -#include "convert.h" #include "ggc.h" -#include "obstack.h" #include "target.h" #include "expr.h" @@ -49,7 +47,6 @@ #include "fe.h" #include "sinfo.h" #include "einfo.h" -#include "hashtab.h" #include "ada-tree.h" #include "gigi.h" diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c index c35a9c3..5385411 100644 --- a/gcc/ada/gcc-interface/misc.c +++ b/gcc/ada/gcc-interface/misc.c @@ -32,30 +32,25 @@ #include "coretypes.h" #include "tm.h" #include "tree.h" -#include "real.h" -#include "rtl.h" #include "diagnostic.h" +#include "target.h" #include "expr.h" #include "libfuncs.h" #include "ggc.h" #include "flags.h" #include "debug.h" #include "cgraph.h" -#include "tree-inline.h" -#include "insn-codes.h" -#include "insn-flags.h" -#include "insn-config.h" #include "optabs.h" -#include "recog.h" #include "toplev.h" -#include "output.h" #include "except.h" -#include "tm_p.h" #include "langhooks.h" #include "langhooks-def.h" -#include "target.h" +#include "opts.h" +#include "options.h" +#include "tree-inline.h" #include "ada.h" +#include "adadecode.h" #include "types.h" #include "atree.h" #include "elists.h" @@ -68,9 +63,6 @@ #include "einfo.h" #include "ada-tree.h" #include "gigi.h" -#include "adadecode.h" -#include "opts.h" -#include "options.h" static bool gnat_init (void); static unsigned int gnat_init_options (unsigned int, const char **); diff --git a/gcc/ada/gcc-interface/targtyps.c b/gcc/ada/gcc-interface/targtyps.c index 7c25108..ed608e5 100644 --- a/gcc/ada/gcc-interface/targtyps.c +++ b/gcc/ada/gcc-interface/targtyps.c @@ -30,8 +30,7 @@ #include "coretypes.h" #include "tm.h" #include "tree.h" -#include "real.h" -#include "rtl.h" + #include "ada.h" #include "types.h" #include "atree.h" diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c index cb5dc7b..ff1d918 100644 --- a/gcc/ada/gcc-interface/trans.c +++ b/gcc/ada/gcc-interface/trans.c @@ -28,20 +28,15 @@ #include "coretypes.h" #include "tm.h" #include "tree.h" -#include "real.h" #include "flags.h" -#include "toplev.h" -#include "rtl.h" #include "expr.h" #include "ggc.h" -#include "cgraph.h" -#include "function.h" -#include "except.h" -#include "debug.h" #include "output.h" #include "tree-iterator.h" #include "gimple.h" + #include "ada.h" +#include "adadecode.h" #include "types.h" #include "atree.h" #include "elists.h" @@ -56,9 +51,6 @@ #include "einfo.h" #include "ada-tree.h" #include "gigi.h" -#include "adadecode.h" -#include "dwarf2.h" -#include "dwarf2out.h" /* We should avoid allocating more than ALLOCA_THRESHOLD bytes via alloca, for fear of running out of stack space. If we need more, we use xmalloc diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c index 6ea9138..c61809a 100644 --- a/gcc/ada/gcc-interface/utils.c +++ b/gcc/ada/gcc-interface/utils.c @@ -33,22 +33,21 @@ #include "tm.h" #include "tree.h" #include "flags.h" -#include "defaults.h" #include "toplev.h" +#include "rtl.h" #include "output.h" #include "ggc.h" #include "debug.h" #include "convert.h" #include "target.h" #include "function.h" +#include "langhooks.h" +#include "pointer-set.h" #include "cgraph.h" +#include "tree-dump.h" #include "tree-inline.h" #include "tree-iterator.h" #include "gimple.h" -#include "tree-dump.h" -#include "pointer-set.h" -#include "langhooks.h" -#include "rtl.h" #include "ada.h" #include "types.h" diff --git a/gcc/ada/gcc-interface/utils2.c b/gcc/ada/gcc-interface/utils2.c index baa8a27..8ab39ee 100644 --- a/gcc/ada/gcc-interface/utils2.c +++ b/gcc/ada/gcc-interface/utils2.c @@ -28,24 +28,23 @@ #include "coretypes.h" #include "tm.h" #include "tree.h" -#include "rtl.h" #include "ggc.h" #include "flags.h" #include "output.h" #include "ada.h" #include "types.h" #include "atree.h" -#include "stringt.h" +#include "elists.h" #include "namet.h" +#include "nlists.h" +#include "snames.h" +#include "stringt.h" #include "uintp.h" #include "fe.h" -#include "elists.h" -#include "nlists.h" #include "sinfo.h" #include "einfo.h" #include "ada-tree.h" #include "gigi.h" -#include "snames.h" static tree find_common_type (tree, tree); static bool contains_save_expr_p (tree); -- 2.7.4