linux_like: unify SIGEV_THREAD_ID support

This effectively adds the constant for musl too, as last platform of this category. It has been supported in musl since 7c71792e ("add support for SIGEV_THREAD_ID timers") and was released with v1.2.2 in January 2021. Also double-checked that the `sigevent` struct is defined in the exact same way. Signed-off-by: Christoph Heiss <[email protected]>
rust-lang · Aug 16, 2024 · 9272dc5 · 9272dc5
1 parent 8f20f00
commit 9272dc5
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/libc-test/semver/linux-gnu.txt b/libc-test/semver/linux-gnu.txt
@@ -409,7 +409,6 @@ RWF_NOWAIT
 RWF_SYNC
 SECURITYFS_MAGIC
 SELINUX_MAGIC
-SIGEV_THREAD_ID
 SMACK_MAGIC
 SMB_SUPER_MAGIC
 SOL_CAIF

diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt
@@ -2498,6 +2498,7 @@ SHORT_INODE
 SIGEV_NONE
 SIGEV_SIGNAL
 SIGEV_THREAD
+SIGEV_THREAD_ID
 SIGIO
 SIGPOLL
 SIGPWR

diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs
@@ -2209,8 +2209,6 @@ pub const NLA_TYPE_MASK: ::c_int = !(NLA_F_NESTED | NLA_F_NET_BYTEORDER);
 
 pub const NLA_ALIGNTO: ::c_int = 4;
 
-pub const SIGEV_THREAD_ID: ::c_int = 4;
-
 pub const CIBAUD: ::tcflag_t = 0o02003600000;
 pub const CBAUDEX: ::tcflag_t = 0o010000;
 

diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs
@@ -819,8 +819,6 @@ pub const PF_NFC: ::c_int = AF_NFC;
 pub const PF_VSOCK: ::c_int = AF_VSOCK;
 pub const PF_XDP: ::c_int = AF_XDP;
 
-pub const SIGEV_THREAD_ID: ::c_int = 4;
-
 pub const BUFSIZ: ::c_uint = 8192;
 pub const TMP_MAX: ::c_uint = 238328;
 pub const FOPEN_MAX: ::c_uint = 16;

diff --git a/src/unix/linux_like/linux/uclibc/mod.rs b/src/unix/linux_like/linux/uclibc/mod.rs
@@ -169,8 +169,6 @@ pub const MCL_CURRENT: ::c_int = 0x0001;
 pub const MCL_FUTURE: ::c_int = 0x0002;
 pub const MCL_ONFAULT: ::c_int = 0x0004;
 
-pub const SIGEV_THREAD_ID: ::c_int = 4;
-
 pub const AF_VSOCK: ::c_int = 40;
 
 // Most `*_SUPER_MAGIC` constants are defined at the `linux_like` level; the

diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs
@@ -1269,6 +1269,11 @@ pub const CLD_CONTINUED: ::c_int = 6;
 pub const SIGEV_SIGNAL: ::c_int = 0;
 pub const SIGEV_NONE: ::c_int = 1;
 pub const SIGEV_THREAD: ::c_int = 2;
+cfg_if! {
+    if #[cfg(not(target_os = "emscripten"))] {
+        pub const SIGEV_THREAD_ID: ::c_int = 4;
+    }
+}
 
 pub const P_ALL: idtype_t = 0;
 pub const P_PID: idtype_t = 1;