runtime/cgo: adapt files copied from libcgo

Necessary but not sufficient step toward
making those builds work.

R=r
CC=golang-dev
https://golang.org/cl/3411043

diff --git a/src/pkg/runtime/cgo/freebsd_386.c b/src/pkg/runtime/cgo/freebsd_386.c
index b445b940ad6d33da2c91622892af21d4a32d5a04..449a8ef108d647fdb8ca0a441952f63fb8aafd2a 100644 (file)
--- a/src/pkg/runtime/cgo/freebsd_386.c
+++ b/src/pkg/runtime/cgo/freebsd_386.c
@@ -11,14 +11,11 @@ char *environ[] = { 0 };
 char *__progname;
 
 static void
-inittls(void)
+xinitcgo(void)
 {
 }
 
-void
-initcgo(void)
-{
-}
+void (*initcgo)(void) = xinitcgo;
 
 void
 libcgo_sys_thread_start(ThreadStart *ts)

diff --git a/src/pkg/runtime/cgo/freebsd_amd64.c b/src/pkg/runtime/cgo/freebsd_amd64.c
index bc3a5618689226020a961c52e0ba63a276da6b6c..daac403c11ce62390c0fabf2b5739bfb07af8b6a 100644 (file)
--- a/src/pkg/runtime/cgo/freebsd_amd64.c
+++ b/src/pkg/runtime/cgo/freebsd_amd64.c
@@ -10,11 +10,13 @@ static void* threadentry(void*);
 char *environ[] = { 0 };
 char *__progname;
 
-void
-initcgo(void)
+static void
+xinitcgo(void)
 {
 }
 
+void (*initcgo)(void) = xinitcgo;
+
 void
 libcgo_sys_thread_start(ThreadStart *ts)
 {

diff --git a/src/pkg/runtime/cgo/nacl_386.c b/src/pkg/runtime/cgo/nacl_386.c
index d674aca1df61f821145ef957ff67492b3cfd78f0..e556c433ce433a03dde5e8e9d47dfe526632ae99 100644 (file)
--- a/src/pkg/runtime/cgo/nacl_386.c
+++ b/src/pkg/runtime/cgo/nacl_386.c
@@ -4,11 +4,13 @@
 
 #include "libcgo.h"
 
-void
-initcgo(void)
+static void
+xinitcgo(void)
 {
 }
 
+void (*initcgo)(void) = xinitcgo;
+
 void
 libcgo_sys_thread_start(ThreadStart *ts)
 {

diff --git a/src/pkg/runtime/cgo/windows_386.c b/src/pkg/runtime/cgo/windows_386.c
index e221d69981077ca802674e6f926adba0d24d3d2a..5f5235bd2dafa8ab98e4bc154888dbad0f30cb0e 100755 (executable)
--- a/src/pkg/runtime/cgo/windows_386.c
+++ b/src/pkg/runtime/cgo/windows_386.c
@@ -12,11 +12,13 @@ static void *threadentry(void*);
    Allocation granularity on Windows is typically 64 KB. */
 #define STACKSIZE (1*1024*1024)
 
-void
-initcgo(void)
+static void
+xinitcgo(void)
 {
 }
 
+void (*initcgo)(void) = xinitcgo;
+
 void
 libcgo_sys_thread_start(ThreadStart *ts)
 {

diff --git a/src/pkg/runtime/cgo/windows_amd64.c b/src/pkg/runtime/cgo/windows_amd64.c
index 1f34f850052f1fc0b46451491960b4bd325c557a..dafe8cd9d424566500c0bc2bc8032247b56ba4da 100755 (executable)
--- a/src/pkg/runtime/cgo/windows_amd64.c
+++ b/src/pkg/runtime/cgo/windows_amd64.c
@@ -12,11 +12,13 @@ static void *threadentry(void*);
    Allocation granularity on Windows is typically 64 KB. */
 #define STACKSIZE (2*1024*1024)
 
-void
-initcgo(void)
+static void
+xinitcgo(void)
 {
 }
 
+void (*initcgo)(void) = xinitcgo;
+
 void
 libcgo_sys_thread_start(ThreadStart *ts)
 {