Merge pull request #4266 from tgross35/backport-shiitake

[0.2] Backports

Author: tgross35

.cirrus.yml

@@ -3,19 +3,22 @@ task:
   env:
     HOME: /tmp  # cargo cache needs it
     TARGET: x86_64-unknown-freebsd
+    # FIXME(freebsd): FreeBSD has a segfault when `RUST_BACKTRACE` is set
+    # https://github.com/rust-lang/rust/issues/132185
+    RUST_BACKTRACE: "0"
   matrix:
     - name: nightly freebsd-13 i686
       # Test i686 FreeBSD in 32-bit emulation on a 64-bit host.
       env:
         TARGET: i686-unknown-freebsd
       freebsd_instance:
-        image_family: freebsd-13-3
+        image_family: freebsd-13-4
     - name: nightly freebsd-13 x86_64
       freebsd_instance:
-        image_family: freebsd-13-3
+        image_family: freebsd-13-4
     - name: nightly freebsd-14 x86_64
       freebsd_instance:
-        image: freebsd-14-1-release-amd64-ufs
+        image: freebsd-14-2-release-amd64-ufs
     - name: nightly freebsd-15 x86_64
       freebsd_instance:
        image_family: freebsd-15-0-snap

.github/workflows/ci.yaml

@@ -136,7 +136,9 @@ jobs:
           - i686-unknown-linux-musl
           - loongarch64-unknown-linux-gnu
           - loongarch64-unknown-linux-musl
-          - powerpc-unknown-linux-gnu
+          # FIXME(ppc): SIGILL running tests, see
+          # https://github.com/rust-lang/libc/pull/4254#issuecomment-2636288713
+          # - powerpc-unknown-linux-gnu
           - powerpc64-unknown-linux-gnu
           - powerpc64le-unknown-linux-gnu
           - riscv64gc-unknown-linux-gnu

libc-test/build.rs

@@ -2140,6 +2140,9 @@ fn test_android(target: &str) {
             // Added in API level 26, but some tests use level 24.
             "endgrent" => true,
 
+            // Added in API level 26, but some tests use level 24.
+            "getdomainname" | "setdomainname" => true,
+
             // FIXME: bad function pointers:
             "isalnum" | "isalpha" | "iscntrl" | "isdigit" | "isgraph" | "islower" | "isprint"
             | "ispunct" | "isspace" | "isupper" | "isxdigit" | "isblank" | "tolower"

libc-test/semver/android.txt

@@ -3324,6 +3324,7 @@ getaddrinfo
 getchar
 getchar_unlocked
 getcwd
+getdomainname
 getegid
 getenv
 geteuid
@@ -3720,6 +3721,7 @@ sendmsg
 sendto
 servent
 setbuf
+setdomainname
 setegid
 setenv
 seteuid

libc-test/semver/linux-musl.txt

@@ -5,6 +5,7 @@ AIO_ALLDONE
 AIO_CANCELED
 AIO_NOTCANCELED
 BOOT_TIME
+CLONE_NEWTIME
 DEAD_PROCESS
 EMPTY
 Elf32_Chdr

src/macros.rs

@@ -243,7 +243,7 @@ cfg_if! {
             )*) => ($(
                 #[inline]
                 $(#[$attr])*
-                pub $($constness)* unsafe extern fn $i($($arg: $argty),*) -> $ret
+                pub $($constness)* unsafe extern "C" fn $i($($arg: $argty),*) -> $ret
                     $body
             )*)
         }
@@ -257,7 +257,7 @@ cfg_if! {
             )*) => ($(
                 #[inline]
                 $(#[$attr])*
-                pub $($constness)* extern fn $i($($arg: $argty),*) -> $ret
+                pub $($constness)* extern "C" fn $i($($arg: $argty),*) -> $ret
                     $body
             )*)
         }
@@ -285,7 +285,7 @@ cfg_if! {
             )*) => ($(
                 #[inline]
                 $(#[$attr])*
-                pub unsafe extern fn $i($($arg: $argty),*) -> $ret
+                pub unsafe extern "C" fn $i($($arg: $argty),*) -> $ret
                     $body
             )*)
         }
@@ -299,7 +299,7 @@ cfg_if! {
             )*) => ($(
                 #[inline]
                 $(#[$attr])*
-                pub extern fn $i($($arg: $argty),*) -> $ret
+                pub extern "C" fn $i($($arg: $argty),*) -> $ret
                     $body
             )*)
         }

src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs

@@ -266,7 +266,8 @@ s! {
         pub st_blksize: crate::blksize_t,
         pub st_flags: crate::fflags_t,
         pub st_gen: u64,
-        pub st_spare: [u64; 10],
+        pub st_filerev: u64,
+        pub st_spare: [u64; 9],
     }
 }
 

src/unix/hurd/mod.rs

