From edc53e1f144fe5d1be8c787992ea6e9d9067ebf6 Mon Sep 17 00:00:00 2001 From: Shenghou Ma Date: Wed, 22 Apr 2015 18:03:18 -0400 Subject: runtime: fix build after CL 9164 on Linux There is an assumption that the function executed in child thread created by runtime.close should not return. And different systems enforce that differently: some exit that thread, some exit the whole process. The test TestNewOSProc0 introduced in CL 9161 breaks that assumption, so we need to adjust the code to only exit the thread should the called function return. Change-Id: Id631cb2f02ec6fbd765508377a79f3f96c6a2ed6 Reviewed-on: https://go-review.googlesource.com/9246 Reviewed-by: Dave Cheney --- src/runtime/sys_linux_amd64.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/runtime/sys_linux_amd64.s') diff --git a/src/runtime/sys_linux_amd64.s b/src/runtime/sys_linux_amd64.s index 3a0c47fb63..fa7fa164b5 100644 --- a/src/runtime/sys_linux_amd64.s +++ b/src/runtime/sys_linux_amd64.s @@ -350,7 +350,7 @@ nog: // Call fn CALL R12 - // It shouldn't return. If it does, exit + // It shouldn't return. If it does, exit that thread. MOVL $111, DI MOVL $60, AX SYSCALL -- cgit v1.3