PR bootstrap/31776

* system.h: Remove inclusion of double-int.h
* tree.h: Include double-int.h
* gengtype.c: Likewise
* cfgloop.h: Likewise
* Makefile.in: Adjust dependencies on double-int.h


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

6 files changed, 17 insertions, 7 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c88c6644dad..c1438c6ed7e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-02  Brooks Moses  <brooks.moses@codesourcery.com>
+
+	PR bootstrap/31776
+	* system.h: Remove inclusion of double-int.h
+	* tree.h: Include double-int.h
+	* gengtype.c: Likewise
+	* cfgloop.h: Likewise
+	* Makefile.in: Adjust dependencies on double-int.h
+
 2007-05-02  Eric Christopher  <echristo@apple.com>
 
 	* config/darwin.h (TARGET_OPTION_TRANSLATE_TABLE): Translate
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 8856c641579..ad90a7ca21c 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -733,7 +733,8 @@ RTL_H = $(RTL_BASE_H) genrtl.h
 PARAMS_H = params.h params.def
 BUILTINS_DEF = builtins.def sync-builtins.def omp-builtins.def
 TREE_H = tree.h tree.def $(MACHMODE_H) tree-check.h $(BUILTINS_DEF) \
-          input.h statistics.h vec.h treestruct.def $(HASHTAB_H)
+          input.h statistics.h vec.h treestruct.def $(HASHTAB_H) \
+          double-int.h
 BASIC_BLOCK_H = basic-block.h bitmap.h sbitmap.h varray.h $(PARTITION_H) \
           hard-reg-set.h cfghooks.h $(OBSTACK_H)
 GCOV_IO_H = gcov-io.h gcov-iov.h auto-host.h
@@ -751,7 +752,7 @@ RESOURCE_H = resource.h hard-reg-set.h
 SCHED_INT_H = sched-int.h $(INSN_ATTR_H) $(BASIC_BLOCK_H) $(RTL_H)
 INTEGRATE_H = integrate.h $(VARRAY_H)
 CFGLAYOUT_H = cfglayout.h $(BASIC_BLOCK_H)
-CFGLOOP_H = cfgloop.h $(BASIC_BLOCK_H) $(RTL_H) vecprim.h
+CFGLOOP_H = cfgloop.h $(BASIC_BLOCK_H) $(RTL_H) vecprim.h double-int.h
 IPA_UTILS_H = ipa-utils.h $(TREE_H) $(CGRAPH_H)
 IPA_REFERENCE_H = ipa-reference.h bitmap.h $(TREE_H)
 IPA_TYPE_ESCAPE_H = ipa-type-escape.h $(TREE_H)
@@ -765,7 +766,7 @@ INSN_ATTR_H = insn-attr.h $(srcdir)/insn-addr.h $(srcdir)/varray.h
 C_COMMON_H = c-common.h $(SPLAY_TREE_H) $(CPPLIB_H) $(GGC_H)
 C_PRAGMA_H = c-pragma.h $(CPPLIB_H)
 C_TREE_H = c-tree.h $(C_COMMON_H) toplev.h $(DIAGNOSTIC_H)
-SYSTEM_H = system.h hwint.h double-int.h $(srcdir)/../include/libiberty.h
+SYSTEM_H = system.h hwint.h $(srcdir)/../include/libiberty.h
 PREDICT_H = predict.h predict.def
 CPPLIB_H = $(srcdir)/../libcpp/include/line-map.h \
 	$(srcdir)/../libcpp/include/cpplib.h
@@ -3062,7 +3063,7 @@ build/gengtype-lex.o : gengtype-lex.c gengtype.h $(BCONFIG_H) $(SYSTEM_H)
 build/gengtype-parse.o : gengtype-parse.c gengtype.h $(BCONFIG_H)	\
   $(SYSTEM_H)
 build/gengtype.o : gengtype.c $(BCONFIG_H) $(SYSTEM_H) gengtype.h 	\
-  rtl.def insn-notes.def errors.h
+  rtl.def insn-notes.def errors.h double-int.h
 build/genmddeps.o: genmddeps.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h	\
   $(GTM_H) $(RTL_BASE_H) errors.h gensupport.h
 build/genmodes.o : genmodes.c $(BCONFIG_H) $(SYSTEM_H) errors.h		\
diff --git a/gcc/cfgloop.h b/gcc/cfgloop.h
index 52160635bb9..ef70a71c981 100644
--- a/gcc/cfgloop.h
+++ b/gcc/cfgloop.h
@@ -26,6 +26,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 /* For rtx_code.  */
 #include "rtl.h"
 #include "vecprim.h"
+#include "double-int.h"
 
 /* Structure to hold decision about unrolling/peeling.  */
 enum lpt_dec
diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index 648246dbd66..2728fabbeef 100644
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -23,6 +23,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #include "system.h"
 #include "gengtype.h"
 #include "errors.h"	/* for fatal */
+#include "double-int.h"
 
 /* Data types, macros, etc. used only in this file.  */
 
diff --git a/gcc/system.h b/gcc/system.h
index 7a3c489e1d4..12f4b66fa69 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -611,9 +611,6 @@ extern void fancy_abort (const char *, int, const char *) ATTRIBUTE_NORETURN;
 # define FALSE false
 #endif /* !__cplusplus */
 
-/* Get definition of double_int.  */
-#include "double-int.h"
-
 /* Some compilers do not allow the use of unsigned char in bitfields.  */
 #define BOOL_BITFIELD unsigned int
 
diff --git a/gcc/tree.h b/gcc/tree.h
index 3059d402804..0c65e3bf59b 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -27,6 +27,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #include "input.h"
 #include "statistics.h"
 #include "vec.h"
+#include "double-int.h"
 
 /* Codes of tree nodes */