Enable statx for musl

Author: frc4533-lincoln

libc-test/build.rs

@@ -5525,9 +5525,9 @@ fn test_aix(target: &str) {
     });
 
     cfg.type_name(move |ty, is_struct, is_union| match ty {
-        "DIR"  => ty.to_string(),
-        "FILE"  => ty.to_string(),
-        "ACTION"  => ty.to_string(),
+        "DIR" => ty.to_string(),
+        "FILE" => ty.to_string(),
+        "ACTION" => ty.to_string(),
 
         // 'sigval' is a struct in Rust, but a union in C.
         "sigval" => format!("union sigval"),
@@ -5614,9 +5614,9 @@ fn test_aix(target: &str) {
             // POSIX-compliant versions in the system libc. As a result,
             // function pointer comparisons between the C and Rust sides
             // would fail.
-            "getpwuid_r" | "getpwnam_r" | "getgrgid_r" | "getgrnam_r"
-            | "aio_cancel" | "aio_error" | "aio_fsync" | "aio_read"
-            | "aio_return" | "aio_suspend" | "aio_write" | "select" => true,
+            "getpwuid_r" | "getpwnam_r" | "getgrgid_r" | "getgrnam_r" | "aio_cancel"
+            | "aio_error" | "aio_fsync" | "aio_read" | "aio_return" | "aio_suspend"
+            | "aio_write" | "select" => true,
 
             // 'getdtablesize' is a constant in the AIX header but it is
             // a real function in libc which the Rust side is resolved to.
@@ -5633,7 +5633,6 @@ fn test_aix(target: &str) {
         }
     });
 
-
     cfg.volatile_item(|i| {
         use ctest::VolatileItemKind::*;
         match i {

libc-test/test/cmsg.rs

@@ -70,7 +70,7 @@ mod t {
             for cmsg_len in 0..64 {
                 // Address must be a multiple of 0x4 for testing on AIX.
                 if cfg!(target_os = "aix") && cmsg_len % std::mem::size_of::<cmsghdr>() != 0 {
-                   continue;
+                    continue;
                 }
                 for next_cmsg_len in 0..32 {
                     unsafe {

src/unix/aix/mod.rs

@@ -1,6 +1,5 @@
-use crate::in_addr_t;
-use crate::in_port_t;
 use crate::prelude::*;
+use crate::{in_addr_t, in_port_t};
 
 pub type caddr_t = *mut c_char;
 pub type clockid_t = c_longlong;

src/unix/linux_like/mod.rs

@@ -239,7 +239,7 @@ cfg_if! {
 }
 
 cfg_if! {
-    if #[cfg(any(target_env = "gnu", target_os = "android"))] {
+    if #[cfg(any(target_env = "gnu", target_os = "android", target_env = "musl"))] {
         s! {
             pub struct statx {
                 pub stx_mask: crate::__u32,
@@ -1709,7 +1709,7 @@ cfg_if! {
 }
 
 cfg_if! {
-    if #[cfg(any(target_env = "gnu", target_os = "android"))] {
+    if #[cfg(any(target_env = "gnu", target_os = "android", target_env = "musl"))] {
         pub const AT_STATX_SYNC_TYPE: c_int = 0x6000;
         pub const AT_STATX_SYNC_AS_STAT: c_int = 0x0000;
         pub const AT_STATX_FORCE_SYNC: c_int = 0x2000;
@@ -2206,7 +2206,7 @@ cfg_if! {
 
 // The statx syscall, available on some libcs.
 cfg_if! {
-    if #[cfg(any(target_env = "gnu", target_os = "android"))] {
+    if #[cfg(any(target_env = "gnu", target_os = "android", target_env = "musl"))] {
         extern "C" {
             pub fn statx(
                 dirfd: c_int,