From 6a522c47bd7929d514fa4aaf77fc2698173f315e Mon Sep 17 00:00:00 2001
From: Alan Somers <asomers@gmail.com>
Date: Sat, 26 Aug 2023 09:23:20 -0600
Subject: [PATCH] Tweak the #[cfg()] statements in sys/ioctl/linux a little

This should give Nix a better chance of building on architectures that
aren't specifically-supported.
---
 src/sys/ioctl/linux.rs | 79 ++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 42 deletions(-)

diff --git a/src/sys/ioctl/linux.rs b/src/sys/ioctl/linux.rs
index 669d517906..610b8ddac0 100644
--- a/src/sys/ioctl/linux.rs
+++ b/src/sys/ioctl/linux.rs
@@ -1,3 +1,5 @@
+use cfg_if::cfg_if;
+
 /// The datatype used for the ioctl number
 #[cfg(any(target_os = "android", target_env = "musl"))]
 #[doc(hidden)]
@@ -14,48 +16,41 @@ pub const NRBITS: ioctl_num_type = 8;
 #[doc(hidden)]
 pub const TYPEBITS: ioctl_num_type = 8;
 
-#[cfg(any(
-    target_arch = "mips",
-    target_arch = "mips64",
-    target_arch = "powerpc",
-    target_arch = "powerpc64",
-    target_arch = "sparc64"
-))]
-mod consts {
-    #[doc(hidden)]
-    pub const NONE: u8 = 1;
-    #[doc(hidden)]
-    pub const READ: u8 = 2;
-    #[doc(hidden)]
-    pub const WRITE: u8 = 4;
-    #[doc(hidden)]
-    pub const SIZEBITS: u8 = 13;
-    #[doc(hidden)]
-    pub const DIRBITS: u8 = 3;
-}
-
-// "Generic" ioctl protocol
-#[cfg(any(
-    target_arch = "x86",
-    target_arch = "arm",
-    target_arch = "s390x",
-    target_arch = "x86_64",
-    target_arch = "aarch64",
-    target_arch = "riscv32",
-    target_arch = "riscv64",
-    target_arch = "loongarch64"
-))]
-mod consts {
-    #[doc(hidden)]
-    pub const NONE: u8 = 0;
-    #[doc(hidden)]
-    pub const READ: u8 = 2;
-    #[doc(hidden)]
-    pub const WRITE: u8 = 1;
-    #[doc(hidden)]
-    pub const SIZEBITS: u8 = 14;
-    #[doc(hidden)]
-    pub const DIRBITS: u8 = 2;
+cfg_if! {
+    if #[cfg(any(
+        target_arch = "mips",
+        target_arch = "mips64",
+        target_arch = "powerpc",
+        target_arch = "powerpc64",
+        target_arch = "sparc64"
+    ))] {
+        mod consts {
+            #[doc(hidden)]
+            pub const NONE: u8 = 1;
+            #[doc(hidden)]
+            pub const READ: u8 = 2;
+            #[doc(hidden)]
+            pub const WRITE: u8 = 4;
+            #[doc(hidden)]
+            pub const SIZEBITS: u8 = 13;
+            #[doc(hidden)]
+            pub const DIRBITS: u8 = 3;
+        }
+    } else {
+        // "Generic" ioctl protocol
+        mod consts {
+            #[doc(hidden)]
+            pub const NONE: u8 = 0;
+            #[doc(hidden)]
+            pub const READ: u8 = 2;
+            #[doc(hidden)]
+            pub const WRITE: u8 = 1;
+            #[doc(hidden)]
+            pub const SIZEBITS: u8 = 14;
+            #[doc(hidden)]
+            pub const DIRBITS: u8 = 2;
+        }
+    }
 }
 
 pub use self::consts::*;