diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/runtime/signal_gccgo.go | 8 | ||||
| -rw-r--r-- | libgo/go/runtime/signal_sighandler.go | 2 | ||||
| -rw-r--r-- | libgo/go/runtime/signal_unix.go | 4 | ||||
| -rw-r--r-- | libgo/go/runtime/stubs.go | 4 |
5 files changed, 9 insertions, 11 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 35c0275..375ce17 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -a28b04adaeff8de61c336374db66b24ed96c30f0 +223cba75b947afc1ee5a13a60c15c66f6ff355c1 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/runtime/signal_gccgo.go b/libgo/go/runtime/signal_gccgo.go index 62fe458..570a076 100644 --- a/libgo/go/runtime/signal_gccgo.go +++ b/libgo/go/runtime/signal_gccgo.go @@ -46,15 +46,13 @@ func kill(pid _pid_t, sig uint32) int32 //extern setitimer func setitimer(which int32, new *_itimerval, old *_itimerval) int32 -type siginfo _siginfo_t - type sigTabT struct { flags int32 name string } type sigctxt struct { - info *siginfo + info *_siginfo_t ctxt unsafe.Pointer } @@ -128,9 +126,9 @@ func raiseproc(sig uint32) { //go:nosplit //go:nowritebarrierrec -func sigfwd(fn uintptr, sig uint32, info *siginfo, ctx unsafe.Pointer) { +func sigfwd(fn uintptr, sig uint32, info *_siginfo_t, ctx unsafe.Pointer) { f1 := &[1]uintptr{fn} - f2 := *(*func(uint32, *siginfo, unsafe.Pointer))(unsafe.Pointer(&f1)) + f2 := *(*func(uint32, *_siginfo_t, unsafe.Pointer))(unsafe.Pointer(&f1)) f2(sig, info, ctx) } diff --git a/libgo/go/runtime/signal_sighandler.go b/libgo/go/runtime/signal_sighandler.go index a057df9..279001b 100644 --- a/libgo/go/runtime/signal_sighandler.go +++ b/libgo/go/runtime/signal_sighandler.go @@ -25,7 +25,7 @@ var crashing int32 // are not allowed. // //go:nowritebarrierrec -func sighandler(sig uint32, info *siginfo, ctxt unsafe.Pointer, gp *g) { +func sighandler(sig uint32, info *_siginfo_t, ctxt unsafe.Pointer, gp *g) { _g_ := getg() c := sigctxt{info, ctxt} diff --git a/libgo/go/runtime/signal_unix.go b/libgo/go/runtime/signal_unix.go index 4324753..cd6f3fb 100644 --- a/libgo/go/runtime/signal_unix.go +++ b/libgo/go/runtime/signal_unix.go @@ -202,7 +202,7 @@ func sigpipe() { // This is called by the signal handler, and the world may be stopped. //go:nosplit //go:nowritebarrierrec -func sigtrampgo(sig uint32, info *siginfo, ctx unsafe.Pointer) { +func sigtrampgo(sig uint32, info *_siginfo_t, ctx unsafe.Pointer) { if sigfwdgo(sig, info, ctx) { return } @@ -446,7 +446,7 @@ func badsignal(sig uintptr, c *sigctxt) { // This is called by the signal handler, and the world may be stopped. //go:nosplit //go:nowritebarrierrec -func sigfwdgo(sig uint32, info *siginfo, ctx unsafe.Pointer) bool { +func sigfwdgo(sig uint32, info *_siginfo_t, ctx unsafe.Pointer) bool { if sig >= uint32(len(sigtable)) { return false } diff --git a/libgo/go/runtime/stubs.go b/libgo/go/runtime/stubs.go index c51ccc6..bf9f62e 100644 --- a/libgo/go/runtime/stubs.go +++ b/libgo/go/runtime/stubs.go @@ -485,10 +485,10 @@ func setSigactionHandler(*_sigaction, uintptr) // Retrieve fields from the siginfo_t and ucontext_t pointers passed // to a signal handler using C, as they are often hidden in a union. // Returns and, if available, PC where signal occurred. -func getSiginfo(*siginfo, unsafe.Pointer) (sigaddr uintptr, sigpc uintptr) +func getSiginfo(*_siginfo_t, unsafe.Pointer) (sigaddr uintptr, sigpc uintptr) // Implemented in C for gccgo. -func dumpregs(*siginfo, unsafe.Pointer) +func dumpregs(*_siginfo_t, unsafe.Pointer) // Temporary for gccgo until we port proc.go. //go:linkname getsched runtime.getsched |