commit 34fb044a8d216c98a3f7c7162586f4489fe99b3e
author Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Mon Dec 15 02:37:56 2014 +0100
committer Dmitriy Ivanov <dimitry@google.com> Wed May 27 18:55:45 2015 -0700
tree 221fd1c3ba6ea3026414fdb86e75d4187d7f6dc2
parent d97e578d89c7c0be1a651b5abaf537ed61e9c328

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.

Bug: http://b/21471495
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
(cherry picked from commit 68b3cc44ab604e4737e13c0f4dbd62177d2a9d6b)

include/valgrind.h

diff --git a/include/valgrind.h b/include/valgrind.h
index 4baf855..613de06 100644
--- a/include/valgrind.h
+++ b/include/valgrind.h
@@ -785,7 +785,7 @@
                      "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;                                                  \
   })