From 4a7310a5e53fd16224e764b1b434340457c704e1 Mon Sep 17 00:00:00 2001
From: Dan Gohman <dev@sunfishcode.online>
Date: Sat, 9 Nov 2024 08:17:14 -0800
Subject: [PATCH] Disable `AF_NCA`, `VSTATUS`, `VERASE2`, and `fcntl_lock` on
 Solaris. (#1211)

Recent versions of libc 0.2.x have removed these declarations on Solaris,
so remove the code that uses them from rustix.
---
 src/backend/libc/fs/syscalls.rs | 8 +++++++-
 src/backend/libc/fs/types.rs    | 7 ++++++-
 src/fs/fcntl.rs                 | 2 ++
 src/net/types.rs                | 2 +-
 src/termios/types.rs            | 8 ++++----
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/backend/libc/fs/syscalls.rs b/src/backend/libc/fs/syscalls.rs
index 2d2f4c674..2b09c5829 100644
--- a/src/backend/libc/fs/syscalls.rs
+++ b/src/backend/libc/fs/syscalls.rs
@@ -36,7 +36,12 @@ use crate::fs::AtFlags;
     target_os = "vita",
 )))]
 use crate::fs::FallocateFlags;
-#[cfg(not(any(target_os = "espidf", target_os = "vita", target_os = "wasi")))]
+#[cfg(not(any(
+    target_os = "espidf",
+    target_os = "solaris",
+    target_os = "vita",
+    target_os = "wasi"
+)))]
 use crate::fs::FlockOperation;
 #[cfg(any(linux_kernel, target_os = "freebsd"))]
 use crate::fs::MemfdFlags;
@@ -1252,6 +1257,7 @@ pub(crate) fn fcntl_add_seals(fd: BorrowedFd<'_>, seals: SealFlags) -> io::Resul
     target_os = "espidf",
     target_os = "fuchsia",
     target_os = "redox",
+    target_os = "solaris",
     target_os = "vita",
     target_os = "wasi"
 )))]
diff --git a/src/backend/libc/fs/types.rs b/src/backend/libc/fs/types.rs
index c8bb01f46..cac86994a 100644
--- a/src/backend/libc/fs/types.rs
+++ b/src/backend/libc/fs/types.rs
@@ -949,7 +949,12 @@ bitflags! {
 ///
 /// [`flock`]: crate::fs::flock
 /// [`fcntl_lock`]: crate::fs::fcntl_lock
-#[cfg(not(any(target_os = "espidf", target_os = "vita", target_os = "wasi")))]
+#[cfg(not(any(
+    target_os = "espidf",
+    target_os = "solaris",
+    target_os = "vita",
+    target_os = "wasi"
+)))]
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 #[repr(u32)]
 pub enum FlockOperation {
diff --git a/src/fs/fcntl.rs b/src/fs/fcntl.rs
index f5cd47ddf..c93f9d32f 100644
--- a/src/fs/fcntl.rs
+++ b/src/fs/fcntl.rs
@@ -8,6 +8,7 @@
     target_os = "espidf",
     target_os = "fuchsia",
     target_os = "redox",
+    target_os = "solaris",
     target_os = "vita",
     target_os = "wasi"
 )))]
@@ -101,6 +102,7 @@ pub fn fcntl_add_seals<Fd: AsFd>(fd: Fd, seals: SealFlags) -> io::Result<()> {
     target_os = "espidf",
     target_os = "fuchsia",
     target_os = "redox",
+    target_os = "solaris",
     target_os = "vita",
     target_os = "wasi"
 )))]
diff --git a/src/net/types.rs b/src/net/types.rs
index 0d4c40ea8..853d6fbc9 100644
--- a/src/net/types.rs
+++ b/src/net/types.rs
@@ -541,7 +541,7 @@ impl AddressFamily {
     #[cfg(solarish)]
     pub const NBS: Self = Self(c::AF_NBS as _);
     /// `AF_NCA`
-    #[cfg(solarish)]
+    #[cfg(target_os = "illumos")]
     pub const NCA: Self = Self(c::AF_NCA as _);
     /// `AF_NDD`
     #[cfg(target_os = "aix")]
diff --git a/src/termios/types.rs b/src/termios/types.rs
index 7b97808a1..fcc295cbc 100644
--- a/src/termios/types.rs
+++ b/src/termios/types.rs
@@ -1192,11 +1192,11 @@ impl SpecialCodeIndex {
     pub const VDSUSP: Self = Self(c::VDSUSP as usize);
 
     /// `VSTATUS`
-    #[cfg(any(bsd, solarish, target_os = "hurd"))]
+    #[cfg(any(bsd, target_os = "hurd", target_os = "illumos"))]
     pub const VSTATUS: Self = Self(c::VSTATUS as usize);
 
     /// `VERASE2`
-    #[cfg(any(freebsdlike, solarish))]
+    #[cfg(any(freebsdlike, target_os = "illumos"))]
     pub const VERASE2: Self = Self(c::VERASE2 as usize);
 }
 
@@ -1272,9 +1272,9 @@ impl core::fmt::Debug for SpecialCodeIndex {
                 target_os = "nto"
             ))]
             Self::VDSUSP => write!(f, "VDSUSP"),
-            #[cfg(any(bsd, solarish, target_os = "hurd"))]
+            #[cfg(any(bsd, target_os = "hurd", target_os = "illumos"))]
             Self::VSTATUS => write!(f, "VSTATUS"),
-            #[cfg(any(freebsdlike, solarish))]
+            #[cfg(any(freebsdlike, target_os = "illumos"))]
             Self::VERASE2 => write!(f, "VERASE2"),
 
             _ => write!(f, "unknown"),