From 61049394326c9c7424747801c136312ab72d0e07 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 19 Jan 2018 10:56:59 -0800 Subject: [PATCH] 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 TryBot-Result: Gobot Gobot Reviewed-by: Hyang-Ah Hana Kim --- src/runtime/rt0_android_386.s | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- 2.48.1