From: Yuval Pavel Zholkover <paulzhol@gmail.com>
Date: Mon, 25 Jul 2011 16:25:41 +0000 (-0400)
Subject: runtime: Plan 9, skip calling runtime·ldt0setup.
X-Git-Tag: weekly.2011-07-29~62
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=2aa2ceb8730f5e0fff792b43a091a6fa2cfa8e0f;p=gostls13.git

runtime: Plan 9, skip calling runtime·ldt0setup.

R=golang-dev
CC=alex.brainman, golang-dev
https://golang.org/cl/4816049
---

diff --git a/src/pkg/runtime/386/asm.s b/src/pkg/runtime/386/asm.s
index add14be964..24e64a11e5 100644
--- a/src/pkg/runtime/386/asm.s
+++ b/src/pkg/runtime/386/asm.s
@@ -28,15 +28,18 @@ TEXT _rt0_386(SB),7,$0
 	TESTL	AX, AX
 	JZ	4(PC)
 	CALL	AX
+	// skip runtime·ldt0setup(SB) and tls test after initcgo for non-windows
 	CMPL runtime·iswindows(SB), $0
 	JEQ ok
 
+	// skip runtime·ldt0setup(SB) and tls test on Plan 9 in all cases
+	CMPL	runtime·isplan9(SB), $1
+	JEQ	ok
+
 	// set up %gs
 	CALL	runtime·ldt0setup(SB)
 
 	// store through it, to make sure it works
-	CMPL	runtime·isplan9(SB), $1
-	JEQ	ok
 	get_tls(BX)
 	MOVL	$0x123, g(BX)
 	MOVL	runtime·tls0(SB), AX