From db29cd3d807e01e17add6dd664c408d8977eaa1b Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Fri, 9 Apr 2010 14:15:15 -0700
Subject: Run initcgo for all amd64 targets, not just GNU/Linux.

This is required to make cgo export work on Darwin.  Note that
this corrects the stack alignment when calling initcgo to that
required by gcc on amd64.

R=rsc
CC=golang-dev
http://codereview.appspot.com/907041
---
 src/pkg/runtime/amd64/asm.s       | 9 ++++++++-
 src/pkg/runtime/linux/amd64/rt0.s | 7 -------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/pkg/runtime/amd64/asm.s b/src/pkg/runtime/amd64/asm.s
index 627af6632..52b0a89bc 100644
--- a/src/pkg/runtime/amd64/asm.s
+++ b/src/pkg/runtime/amd64/asm.s
@@ -9,10 +9,16 @@ TEXT	_rt0_amd64(SB),7,$-8
 	MOVQ	0(DI), AX		// argc
 	LEAQ	8(DI), BX		// argv
 	SUBQ	$(4*8+7), SP		// 2args 2auto
-	ANDQ	$~7, SP
+	ANDQ	$~15, SP
 	MOVQ	AX, 16(SP)
 	MOVQ	BX, 24(SP)
 
+	// if there is an initcgo, call it.
+	MOVQ	initcgo(SB), AX
+	TESTQ	AX, AX
+	JZ	2(PC)
+	CALL	AX
+
 	// set the per-goroutine and per-mach registers
 	LEAQ	m0(SB), m
 	LEAQ	g0(SB), g
@@ -372,4 +378,5 @@ TEXT getcallersp(SB),7,$0
 	MOVQ	sp+0(FP), AX
 	RET
 
+GLOBL initcgo(SB), $8
 GLOBL libcgo_set_scheduler(SB), $8
diff --git a/src/pkg/runtime/linux/amd64/rt0.s b/src/pkg/runtime/linux/amd64/rt0.s
index 6b1b29775..2190b4414 100644
--- a/src/pkg/runtime/linux/amd64/rt0.s
+++ b/src/pkg/runtime/linux/amd64/rt0.s
@@ -5,13 +5,6 @@
 // Darwin and Linux use the same linkage to main
 
 TEXT	_rt0_amd64_linux(SB),7,$-8
-	MOVQ	initcgo(SB), AX
-	TESTQ	AX, AX
-	JZ	2(PC)
-	CALL	AX
-
 	MOVQ	$_rt0_amd64(SB), AX
 	MOVQ	SP, DI
 	JMP	AX
-
-GLOBL initcgo(SB), $8
-- 
cgit v1.2.3