Skip to content

Commit c27ea90

Browse files
authored
Don't define the sa_restorer field on platforms which lack it. (#52)
riscv and others don't define `SA_RESTORER` and don't have a `sa_restorer` field.
1 parent f892ac4 commit c27ea90

7 files changed

Lines changed: 2 additions & 6 deletions

File tree

gen/modules/general.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,8 @@ struct kernel_sigaction {
376376
// Some platforms make `sa_handler` a macro, so use a different name.
377377
__kernel_sighandler_t sa_handler_kernel;
378378
unsigned long sa_flags;
379+
#ifdef SA_RESTORER
379380
__sigrestore_t sa_restorer;
381+
#endif
380382
kernel_sigset_t sa_mask;
381383
};

src/mips/general.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5552,6 +5552,5 @@ pub sig: [crate::ctypes::c_ulong; 4usize],
55525552
pub struct kernel_sigaction {
55535553
pub sa_handler_kernel: __kernel_sighandler_t,
55545554
pub sa_flags: crate::ctypes::c_ulong,
5555-
pub sa_restorer: __sigrestore_t,
55565555
pub sa_mask: kernel_sigset_t,
55575556
}

src/mips64/general.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5477,6 +5477,5 @@ pub sig: [crate::ctypes::c_ulong; 2usize],
54775477
pub struct kernel_sigaction {
54785478
pub sa_handler_kernel: __kernel_sighandler_t,
54795479
pub sa_flags: crate::ctypes::c_ulong,
5480-
pub sa_restorer: __sigrestore_t,
54815480
pub sa_mask: kernel_sigset_t,
54825481
}

src/riscv32/general.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5272,6 +5272,5 @@ pub sig: [crate::ctypes::c_ulong; 2usize],
52725272
pub struct kernel_sigaction {
52735273
pub sa_handler_kernel: __kernel_sighandler_t,
52745274
pub sa_flags: crate::ctypes::c_ulong,
5275-
pub sa_restorer: __sigrestore_t,
52765275
pub sa_mask: kernel_sigset_t,
52775276
}

src/riscv64/general.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5265,6 +5265,5 @@ pub sig: [crate::ctypes::c_ulong; 1usize],
52655265
pub struct kernel_sigaction {
52665266
pub sa_handler_kernel: __kernel_sighandler_t,
52675267
pub sa_flags: crate::ctypes::c_ulong,
5268-
pub sa_restorer: __sigrestore_t,
52695268
pub sa_mask: kernel_sigset_t,
52705269
}

src/sparc/general.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5650,6 +5650,5 @@ pub sig: [crate::ctypes::c_ulong; 1usize],
56505650
pub struct kernel_sigaction {
56515651
pub sa_handler_kernel: __kernel_sighandler_t,
56525652
pub sa_flags: crate::ctypes::c_ulong,
5653-
pub sa_restorer: __sigrestore_t,
56545653
pub sa_mask: kernel_sigset_t,
56555654
}

src/sparc64/general.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5612,6 +5612,5 @@ pub sig: __IncompleteArrayField<crate::ctypes::c_ulong>,
56125612
pub struct kernel_sigaction {
56135613
pub sa_handler_kernel: __kernel_sighandler_t,
56145614
pub sa_flags: crate::ctypes::c_ulong,
5615-
pub sa_restorer: __sigrestore_t,
56165615
pub sa_mask: kernel_sigset_t,
56175616
}

0 commit comments

Comments
 (0)