aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2018-01-19 10:56:59 -0800
committerIan Lance Taylor <iant@golang.org>2018-01-21 04:56:36 +0000
commit61049394326c9c7424747801c136312ab72d0e07 (patch)
tree0bb3436ed899ca46b80b9ef17f70efda1f2b69ea
parent919e85ae056a238789af6bb2d7b34fe9fdde4ebb (diff)
downloadgo-61049394326c9c7424747801c136312ab72d0e07.tar.gz
go-61049394326c9c7424747801c136312ab72d0e07.zip
runtime: pass dummy argc/argv correctly in r0_386_android_lib
Fix breakage introduced in CL 70530. Change-Id: I87f3da6b20554d4f405a1143b0d894c5953b63aa Reviewed-on: https://go-review.googlesource.com/88516 Run-TryBot: Ian Lance Taylor <iant@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
-rw-r--r--src/runtime/rt0_android_386.s5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/runtime/rt0_android_386.s b/src/runtime/rt0_android_386.s
index eabdf81235..3a1b06b148 100644
--- a/src/runtime/rt0_android_386.s
+++ b/src/runtime/rt0_android_386.s
@@ -10,7 +10,10 @@ TEXT _rt0_386_android(SB),NOSPLIT,$0
TEXT _rt0_386_android_lib(SB),NOSPLIT,$0
PUSHL $_rt0_386_android_argv(SB) // argv
PUSHL $1 // argc
- JMP _rt0_386_lib(SB)
+ CALL _rt0_386_lib(SB)
+ POPL AX
+ POPL AX
+ RET
DATA _rt0_386_android_argv+0x00(SB)/4,$_rt0_386_android_argv0(SB)
DATA _rt0_386_android_argv+0x04(SB)/4,$0 // argv terminate