Move arch specific defines down into arch modules

Author: antonblanchard

src/unix/notbsd/linux/other/b32/arm.rs

@@ -4,3 +4,17 @@ pub type wchar_t = u32;
 pub const O_DIRECT: ::c_int = 0x10000;
 pub const O_DIRECTORY: ::c_int = 0x4000;
 pub const O_NOFOLLOW: ::c_int = 0x8000;
+
+pub const MAP_LOCKED: ::c_int = 0x02000;
+pub const MAP_NORESERVE: ::c_int = 0x04000;
+
+pub const EDEADLK: ::c_int = 35;
+
+pub const SO_PEERCRED: ::c_int = 17;
+pub const SO_RCVLOWAT: ::c_int = 18;
+pub const SO_SNDLOWAT: ::c_int = 19;
+pub const SO_RCVTIMEO: ::c_int = 20;
+pub const SO_SNDTIMEO: ::c_int = 21;
+
+pub const FIOCLEX: ::c_ulong = 0x5451;
+pub const FIONBIO: ::c_ulong = 0x5421;

src/unix/notbsd/linux/other/b32/x86.rs

@@ -4,3 +4,17 @@ pub type wchar_t = i32;
 pub const O_DIRECT: ::c_int = 0x4000;
 pub const O_DIRECTORY: ::c_int = 0x10000;
 pub const O_NOFOLLOW: ::c_int = 0x20000;
+
+pub const MAP_LOCKED: ::c_int = 0x02000;
+pub const MAP_NORESERVE: ::c_int = 0x04000;
+
+pub const EDEADLK: ::c_int = 35;
+
+pub const SO_PEERCRED: ::c_int = 17;
+pub const SO_RCVLOWAT: ::c_int = 18;
+pub const SO_SNDLOWAT: ::c_int = 19;
+pub const SO_RCVTIMEO: ::c_int = 20;
+pub const SO_SNDTIMEO: ::c_int = 21;
+
+pub const FIOCLEX: ::c_ulong = 0x5451;
+pub const FIONBIO: ::c_ulong = 0x5421;

src/unix/notbsd/linux/other/b64/aarch64.rs

@@ -12,6 +12,20 @@ pub const O_DIRECT: ::c_int = 0x10000;
 pub const O_DIRECTORY: ::c_int = 0x4000;
 pub const O_NOFOLLOW: ::c_int = 0x8000;
 
