valgrind/valgrind-3.11.0-arm-no-cast-align.patch

commit 149c892c4ff54581ef1be6ba98abec8e3949e78e
Author: florian <florian@a5019735-40e9-0310-863c-91ae7b9d1cf9>
Date:   Mon Sep 14 21:11:32 2015 +0000

    Do not compile with -Wcast-align on arm. There are too many
    warnings due to GCC being very conservative.
    
    
    git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15651 a5019735-40e9-0310-863c-91ae7b9d1cf9

diff --git a/Makefile.all.am b/Makefile.all.am
index 708e8d8..44a6207 100644
--- a/Makefile.all.am
+++ b/Makefile.all.am
@@ -100,12 +100,12 @@ AM_CFLAGS_BASE = \
 	-O2 -g \
 	-std=gnu99 \
 	-Wall \
-	-Wcast-align \
 	-Wmissing-prototypes \
 	-Wshadow \
 	-Wpointer-arith \
 	-Wstrict-prototypes \
 	-Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ \
 	@FLAG_W_CAST_QUAL@ \
 	@FLAG_W_WRITE_STRINGS@ \
 	@FLAG_W_EMPTY_BODY@ \
diff --git a/configure.ac b/configure.ac
index f257d93..65d56c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1967,6 +1967,15 @@ AC_MSG_RESULT([-Wextra])
 ])
 CFLAGS=$safe_CFLAGS
 
+# On ARM we do not want to pass -Wcast-align as that produces loads
+# of warnings. GCC is just being conservative. See here:
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65459#c4
+if test "X$VGCONF_ARCH_PRI" = "Xarm"; then
+  AC_SUBST([FLAG_W_CAST_ALIGN], [""])
+else
+  AC_SUBST([FLAG_W_CAST_ALIGN], [-Wcast-align])
+fi
+
 # does this compiler support -fno-stack-protector ?
 AC_MSG_CHECKING([if gcc accepts -fno-stack-protector])
 
diff -ur valgrind-3.11.0.TEST1.orig/auxprogs/Makefile.in valgrind-3.11.0.TEST1/auxprogs/Makefile.in
--- valgrind-3.11.0.TEST1.orig/auxprogs/Makefile.in	2015-09-18 21:57:00.645836494 +0200
+++ valgrind-3.11.0.TEST1/auxprogs/Makefile.in	2015-09-18 22:28:14.511177265 +0200
@@ -271,6 +271,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -403,15 +404,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/cachegrind/Makefile.in valgrind-3.11.0.TEST1/cachegrind/Makefile.in
--- valgrind-3.11.0.TEST1.orig/cachegrind/Makefile.in	2015-09-18 21:57:00.736836305 +0200
+++ valgrind-3.11.0.TEST1/cachegrind/Makefile.in	2015-09-18 22:28:14.570177152 +0200
@@ -326,6 +326,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -459,15 +460,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/cachegrind/tests/Makefile.in valgrind-3.11.0.TEST1/cachegrind/tests/Makefile.in
--- valgrind-3.11.0.TEST1.orig/cachegrind/tests/Makefile.in	2015-09-18 21:57:00.737836303 +0200
+++ valgrind-3.11.0.TEST1/cachegrind/tests/Makefile.in	2015-09-18 22:28:14.618177061 +0200
@@ -288,6 +288,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -420,15 +421,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/cachegrind/tests/x86/Makefile.in valgrind-3.11.0.TEST1/cachegrind/tests/x86/Makefile.in
--- valgrind-3.11.0.TEST1.orig/cachegrind/tests/x86/Makefile.in	2015-09-18 21:57:00.737836303 +0200
+++ valgrind-3.11.0.TEST1/cachegrind/tests/x86/Makefile.in	2015-09-18 22:28:14.661176978 +0200
@@ -236,6 +236,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -368,15 +369,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/callgrind/Makefile.in valgrind-3.11.0.TEST1/callgrind/Makefile.in
--- valgrind-3.11.0.TEST1.orig/callgrind/Makefile.in	2015-09-18 21:57:00.659836465 +0200
+++ valgrind-3.11.0.TEST1/callgrind/Makefile.in	2015-09-18 22:28:14.749176810 +0200
@@ -338,6 +338,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -471,15 +472,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/callgrind/tests/Makefile.in valgrind-3.11.0.TEST1/callgrind/tests/Makefile.in
--- valgrind-3.11.0.TEST1.orig/callgrind/tests/Makefile.in	2015-09-18 21:57:00.660836463 +0200
+++ valgrind-3.11.0.TEST1/callgrind/tests/Makefile.in	2015-09-18 22:28:14.795176722 +0200
@@ -277,6 +277,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -409,15 +410,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/configure valgrind-3.11.0.TEST1/configure
--- valgrind-3.11.0.TEST1.orig/configure	2015-09-18 21:57:00.674836434 +0200
+++ valgrind-3.11.0.TEST1/configure	2015-09-18 22:28:19.751167239 +0200
@@ -754,6 +754,7 @@
 FLAG_FSANITIZE
 FLAG_FNO_IPA_ICF
 FLAG_FNO_STACK_PROTECTOR
