[0.2] Backports

.github/workflows/ci.yaml

@@ -62,12 +62,6 @@ jobs:
       TOOLCHAIN: ${{ matrix.toolchain }}
     steps:
       - uses: actions/checkout@v4
-      # Remove `-Dwarnings` at the MSRV since lints may be different or buffier
-      - name: Update RUSTFLAGS
-        run: |
-          set -eux
-          [ "${{ matrix.toolchain }}" = "1.63.0" ] && echo 'RUSTFLAGS=' >> "$GITHUB_ENV" || true
-
       - name: Setup Rust toolchain
         run: ./ci/install-rust.sh
 
@@ -85,7 +79,11 @@ jobs:
         run: du -sh target | sort -k 2 || true
 
       - name: Execute build.sh
-        run: ./ci/verify-build.sh
+        run: |
+          set -eux
+          # Remove `-Dwarnings` at the MSRV since lints may be different
+          [ "${{ matrix.toolchain }}" = "1.63.0" ] && export RUSTFLAGS=""
+          ./ci/verify-build.sh
       - name: Target size after job completion
         run: du -sh target | sort -k 2
 

build.rs

@@ -95,7 +95,7 @@ fn main() {
     let musl_v1_2_3 = env::var("RUST_LIBC_UNSTABLE_MUSL_V1_2_3").is_ok();
     println!("cargo:rerun-if-env-changed=RUST_LIBC_UNSTABLE_MUSL_V1_2_3");
     // loongarch64 and ohos have already updated
-    if musl_v1_2_3 || target_os == "loongarch64" || target_env == "ohos" {
+    if musl_v1_2_3 || target_arch == "loongarch64" || target_env == "ohos" {
         // FIXME(musl): enable time64 api as well
         set_cfg("musl_v1_2_3");
     }

ci/run.sh

@@ -51,7 +51,7 @@ if [ -n "${QEMU:-}" ]; then
     cargo build \
         --manifest-path libc-test/Cargo.toml \
         --target "$target" \
-        --test main ${LIBC_CI_ZBUILD_STD+"-Zbuild-std"}
+        --test main ${LIBC_CI_ZBUILD_STD+"-Zbuild-std=core"}
     rm "${CARGO_TARGET_DIR}/${target}"/debug/main-*.d
     cp "${CARGO_TARGET_DIR}/${target}"/debug/main-* "${tmpdir}"/mount/libc-test
     # shellcheck disable=SC2016

ci/verify-build.sh

@@ -48,7 +48,7 @@ test_target() {
 
     if [ "${no_dist}" != "0" ]; then
         # If we can't download a `core`, we need to build it
-        cmd="$cmd -Zbuild-std=core,alloc"
+        cmd="$cmd -Zbuild-std=core"
 
         # FIXME: With `build-std` feature, `compiler_builtins` emits a lof of lint warnings.
         RUSTFLAGS="${RUSTFLAGS:-} -Aimproper_ctypes_definitions"

libc-test/build.rs

@@ -3580,7 +3580,7 @@ fn test_neutrino(target: &str) {
         )
     });
 
-    cfg.skip_static(move |name| (name == "__dso_handle"));
+    cfg.skip_static(move |name| name == "__dso_handle");
 
     cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
 }
@@ -5729,6 +5729,9 @@ fn test_aix(target: &str) {
             // https://github.com/gnzlbg/ctest/issues/68.
             "lio_listio" => true,
 
+            // The function is only available under macro _KERNEL in 'proto_uipc.h'.
+            "getpeereid" => true,
+
             _ => false,
         }
     });

libc-test/semver/aix.txt

@@ -1989,6 +1989,7 @@ getmntent
 getnameinfo
 getopt
 getpagesize
+getpeereid
 getpeername
 getpgid
 getpgrp

libc-test/semver/linux-gnu-powerpc64.txt

@@ -0,0 +1,14 @@
+KEYCTL_CAPABILITIES
+KEYCTL_CAPS0_BIG_KEY
+KEYCTL_CAPS0_CAPABILITIES
+KEYCTL_CAPS0_DIFFIE_HELLMAN
+KEYCTL_CAPS0_INVALIDATE
+KEYCTL_CAPS0_MOVE
+KEYCTL_CAPS0_PERSISTENT_KEYRINGS
+KEYCTL_CAPS0_PUBLIC_KEY
+KEYCTL_CAPS0_RESTRICT_KEYRING
+KEYCTL_CAPS1_NS_KEYRING_NAME
+KEYCTL_CAPS1_NS_KEY_TAG
+KEYCTL_MOVE
+max_align_t
+sysctl

libc-test/semver/linux-powerpc64.txt

@@ -2,29 +2,12 @@ B2500000
 B3000000
 B3500000
 B4000000
