[0.2] Backports

.github/workflows/ci.yaml

@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-26.04
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Setup Rust toolchain
@@ -44,7 +44,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - run: rustup update stable --no-self-update
@@ -75,14 +75,14 @@ jobs:
     env:
       TOOLCHAIN: ${{ matrix.toolchain }}
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Setup Rust toolchain
         run: ./ci/install-rust.sh
 
       - name: Install semver-checks
-        uses: taiki-e/install-action@a6b2e2dcd845ddd7f509ce4f3ed3d922b80cc5d9 # v2.84.0
+        uses: taiki-e/install-action@6a1bd70eaac3c8bdf093356838d7ee09fda951cf # v2.85.5
         if: matrix.toolchain == 'stable'
         with:
           tool: cargo-semver-checks
@@ -133,8 +133,6 @@ jobs:
             os: windows-11-arm
           - target: aarch64-unknown-linux-gnu
             os: ubuntu-26.04-arm
-          - target: i686-pc-windows-gnu
-            os: windows-2025
           - target: i686-pc-windows-msvc
             os: windows-2025
           - target: i686-unknown-linux-gnu
@@ -148,7 +146,7 @@ jobs:
     env:
       TARGET: ${{ matrix.target }}
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Setup Rust toolchain
@@ -231,7 +229,6 @@ jobs:
           - target: x86_64-apple-darwin
             os: macos-26-intel
           - target: x86_64-linux-android
-            env: { TEST_CUTTLEFISH: 1 }
             # Keep in sync with the Android build pinned in ci/cuttlefish-setup.sh
             artifact-tag: android17
           # FIXME: Exec format error (os error 8)
@@ -251,7 +248,7 @@ jobs:
     env:
       TARGET: ${{ matrix.target }}
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Setup Rust toolchain
@@ -303,7 +300,7 @@ jobs:
           - target: x86_64-unknown-illumos
     timeout-minutes: 25
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
       - name: Test on FreeBSD
@@ -334,7 +331,7 @@ jobs:
           run: ./ci/bsd-run.sh ${{ matrix.target }}
 
       - name: Test on NetBSD
-        uses: vmactions/netbsd-vm@0c26a4c4a5e234038862a4a53a00c905b8a107c9 # v1.4.2
+        uses: vmactions/netbsd-vm@e7ac71b97abbe8437cec8859a5acf72dfa6a8be0 # v1.4.5
         if: contains(matrix.target, 'netbsd')
         with:
           release: "10.1"
@@ -363,11 +360,12 @@ jobs:
     runs-on: ubuntu-26.04
     timeout-minutes: 10
     steps:
-    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+    - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       with:
         persist-credentials: false
     - name: Install Rust
-      run: rustup update nightly --no-self-update && rustup default nightly
+      # FIXME(rust-lang/rust#160439): unpin once the issue is fixed
+      run: rustup update nightly-2026-08-02 --no-self-update && rustup default nightly-2026-08-02
     - uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
     - run: cargo doc --workspace --no-deps
 
@@ -379,12 +377,12 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
 
       - name: Run zizmor
-        uses: zizmorcore/zizmor-action@192e21d79ab29983730a13d1382995c2307fbcaa # v0.5.7
+        uses: zizmorcore/zizmor-action@6fc4b006235f201fdab3722e17240ab420d580e5 # v0.6.1
 
   # One job that "summarizes" the success state of this pipeline. This can then be added to branch
   # protection, rather than having to add each job separately.

.github/workflows/publish_0.2.yml

@@ -15,9 +15,10 @@ jobs:
   release-plz:
     name: Release-plz v0.2
     runs-on: ubuntu-latest
+    environment: release
     steps:
       - name: Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -27,7 +28,6 @@ jobs:
         uses: release-plz/action@2eb1d8bcb770b4c48ccfaad919734b38b51958c9 # v0.5.131
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
         with:
           # FIXME(release): release-pr is broken since we have two release tracks for
           # `libc` :(

CONTRIBUTING.md

@@ -116,7 +116,7 @@ Please include permalinks to headers in commit messages for all API changes.
 Common sources include:
 
 * Linux uapi: https://github.com/torvalds/linux/tree/master/include/uapi
-* Glibc: https://sourceware.org/git/?p=glibc.git;a=tree
+* Glibc: https://github.com/sailfishos-mirror/glibc (original is https://sourceware.org/git/?p=glibc.git;a=tree)
 * Musl: https://github.com/kraj/musl (original is https://git.musl-libc.org/cgit/musl/tree/)
 * Apple XNU: https://github.com/apple-oss-distributions/xnu, libc https://github.com/apple-oss-distributions/Libc/tree/main/include
 * Android: https://cs.android.com/android/platform/superproject/main

Cargo.toml

@@ -3,7 +3,15 @@ name = "libc"
 version = "0.2.189"
 keywords = ["libc", "ffi", "bindings", "operating", "system"]
 categories = ["external-ffi-bindings", "no-std", "os"]
