summaryrefslogtreecommitdiff
path: root/gcc/alloc-pool.c
diff options
context:
space:
mode:
authorRichard Biener <rguenther@suse.de>2014-04-28 14:01:40 +0000
committerRichard Biener <rguenth@gcc.gnu.org>2014-04-28 14:01:40 +0000
commit279a935ff4bc1df86e090f8e28f15d70384514eb (patch)
treea5bc6249aa24285c664840fc0a7c18d7aea148b9 /gcc/alloc-pool.c
parent07357f2f5a81e008b78af738e5e0050d850425a8 (diff)
configure.ac: Do valgrind header checks unconditionally.
2014-04-28 Richard Biener <rguenther@suse.de> * configure.ac: Do valgrind header checks unconditionally. Add --enable-valgrind-annotations. * system.h: Guard valgrind header inclusion with ENABLE_VALGRIND_ANNOTATIONS instead of ENABLE_VALGRIND_CHECKING. * alloc-pool.c (pool_alloc, pool_free): Use ENABLE_VALGRIND_ANNOTATIONS instead of ENABLE_VALGRIND_CHECKING to guard possibly dead code. * config.in: Regenerated. * configure: Likewise. From-SVN: r209861
Diffstat (limited to 'gcc/alloc-pool.c')
-rw-r--r--gcc/alloc-pool.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/alloc-pool.c b/gcc/alloc-pool.c
index dfb13ce55fb..87fbd8556fb 100644
--- a/gcc/alloc-pool.c
+++ b/gcc/alloc-pool.c
@@ -250,7 +250,7 @@ void *
pool_alloc (alloc_pool pool)
{
alloc_pool_list header;
-#ifdef ENABLE_VALGRIND_CHECKING
+#ifdef ENABLE_VALGRIND_ANNOTATIONS
int size;
#endif
@@ -265,7 +265,7 @@ pool_alloc (alloc_pool pool)
}
gcc_checking_assert (pool);
-#ifdef ENABLE_VALGRIND_CHECKING
+#ifdef ENABLE_VALGRIND_ANNOTATIONS
size = pool->elt_size - offsetof (allocation_object, u.data);
#endif
@@ -334,7 +334,7 @@ void
pool_free (alloc_pool pool, void *ptr)
{
alloc_pool_list header;
-#if defined(ENABLE_VALGRIND_CHECKING) || defined(ENABLE_CHECKING)
+#if defined(ENABLE_VALGRIND_ANNOTATIONS) || defined(ENABLE_CHECKING)
int size;
size = pool->elt_size - offsetof (allocation_object, u.data);
#endif