diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2012-07-30 16:13:07 +0100 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2012-07-31 20:04:42 +0000 |
commit | 06d71fa1487fdef03e713b9e1aed50f7dceff27b (patch) | |
tree | 28176f7ef48ed3d24b6abe7311b1e34bce9d348a /configure | |
parent | 5e3bc7144edd6e4fa2824944e5eb16c28197dd5a (diff) | |
download | hqemu-06d71fa1487fdef03e713b9e1aed50f7dceff27b.zip hqemu-06d71fa1487fdef03e713b9e1aed50f7dceff27b.tar.gz |
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 <peter.maydell@linaro.org>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 23 |
1 files changed, 21 insertions, 2 deletions
@@ -2873,14 +2873,29 @@ if compile_prog "" "" ; then fi ######################################## +# check whether we can disable the -Wunused-but-set-variable +# option with a pragma (this is needed to silence a warning in +# some versions of the valgrind VALGRIND_STACK_DEREGISTER macro.) +# This test has to be compiled with -Werror as otherwise an +# unknown pragma is only a warning. +pragma_disable_unused_but_set=no +cat > $TMPC << EOF +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" +int main(void) { + return 0; +} +EOF +if compile_prog "-Werror" "" ; then + pragma_disable_unused_but_set=yes +fi + +######################################## # check if we have valgrind/valgrind.h valgrind_h=no cat > $TMPC << EOF #include <valgrind/valgrind.h> -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" int main(void) { - VALGRIND_STACK_DEREGISTER(0); return 0; } EOF @@ -3397,6 +3412,10 @@ if test "$linux_magic_h" = "yes" ; then echo "CONFIG_LINUX_MAGIC_H=y" >> $config_host_mak fi +if test "$pragma_disable_unused_but_set" = "yes" ; then + echo "CONFIG_PRAGMA_DISABLE_UNUSED_BUT_SET=y" >> $config_host_mak +fi + if test "$valgrind_h" = "yes" ; then echo "CONFIG_VALGRIND_H=y" >> $config_host_mak fi |