motiejus/zig
1
Fork 0
Code Releases Activity

Merge pull request #13418 from ryanschneider/signal-alignment-13216

Browse Source 
std.os: fix alignment of Sigaction.handler_fn
This commit is contained in:
Veikka Tuominen
2022-11-09 17:36:40 +02:00
committed by GitHub
parent d1e7be0bd1 a68b27c252
commit 41b7e40d75
9 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/std/os/linux.zig
View File

@@ -3130,7 +3130,7 @@ pub const all_mask: sigset_t = [_]u32{0xffffffff} ** @typeInfo(sigset_t).Array.l
pub const app_mask: sigset_t = [2]u32{ 0xfffffffc, 0x7fffffff } ++ [_]u32{0xffffffff} ** 30;
const k_sigaction_funcs = struct {
const handler = ?std.meta.FnPtr(fn (c_int) callconv(.C) void);
const handler = ?std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void);
const restorer = std.meta.FnPtr(fn () callconv(.C) void);
};
@@ -3157,7 +3157,7 @@ pub const k_sigaction = switch (native_arch) {
/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
pub const Sigaction = extern struct {
pub const handler_fn = std.meta.FnPtr(fn (c_int) callconv(.C) void);
pub const handler_fn = std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void);
pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);
handler: extern union {