From bdaaa1f177dbc41b761936b150079dadc7da497e Mon Sep 17 00:00:00 2001
From: Andrew MacLeod <amacleod@redhat.com>
Date: Tue, 29 Oct 2013 16:37:01 +0000
Subject: [PATCH] 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
---
 gcc/ChangeLog | 5 +++++
 gcc/expr.h    | 3 +++
 gcc/rtl.h     | 1 -
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4b54fa6d2535..7400792a9361 100644
--- 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 2d7916488783..56f504ac1552 100644
--- 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 b7b3516314b1..247a0d067018 100644
--- 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.  */
-- 
GitLab