+FLAG_W_CAST_ALIGN
 FLAG_W_EXTRA
 FLAG_W_FORMAT_SECURITY
 FLAG_W_MISSING_PARAMETER_TYPE
@@ -9340,6 +9341,17 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 CFLAGS=$safe_CFLAGS
 
+# On ARM we do not want to pass -Wcast-align as that produces loads
+# of warnings. GCC is just being conservative. See here:
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65459#c4
+if test "X$VGCONF_ARCH_PRI" = "Xarm"; then
+  FLAG_W_CAST_ALIGN=""
+
+else
+  FLAG_W_CAST_ALIGN=-Wcast-align
+
+fi
+
 # does this compiler support -fno-stack-protector ?
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc accepts -fno-stack-protector" >&5
 $as_echo_n "checking if gcc accepts -fno-stack-protector... " >&6; }
diff -ur valgrind-3.11.0.TEST1.orig/coregrind/Makefile.in valgrind-3.11.0.TEST1/coregrind/Makefile.in
--- valgrind-3.11.0.TEST1.orig/coregrind/Makefile.in	2015-09-18 21:57:00.665836452 +0200
+++ valgrind-3.11.0.TEST1/coregrind/Makefile.in	2015-09-18 22:28:15.340175679 +0200
@@ -988,6 +988,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -1120,15 +1121,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/docs/Makefile.in valgrind-3.11.0.TEST1/docs/Makefile.in
--- valgrind-3.11.0.TEST1.orig/docs/Makefile.in	2015-09-18 21:57:00.658836467 +0200
+++ valgrind-3.11.0.TEST1/docs/Makefile.in	2015-09-18 22:28:15.375175612 +0200
@@ -156,6 +156,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
diff -ur valgrind-3.11.0.TEST1.orig/drd/Makefile.in valgrind-3.11.0.TEST1/drd/Makefile.in
--- valgrind-3.11.0.TEST1.orig/drd/Makefile.in	2015-09-18 21:57:00.725836328 +0200
+++ valgrind-3.11.0.TEST1/drd/Makefile.in	2015-09-18 22:28:15.482175407 +0200
@@ -388,6 +388,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -521,15 +522,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/drd/tests/Makefile.in valgrind-3.11.0.TEST1/drd/tests/Makefile.in
--- valgrind-3.11.0.TEST1.orig/drd/tests/Makefile.in	2015-09-18 21:57:00.732836313 +0200
+++ valgrind-3.11.0.TEST1/drd/tests/Makefile.in	2015-09-18 22:28:15.610175162 +0200
@@ -686,6 +686,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -818,15 +819,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/exp-bbv/Makefile.in valgrind-3.11.0.TEST1/exp-bbv/Makefile.in
--- valgrind-3.11.0.TEST1.orig/exp-bbv/Makefile.in	2015-09-18 21:57:00.675836432 +0200
+++ valgrind-3.11.0.TEST1/exp-bbv/Makefile.in	2015-09-18 22:28:15.664175059 +0200
@@ -278,6 +278,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -411,15 +412,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/exp-bbv/tests/amd64-linux/Makefile.in valgrind-3.11.0.TEST1/exp-bbv/tests/amd64-linux/Makefile.in
--- valgrind-3.11.0.TEST1.orig/exp-bbv/tests/amd64-linux/Makefile.in	2015-09-18 21:57:00.677836428 +0200
+++ valgrind-3.11.0.TEST1/exp-bbv/tests/amd64-linux/Makefile.in	2015-09-18 22:28:15.756174883 +0200
@@ -264,6 +264,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -396,15 +397,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/exp-bbv/tests/arm-linux/Makefile.in valgrind-3.11.0.TEST1/exp-bbv/tests/arm-linux/Makefile.in
--- valgrind-3.11.0.TEST1.orig/exp-bbv/tests/arm-linux/Makefile.in	2015-09-18 21:57:00.676836430 +0200
+++ valgrind-3.11.0.TEST1/exp-bbv/tests/arm-linux/Makefile.in	2015-09-18 22:28:15.801174797 +0200
@@ -239,6 +239,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -371,15 +372,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/exp-bbv/tests/Makefile.in valgrind-3.11.0.TEST1/exp-bbv/tests/Makefile.in
--- valgrind-3.11.0.TEST1.orig/exp-bbv/tests/Makefile.in	2015-09-18 21:57:00.675836432 +0200
+++ valgrind-3.11.0.TEST1/exp-bbv/tests/Makefile.in	2015-09-18 22:28:15.707174977 +0200
@@ -258,6 +258,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -390,15 +391,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/exp-bbv/tests/ppc32-linux/Makefile.in valgrind-3.11.0.TEST1/exp-bbv/tests/ppc32-linux/Makefile.in
--- valgrind-3.11.0.TEST1.orig/exp-bbv/tests/ppc32-linux/Makefile.in	2015-09-18 21:57:00.676836430 +0200
+++ valgrind-3.11.0.TEST1/exp-bbv/tests/ppc32-linux/Makefile.in	2015-09-18 22:28:15.853174698 +0200
@@ -239,6 +239,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -371,15 +372,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/exp-bbv/tests/x86/Makefile.in valgrind-3.11.0.TEST1/exp-bbv/tests/x86/Makefile.in
--- valgrind-3.11.0.TEST1.orig/exp-bbv/tests/x86/Makefile.in	2015-09-18 21:57:00.676836430 +0200
+++ valgrind-3.11.0.TEST1/exp-bbv/tests/x86/Makefile.in	2015-09-18 22:28:15.945174521 +0200
@@ -248,6 +248,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -380,15 +381,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/exp-bbv/tests/x86-linux/Makefile.in valgrind-3.11.0.TEST1/exp-bbv/tests/x86-linux/Makefile.in
--- valgrind-3.11.0.TEST1.orig/exp-bbv/tests/x86-linux/Makefile.in	2015-09-18 21:57:00.675836432 +0200
+++ valgrind-3.11.0.TEST1/exp-bbv/tests/x86-linux/Makefile.in	2015-09-18 22:28:15.898174611 +0200
@@ -239,6 +239,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -371,15 +372,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/exp-dhat/Makefile.in valgrind-3.11.0.TEST1/exp-dhat/Makefile.in
--- valgrind-3.11.0.TEST1.orig/exp-dhat/Makefile.in	2015-09-18 21:57:00.724836330 +0200
+++ valgrind-3.11.0.TEST1/exp-dhat/Makefile.in	2015-09-18 22:28:16.001174414 +0200
@@ -302,6 +302,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -435,15 +436,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/exp-dhat/tests/Makefile.in valgrind-3.11.0.TEST1/exp-dhat/tests/Makefile.in
--- valgrind-3.11.0.TEST1.orig/exp-dhat/tests/Makefile.in	2015-09-18 21:57:00.724836330 +0200
+++ valgrind-3.11.0.TEST1/exp-dhat/tests/Makefile.in	2015-09-18 22:28:16.029174361 +0200
@@ -156,6 +156,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
diff -ur valgrind-3.11.0.TEST1.orig/exp-sgcheck/Makefile.in valgrind-3.11.0.TEST1/exp-sgcheck/Makefile.in
--- valgrind-3.11.0.TEST1.orig/exp-sgcheck/Makefile.in	2015-09-18 21:57:00.723836332 +0200
+++ valgrind-3.11.0.TEST1/exp-sgcheck/Makefile.in	2015-09-18 22:28:16.098174229 +0200
@@ -320,6 +320,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -453,15 +454,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/exp-sgcheck/tests/Makefile.in valgrind-3.11.0.TEST1/exp-sgcheck/tests/Makefile.in
--- valgrind-3.11.0.TEST1.orig/exp-sgcheck/tests/Makefile.in	2015-09-18 21:57:00.724836330 +0200
+++ valgrind-3.11.0.TEST1/exp-sgcheck/tests/Makefile.in	2015-09-18 22:28:16.153174123 +0200
@@ -264,6 +264,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -396,15 +397,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/gdbserver_tests/Makefile.in valgrind-3.11.0.TEST1/gdbserver_tests/Makefile.in
--- valgrind-3.11.0.TEST1.orig/gdbserver_tests/Makefile.in	2015-09-18 21:57:00.679836423 +0200
+++ valgrind-3.11.0.TEST1/gdbserver_tests/Makefile.in	2015-09-18 22:28:16.207174020 +0200
@@ -318,6 +318,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -450,15 +451,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/gdbserver_tests/solaris/Makefile.in valgrind-3.11.0.TEST1/gdbserver_tests/solaris/Makefile.in
--- valgrind-3.11.0.TEST1.orig/gdbserver_tests/solaris/Makefile.in	2015-09-18 21:57:00.680836421 +0200
+++ valgrind-3.11.0.TEST1/gdbserver_tests/solaris/Makefile.in	2015-09-18 22:28:16.246173945 +0200
@@ -191,6 +191,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -323,15 +324,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/helgrind/Makefile.in valgrind-3.11.0.TEST1/helgrind/Makefile.in
--- valgrind-3.11.0.TEST1.orig/helgrind/Makefile.in	2015-09-18 21:57:00.506836783 +0200
+++ valgrind-3.11.0.TEST1/helgrind/Makefile.in	2015-09-18 22:28:16.323173798 +0200
@@ -353,6 +353,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -486,15 +487,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/helgrind/tests/Makefile.in valgrind-3.11.0.TEST1/helgrind/tests/Makefile.in
--- valgrind-3.11.0.TEST1.orig/helgrind/tests/Makefile.in	2015-09-18 21:57:00.519836756 +0200
+++ valgrind-3.11.0.TEST1/helgrind/tests/Makefile.in	2015-09-18 22:28:16.406173639 +0200
@@ -501,6 +501,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -633,15 +634,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/include/Makefile.in valgrind-3.11.0.TEST1/include/Makefile.in
--- valgrind-3.11.0.TEST1.orig/include/Makefile.in	2015-09-18 21:57:00.643836498 +0200
+++ valgrind-3.11.0.TEST1/include/Makefile.in	2015-09-18 22:28:16.439173576 +0200
@@ -205,6 +205,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
diff -ur valgrind-3.11.0.TEST1.orig/lackey/Makefile.in valgrind-3.11.0.TEST1/lackey/Makefile.in
--- valgrind-3.11.0.TEST1.orig/lackey/Makefile.in	2015-09-18 21:57:00.692836396 +0200
+++ valgrind-3.11.0.TEST1/lackey/Makefile.in	2015-09-18 22:28:16.492173475 +0200
@@ -278,6 +278,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -411,15 +412,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/lackey/tests/Makefile.in valgrind-3.11.0.TEST1/lackey/tests/Makefile.in
--- valgrind-3.11.0.TEST1.orig/lackey/tests/Makefile.in	2015-09-18 21:57:00.692836396 +0200
+++ valgrind-3.11.0.TEST1/lackey/tests/Makefile.in	2015-09-18 22:28:16.521173419 +0200
@@ -159,6 +159,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
diff -ur valgrind-3.11.0.TEST1.orig/Makefile.in valgrind-3.11.0.TEST1/Makefile.in
--- valgrind-3.11.0.TEST1.orig/Makefile.in	2015-09-18 21:57:00.674836434 +0200
+++ valgrind-3.11.0.TEST1/Makefile.in	2015-09-18 22:28:14.274177719 +0200
@@ -295,6 +295,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -428,15 +429,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/Makefile.vex.in valgrind-3.11.0.TEST1/Makefile.vex.in
--- valgrind-3.11.0.TEST1.orig/Makefile.vex.in	2015-09-18 21:57:00.674836434 +0200
+++ valgrind-3.11.0.TEST1/Makefile.vex.in	2015-09-18 22:28:14.456177371 +0200
@@ -410,6 +410,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -542,15 +543,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/massif/Makefile.in valgrind-3.11.0.TEST1/massif/Makefile.in
--- valgrind-3.11.0.TEST1.orig/massif/Makefile.in	2015-09-18 21:57:00.689836403 +0200
+++ valgrind-3.11.0.TEST1/massif/Makefile.in	2015-09-18 22:28:16.577173312 +0200
@@ -333,6 +333,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -466,15 +467,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/massif/tests/Makefile.in valgrind-3.11.0.TEST1/massif/tests/Makefile.in
--- valgrind-3.11.0.TEST1.orig/massif/tests/Makefile.in	2015-09-18 21:57:00.691836398 +0200
+++ valgrind-3.11.0.TEST1/massif/tests/Makefile.in	2015-09-18 22:28:16.635173201 +0200
@@ -321,6 +321,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -453,15 +454,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/memcheck/Makefile.in valgrind-3.11.0.TEST1/memcheck/Makefile.in
--- valgrind-3.11.0.TEST1.orig/memcheck/Makefile.in	2015-09-18 21:57:00.693836394 +0200
+++ valgrind-3.11.0.TEST1/memcheck/Makefile.in	2015-09-18 22:28:16.711173056 +0200
@@ -351,6 +351,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -484,15 +485,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/memcheck/tests/amd64/Makefile.in valgrind-3.11.0.TEST1/memcheck/tests/amd64/Makefile.in
--- valgrind-3.11.0.TEST1.orig/memcheck/tests/amd64/Makefile.in	2015-09-18 21:57:00.715836349 +0200
+++ valgrind-3.11.0.TEST1/memcheck/tests/amd64/Makefile.in	2015-09-18 22:28:17.052172403 +0200
@@ -293,6 +293,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -425,15 +426,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/memcheck/tests/amd64-linux/Makefile.in valgrind-3.11.0.TEST1/memcheck/tests/amd64-linux/Makefile.in
--- valgrind-3.11.0.TEST1.orig/memcheck/tests/amd64-linux/Makefile.in	2015-09-18 21:57:00.721836336 +0200
+++ valgrind-3.11.0.TEST1/memcheck/tests/amd64-linux/Makefile.in	2015-09-18 22:28:16.949172600 +0200
@@ -239,6 +239,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -371,15 +372,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/memcheck/tests/amd64-solaris/Makefile.in valgrind-3.11.0.TEST1/memcheck/tests/amd64-solaris/Makefile.in
--- valgrind-3.11.0.TEST1.orig/memcheck/tests/amd64-solaris/Makefile.in	2015-09-18 21:57:00.719836340 +0200
+++ valgrind-3.11.0.TEST1/memcheck/tests/amd64-solaris/Makefile.in	2015-09-18 22:28:16.996172510 +0200
@@ -249,6 +249,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -381,15 +382,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/memcheck/tests/common/Makefile.in valgrind-3.11.0.TEST1/memcheck/tests/common/Makefile.in
--- valgrind-3.11.0.TEST1.orig/memcheck/tests/common/Makefile.in	2015-09-18 21:57:00.719836340 +0200
+++ valgrind-3.11.0.TEST1/memcheck/tests/common/Makefile.in	2015-09-18 22:28:17.090172331 +0200
@@ -189,6 +189,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -321,15 +322,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/memcheck/tests/darwin/Makefile.in valgrind-3.11.0.TEST1/memcheck/tests/darwin/Makefile.in
--- valgrind-3.11.0.TEST1.orig/memcheck/tests/darwin/Makefile.in	2015-09-18 21:57:00.713836353 +0200
+++ valgrind-3.11.0.TEST1/memcheck/tests/darwin/Makefile.in	2015-09-18 22:28:17.140172235 +0200
@@ -270,6 +270,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -402,15 +403,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/memcheck/tests/linux/Makefile.in valgrind-3.11.0.TEST1/memcheck/tests/linux/Makefile.in
--- valgrind-3.11.0.TEST1.orig/memcheck/tests/linux/Makefile.in	2015-09-18 21:57:00.718836342 +0200
+++ valgrind-3.11.0.TEST1/memcheck/tests/linux/Makefile.in	2015-09-18 22:28:17.192172136 +0200
@@ -285,6 +285,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -417,15 +418,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/memcheck/tests/Makefile.in valgrind-3.11.0.TEST1/memcheck/tests/Makefile.in
--- valgrind-3.11.0.TEST1.orig/memcheck/tests/Makefile.in	2015-09-18 21:57:00.703836373 +0200
+++ valgrind-3.11.0.TEST1/memcheck/tests/Makefile.in	2015-09-18 22:28:16.899172696 +0200
@@ -979,6 +979,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -1111,15 +1112,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/memcheck/tests/ppc32/Makefile.in valgrind-3.11.0.TEST1/memcheck/tests/ppc32/Makefile.in
--- valgrind-3.11.0.TEST1.orig/memcheck/tests/ppc32/Makefile.in	2015-09-18 21:57:00.709836361 +0200
+++ valgrind-3.11.0.TEST1/memcheck/tests/ppc32/Makefile.in	2015-09-18 22:28:17.241172041 +0200
@@ -241,6 +241,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -373,15 +374,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/memcheck/tests/ppc64/Makefile.in valgrind-3.11.0.TEST1/memcheck/tests/ppc64/Makefile.in
--- valgrind-3.11.0.TEST1.orig/memcheck/tests/ppc64/Makefile.in	2015-09-18 21:57:00.714836351 +0200
+++ valgrind-3.11.0.TEST1/memcheck/tests/ppc64/Makefile.in	2015-09-18 22:28:17.291171946 +0200
@@ -241,6 +241,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -373,15 +374,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/memcheck/tests/s390x/Makefile.in valgrind-3.11.0.TEST1/memcheck/tests/s390x/Makefile.in
--- valgrind-3.11.0.TEST1.orig/memcheck/tests/s390x/Makefile.in	2015-09-18 21:57:00.717836344 +0200
+++ valgrind-3.11.0.TEST1/memcheck/tests/s390x/Makefile.in	2015-09-18 22:28:17.343171846 +0200
@@ -260,6 +260,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -392,15 +393,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/memcheck/tests/solaris/Makefile.in valgrind-3.11.0.TEST1/memcheck/tests/solaris/Makefile.in
--- valgrind-3.11.0.TEST1.orig/memcheck/tests/solaris/Makefile.in	2015-09-18 21:57:00.711836357 +0200
+++ valgrind-3.11.0.TEST1/memcheck/tests/solaris/Makefile.in	2015-09-18 22:28:17.417171705 +0200
@@ -435,6 +435,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -567,15 +568,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/memcheck/tests/vbit-test/Makefile.in valgrind-3.11.0.TEST1/memcheck/tests/vbit-test/Makefile.in
--- valgrind-3.11.0.TEST1.orig/memcheck/tests/vbit-test/Makefile.in	2015-09-18 21:57:00.722836334 +0200
+++ valgrind-3.11.0.TEST1/memcheck/tests/vbit-test/Makefile.in	2015-09-18 22:28:17.476171592 +0200
@@ -256,6 +256,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -388,15 +389,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/memcheck/tests/x86/Makefile.in valgrind-3.11.0.TEST1/memcheck/tests/x86/Makefile.in
--- valgrind-3.11.0.TEST1.orig/memcheck/tests/x86/Makefile.in	2015-09-18 21:57:00.720836338 +0200
+++ valgrind-3.11.0.TEST1/memcheck/tests/x86/Makefile.in	2015-09-18 22:28:17.630171297 +0200
@@ -290,6 +290,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -422,15 +423,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/memcheck/tests/x86-linux/Makefile.in valgrind-3.11.0.TEST1/memcheck/tests/x86-linux/Makefile.in
--- valgrind-3.11.0.TEST1.orig/memcheck/tests/x86-linux/Makefile.in	2015-09-18 21:57:00.716836346 +0200
+++ valgrind-3.11.0.TEST1/memcheck/tests/x86-linux/Makefile.in	2015-09-18 22:28:17.524171500 +0200
@@ -254,6 +254,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -386,15 +387,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/memcheck/tests/x86-solaris/Makefile.in valgrind-3.11.0.TEST1/memcheck/tests/x86-solaris/Makefile.in
--- valgrind-3.11.0.TEST1.orig/memcheck/tests/x86-solaris/Makefile.in	2015-09-18 21:57:00.722836334 +0200
+++ valgrind-3.11.0.TEST1/memcheck/tests/x86-solaris/Makefile.in	2015-09-18 22:28:17.573171406 +0200
@@ -260,6 +260,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -392,15 +393,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/mpi/Makefile.in valgrind-3.11.0.TEST1/mpi/Makefile.in
--- valgrind-3.11.0.TEST1.orig/mpi/Makefile.in	2015-09-18 21:57:00.723836332 +0200
+++ valgrind-3.11.0.TEST1/mpi/Makefile.in	2015-09-18 22:28:17.677171207 +0200
@@ -228,6 +228,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -360,15 +361,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/Makefile.in valgrind-3.11.0.TEST1/none/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/Makefile.in	2015-09-18 21:57:00.525836743 +0200
+++ valgrind-3.11.0.TEST1/none/Makefile.in	2015-09-18 22:28:17.731171104 +0200
@@ -276,6 +276,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -409,15 +410,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/amd64/Makefile.in valgrind-3.11.0.TEST1/none/tests/amd64/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/amd64/Makefile.in	2015-09-18 21:57:00.584836621 +0200
+++ valgrind-3.11.0.TEST1/none/tests/amd64/Makefile.in	2015-09-18 22:28:18.080170436 +0200
@@ -485,6 +485,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -617,15 +618,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/amd64-darwin/Makefile.in valgrind-3.11.0.TEST1/none/tests/amd64-darwin/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/amd64-darwin/Makefile.in	2015-09-18 21:57:00.608836571 +0200
+++ valgrind-3.11.0.TEST1/none/tests/amd64-darwin/Makefile.in	2015-09-18 22:28:17.902170777 +0200
@@ -230,6 +230,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -362,15 +363,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/amd64-linux/Makefile.in valgrind-3.11.0.TEST1/none/tests/amd64-linux/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/amd64-linux/Makefile.in	2015-09-18 21:57:00.628836529 +0200
+++ valgrind-3.11.0.TEST1/none/tests/amd64-linux/Makefile.in	2015-09-18 22:28:17.948170689 +0200
@@ -233,6 +233,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -365,15 +366,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/amd64-solaris/Makefile.in valgrind-3.11.0.TEST1/none/tests/amd64-solaris/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/amd64-solaris/Makefile.in	2015-09-18 21:57:00.612836562 +0200
+++ valgrind-3.11.0.TEST1/none/tests/amd64-solaris/Makefile.in	2015-09-18 22:28:17.993170603 +0200
@@ -241,6 +241,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -373,15 +374,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/arm/Makefile.in valgrind-3.11.0.TEST1/none/tests/arm/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/arm/Makefile.in	2015-09-18 21:57:00.631836523 +0200
+++ valgrind-3.11.0.TEST1/none/tests/arm/Makefile.in	2015-09-18 22:28:18.146170310 +0200
@@ -296,6 +296,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -428,15 +429,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/arm64/Makefile.in valgrind-3.11.0.TEST1/none/tests/arm64/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/arm64/Makefile.in	2015-09-18 21:57:00.639836507 +0200
+++ valgrind-3.11.0.TEST1/none/tests/arm64/Makefile.in	2015-09-18 22:28:18.198170211 +0200
@@ -253,6 +253,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -385,15 +386,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/darwin/Makefile.in valgrind-3.11.0.TEST1/none/tests/darwin/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/darwin/Makefile.in	2015-09-18 21:57:00.567836656 +0200
+++ valgrind-3.11.0.TEST1/none/tests/darwin/Makefile.in	2015-09-18 22:28:18.245170120 +0200
@@ -245,6 +245,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -377,15 +378,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/linux/Makefile.in valgrind-3.11.0.TEST1/none/tests/linux/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/linux/Makefile.in	2015-09-18 21:57:00.607836573 +0200
+++ valgrind-3.11.0.TEST1/none/tests/linux/Makefile.in	2015-09-18 22:28:18.296170023 +0200
@@ -274,6 +274,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -406,15 +407,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/Makefile.in valgrind-3.11.0.TEST1/none/tests/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/Makefile.in	2015-09-18 21:57:00.628836529 +0200
+++ valgrind-3.11.0.TEST1/none/tests/Makefile.in	2015-09-18 22:28:17.852170873 +0200
@@ -675,6 +675,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -807,15 +808,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/mips32/Makefile.in valgrind-3.11.0.TEST1/none/tests/mips32/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/mips32/Makefile.in	2015-09-18 21:57:00.611836565 +0200
+++ valgrind-3.11.0.TEST1/none/tests/mips32/Makefile.in	2015-09-18 22:28:18.355169910 +0200
@@ -323,6 +323,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -455,15 +456,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/mips64/Makefile.in valgrind-3.11.0.TEST1/none/tests/mips64/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/mips64/Makefile.in	2015-09-18 21:57:00.621836544 +0200
+++ valgrind-3.11.0.TEST1/none/tests/mips64/Makefile.in	2015-09-18 22:28:18.427169772 +0200
@@ -378,6 +378,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -510,15 +511,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/ppc32/Makefile.in valgrind-3.11.0.TEST1/none/tests/ppc32/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/ppc32/Makefile.in	2015-09-18 21:57:00.536836720 +0200
+++ valgrind-3.11.0.TEST1/none/tests/ppc32/Makefile.in	2015-09-18 22:28:18.513169608 +0200
@@ -385,6 +385,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -517,15 +518,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/ppc64/Makefile.in valgrind-3.11.0.TEST1/none/tests/ppc64/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/ppc64/Makefile.in	2015-09-18 21:57:00.572836646 +0200
+++ valgrind-3.11.0.TEST1/none/tests/ppc64/Makefile.in	2015-09-18 22:28:18.591169458 +0200
@@ -354,6 +354,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -486,15 +487,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/s390x/Makefile.in valgrind-3.11.0.TEST1/none/tests/s390x/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/s390x/Makefile.in	2015-09-18 21:57:00.601836585 +0200
+++ valgrind-3.11.0.TEST1/none/tests/s390x/Makefile.in	2015-09-18 22:28:18.706169238 +0200
@@ -693,6 +693,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -825,15 +826,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/scripts/Makefile.in valgrind-3.11.0.TEST1/none/tests/scripts/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/scripts/Makefile.in	2015-09-18 21:57:00.634836517 +0200
+++ valgrind-3.11.0.TEST1/none/tests/scripts/Makefile.in	2015-09-18 22:28:18.747169160 +0200
@@ -191,6 +191,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -323,15 +324,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/solaris/Makefile.in valgrind-3.11.0.TEST1/none/tests/solaris/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/solaris/Makefile.in	2015-09-18 21:57:00.565836660 +0200
+++ valgrind-3.11.0.TEST1/none/tests/solaris/Makefile.in	2015-09-18 22:28:18.804169051 +0200
@@ -324,6 +324,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -456,15 +457,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/tilegx/Makefile.in valgrind-3.11.0.TEST1/none/tests/tilegx/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/tilegx/Makefile.in	2015-09-18 21:57:00.555836681 +0200
+++ valgrind-3.11.0.TEST1/none/tests/tilegx/Makefile.in	2015-09-18 22:28:19.112168461 +0200
@@ -3604,6 +3604,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -3736,15 +3737,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/x86/Makefile.in valgrind-3.11.0.TEST1/none/tests/x86/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/x86/Makefile.in	2015-09-18 21:57:00.626836534 +0200
+++ valgrind-3.11.0.TEST1/none/tests/x86/Makefile.in	2015-09-18 22:28:19.344168018 +0200
@@ -448,6 +448,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -580,15 +581,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/x86-darwin/Makefile.in valgrind-3.11.0.TEST1/none/tests/x86-darwin/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/x86-darwin/Makefile.in	2015-09-18 21:57:00.563836664 +0200
+++ valgrind-3.11.0.TEST1/none/tests/x86-darwin/Makefile.in	2015-09-18 22:28:19.167168356 +0200
@@ -233,6 +233,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -365,15 +366,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/x86-linux/Makefile.in valgrind-3.11.0.TEST1/none/tests/x86-linux/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/x86-linux/Makefile.in	2015-09-18 21:57:00.589836610 +0200
+++ valgrind-3.11.0.TEST1/none/tests/x86-linux/Makefile.in	2015-09-18 22:28:19.214168266 +0200
@@ -240,6 +240,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -372,15 +373,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/none/tests/x86-solaris/Makefile.in valgrind-3.11.0.TEST1/none/tests/x86-solaris/Makefile.in
--- valgrind-3.11.0.TEST1.orig/none/tests/x86-solaris/Makefile.in	2015-09-18 21:57:00.636836513 +0200
+++ valgrind-3.11.0.TEST1/none/tests/x86-solaris/Makefile.in	2015-09-18 22:28:19.261168176 +0200
@@ -240,6 +240,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -372,15 +373,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/perf/Makefile.in valgrind-3.11.0.TEST1/perf/Makefile.in
--- valgrind-3.11.0.TEST1.orig/perf/Makefile.in	2015-09-18 21:57:00.641836502 +0200
+++ valgrind-3.11.0.TEST1/perf/Makefile.in	2015-09-18 22:28:19.401167909 +0200
@@ -272,6 +272,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -404,15 +405,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@
 
