From 2c5d2083e41371aa4f5aab9e86921002c1f9b504 Mon Sep 17 00:00:00 2001 From: Rhys Hiltner Date: Mon, 29 Nov 2021 16:48:34 -0800 Subject: [PATCH] runtime: fix riscv64 sigaction mask field offset The Linux kernel for riscv64 does not include an sa_restorer field on its sigaction struct, and expects sa_mask to come immediately after the sa_flags field. Arrange the fields of the sigaction struct that are known to the kernel so they appear at the correct byte offsets, and so they agree with the output of "go tool cgo -godefs". Follow the example set by the mips/mipsle port to leave the sa_restorer field in place, but at an offset where it won't hurt anything. Fixes #49709 Change-Id: I9bb0d7dbd7439d07e3a204461c7d790f33fd4977 Reviewed-on: https://go-review.googlesource.com/c/go/+/367635 Run-TryBot: Rhys Hiltner Reviewed-by: Cherry Mui Reviewed-by: Joel Sing Trust: Ian Lance Taylor --- src/runtime/defs_linux_riscv64.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/runtime/defs_linux_riscv64.go b/src/runtime/defs_linux_riscv64.go index 332720a8c8..747e26bc4b 100644 --- a/src/runtime/defs_linux_riscv64.go +++ b/src/runtime/defs_linux_riscv64.go @@ -122,10 +122,12 @@ func (tv *timeval) set_usec(x int32) { } type sigactiont struct { - sa_handler uintptr - sa_flags uint64 + sa_handler uintptr + sa_flags uint64 + sa_mask uint64 + // Linux on riscv64 does not have the sa_restorer field, but the setsig + // function references it (for x86). Not much harm to include it at the end. sa_restorer uintptr - sa_mask uint64 } type siginfoFields struct { -- 2.51.0