]> Cypherpunks repositories - gostls13.git/commitdiff
runtime: pass dummy argc/argv correctly in r0_386_android_lib
authorIan Lance Taylor <iant@golang.org>
Fri, 19 Jan 2018 18:56:59 +0000 (10:56 -0800)
committerIan Lance Taylor <iant@golang.org>
Sun, 21 Jan 2018 04:56:36 +0000 (04:56 +0000)
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>
src/runtime/rt0_android_386.s

index eabdf812357c15d62f1e7f3086c99e682303a352..3a1b06b1482336b13626d37ba9601eee30ed1114 100644 (file)
@@ -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