diff -ur valgrind-3.11.0.TEST1.orig/shared/Makefile.in valgrind-3.11.0.TEST1/shared/Makefile.in
--- valgrind-3.11.0.TEST1.orig/shared/Makefile.in	2015-09-18 21:57:00.524836745 +0200
+++ valgrind-3.11.0.TEST1/shared/Makefile.in	2015-09-18 22:28:19.430167853 +0200
@@ -156,6 +156,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
diff -ur valgrind-3.11.0.TEST1.orig/solaris/Makefile.in valgrind-3.11.0.TEST1/solaris/Makefile.in
--- valgrind-3.11.0.TEST1.orig/solaris/Makefile.in	2015-09-18 21:57:00.504836787 +0200
+++ valgrind-3.11.0.TEST1/solaris/Makefile.in	2015-09-18 22:28:19.459167798 +0200
@@ -162,6 +162,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
diff -ur valgrind-3.11.0.TEST1.orig/tests/Makefile.in valgrind-3.11.0.TEST1/tests/Makefile.in
--- valgrind-3.11.0.TEST1.orig/tests/Makefile.in	2015-09-18 21:57:00.738836301 +0200
+++ valgrind-3.11.0.TEST1/tests/Makefile.in	2015-09-18 22:28:19.511167698 +0200
@@ -267,6 +267,7 @@
 FLAG_OCTEON2 = @FLAG_OCTEON2@
 FLAG_T_TEXT = @FLAG_T_TEXT@
 FLAG_UNLIMITED_INLINE_UNIT_GROWTH = @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+FLAG_W_CAST_ALIGN = @FLAG_W_CAST_ALIGN@
 FLAG_W_CAST_QUAL = @FLAG_W_CAST_QUAL@
 FLAG_W_EMPTY_BODY = @FLAG_W_EMPTY_BODY@
 FLAG_W_EXTRA = @FLAG_W_EXTRA@
