runtime/cgo: darwin signal masking

Fixes #3101 (again).

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5825043

diff --git a/src/pkg/runtime/cgo/gcc_darwin_386.c b/src/pkg/runtime/cgo/gcc_darwin_386.c
index d9f25347a50ea13519f79c825570009c3ef850ff..2c30c666fc44ad14f44355e8a55e27f8230790d1 100644 (file)
--- a/src/pkg/runtime/cgo/gcc_darwin_386.c
+++ b/src/pkg/runtime/cgo/gcc_darwin_386.c
@@ -4,6 +4,7 @@
 
 #include <string.h> /* for strerror */
 #include <pthread.h>
+#include <signal.h>
 #include "libcgo.h"
 
 static void* threadentry(void*);
@@ -120,14 +121,21 @@ void
 libcgo_sys_thread_start(ThreadStart *ts)
 {
        pthread_attr_t attr;
+       sigset_t ign, oset;
        pthread_t p;
        size_t size;
        int err;
 
+       sigfillset(&ign);
+       sigprocmask(SIG_SETMASK, &ign, &oset);
+
        pthread_attr_init(&attr);
        pthread_attr_getstacksize(&attr, &size);
        ts->g->stackguard = size;
        err = pthread_create(&p, &attr, threadentry, ts);
+
+       sigprocmask(SIG_SETMASK, &oset, nil);
+
        if (err != 0) {
                fprintf(stderr, "runtime/cgo: pthread_create failed: %s\n", strerror(err));
                abort();

diff --git a/src/pkg/runtime/cgo/gcc_darwin_amd64.c b/src/pkg/runtime/cgo/gcc_darwin_amd64.c
index a0b026ee2bf680f24fee5b5d098c85d86b2a5813..89dc7a4e8ebfac8577d4f3b187a4dd4a0c151938 100644 (file)
--- a/src/pkg/runtime/cgo/gcc_darwin_amd64.c
+++ b/src/pkg/runtime/cgo/gcc_darwin_amd64.c
@@ -4,6 +4,7 @@
 
 #include <string.h> /* for strerror */
 #include <pthread.h>
+#include <signal.h>
 #include "libcgo.h"
 
 static void* threadentry(void*);
@@ -90,14 +91,21 @@ void
 libcgo_sys_thread_start(ThreadStart *ts)
 {
        pthread_attr_t attr;
+       sigset_t ign, oset;
        pthread_t p;
        size_t size;
        int err;
 
+       sigfillset(&ign);
+       sigprocmask(SIG_SETMASK, &ign, &oset);
+
        pthread_attr_init(&attr);
        pthread_attr_getstacksize(&attr, &size);
        ts->g->stackguard = size;
        err = pthread_create(&p, &attr, threadentry, ts);
+
+       sigprocmask(SIG_SETMASK, &oset, nil);
+
        if (err != 0) {
                fprintf(stderr, "runtime/cgo: pthread_create failed: %s\n", strerror(err));
                abort();