Ensure -Wdeclaration-after-statement gets through to vex-land.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5593

diff --git a/Makefile.tool.am b/Makefile.tool.am
index e985aecd5433408333d2ae239a0408b6473c3d70..7c9318e8df3a01c7101c3511804da5dec9e5f8a2 100644 (file)
--- a/Makefile.tool.am
+++ b/Makefile.tool.am
@@ -37,16 +37,20 @@ COREGRIND_LIBS_PPC64_LINUX = \
 ##.PHONY:  @VEX_DIR@/libvex.a
 
 @VEX_DIR@/libvex_x86_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h
-       $(MAKE) -C @VEX_DIR@ CC="$(CC)" libvex_x86_linux.a EXTRA_CFLAGS="$(AM_CFLAGS_X86_LINUX)"
+       $(MAKE) -C @VEX_DIR@ CC="$(CC)" libvex_x86_linux.a \
+       EXTRA_CFLAGS="$(AM_CFLAGS_X86_LINUX) @FLAG_WDECL_AFTER_STMT@"
 
 @VEX_DIR@/libvex_amd64_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h
-       $(MAKE) -C @VEX_DIR@ CC="$(CC)" libvex_amd64_linux.a EXTRA_CFLAGS="$(AM_CFLAGS_AMD64_LINUX)"
+       $(MAKE) -C @VEX_DIR@ CC="$(CC)" libvex_amd64_linux.a \
+       EXTRA_CFLAGS="$(AM_CFLAGS_AMD64_LINUX) @FLAG_WDECL_AFTER_STMT@"
 
 @VEX_DIR@/libvex_ppc32_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h
-       $(MAKE) -C @VEX_DIR@ CC="$(CC)" libvex_ppc32_linux.a EXTRA_CFLAGS="$(AM_CFLAGS_PPC32_LINUX)"
+       $(MAKE) -C @VEX_DIR@ CC="$(CC)" libvex_ppc32_linux.a \
+       EXTRA_CFLAGS="$(AM_CFLAGS_PPC32_LINUX) @FLAG_WDECL_AFTER_STMT@"
 
 @VEX_DIR@/libvex_ppc64_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h
-       $(MAKE) -C @VEX_DIR@ CC="$(CC)" libvex_ppc64_linux.a EXTRA_CFLAGS="$(AM_CFLAGS_PPC64_LINUX)"
+       $(MAKE) -C @VEX_DIR@ CC="$(CC)" libvex_ppc64_linux.a \
+       EXTRA_CFLAGS="$(AM_CFLAGS_PPC64_LINUX) @FLAG_WDECL_AFTER_STMT@"
 
 @VEX_DIR@/priv/main/vex_svnversion.h:
        $(MAKE) -C @VEX_DIR@ CC="$(CC)" version

diff --git a/configure.in b/configure.in
index be46a73ce2f55ab1a95ad2dc8eed65f0560b6838..cf78a90d20b9c19e2d4b0eba8c6859c79642ad65 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -486,13 +486,17 @@ int main () { return 0 ; }
 ],
 [
 declaration_after_statement=yes
+FLAG_WDECL_AFTER_STMT="-Wdeclaration-after-statement"
 AC_MSG_RESULT([yes])
 ], [
 declaration_after_statement=no
+FLAG_WDECL_AFTER_STMT=""
 AC_MSG_RESULT([no])
 ])
 CFLAGS=$safe_CFLAGS
 
+AC_SUBST(FLAG_WDECL_AFTER_STMT)
+
 if test x$declaration_after_statement = xyes; then
   CFLAGS="$CFLAGS -Wdeclaration-after-statement"
 fi