@@ -399,15 +400,14 @@
 # performance and get whatever useful warnings we can out of gcc.
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
-AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wcast-align \
-	-Wmissing-prototypes -Wshadow -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations @FLAG_W_CAST_QUAL@ \
-	@FLAG_W_WRITE_STRINGS@ @FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ \
-	@FLAG_W_FORMAT_SIGNEDNESS@ @FLAG_W_FORMAT_SECURITY@ \
-	@FLAG_W_IGNORED_QUALIFIERS@ @FLAG_W_MISSING_PARAMETER_TYPE@ \
-	@FLAG_W_OLD_STYLE_DECLARATION@ @FLAG_FNO_STACK_PROTECTOR@ \
-	@FLAG_FSANITIZE@ -fno-strict-aliasing -fno-builtin \
-	$(am__append_1)
+AM_CFLAGS_BASE = -O2 -g -std=gnu99 -Wall -Wmissing-prototypes -Wshadow \
+	-Wpointer-arith -Wstrict-prototypes -Wmissing-declarations \
+	@FLAG_W_CAST_ALIGN@ @FLAG_W_CAST_QUAL@ @FLAG_W_WRITE_STRINGS@ \
+	@FLAG_W_EMPTY_BODY@ @FLAG_W_FORMAT@ @FLAG_W_FORMAT_SIGNEDNESS@ \
+	@FLAG_W_FORMAT_SECURITY@ @FLAG_W_IGNORED_QUALIFIERS@ \
+	@FLAG_W_MISSING_PARAMETER_TYPE@ @FLAG_W_OLD_STYLE_DECLARATION@ \
+	@FLAG_FNO_STACK_PROTECTOR@ @FLAG_FSANITIZE@ \
+	-fno-strict-aliasing -fno-builtin $(am__append_1)
 @VGCONF_OS_IS_DARWIN_FALSE@AM_CFLAGS_PSO_BASE = -O -g -fno-omit-frame-pointer -fno-strict-aliasing \
 @VGCONF_OS_IS_DARWIN_FALSE@		     -fpic -fno-builtin @FLAG_FNO_IPA_ICF@