-Elf32_Rela
-Elf64_Rela
-KEYCTL_CAPABILITIES
-KEYCTL_CAPS0_BIG_KEY
-KEYCTL_CAPS0_CAPABILITIES
-KEYCTL_CAPS0_DIFFIE_HELLMAN
-KEYCTL_CAPS0_INVALIDATE
-KEYCTL_CAPS0_MOVE
-KEYCTL_CAPS0_PERSISTENT_KEYRINGS
-KEYCTL_CAPS0_PUBLIC_KEY
-KEYCTL_CAPS0_RESTRICT_KEYRING
-KEYCTL_CAPS1_NS_KEYRING_NAME
-KEYCTL_CAPS1_NS_KEY_TAG
-KEYCTL_MOVE
 MADV_SOFT_OFFLINE
 MAP_SYNC
 NFT_MSG_DELOBJ
 NFT_MSG_GETOBJ
 NFT_MSG_GETOBJ_RESET
 NFT_MSG_NEWOBJ
-PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
-PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
-PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
 SCM_TIMESTAMPNS
 SCM_WIFI_STATUS
 SIGSTKFLT
@@ -161,5 +144,3 @@ TIOCGRS485
 TIOCSBRK
 TIOCSRS485
 flock64
-max_align_t
-sysctl

src/unix/aix/mod.rs

@@ -2949,6 +2949,7 @@ extern "C" {
         flags: c_int,
     ) -> c_int;
     pub fn getpagesize() -> c_int;
+    pub fn getpeereid(socket: c_int, euid: *mut crate::uid_t, egid: *mut crate::gid_t) -> c_int;
     pub fn getpriority(which: c_int, who: crate::id_t) -> c_int;
     pub fn getpwent() -> *mut crate::passwd;
     #[link_name = "_posix_getpwnam_r"]

src/unix/linux_like/linux/musl/b32/powerpc.rs

@@ -4,6 +4,17 @@ use crate::prelude::*;
 pub type wchar_t = i32;
 
 s! {
+    pub struct termios {
+        pub c_iflag: crate::tcflag_t,
+        pub c_oflag: crate::tcflag_t,
+        pub c_cflag: crate::tcflag_t,
+        pub c_lflag: crate::tcflag_t,
+        pub c_cc: [crate::cc_t; crate::NCCS],
+        pub c_line: crate::cc_t,
+        pub __c_ispeed: crate::speed_t,
+        pub __c_ospeed: crate::speed_t,
+    }
+
     pub struct stat {
         pub st_dev: crate::dev_t,
         pub st_ino: crate::ino_t,

src/unix/linux_like/linux/musl/b64/mips64.rs

@@ -56,6 +56,12 @@ s! {
         __pad5: [c_int; 14],
     }
 
+    pub struct stack_t {
+        pub ss_sp: *mut c_void,
+        pub ss_size: size_t,
+        pub ss_flags: c_int,
+    }
+
     pub struct ipc_perm {
         #[cfg(musl_v1_2_3)]
         pub __key: crate::key_t,
@@ -76,6 +82,36 @@ s! {
         __unused1: c_ulong,
         __unused2: c_ulong,
     }
+
+    pub struct statfs {
+        pub f_type: c_ulong,
+        pub f_bsize: c_ulong,
+        pub f_frsize: c_ulong,
+        pub f_blocks: crate::fsblkcnt_t,
+        pub f_bfree: crate::fsblkcnt_t,
+        pub f_files: crate::fsfilcnt_t,
+        pub f_ffree: crate::fsfilcnt_t,
+        pub f_bavail: crate::fsblkcnt_t,
+        pub f_fsid: crate::fsid_t,
+        pub f_namelen: c_ulong,
+        pub f_flags: c_ulong,
+        pub f_spare: [c_ulong; 5],
+    }
+
+    pub struct statfs64 {
+        pub f_type: c_ulong,
+        pub f_bsize: c_ulong,
+        pub f_frsize: c_ulong,
+        pub f_blocks: crate::fsblkcnt64_t,
+        pub f_bfree: crate::fsblkcnt64_t,
+        pub f_files: crate::fsfilcnt64_t,
+        pub f_ffree: crate::fsfilcnt64_t,
+        pub f_bavail: crate::fsblkcnt64_t,
+        pub f_fsid: crate::fsid_t,
+        pub f_namelen: c_ulong,
+        pub f_flags: c_ulong,
+        pub f_spare: [c_ulong; 5],
+    }
 }
 
 pub const SIGSTKSZ: size_t = 8192;

src/unix/linux_like/linux/musl/b64/mod.rs

@@ -3,6 +3,8 @@ use crate::prelude::*;
 pub type regoff_t = c_long;
 
 s! {
+    // MIPS implementation is special, see the subfolder.
+    #[cfg(not(target_arch = "mips64"))]
     pub struct stack_t {
         pub ss_sp: *mut c_void,
         pub ss_flags: c_int,
@@ -17,6 +19,8 @@ s! {
         __val: [c_ulong; 16],
     }
 
+    // PowerPC implementation is special, see the subfolder.
+    #[cfg(not(target_arch = "powerpc64"))]
     pub struct shmid_ds {
         pub shm_perm: crate::ipc_perm,
         pub shm_segsz: size_t,