authorgravatar for ryanleeschneider@gmail.comRyan Schneider <ryanleeschneider@gmail.com> 2022-11-02 18:55:17-07:00
committergravatar for ryanleeschneider@gmail.comRyan Schneider <ryanleeschneider@gmail.com> 2022-11-04 08:00:50-07:00
log7f1f2e653d6f3cd541e92727f2001596935f3c62
tree8aea17fa77a10d9102eab623f6e8cd0ebf7bc9bc
parent64b3ffd8ffb970ca881827a21ef6546f7ad6de99

std.os: fix alignment of Sigaction.handler_fn

Fixes #13216

8 files changed, 9 insertions(+), 9 deletions(-)

lib/std/c/darwin.zig+1-1
...@@ -918,7 +918,7 @@ pub const siginfo_t = extern struct {...@@ -918,7 +918,7 @@ pub const siginfo_t = extern struct {
918918
919/// Renamed from `sigaction` to `Sigaction` to avoid conflict with function name.919/// Renamed from `sigaction` to `Sigaction` to avoid conflict with function name.
920pub const Sigaction = extern struct {920pub const Sigaction = extern struct {
921 pub const handler_fn = std.meta.FnPtr(fn (c_int) callconv(.C) void);921 pub const handler_fn = std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void);
922 pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);922 pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);
923923
924 handler: extern union {924 handler: extern union {
lib/std/c/dragonfly.zig+1-1
...@@ -681,7 +681,7 @@ pub const empty_sigset = sigset_t{ .__bits = [_]c_uint{0} ** _SIG_WORDS };...@@ -681,7 +681,7 @@ pub const empty_sigset = sigset_t{ .__bits = [_]c_uint{0} ** _SIG_WORDS };
681pub const sig_atomic_t = c_int;681pub const sig_atomic_t = c_int;
682682
683pub const Sigaction = extern struct {683pub const Sigaction = extern struct {
684 pub const handler_fn = std.meta.FnPtr(fn (c_int) callconv(.C) void);684 pub const handler_fn = std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void);
685 pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);685 pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);
686686
687 /// signal handler687 /// signal handler
lib/std/c/freebsd.zig+1-1
...@@ -1197,7 +1197,7 @@ const NSIG = 32;...@@ -1197,7 +1197,7 @@ const NSIG = 32;
11971197
1198/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.1198/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
1199pub const Sigaction = extern struct {1199pub const Sigaction = extern struct {
1200 pub const handler_fn = std.meta.FnPtr(fn (c_int) callconv(.C) void);1200 pub const handler_fn = std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void);
1201 pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);1201 pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);
12021202
1203 /// signal handler1203 /// signal handler
lib/std/c/haiku.zig+1-1
...@@ -742,7 +742,7 @@ const NSIG = 32;...@@ -742,7 +742,7 @@ const NSIG = 32;
742742
743/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.743/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
744pub const Sigaction = extern struct {744pub const Sigaction = extern struct {
745 pub const handler_fn = std.meta.FnPtr(fn (i32) callconv(.C) void);745 pub const handler_fn = std.meta.FnPtr(fn (i32) align(1) callconv(.C) void);
746746
747 /// signal handler747 /// signal handler
748 __sigaction_u: extern union {748 __sigaction_u: extern union {
lib/std/c/netbsd.zig+1-1
...@@ -971,7 +971,7 @@ pub const SIG = struct {...@@ -971,7 +971,7 @@ pub const SIG = struct {
971971
972/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.972/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
973pub const Sigaction = extern struct {973pub const Sigaction = extern struct {
974 pub const handler_fn = std.meta.FnPtr(fn (c_int) callconv(.C) void);974 pub const handler_fn = std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void);
975 pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);975 pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);
976976
977 /// signal handler977 /// signal handler
lib/std/c/openbsd.zig+1-1
...@@ -1026,7 +1026,7 @@ pub const SIG = struct {...@@ -1026,7 +1026,7 @@ pub const SIG = struct {
10261026
1027/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.1027/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
1028pub const Sigaction = extern struct {1028pub const Sigaction = extern struct {
1029 pub const handler_fn = std.meta.FnPtr(fn (c_int) callconv(.C) void);1029 pub const handler_fn = std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void);
1030 pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);1030 pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);
10311031
1032 /// signal handler1032 /// signal handler
lib/std/c/solaris.zig+1-1
...@@ -952,7 +952,7 @@ pub const SIG = struct {...@@ -952,7 +952,7 @@ pub const SIG = struct {
952952
953/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.953/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
954pub const Sigaction = extern struct {954pub const Sigaction = extern struct {
955 pub const handler_fn = std.meta.FnPtr(fn (c_int) callconv(.C) void);955 pub const handler_fn = std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void);
956 pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);956 pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);
957957
958 /// signal options958 /// signal options
lib/std/os/linux.zig+2-2
...@@ -3130,7 +3130,7 @@ pub const all_mask: sigset_t = [_]u32{0xffffffff} ** @typeInfo(sigset_t).Array.l...@@ -3130,7 +3130,7 @@ pub const all_mask: sigset_t = [_]u32{0xffffffff} ** @typeInfo(sigset_t).Array.l
3130pub const app_mask: sigset_t = [2]u32{ 0xfffffffc, 0x7fffffff } ++ [_]u32{0xffffffff} ** 30;3130pub const app_mask: sigset_t = [2]u32{ 0xfffffffc, 0x7fffffff } ++ [_]u32{0xffffffff} ** 30;
31313131
3132const k_sigaction_funcs = struct {3132const k_sigaction_funcs = struct {
3133 const handler = ?std.meta.FnPtr(fn (c_int) callconv(.C) void);3133 const handler = ?std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void);
3134 const restorer = std.meta.FnPtr(fn () callconv(.C) void);3134 const restorer = std.meta.FnPtr(fn () callconv(.C) void);
3135};3135};
31363136
...@@ -3157,7 +3157,7 @@ pub const k_sigaction = switch (native_arch) {...@@ -3157,7 +3157,7 @@ pub const k_sigaction = switch (native_arch) {
31573157
3158/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.3158/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
3159pub const Sigaction = extern struct {3159pub const Sigaction = extern struct {
3160 pub const handler_fn = std.meta.FnPtr(fn (c_int) callconv(.C) void);3160 pub const handler_fn = std.meta.FnPtr(fn (c_int) align(1) callconv(.C) void);
3161 pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);3161 pub const sigaction_fn = std.meta.FnPtr(fn (c_int, *const siginfo_t, ?*const anyopaque) callconv(.C) void);
31623162
3163 handler: extern union {3163 handler: extern union {