This fixes --enable-gather-detailed-mem-stats build. Bootstrapped through stage2 with and without that option, applied.
Richard. 2014-11-12 Richard Biener <rguent...@suse.de> PR bootstrap/63819 * hash-table.h: Include ggc.h also for generator programs. * genmatch.c (ggc_internal_cleared_alloc): Properly define using MEM_STAT_DECL instead of CXX_MEM_STAT_INFO. Index: gcc/hash-table.h =================================================================== --- gcc/hash-table.h (revision 217349) +++ gcc/hash-table.h (working copy) @@ -196,14 +196,7 @@ along with GCC; see the file COPYING3. #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> Index: gcc/genmatch.c =================================================================== --- gcc/genmatch.c (revision 217349) +++ gcc/genmatch.c (working copy) @@ -37,8 +37,7 @@ along with GCC; see the file COPYING3. /* Stubs for GGC referenced through instantiations triggered by hash-map. */ void *ggc_internal_cleared_alloc (size_t, void (*)(void *), - size_t, size_t - CXX_MEM_STAT_INFO) + size_t, size_t MEM_STAT_DECL) { return NULL; }