Enable sock_txtime on mips musl target

rust-lang · May 2, 2022 · 540d160 · 540d160
1 parent 42faa24
commit 540d160
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt
@@ -2069,6 +2069,8 @@ SOF_TIMESTAMPING_SOFTWARE
 SOF_TIMESTAMPING_SYS_HARDWARE
 SOF_TIMESTAMPING_TX_HARDWARE
 SOF_TIMESTAMPING_TX_SOFTWARE
+SOF_TXTIME_DEADLINE_MODE
+SOF_TXTIME_REPORT_ERRORS
 SOL_AAL
 SOL_ALG
 SOL_ATM
@@ -3063,6 +3065,7 @@ sigwaitinfo
 sock_extended_err
 sock_filter
 sock_fprog
+sock_txtime
 sockaddr_alg
 sockaddr_can
 sockaddr_ll

diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
@@ -685,16 +685,12 @@ s_no_extra_traits! {
     }
 }
 
-cfg_if! {
-    if #[cfg(not(all(target_env = "musl", target_arch = "mips")))] {
-        s_no_extra_traits! {
-            // linux/net_tstamp.h
-            #[allow(missing_debug_implementations)]
-            pub struct sock_txtime {
-                pub clockid: ::clockid_t,
-                pub flags: ::__u32,
-            }
-        }
+s_no_extra_traits! {
+    // linux/net_tstamp.h
+    #[allow(missing_debug_implementations)]
+    pub struct sock_txtime {
+        pub clockid: ::clockid_t,
+        pub flags: ::__u32,
     }
 }
 
@@ -2663,12 +2659,8 @@ pub const SOF_TIMESTAMPING_RX_SOFTWARE: ::c_uint = 1 << 3;
 pub const SOF_TIMESTAMPING_SOFTWARE: ::c_uint = 1 << 4;
 pub const SOF_TIMESTAMPING_SYS_HARDWARE: ::c_uint = 1 << 5;
 pub const SOF_TIMESTAMPING_RAW_HARDWARE: ::c_uint = 1 << 6;
-cfg_if! {
-    if #[cfg(not(all(target_env = "musl", target_arch = "mips")))] {
-        pub const SOF_TXTIME_DEADLINE_MODE: u32 = 1 << 0;
-        pub const SOF_TXTIME_REPORT_ERRORS: u32 = 1 << 1;
-    }
-}
+pub const SOF_TXTIME_DEADLINE_MODE: u32 = 1 << 0;
+pub const SOF_TXTIME_REPORT_ERRORS: u32 = 1 << 1;
 
 // linux/if_alg.h
 pub const ALG_SET_KEY: ::c_int = 1;