]> Cypherpunks repositories - gostls13.git/commitdiff
runtime/cgo: add cgo support for solaris/amd64
authorAram Hăvărneanu <aram@mgk.ro>
Mon, 30 Mar 2015 21:03:09 +0000 (23:03 +0200)
committerAram Hăvărneanu <aram@mgk.ro>
Wed, 6 May 2015 11:37:28 +0000 (11:37 +0000)
Change-Id: Ic9744c7716cdd53f27c6e5874230963e5fff0333
Reviewed-on: https://go-review.googlesource.com/8260
Reviewed-by: Minux Ma <minux@golang.org>
src/runtime/cgo/cgo.go
src/runtime/cgo/gcc_libinit.c
src/runtime/cgo/gcc_setenv.c
src/runtime/cgo/gcc_solaris_amd64.c [new file with mode: 0644]
src/runtime/cgo/setenv.go

index 846801cfa863107486796ec41fa5865f0308093e..cb24678bf03cf8ce238f9e086f3edb3cf73f1718 100644 (file)
@@ -24,5 +24,7 @@ package cgo
 
 #cgo CFLAGS: -Wall -Werror
 
+#cgo solaris CPPFLAGS: -D_POSIX_PTHREAD_SEMANTICS
+
 */
 import "C"
index 0342b1323efaef1c66f514ea02ff01205a49e72c..c3e94f58d2c902c3652cd58a3a840e496074637f 100644 (file)
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd
+// +build darwin dragonfly freebsd linux netbsd solaris
 // +build !ppc64,!ppc64le
 
 #include <pthread.h>
index af0fc5d8d8c71eed18cce7b90c6bc1b4c595b4c2..ca29dcb05f2040cde508f766e2432c85ea0e1947 100644 (file)
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 #include "libcgo.h"
 
diff --git a/src/runtime/cgo/gcc_solaris_amd64.c b/src/runtime/cgo/gcc_solaris_amd64.c
new file mode 100644 (file)
index 0000000..72ace56
--- /dev/null
@@ -0,0 +1,75 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+#include <pthread.h>
+#include <string.h>
+#include <signal.h>
+#include <ucontext.h>
+#include "libcgo.h"
+
+static void* threadentry(void*);
+static void (*setg_gcc)(void*);
+
+void
+x_cgo_init(G *g, void (*setg)(void*))
+{
+       ucontext_t ctx;
+
+       setg_gcc = setg;
+       if (getcontext(&ctx) != 0)
+               perror("runtime/cgo: getcontext failed");
+       g->stacklo = (uintptr_t)ctx.uc_stack.ss_sp;
+}
+
+void
+_cgo_sys_thread_start(ThreadStart *ts)
+{
+       pthread_attr_t attr;
+       sigset_t ign, oset;
+       pthread_t p;
+       void *base;
+       size_t size;
+       int err;
+
+       sigfillset(&ign);
+       pthread_sigmask(SIG_SETMASK, &ign, &oset);
+
+       pthread_attr_init(&attr);
+
+       if (pthread_attr_getstack(&attr, &base, &size) != 0)
+               perror("runtime/cgo: pthread_attr_getstack failed");
+       if (size == 0) {
+               ts->g->stackhi = 2 << 20;
+               if (pthread_attr_setstack(&attr, NULL, ts->g->stackhi) != 0)
+                       perror("runtime/cgo: pthread_attr_setstack failed");
+       } else {
+               ts->g->stackhi = size;
+       }
+       pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+       err = pthread_create(&p, &attr, threadentry, ts);
+
+       pthread_sigmask(SIG_SETMASK, &oset, nil);
+
+       if (err != 0) {
+               fprintf(stderr, "runtime/cgo: pthread_create failed: %s\n", strerror(err));
+               abort();
+       }
+}
+
+static void*
+threadentry(void *v)
+{
+       ThreadStart ts;
+
+       ts = *(ThreadStart*)v;
+       free(v);
+
+       /*
+        * Set specific keys.
+        */
+       setg_gcc((void*)ts.g);
+
+       crosscall_amd64(ts.fn);
+       return nil;
+}
index 97c8c6ac9d4af5d5c3ac3991966792dcf6f8f0c7..20d5703350d32f1f7a2430d326cb818c9bb12dad 100644 (file)
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package cgo