-exclude = ["/ci/*", "/.github/*", "/triagebot.toml", "cherry-pick-stable.sh"]
+include = [
+    "/src",
+    "/tests",
+    "/examples",
+    "/build.rs",
+    "/CHANGELOG*",
+    "/LICENSE*",
+    "/README*",
+]
 description = "Raw FFI bindings to platform libraries like libc."
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -34,7 +42,6 @@ targets = [
     "arm-unknown-linux-gnueabihf",
     "armv7-unknown-linux-gnueabihf",
     "armv7-unknown-linux-ohos",
-    "i686-pc-windows-gnu",
     "loongarch64-unknown-linux-gnu",
     "loongarch64-unknown-linux-musl",
     "powerpc-unknown-linux-gnu",
@@ -72,6 +79,7 @@ targets = [
     "i586-unknown-linux-gnu",
     "i586-unknown-linux-musl",
     "i686-linux-android",
+    "i686-pc-windows-gnu",
     "i686-unknown-freebsd",
     "i686-unknown-linux-musl",
     "nvptx64-nvidia-cuda",
@@ -128,6 +136,7 @@ targets = [
     "powerpc64-ibm-aix",
     "powerpc64-unknown-freebsd",
     "powerpc64-unknown-linux-gnu",
+    "powerpc64-unknown-linux-gnuelfv2",
     "powerpc64-wrs-vxworks",
     "riscv32-wrs-vxworks",
     "riscv32gc-unknown-linux-musl",

build.rs

@@ -30,6 +30,7 @@ const ALLOWED_CFGS: &[&str] = &[
     // GNU to expose a 64-bit `time_t`.
     "gnu_time_bits64",
     "libc_deny_warnings",
+    "libc_elfv2",
     // Corresponds to `__USE_TIME_BITS64` in UAPI
     "linux_time_bits64",
     "musl_v1_2_3",
@@ -92,9 +93,12 @@ fn main() {
     let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap_or_default();
     let target_abi = env::var("CARGO_CFG_TARGET_ABI").unwrap_or_default();
 
-    // FIXME(msrv): Once the MSRV is 1.78, use `cfg(target_abi = "pauthtest")`
-    // directly instead of translating it to `libc_pauthtest`. `target_abi`
-    // cannot be used directly in cfg expressions on the current MSRV.
+    // FIXME(msrv): Once the MSRV is 1.78, use `cfg(target_abi)` directly instead
+    // of translating its values. `target_abi` cannot be used directly in cfg
+    // expressions on the current MSRV.
+    if target_abi == "elfv2" {
+        set_cfg("libc_elfv2");
+    }
     if target_abi == "pauthtest" {
         set_cfg("libc_pauthtest");
     }
@@ -147,6 +151,13 @@ fn main() {
     }
 
     let mut musl_v1_2_3 = env_flag("CARGO_CFG_LIBC_UNSTABLE_MUSL_V1_2_3");
+    if let Ok(old_musl_v1_2_3) = env::var("RUST_LIBC_UNSTABLE_MUSL_V1_2_3") {
+        println!(
+            "cargo:warning=RUST_LIBC_UNSTABLE_MUSL_V1_2_3 will be removed; \
+            set `--cfg=libc_unstable_musl_v1_2_3` via RUSTFLAGS instead"
+        );
+        musl_v1_2_3 |= old_musl_v1_2_3 != "0";
+    }
 
     // OpenHarmony uses a fork of the musl libc
     let musl = target_env == "musl" || target_env == "ohos";
@@ -177,7 +188,7 @@ fn main() {
     }
 
     if target_env == "gnu"
-        && matches!(target_os.as_str(), "linux" | "windows")
+        && matches!(target_os.as_str(), "linux" | "windows" | "hurd")
         && target_ptr_width == "32"
         && target_arch != "riscv32"
         && target_arch != "x86_64"

ci/android-install-sdk.sh

@@ -14,25 +14,31 @@ mkdir -p sdk/cmdline-tools
 wget -q --tries=20 "https://dl.google.com/android/repository/commandlinetools-linux-${sdk}_latest.zip"
 unzip -q -d sdk/cmdline-tools "commandlinetools-linux-${sdk}_latest.zip"
 
-case "$1" in
+# The API level is passed in (arg 2) so it stays a single source of truth
+# shared with the CC wrapper name in the Dockerfile; only the image variant
+# is arch-specific here.
+arch="$1"
+api="$2"
+if [ -z "${api}" ]; then
+    echo "usage: $0 <arch> <api-level>"
+    exit 1
+fi
+
+case "${arch}" in
     arm | armv7)
-        api=24
         image="system-images;android-${api};default;armeabi-v7a"
         ;;
     aarch64)
-        api=24
         image="system-images;android-${api};google_apis;arm64-v8a"
         ;;
     i686)
-        api=28
         image="system-images;android-${api};default;x86"
         ;;
     x86_64)
-        api=28
         image="system-images;android-${api};default;x86_64"
         ;;
     *)
-        echo "invalid arch: $1"
+        echo "invalid arch: ${arch}"
         exit 1
         ;;
 esac
@@ -66,7 +72,7 @@ cp /android/android-emulator-package.xml /android/sdk/emulator/package.xml
 
 echo "no" |
     ./sdk/cmdline-tools/tools/bin/avdmanager create avd \
-        --name "${1}" \
+        --name "${arch}" \
         --package "${image}" | grep -v = || true
 
 rm -rf "commandlinetools-linux-${sdk}_latest.zip" emulator-linux_x64-9058569.zip