@@ -226,7 +226,7 @@ pub type nl_item = c_int;
 pub type iconv_t = *mut c_void;
 
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
-pub enum fpos64_t {} // FIXME: fill this out with a struct
+pub enum fpos64_t {} // FIXME(hurd): fill this out with a struct
 impl Copy for fpos64_t {}
 impl Clone for fpos64_t {
     fn clone(&self) -> fpos64_t {
@@ -814,7 +814,7 @@ s! {
         pub ifa_flags: c_uint,
         pub ifa_addr: *mut crate::sockaddr,
         pub ifa_netmask: *mut crate::sockaddr,
-        pub ifa_ifu: *mut crate::sockaddr, // FIXME This should be a union
+        pub ifa_ifu: *mut crate::sockaddr, // FIXME(union) This should be a union
         pub ifa_data: *mut c_void,
     }
 
@@ -1092,7 +1092,7 @@ cfg_if! {
                     .field("ut_line", &self.ut_line)
                     .field("ut_id", &self.ut_id)
                     .field("ut_user", &self.ut_user)
-                    // FIXME: .field("ut_host", &self.ut_host)
+                    // FIXME(debug): .field("ut_host", &self.ut_host)
                     .field("ut_exit", &self.ut_exit)
                     .field("ut_session", &self.ut_session)
                     .field("ut_tv", &self.ut_tv)

src/unix/linux_like/android/b32/x86/mod.rs

@@ -268,9 +268,11 @@ pub const SYS_modify_ldt: c_long = 123;
 pub const SYS_adjtimex: c_long = 124;
 pub const SYS_mprotect: c_long = 125;
 pub const SYS_sigprocmask: c_long = 126;
+#[deprecated(since = "0.2.70", note = "Functional up to 2.6 kernel")]
 pub const SYS_create_module: c_long = 127;
 pub const SYS_init_module: c_long = 128;
 pub const SYS_delete_module: c_long = 129;
+#[deprecated(since = "0.2.70", note = "Functional up to 2.6 kernel")]
 pub const SYS_get_kernel_syms: c_long = 130;
 pub const SYS_quotactl: c_long = 131;
 pub const SYS_getpgid: c_long = 132;
@@ -281,11 +283,11 @@ pub const SYS_personality: c_long = 136;
 pub const SYS_afs_syscall: c_long = 137;
 pub const SYS_setfsuid: c_long = 138;
 pub const SYS_setfsgid: c_long = 139;
-// FIXME: SYS__llseek is in the NDK sources but for some reason is
+// FIXME(android): SYS__llseek is in the NDK sources but for some reason is
 //        not available in the tests
 // pub const SYS__llseek: c_long = 140;
 pub const SYS_getdents: c_long = 141;
-// FIXME: SYS__newselect is in the NDK sources but for some reason is
+// FIXME(android): SYS__newselect is in the NDK sources but for some reason is
 //        not available in the tests
 // pub const SYS__newselect: c_long = 142;
 pub const SYS_flock: c_long = 143;
@@ -294,7 +296,7 @@ pub const SYS_readv: c_long = 145;
 pub const SYS_writev: c_long = 146;
 pub const SYS_getsid: c_long = 147;
 pub const SYS_fdatasync: c_long = 148;
-// FIXME: SYS__llseek is in the NDK sources but for some reason is
+// FIXME(android): SYS__llseek is in the NDK sources but for some reason is
 //        not available in the tests
 // pub const SYS__sysctl: c_long = 149;
 pub const SYS_mlock: c_long = 150;
@@ -314,6 +316,7 @@ pub const SYS_mremap: c_long = 163;
 pub const SYS_setresuid: c_long = 164;
 pub const SYS_getresuid: c_long = 165;
 pub const SYS_vm86: c_long = 166;
+#[deprecated(since = "0.2.70", note = "Functional up to 2.6 kernel")]
 pub const SYS_query_module: c_long = 167;
 pub const SYS_poll: c_long = 168;
 pub const SYS_nfsservctl: c_long = 169;

src/unix/linux_like/android/b64/mod.rs

@@ -161,7 +161,7 @@ cfg_if! {
             fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
                 f.debug_struct("pthread_mutex_t")
                     .field("value", &self.value)
-                    // FIXME: .field("__reserved", &self.__reserved)
+                    // FIXME(debug): .field("__reserved", &self.__reserved)
                     .finish()
             }
         }
@@ -190,7 +190,7 @@ cfg_if! {
             fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
                 f.debug_struct("pthread_cond_t")
                     .field("value", &self.value)
-                    // FIXME: .field("__reserved", &self.__reserved)
+                    // FIXME(debug): .field("__reserved", &self.__reserved)
                     .finish()
             }
         }
@@ -227,7 +227,7 @@ cfg_if! {
                     .field("pendingReaders", &self.pendingReaders)
                     .field("pendingWriters", &self.pendingWriters)
                     .field("attr", &self.attr)
-                    // FIXME: .field("__reserved", &self.__reserved)
+                    // FIXME(debug): .field("__reserved", &self.__reserved)
                     .finish()
             }
         }