runtime: provide a dummy value of _SIGPROF on plan9 and windows

Fixes build on plan9 and windows.

Change-Id: Ic9b02c641ab84e4f6d8149de71b9eb495e3343b2
Reviewed-on: https://go-review.googlesource.com/2233
Reviewed-by: Alex Brainman <alex.brainman@gmail.com>

diff --git a/src/runtime/defs_windows.go b/src/runtime/defs_windows.go
index 7ce67974141c08ee53677a57b4c80675b1674516..5dfb83a7cf6de98a255422ddeeb2c36b530ebd0b 100644 (file)
--- a/src/runtime/defs_windows.go
+++ b/src/runtime/defs_windows.go
@@ -41,6 +41,7 @@ const (
        DUPLICATE_SAME_ACCESS   = C.DUPLICATE_SAME_ACCESS
        THREAD_PRIORITY_HIGHEST = C.THREAD_PRIORITY_HIGHEST
 
+       SIGPROF          = 0 // dummy value for badsignal
        SIGINT           = C.SIGINT
        CTRL_C_EVENT     = C.CTRL_C_EVENT
        CTRL_BREAK_EVENT = C.CTRL_BREAK_EVENT

diff --git a/src/runtime/defs_windows_386.go b/src/runtime/defs_windows_386.go
index abec2d839fd90f5a5df8140dab7d71b696011507..450a371769184772b4c05f4d26e1b108704ef77f 100644 (file)
--- a/src/runtime/defs_windows_386.go
+++ b/src/runtime/defs_windows_386.go
@@ -15,6 +15,7 @@ const (
        _DUPLICATE_SAME_ACCESS   = 0x2
        _THREAD_PRIORITY_HIGHEST = 0x2
 
+       _SIGPROF          = 0 // dummy value for badsignal
        _SIGINT           = 0x2
        _CTRL_C_EVENT     = 0x0
        _CTRL_BREAK_EVENT = 0x1

diff --git a/src/runtime/defs_windows_amd64.go b/src/runtime/defs_windows_amd64.go
index 81b13597b7531c2dd17f32315579ffbf3a3d052e..ed28576aac18ddb5142adffa35608d3390335cfe 100644 (file)
--- a/src/runtime/defs_windows_amd64.go
+++ b/src/runtime/defs_windows_amd64.go
@@ -15,6 +15,7 @@ const (
        _DUPLICATE_SAME_ACCESS   = 0x2
        _THREAD_PRIORITY_HIGHEST = 0x2
 
+       _SIGPROF          = 0 // dummy value for badsignal
        _SIGINT           = 0x2
        _CTRL_C_EVENT     = 0x0
        _CTRL_BREAK_EVENT = 0x1

diff --git a/src/runtime/os2_plan9.go b/src/runtime/os2_plan9.go
index f64f4c8dab45a16d5743ae4f76d2671716e43022..ca9cee767fc8dc70dff25e58739cb5741e860df4 100644 (file)
--- a/src/runtime/os2_plan9.go
+++ b/src/runtime/os2_plan9.go
@@ -69,4 +69,6 @@ const (
        _SIGINTDIV = 4
        _SIGFLOAT  = 5
        _SIGTRAP   = 6
+       // dummy value defined for badsignal
+       _SIGPROF   = 0
 )

diff --git a/src/runtime/sigqueue.go b/src/runtime/sigqueue.go
index a760790396911efe3291253eb310e4bd6ac1d61b..543651076d3f22e7981e97b1d22207789fd69424 100644 (file)
--- a/src/runtime/sigqueue.go
+++ b/src/runtime/sigqueue.go
@@ -160,8 +160,13 @@ func badsignal(sig uintptr) {
        // call to cgocallback below will bring down the whole process.
        // It's better to miss a few SIGPROF signals than to abort in this case.
        // See http://golang.org/issue/9456.
-       if sig == _SIGPROF && needextram != 0 {
-               return
+       switch GOOS {
+       case "windows", "plan9":
+               // no actual SIGPROF is defined, nothing to do
+       default:
+               if sig == _SIGPROF && needextram != 0 {
+                       return
+               }
        }
        cgocallback(unsafe.Pointer(funcPC(sigsend)), noescape(unsafe.Pointer(&sig)), unsafe.Sizeof(sig))
 }