From 860e981ce96b322ed991c4a1744f588917e5b268 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Fri, 9 Jan 2015 21:45:33 +0000
Subject: [PATCH] Fix the jit build after header flattening of r219402

gcc/jit/ChangeLog:
	* dummy-frontend.c: Include "fixed-value.h", "alias.h", "flags.h",
	"symtab.h", "inchash.h".  Move include of "hash-set.h" much
	earlier.
	* jit-builtins.c: Remove redundant includes of "opts.h" and
	"tree.h".
	* jit-common.h: Include "hash-set.h", "input.h", "vec.h",
	"double-int.h", "alias.h", "flags.h", "symtab.h", "inchash.h".
	* jit-playback.c: Include "hashtab.h", "machmode.h", "input.h",
	"statistics.h", "vec.h", "double-int.h", "real.h",
	"fixed-value.h", "alias.h", "flags.h", "symtab.h", "tree-core.h",
	"inchash.h", "fold-const.h".  Move include of "hash-set.h" to
	earlier.
	* jit-recording.c: Remove redundant includes of "opts.h" and
	"tree.h".

From-SVN: r219411
---
 gcc/jit/ChangeLog        | 17 +++++++++++++++++
 gcc/jit/dummy-frontend.c |  7 ++++++-
 gcc/jit/jit-builtins.c   |  2 --
 gcc/jit/jit-common.h     |  8 ++++++++
 gcc/jit/jit-playback.c   | 16 +++++++++++++++-
 gcc/jit/jit-recording.c  |  2 --
 6 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog
index b84ac992cb2..5553d904eac 100644
--- a/gcc/jit/ChangeLog
+++ b/gcc/jit/ChangeLog
@@ -1,3 +1,20 @@
+2015-01-09  David Malcolm  <dmalcolm@redhat.com>
+
+	* dummy-frontend.c: Include "fixed-value.h", "alias.h", "flags.h",
+	"symtab.h", "inchash.h".  Move include of "hash-set.h" much
+	earlier.
+	* jit-builtins.c: Remove redundant includes of "opts.h" and
+	"tree.h".
+	* jit-common.h: Include "hash-set.h", "input.h", "vec.h",
+	"double-int.h", "alias.h", "flags.h", "symtab.h", "inchash.h".
+	* jit-playback.c: Include "hashtab.h", "machmode.h", "input.h",
+	"statistics.h", "vec.h", "double-int.h", "real.h",
+	"fixed-value.h", "alias.h", "flags.h", "symtab.h", "tree-core.h",
+	"inchash.h", "fold-const.h".  Move include of "hash-set.h" to
+	earlier.
+	* jit-recording.c: Remove redundant includes of "opts.h" and
+	"tree.h".
+
 2015-01-09  David Malcolm  <dmalcolm@redhat.com>
 
 	* docs/cp/topics/expressions.rst (Simple expressions): Use
diff --git a/gcc/jit/dummy-frontend.c b/gcc/jit/dummy-frontend.c
index 23883ad230c..a4dae3ead32 100644
--- a/gcc/jit/dummy-frontend.c
+++ b/gcc/jit/dummy-frontend.c
@@ -22,8 +22,14 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "opts.h"
 #include "signop.h"
+#include "hash-set.h"
+#include "fixed-value.h"
+#include "alias.h"
+#include "flags.h"
+#include "symtab.h"
 #include "tree-core.h"
 #include "stor-layout.h"
+#include "inchash.h"
 #include "tree.h"
 #include "debug.h"
 #include "langhooks.h"
@@ -33,7 +39,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "plugin-api.h"
 #include "vec.h"
 #include "hashtab.h"
-#include "hash-set.h"
 #include "machmode.h"
 #include "tm.h"
 #include "hard-reg-set.h"
diff --git a/gcc/jit/jit-builtins.c b/gcc/jit/jit-builtins.c
index c39d9cf3824..871f63e60bb 100644
--- a/gcc/jit/jit-builtins.c
+++ b/gcc/jit/jit-builtins.c
@@ -20,8 +20,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "opts.h"
-#include "tree.h"
 #include "target.h"
 #include "stringpool.h"
 
diff --git a/gcc/jit/jit-common.h b/gcc/jit/jit-common.h
index 80e1cbef1f5..78dc1c514da 100644
--- a/gcc/jit/jit-common.h
+++ b/gcc/jit/jit-common.h
@@ -23,6 +23,14 @@ along with GCC; see the file COPYING3.  If not see
 
 #include "libgccjit.h"
 
+#include "hash-set.h"
+#include "input.h"
+#include "vec.h"
+#include "double-int.h"
+#include "alias.h"
+#include "flags.h"
+#include "symtab.h"
+#include "inchash.h"
 #include "tree.h"
 #include "tree-iterator.h"
 
diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
index 9c3bc17089f..1baf9c544c4 100644
--- a/gcc/jit/jit-playback.c
+++ b/gcc/jit/jit-playback.c
@@ -22,13 +22,26 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "opts.h"
+#include "hashtab.h"
+#include "hash-set.h"
+#include "machmode.h"
+#include "input.h"
+#include "statistics.h"
+#include "vec.h"
+#include "double-int.h"
+#include "real.h"
+#include "fixed-value.h"
+#include "alias.h"
+#include "flags.h"
+#include "symtab.h"
+#include "tree-core.h"
+#include "inchash.h"
 #include "tree.h"
 #include "hash-map.h"
 #include "is-a.h"
 #include "plugin-api.h"
 #include "vec.h"
 #include "hashtab.h"
-#include "hash-set.h"
 #include "machmode.h"
 #include "tm.h"
 #include "hard-reg-set.h"
@@ -48,6 +61,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "gcc-driver-name.h"
 #include "attribs.h"
 #include "context.h"
+#include "fold-const.h"
 
 #include "jit-common.h"
 #include "jit-logging.h"
diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c
index 63dab380db1..8da7f763ad3 100644
--- a/gcc/jit/jit-recording.c
+++ b/gcc/jit/jit-recording.c
@@ -22,8 +22,6 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-#include "opts.h"
-#include "tree.h"
 #include "pretty-print.h"
 
 #include <pthread.h>
-- 
2.30.2