+pub const MAP_LOCKED: ::c_int = 0x02000;
+pub const MAP_NORESERVE: ::c_int = 0x04000;
+
+pub const EDEADLK: ::c_int = 35;
+
+pub const SO_PEERCRED: ::c_int = 17;
+pub const SO_RCVLOWAT: ::c_int = 18;
+pub const SO_SNDLOWAT: ::c_int = 19;
+pub const SO_RCVTIMEO: ::c_int = 20;
+pub const SO_SNDTIMEO: ::c_int = 21;
+
+pub const FIOCLEX: ::c_ulong = 0x5451;
+pub const FIONBIO: ::c_ulong = 0x5421;
+
 s! {
     pub struct stat {
         pub st_dev: ::dev_t,

src/unix/notbsd/linux/other/b64/powerpc64.rs

@@ -12,6 +12,20 @@ pub const O_DIRECTORY: ::c_int = 0x4000;
 pub const O_NOFOLLOW: ::c_int = 0x8000;
 pub const O_DIRECT: ::c_int = 0x20000;
 
+pub const MAP_LOCKED: ::c_int = 0x00080;
+pub const MAP_NORESERVE: ::c_int = 0x00040;
+
+pub const EDEADLK: ::c_int = 58;
+
+pub const SO_PEERCRED: ::c_int = 21;
+pub const SO_RCVLOWAT: ::c_int = 16;
+pub const SO_SNDLOWAT: ::c_int = 17;
+pub const SO_RCVTIMEO: ::c_int = 18;
+pub const SO_SNDTIMEO: ::c_int = 19;
+
+pub const FIOCLEX: ::c_ulong = 0x20006601;
+pub const FIONBIO: ::c_ulong = 0x8004667e;
+
 s! {
     pub struct stat {
         pub st_dev: ::dev_t,

src/unix/notbsd/linux/other/b64/x86_64.rs

@@ -12,6 +12,20 @@ pub const O_DIRECT: ::c_int = 0x4000;
 pub const O_DIRECTORY: ::c_int = 0x10000;
 pub const O_NOFOLLOW: ::c_int = 0x20000;
 
+pub const MAP_LOCKED: ::c_int = 0x02000;
+pub const MAP_NORESERVE: ::c_int = 0x04000;
+
+pub const EDEADLK: ::c_int = 35;
+
+pub const SO_PEERCRED: ::c_int = 17;
+pub const SO_RCVLOWAT: ::c_int = 18;
+pub const SO_SNDLOWAT: ::c_int = 19;
+pub const SO_RCVTIMEO: ::c_int = 20;
+pub const SO_SNDTIMEO: ::c_int = 21;
+
+pub const FIOCLEX: ::c_ulong = 0x5451;
+pub const FIONBIO: ::c_ulong = 0x5421;
+
 pub const PTRACE_GETFPREGS: ::c_uint = 14;
 pub const PTRACE_SETFPREGS: ::c_uint = 15;
 pub const PTRACE_GETFPXREGS: ::c_uint = 18;

src/unix/notbsd/linux/other/mod.rs

@@ -110,23 +110,10 @@ pub const MAP_ANONYMOUS: ::c_int = 0x0020;
 pub const MAP_GROWSDOWN: ::c_int = 0x0100;
 pub const MAP_DENYWRITE: ::c_int = 0x0800;
 pub const MAP_EXECUTABLE: ::c_int = 0x01000;
-cfg_if! {
-    if #[cfg(any(target_arch = "powerpc64", target_arch = "powerpc64le"))] {
-        pub const MAP_LOCKED: ::c_int = 0x00080;
-        pub const MAP_NORESERVE: ::c_int = 0x00040;
-    } else {
-        pub const MAP_LOCKED: ::c_int = 0x02000;
-        pub const MAP_NORESERVE: ::c_int = 0x04000;
-    }
-}
 pub const MAP_POPULATE: ::c_int = 0x08000;
 pub const MAP_NONBLOCK: ::c_int = 0x010000;
 pub const MAP_STACK: ::c_int = 0x020000;
 
-#[cfg(any(target_arch = "powerpc64", target_arch = "powerpc64le"))]
-pub const EDEADLK: ::c_int = 58;
-#[cfg(not(any(target_arch = "powerpc64", target_arch = "powerpc64le")))]
-pub const EDEADLK: ::c_int = 35;
 pub const ENAMETOOLONG: ::c_int = 36;
 pub const ENOLCK: ::c_int = 37;
 pub const ENOSYS: ::c_int = 38;
@@ -227,21 +214,6 @@ pub const SO_KEEPALIVE: ::c_int = 9;
 pub const SO_OOBINLINE: ::c_int = 10;
 pub const SO_LINGER: ::c_int = 13;
 pub const SO_REUSEPORT: ::c_int = 15;
-cfg_if! {
-    if #[cfg(any(target_arch = "powerpc64", target_arch = "powerpc64le"))] {
-        pub const SO_PEERCRED: ::c_int = 21;
-        pub const SO_RCVLOWAT: ::c_int = 16;
-        pub const SO_SNDLOWAT: ::c_int = 17;
-        pub const SO_RCVTIMEO: ::c_int = 18;
-        pub const SO_SNDTIMEO: ::c_int = 19;
-    } else {
-        pub const SO_PEERCRED: ::c_int = 17;
-        pub const SO_RCVLOWAT: ::c_int = 18;
-        pub const SO_SNDLOWAT: ::c_int = 19;
-        pub const SO_RCVTIMEO: ::c_int = 20;
-        pub const SO_SNDTIMEO: ::c_int = 21;
-    }
-}
 pub const SO_ACCEPTCONN: ::c_int = 30;
 
 pub const TCP_COOKIE_TRANSACTIONS: ::c_int = 15;
@@ -287,16 +259,6 @@ pub const SIG_UNBLOCK: ::c_int = 0x01;
 pub const FALLOC_FL_KEEP_SIZE: ::c_int = 0x01;
 pub const FALLOC_FL_PUNCH_HOLE: ::c_int = 0x02;
 
-cfg_if! {
-    if #[cfg(any(target_arch = "powerpc64", target_arch = "powerpc64le"))] {
-        pub const FIOCLEX: ::c_ulong = 0x20006601;
-        pub const FIONBIO: ::c_ulong = 0x8004667e;
-    } else {
-        pub const FIOCLEX: ::c_ulong = 0x5451;
-        pub const FIONBIO: ::c_ulong = 0x5421;
-    }
-}
-
 pub const BUFSIZ: ::c_uint = 8192;
 pub const TMP_MAX: ::c_uint = 238328;
 pub const FOPEN_MAX: ::c_uint = 16;