linux(uclibc): fix cross-architecture flock def

Replace existing definitions. They were not correct under MIPS. This
target needed some special casing.

Author: dybucc

src/unix/linux_like/linux/uclibc/arm/mod.rs

@@ -9,6 +9,14 @@ pub type nlink_t = c_uint;
 pub type blksize_t = c_long;
 
 s! {
+    pub struct flock {
+        pub l_type: c_short,
+        pub l_whence: c_short,
+        pub l_start: crate::off_t,
+        pub l_len: crate::off_t,
+        pub l_pid: crate::pid_t,
+    }
+
     pub struct cmsghdr {
         pub cmsg_len: size_t,
         pub cmsg_level: c_int,
@@ -95,14 +103,6 @@ s! {
         pub st_ino: crate::ino64_t,
     }
 
-    pub struct flock {
-        pub l_type: c_short,
-        pub l_whence: c_short,
-        pub l_start: off_t,
-        pub l_len: off_t,
-        pub l_pid: crate::pid_t,
-    }
-
     pub struct sysinfo {
         pub uptime: c_long,
         pub loads: [c_ulong; 3],

src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs

@@ -183,16 +183,6 @@ s! {
         pub c_cc: [crate::cc_t; crate::NCCS],
     }
 
-    pub struct flock {
-        pub l_type: c_short,
-        pub l_whence: c_short,
-        pub l_start: crate::off_t,
-        pub l_len: crate::off_t,
-        pub l_sysid: c_long,
-        pub l_pid: crate::pid_t,
-        pad: Padding<[c_long; 4]>,
-    }
-
     pub struct sysinfo {
         pub uptime: c_long,
         pub loads: [c_ulong; 3],

src/unix/linux_like/linux/uclibc/mips/mod.rs

@@ -34,6 +34,18 @@ s! {
         pub f_flags: c_long,
         f_spare: Padding<[c_long; 5]>,
     }
+
+    pub struct flock {
+        pub l_type: c_short,
+        pub l_whence: c_short,
+        pub l_start: crate::off_t,
+        pub l_len: crate::off_t,
+        #[cfg(not(all(uclibc_file_offset_bits64, target_arch = "mips64")))]
+        pub l_sysid: c_long,
+        pub l_pid: crate::pid_t,
+        #[cfg(not(all(uclibc_file_offset_bits64, target_arch = "mips64")))]
+        pad: [c_long; 4],
+    }
 }
 
 pub const SFD_CLOEXEC: c_int = 0x080000;

src/unix/linux_like/linux/uclibc/mod.rs

@@ -52,6 +52,14 @@ cfg_if! {
 }
 
 s! {
+    pub struct flock64 {
+        pub l_type: c_short,
+        pub l_whence: c_short,
+        pub l_start: crate::off64_t,
+        pub l_len: crate::off64_t,
+        pub l_pid: crate::pid_t,
+    }
+
     pub struct statvfs {
         // Different than GNU!
         pub f_bsize: c_ulong,

src/unix/linux_like/linux/uclibc/x86_64/mod.rs

@@ -14,6 +14,14 @@ pub type pthread_t = c_ulong;
 pub type stat64 = stat;
 
 s! {
+    pub struct flock {
+        pub l_type: c_short,
+        pub l_whence: c_short,
+        pub l_start: crate::off_t,
+        pub l_len: crate::off_t,
+        pub l_pid: crate::pid_t,
+    }
+
     pub struct ipc_perm {
         pub __key: crate::key_t,
         pub uid: crate::uid_t,