diff options
| author | Richard Biener <rguenther@suse.de> | 2014-11-12 10:12:47 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2014-11-12 10:12:47 +0000 |
| commit | e7d1000cd7501d3dcacda0ef9f6dfb0b4a0729f5 (patch) | |
| tree | 759158cc2db25b2f9f7c5de3e033c22f29735c89 /gcc | |
| parent | f351abd67980aced3a656bb5cc639eda1482439f (diff) | |
| download | gcc-e7d1000cd7501d3dcacda0ef9f6dfb0b4a0729f5.zip gcc-e7d1000cd7501d3dcacda0ef9f6dfb0b4a0729f5.tar.gz gcc-e7d1000cd7501d3dcacda0ef9f6dfb0b4a0729f5.tar.bz2 | |
re PR middle-end/63819 (Cannot build compiler with --enable-gather-detailed-mem-stats (error: default argument given for parameter 5 of ‘void* ggc_internal_cleared_alloc))
2014-11-12 Richard Biener <rguenther@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.
From-SVN: r217410
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/genmatch.c | 3 | ||||
| -rw-r--r-- | gcc/hash-table.h | 7 |
3 files changed, 8 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d6c7d38..35e1198 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2014-11-12 Richard Biener <rguenther@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. + 2014-11-12 Thomas Preud'homme <thomas.preudhomme@arm.com> PR tree-optimization/63761 diff --git a/gcc/genmatch.c b/gcc/genmatch.c index 723de19..234b1a7 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 6df32a2..2493f2e 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 <typename T> -T *ggc_cleared_vec_alloc (size_t); -template <typename T> -T *ggc_alloc (); -#endif #include "hashtab.h" #include <new> |