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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dc672ca2bc95d871bf1e6c7ac46eeb28fa2f447b..269ee365ae56c807ba582ad1610ee16c279bee5f 100644 (file)
--- 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 749a1182f49b17f836a7f1516e3a498a8f9fbe80..3dfde6d2170b643c1b80deea9f2e6d071ffc4ec6 100644 (file)
--- 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 2493f2e983a26f99b68f9d980452682a8306e024..6df32a2e1aa54ef80d3d2f35ec9e8a173895b7f5 100644 (file)
--- 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>