diff options
| author | Ian Lance Taylor <iant@golang.org> | 2016-05-31 14:07:38 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2016-05-31 22:14:39 +0000 |
| commit | 690de51ffac1473820212c88a11685b40f7bde3b (patch) | |
| tree | 980b75ff39ed4d344dc452c258ec7e4d1b9b2234 | |
| parent | 3d037cfaf8c70b8af87cb5d57553a7e3e9dc2117 (diff) | |
| download | go-690de51ffac1473820212c88a11685b40f7bde3b.tar.gz go-690de51ffac1473820212c88a11685b40f7bde3b.zip | |
runtime: fix restoring PC in ARM version of cgocallback_gofunc
Fixes #15856.
Change-Id: Ia8def161642087e4bd92a87298c77a0f9f83dc86
Reviewed-on: https://go-review.googlesource.com/23586
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Elias Naur <elias.naur@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
| -rw-r--r-- | src/runtime/asm_arm.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/runtime/asm_arm.s b/src/runtime/asm_arm.s index df6bde61ee..f02297e8f0 100644 --- a/src/runtime/asm_arm.s +++ b/src/runtime/asm_arm.s @@ -626,7 +626,7 @@ havem: BL runtime·cgocallbackg(SB) // Restore g->sched (== m->curg->sched) from saved values. - MOVW 4(R13), R5 + MOVW 0(R13), R5 MOVW R5, (g_sched+gobuf_pc)(g) MOVW $12(R13), R4 MOVW R4, (g_sched+gobuf_sp)(g) |