Add forgotten SO_*_NEW values to powerpc, mips and arm

The _NEW defines are not available in musl and ohos.
rust-lang · Jan 27, 2025 · 57ffa6c · 57ffa6c
1 parent e3e1daa
commit 57ffa6c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/src/unix/linux_like/linux/arch/generic/mod.rs b/src/unix/linux_like/linux/arch/generic/mod.rs
@@ -57,13 +57,24 @@ const SO_TIMESTAMPING_OLD: c_int = 37;
 cfg_if! {
     if #[cfg(all(
         linux_time_bits64,
-        any(target_arch = "arm", target_arch = "x86")
+        any(target_arch = "arm", target_arch = "x86"),
+        not(any(target_env = "musl", target_env = "ohos"))
     ))] {
         pub const SO_TIMESTAMP: c_int = SO_TIMESTAMP_NEW;
         pub const SO_TIMESTAMPNS: c_int = SO_TIMESTAMPNS_NEW;
         pub const SO_TIMESTAMPING: c_int = SO_TIMESTAMPING_NEW;
         pub const SO_RCVTIMEO: c_int = SO_RCVTIMEO_NEW;
         pub const SO_SNDTIMEO: c_int = SO_SNDTIMEO_NEW;
+    } else if #[cfg(all(
+        linux_time_bits64,
+        any(target_arch = "arm", target_arch = "x86"),
+        any(target_env = "musl", target_env = "ohos")
+    ))] {
+        pub const SO_TIMESTAMP: c_int = 63;
+        pub const SO_TIMESTAMPNS: c_int = 64;
+        pub const SO_TIMESTAMPING: c_int = 65;
+        pub const SO_RCVTIMEO: c_int = 66;
+        pub const SO_SNDTIMEO: c_int = 67;
     } else {
         pub const SO_TIMESTAMP: c_int = SO_TIMESTAMP_OLD;
         pub const SO_TIMESTAMPNS: c_int = SO_TIMESTAMPNS_OLD;
@@ -114,6 +125,7 @@ cfg_if! {
         any(
             target_arch = "x86",
             target_arch = "x86_64",
+            target_arch = "arm",
             target_arch = "aarch64",
             target_arch = "csky",
             target_arch = "loongarch64"

diff --git a/src/unix/linux_like/linux/arch/mips/mod.rs b/src/unix/linux_like/linux/arch/mips/mod.rs
@@ -99,8 +99,13 @@ pub const SO_BINDTOIFINDEX: c_int = 62;
 // but CI haven't support them yet.
 // Some related consts could be found in b32.rs and b64.rs
 const SO_TIMESTAMP_OLD: c_int = 29;
+const SO_RCVTIMEO_NEW: c_int = 66;
+const SO_SNDTIMEO_NEW: c_int = 67;
 const SO_TIMESTAMPNS_OLD: c_int = 35;
 const SO_TIMESTAMPING_OLD: c_int = 37;
+const SO_TIMESTAMP_NEW: c_int = 63;
+const SO_TIMESTAMPNS_NEW: c_int = 64;
+const SO_TIMESTAMPING_NEW: c_int = 65;
 cfg_if! {
     if #[cfg(linux_time_bits64)] {
         pub const SO_TIMESTAMP: c_int = SO_TIMESTAMP_NEW;

diff --git a/src/unix/linux_like/linux/arch/powerpc/mod.rs b/src/unix/linux_like/linux/arch/powerpc/mod.rs
@@ -94,11 +94,11 @@ pub const SO_ZEROCOPY: c_int = 60;
 pub const SO_TXTIME: c_int = 61;
 pub const SCM_TXTIME: c_int = SO_TXTIME;
 pub const SO_BINDTOIFINDEX: c_int = 62;
-// pub const SO_TIMESTAMP_NEW: c_int = 63;
-// pub const SO_TIMESTAMPNS_NEW: c_int = 64;
-// pub const SO_TIMESTAMPING_NEW: c_int = 65;
-// pub const SO_RCVTIMEO_NEW: c_int = 66;
-// pub const SO_SNDTIMEO_NEW: c_int = 67;
+const SO_TIMESTAMP_NEW: c_int = 63;
+const SO_TIMESTAMPNS_NEW: c_int = 64;
+const SO_TIMESTAMPING_NEW: c_int = 65;
+const SO_RCVTIMEO_NEW: c_int = 66;
+const SO_SNDTIMEO_NEW: c_int = 67;
 // pub const SO_DETACH_REUSEPORT_BPF: c_int = 68;
 // pub const SO_PREFER_BUSY_POLL: c_int = 69;
 // pub const SO_BUSY_POLL_BUDGET: c_int = 70;