From 3bb2b4cdacbcbf1d805a1085b54d2907958dc713 Mon Sep 17 00:00:00 2001
From: Andrew MacLeod <amacleod@redhat.com>
Date: Fri, 17 Oct 2014 13:21:52 +0000
Subject: [PATCH] gcc-plugin.h: Add tm.h and flattened includes from
 function.h.

2014-10-17  Andrew MacLeod  <amacleod@redhat.com>

	* gcc-plugin.h:  Add tm.h and flattened includes from function.h.

	* testsuite/g++.dg/plugin/pragma_plugin.c: Revert flattening, only
	include function.h.

From-SVN: r216402
---
 gcc/ChangeLog                               | 4 ++++
 gcc/gcc-plugin.h                            | 6 ++++++
 gcc/testsuite/ChangeLog                     | 5 +++++
 gcc/testsuite/g++.dg/plugin/pragma_plugin.c | 6 ------
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ba84c3295f7..b92567627b1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-17  Andrew MacLeod  <amacleod@redhat.com>
+
+	gcc-plugin.h:  Add tm.h and flattened includes from function.h.
+
 2014-10-17  Alexander Ivchenko  <alexander.ivchenko@intel.com>
 	    Maxim Kuznetsov  <maxim.kuznetsov@intel.com>
 	    Anna Tikhonova  <anna.tikhonova@intel.com>
diff --git a/gcc/gcc-plugin.h b/gcc/gcc-plugin.h
index 035b50b3516..7b019ad52b9 100644
--- a/gcc/gcc-plugin.h
+++ b/gcc/gcc-plugin.h
@@ -28,7 +28,13 @@ along with GCC; see the file COPYING3.  If not see
 #include "system.h"
 #include "coretypes.h"
 #include "highlev-plugin-common.h"
+#include "tm.h"
 #include "hashtab.h"
+#include "hash-set.h"
+#include "vec.h"
+#include "machmode.h"
+#include "hard-reg-set.h"
+#include "input.h"
 
 /* Event names.  */
 enum plugin_event
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e38cfd62dd9..b355cb0c6b4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-17  Andrew MacLeod  <amacleod@redhat.com>
+
+	* g++.dg/plugin/pragma_plugin.c: Revert flattening to test plugin header
+	changes.
+
 2014-10-17  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/63464
diff --git a/gcc/testsuite/g++.dg/plugin/pragma_plugin.c b/gcc/testsuite/g++.dg/plugin/pragma_plugin.c
index a4de7770a2a..940c302df7d 100644
--- a/gcc/testsuite/g++.dg/plugin/pragma_plugin.c
+++ b/gcc/testsuite/g++.dg/plugin/pragma_plugin.c
@@ -8,12 +8,6 @@
 #include "tm.h"
 #include "rtl.h"
 #include "tree.h"
-#include "hashtab.h"
-#include "hash-set.h"
-#include "vec.h"
-#include "machmode.h"
-#include "hard-reg-set.h"
-#include "input.h"
 #include "function.h"
 #include "c-family/c-pragma.h"
 #include "cpplib.h"
-- 
2.30.2