aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>2014-12-15 02:37:56 +0100
committerDmitriy Ivanov <dimitry@google.com>2015-05-27 18:39:19 -0700
commit68b3cc44ab604e4737e13c0f4dbd62177d2a9d6b (patch)
treecbd8fbb22791ceb63614590c47b46d3fa4809f99
parentc7307c6cf60615c01e443ff198a74988659bfa05 (diff)
downloadvalgrind-68b3cc44ab604e4737e13c0f4dbd62177d2a9d6b.tar.gz
Cast _zzq_default to 64-bit before assigning it to a 64bit register
clang's integrated assembler is picky about pushing a 32-bit variable into a 64-bit register. Cast it to the right size in the asm statement. Upstream bug: https://bugs.kde.org/show_bug.cgi?id=342008 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> (cherry picked from commit 001d15c989437f2bffc6bd8c40203a082d4fc3b3) Change-Id: If5725ed1b80eb99b502a135e9ae6dbccb61de4cc
-rw-r--r--include/valgrind.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/valgrind.h b/include/valgrind.h
index 4baf855f4..613de06bf 100644
--- a/include/valgrind.h
+++ b/include/valgrind.h
@@ -785,7 +785,7 @@ typedef
"orr x10, x10, x10\n\t" \
"mov %0, x3" /*result*/ \
: "=r" (_zzq_result) \
- : "r" (_zzq_default), "r" (&_zzq_args[0]) \
+ : "r" ((unsigned long int)_zzq_default), "r" (&_zzq_args[0]) \
: "cc","memory", "x3", "x4"); \
_zzq_result; \
})