From 13f447a33ca50156257d0cef0b707aa18416fa9b Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Wed, 15 Oct 2014 09:55:19 +0000
Subject: [PATCH] hash-table.c: Include bconfig.h if building for the host.

2014-10-15  Richard Biener  <rguenther@suse.de>

	* hash-table.c: Include bconfig.h if building for the host.
	* hash-table.h: Do not include ggc.h on the host but just declare
	a few ggc allocation templates.

From-SVN: r216246
---
 gcc/ChangeLog    | 6 ++++++
 gcc/hash-table.c | 4 ++++
 gcc/hash-table.h | 7 +++++++
 3 files changed, 17 insertions(+)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dc672ca2bc9..269ee365ae5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-15  Richard Biener  <rguenther@suse.de>
+
+	* hash-table.c: Include bconfig.h if building for the host.
+	* hash-table.h: Do not include ggc.h on the host but just declare
+	a few ggc allocation templates.
+
 2014-10-15  Joern Rennecke  <joern.rennecke@embecosm.com>
 	    Jeff Law  <law@redhat.com>
 
diff --git a/gcc/hash-table.c b/gcc/hash-table.c
index 749a1182f49..3dfde6d2170 100644
--- a/gcc/hash-table.c
+++ b/gcc/hash-table.c
@@ -22,7 +22,11 @@ along with GCC; see the file COPYING3.  If not see
 /* This file implements a typed hash table.
    The implementation borrows from libiberty's hashtab.  */
 
+#ifdef GENERATOR_FILE
+#include "bconfig.h"
+#else
 #include "config.h"
+#endif
 #include "system.h"
 #include "coretypes.h"
 #include "hash-table.h"
diff --git a/gcc/hash-table.h b/gcc/hash-table.h
index 2493f2e983a..6df32a2e1aa 100644
--- a/gcc/hash-table.h
+++ b/gcc/hash-table.h
@@ -196,7 +196,14 @@ along with GCC; see the file COPYING3.  If not see
 #ifndef TYPED_HASHTAB_H
 #define TYPED_HASHTAB_H
 
+#ifndef GENERATOR_FILE
 #include "ggc.h"
+#else
+template <typename T>
+T *ggc_cleared_vec_alloc (size_t);
+template <typename T>
+T *ggc_alloc ();
+#endif
 #include "hashtab.h"
 #include <new>
 
-- 
2.30.2