aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/hash-table.c4
-rw-r--r--gcc/hash-table.h7
3 files changed, 17 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dc672ca..269ee36 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 749a118..3dfde6d 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 2493f2e..6df32a2 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>