Merge "Fix arm64 inline assembly code typo." am: 04bcf552a2 am: 2e71f4d68e
am: a102698fb4
Change-Id: I8307a0d807cca351c3604120b5d884f6381cd296
diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index f796969..6584c16 100644
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -269,12 +269,12 @@
#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 (