expr.h: Revert change and include tree-core.h.

	* expr.h: Revert change and include tree-core.h.
	* rtl.h: Revert change and don't include tree-core.h.

From-SVN: r204167

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4b54fa6d2535d5c249261a610805a44047ad1912..7400792a9361640996b3f8f03cb04399d2e9d54d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-29  Andrew MacLeod  <amacleod@redhat.com>
+
+       * expr.h: Revert change and include tree-core.h.
+       * rtl.h: Revert change and don't include tree-core.h.
+
 2013-10-29  Andrew MacLeod  <amacleod@redhat.com>
 
        * config/darwin.c: Include gimple.h.

diff --git a/gcc/expr.h b/gcc/expr.h
index 2d7916488783c48c18d7b314e1962ca4ad051b4c..56f504ac1552b1308a78137bfa94af96f2fe22ee 100644 (file)
--- a/gcc/expr.h
+++ b/gcc/expr.h
@@ -26,6 +26,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "rtl.h"
 /* For optimize_size */
 #include "flags.h"
+/* For host_integerp, tree_low_cst, fold_convert, size_binop, ssize_int,
+   TREE_CODE, TYPE_SIZE, int_size_in_bytes,    */
+#include "tree-core.h"
 /* For GET_MODE_BITSIZE, word_mode */
 #include "machmode.h"
 

diff --git a/gcc/rtl.h b/gcc/rtl.h
index b7b3516314b11e0770fd3b72ef809592f25ab9db..247a0d0670183a3a7d57f9968fc78b7e0f4a1bc3 100644 (file)
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -29,7 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "alias.h"
 #include "hashtab.h"
 #include "flags.h"
-#include "tree-core.h"
 
 /* Value used by some passes to "recognize" noop moves as valid
  instructions.  */