From 538fab5db5316e970860a8fd1c6f113f98ea8885 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 19 Jan 2017 18:40:53 +0100
Subject: [PATCH] valgrind: Fix arm build by avoiding -mthumb

---
 packages/valgrind/build.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/valgrind/build.sh b/packages/valgrind/build.sh
index 379f9e422..eeff1abbb 100644
--- a/packages/valgrind/build.sh
+++ b/packages/valgrind/build.sh
@@ -11,8 +11,12 @@ TERMUX_PKG_BLACKLISTED_ARCHES="x86_64"
 # "error: the clang compiler does not support '-mcpu=cortex-a8'":
 TERMUX_PKG_CLANG=no
 
-if [ "$TERMUX_ARCH" == "arm" ]; then
-	# valgrind doesn't like arm; armv7 works, though.
-	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --host=armv7-linux-androideabi"
-fi
-
+termux_step_pre_configure() {
+	if [ "$TERMUX_ARCH" == "arm" ]; then
+		# valgrind doesn't like arm; armv7 works, though.
+		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --host=armv7-linux-androideabi"
+		# http://lists.busybox.net/pipermail/buildroot/2013-November/082270.html:
+		# "valgrind uses inline assembly that is not Thumb compatible":
+		CFLAGS=${CFLAGS/-mthumb/}
+	fi
+}