diff options
| author | Dimitry Ivanov <dimitry@google.com> | 2015-05-28 02:26:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-28 02:26:39 +0000 |
| commit | b90008b938a8ee2fe9d36e95d76bc4c3579db41b (patch) | |
| tree | cbd8fbb22791ceb63614590c47b46d3fa4809f99 | |
| parent | bc0fbf2e6634573794166939d811ecf84d5d714f (diff) | |
| parent | 6d6499e738f48ec8d565bf42837bc4270a7a8032 (diff) | |
| download | valgrind-b90008b938a8ee2fe9d36e95d76bc4c3579db41b.tar.gz | |
am 6d6499e7: Merge "Cast _zzq_default to 64-bit before assigning it to a 64bit register"
* commit '6d6499e738f48ec8d565bf42837bc4270a7a8032':
Cast _zzq_default to 64-bit before assigning it to a 64bit register
| -rw-r--r-- | include/valgrind.h | 2 |
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; \ }) |