From: Ian Lance Taylor <iant@golang.org>
Date: Fri, 19 Jan 2018 18:56:59 +0000 (-0800)
Subject: runtime: pass dummy argc/argv correctly in r0_386_android_lib
X-Git-Tag: go1.10rc1~24
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=61049394326c9c7424747801c136312ab72d0e07;p=gostls13.git

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>
---

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