From e7d1000cd7501d3dcacda0ef9f6dfb0b4a0729f5 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 12 Nov 2014 10:12:47 +0000 Subject: [PATCH] =?UTF-8?q?re=20PR=20middle-end/63819=20(Cannot=20build=20?= =?UTF-8?q?compiler=20with=20--enable-gather-detailed-mem-stats=20(error:?= =?UTF-8?q?=20default=20argument=20given=20for=20parameter=205=20of=20?= =?UTF-8?q?=E2=80=98void*=20ggc=5Finternal=5Fcleared=5Falloc))?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2014-11-12 Richard Biener 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. From-SVN: r217410 --- gcc/ChangeLog | 7 +++++++ gcc/genmatch.c | 3 +-- gcc/hash-table.h | 7 ------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d6c7d383db6..35e1198c591 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2014-11-12 Richard Biener + + 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. + 2014-11-12 Thomas Preud'homme PR tree-optimization/63761 diff --git a/gcc/genmatch.c b/gcc/genmatch.c index 723de193ad5..234b1a7987c 100644 --- a/gcc/genmatch.c +++ b/gcc/genmatch.c @@ -37,8 +37,7 @@ along with GCC; see the file COPYING3. If not see /* 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; } diff --git a/gcc/hash-table.h b/gcc/hash-table.h index 6df32a2e1aa..2493f2e983a 100644 --- a/gcc/hash-table.h +++ b/gcc/hash-table.h @@ -196,14 +196,7 @@ 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 -T *ggc_cleared_vec_alloc (size_t); -template -T *ggc_alloc (); -#endif #include "hashtab.h" #include