aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2016-09-15 00:45:38 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-15 00:45:38 +0000
commit2e71f4d68e0328c97c37acbaa893d7230802fabd (patch)
treeb430545a79459270127f90247249d4552797fe65
parent9a25385f22432f2b2e269ec5824f09e0c41eb60f (diff)
parent04bcf552a28857cb029dd5b49e40e5e0750d7106 (diff)
downloadvalgrind-2e71f4d68e0328c97c37acbaa893d7230802fabd.tar.gz
Merge "Fix arm64 inline assembly code typo."
am: 04bcf552a2 Change-Id: I48e449af2108a25b8ffcdbcabade4d348654e0a0
-rw-r--r--coregrind/m_syswrap/syswrap-linux.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index f79696989..6584c16db 100644
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -269,12 +269,12 @@ static void run_a_thread_NORETURN ( Word tidW )
#elif defined(VGP_arm64_linux)
asm volatile (
"str %w1, %0\n" /* set tst->status = VgTs_Empty (32-bit store) */
- "mov x8, %2\n" /* set %r7 = __NR_exit */
- "ldr x0, %3\n" /* set %r0 = tst->os_state.exitcode */
+ "mov x8, %2\n" /* set %x8 = __NR_exit */
+ "ldr x0, %3\n" /* set %x0 = tst->os_state.exitcode */
"svc 0x00000000\n" /* exit(tst->os_state.exitcode) */
: "=m" (tst->status)
: "r" (VgTs_Empty), "n" (__NR_exit), "m" (tst->os_state.exitcode)
- : "r0", "r7"
+ : "x0", "x8"
);
#elif defined(VGP_s390x_linux)
asm volatile (