From: Devon H. O'Dell Date: Wed, 9 Dec 2009 02:18:04 +0000 (-0800) Subject: When SA_SIGINFO is set, we should use __sa_sigaction on FreeBSD X-Git-Tag: weekly.2009-12-09~13 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=cdce7325c80aadb481ed431f0ac847122ff0ea6e;p=gostls13.git When SA_SIGINFO is set, we should use __sa_sigaction on FreeBSD R=rsc CC=golang-dev https://golang.org/cl/165097 --- diff --git a/src/pkg/runtime/freebsd/386/signal.c b/src/pkg/runtime/freebsd/386/signal.c index 75445cacf7..1654d2bc3b 100644 --- a/src/pkg/runtime/freebsd/386/signal.c +++ b/src/pkg/runtime/freebsd/386/signal.c @@ -92,9 +92,9 @@ initsig(void) for(i = 0; i < NSIG; i++) { if(sigtab[i].flags) { if(sigtab[i].flags & SigCatch) - sa.__sigaction_u.__sa_handler = (void*) sigtramp; + sa.__sigaction_u.__sa_sigaction = (void*) sigtramp; else - sa.__sigaction_u.__sa_handler = (void*) sigignore; + sa.__sigaction_u.__sa_sigaction = (void*) sigignore; if(sigtab[i].flags & SigRestart) sa.sa_flags |= SA_RESTART; diff --git a/src/pkg/runtime/freebsd/amd64/signal.c b/src/pkg/runtime/freebsd/amd64/signal.c index e83a7bc954..a7ed8260e9 100644 --- a/src/pkg/runtime/freebsd/amd64/signal.c +++ b/src/pkg/runtime/freebsd/amd64/signal.c @@ -100,9 +100,9 @@ initsig(void) for(i = 0; i < NSIG; i++) { if(sigtab[i].flags) { if(sigtab[i].flags & SigCatch) - sa.__sigaction_u.__sa_handler = (void*) sigtramp; + sa.__sigaction_u.__sa_sigaction = (void*) sigtramp; else - sa.__sigaction_u.__sa_handler = (void*) sigignore; + sa.__sigaction_u.__sa_sigaction = (void*) sigignore; if(sigtab[i].flags & SigRestart) sa.sa_flags |= SA_RESTART;