From 06d71fa1487fdef03e713b9e1aed50f7dceff27b Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Mon, 30 Jul 2012 16:13:07 +0100 Subject: configure: Split valgrind test into pragma test and valgrind.h test Split the configure test that checks for valgrind into two, one part checking whether we have the gcc pragma to disable unused-but-set variables, and the other part checking for the existence of valgrind.h. The first of these has to be compiled with -Werror and the second does not and shouldn't generate any warnings. This (a) allows us to enable "make errors in configure tests be build failures" and (b) enables use of valgrind on systems with a gcc which doesn't know about -Wunused-but-set-varibale, like Debian squeeze. Signed-off-by: Peter Maydell Signed-off-by: Blue Swirl --- coroutine-ucontext.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'coroutine-ucontext.c') diff --git a/coroutine-ucontext.c b/coroutine-ucontext.c index e3c450b322..784081ab18 100644 --- a/coroutine-ucontext.c +++ b/coroutine-ucontext.c @@ -200,14 +200,18 @@ Coroutine *qemu_coroutine_new(void) } #ifdef CONFIG_VALGRIND_H +#ifdef CONFIG_PRAGMA_DISABLE_UNUSED_BUT_SET /* Work around an unused variable in the valgrind.h macro... */ #pragma GCC diagnostic ignored "-Wunused-but-set-variable" +#endif static inline void valgrind_stack_deregister(CoroutineUContext *co) { VALGRIND_STACK_DEREGISTER(co->valgrind_stack_id); } +#ifdef CONFIG_PRAGMA_DISABLE_UNUSED_BUT_SET #pragma GCC diagnostic error "-Wunused-but-set-variable" #endif +#endif void qemu_coroutine_delete(Coroutine *co_) { -- cgit v1.2.1