[0.2] Backports

.github/workflows/ci.yaml

@@ -34,7 +34,7 @@ jobs:
     name: Clippy on ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-24.04, macos-15, windows-2022]
+        os: [ubuntu-24.04, macos-15, windows-2025]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 10
     steps:
@@ -52,7 +52,7 @@ jobs:
     strategy:
       matrix:
         toolchain: [stable, nightly, 1.63.0]
-        os: [ubuntu-24.04, macos-15, windows-2022]
+        os: [ubuntu-24.04, macos-15, windows-2025]
         include:
           - toolchain: beta
             os: ubuntu-24.04
@@ -113,19 +113,19 @@ jobs:
           - target: aarch64-apple-darwin
             os: macos-15
           - target: x86_64-pc-windows-gnu
-            os: windows-2022
+            os: windows-2025
             env:
               ARCH_BITS: 64
               ARCH: x86_64
           - target: x86_64-pc-windows-msvc
-            os: windows-2022
+            os: windows-2025
           # FIXME: It currently causes segfaults.
           #- target: i686-pc-windows-gnu
           #  env:
           #    ARCH_BITS: 32
           #    ARCH: i686
           - target: i686-pc-windows-msvc
-            os: windows-2022
+            os: windows-2025
     runs-on: ${{ matrix.os }}
     timeout-minutes: 25
     env:
@@ -225,6 +225,9 @@ jobs:
           - target: powerpc64le-unknown-linux-musl
             env:
               RUST_LIBC_UNSTABLE_MUSL_V1_2_3: 1
+          - target: x86_64-unknown-linux-musl
+            env:
+              RUST_LIBC_UNSTABLE_MUSL_V1_2_3: 1
           # FIXME(ppc): SIGILL running tests, see
           # https://github.com/rust-lang/libc/pull/4254#issuecomment-2636288713
           # - target: powerpc-unknown-linux-gnu

Cargo.toml

@@ -178,3 +178,7 @@ expl_impl_clone_on_copy = "allow"
 uninlined_format_args = "allow"
 unnecessary_cast = "allow"  # some casts like `as usize` are only needed for some targets
 used_underscore_binding = "allow"
+
+[package.metadata.cargo-semver-checks.lints]
+# Alignment is an internal detail that users must not rely upon
+repr_align_removed = "warn"

build.rs

@@ -18,7 +18,6 @@ const ALLOWED_CFGS: &[&str] = &[
     // Corresponds to `_TIME_BITS=64` in glibc
     "gnu_time_bits64",
     "libc_deny_warnings",
-    "libc_thread_local",
     // Corresponds to `__USE_TIME_BITS64` in UAPI
     "linux_time_bits64",
     "musl_v1_2_3",
@@ -47,7 +46,6 @@ fn main() {
     println!("cargo:rerun-if-changed=build.rs");
 
     let (rustc_minor_ver, _is_nightly) = rustc_minor_nightly();
-    let rustc_dep_of_std = env::var("CARGO_FEATURE_RUSTC_DEP_OF_STD").is_ok();
     let libc_ci = env::var("LIBC_CI").is_ok();
     let target_env = env::var("CARGO_CFG_TARGET_ENV").unwrap_or_default();
     let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap_or_default();
@@ -143,28 +141,15 @@ fn main() {
         set_cfg("libc_deny_warnings");
     }
 
-    // #[thread_local] is currently unstable
-    if rustc_dep_of_std {
-        set_cfg("libc_thread_local");
-    }
-
     // Since Rust 1.80, configuration that isn't recognized by default needs to be provided to
     // avoid warnings.
     if rustc_minor_ver >= 80 {
         for cfg in ALLOWED_CFGS {
-            if rustc_minor_ver >= 75 {
-                println!("cargo:rustc-check-cfg=cfg({cfg})");
-            } else {
-                println!("cargo:rustc-check-cfg=values({cfg})");
-            }
+            println!("cargo:rustc-check-cfg=cfg({cfg})");
         }
         for &(name, values) in CHECK_CFG_EXTRA {
             let values = values.join("\",\"");
-            if rustc_minor_ver >= 75 {
-                println!("cargo:rustc-check-cfg=cfg({name},values(\"{values}\"))");
-            } else {
-                println!("cargo:rustc-check-cfg=values({name},\"{values}\")");
-            }
+            println!("cargo:rustc-check-cfg=cfg({name},values(\"{values}\"))");
         }
     }
 }

ci/docker/sparc64-unknown-linux-gnu/Dockerfile

@@ -7,9 +7,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         qemu-system-sparc64 openbios-sparc seabios ipxe-qemu \
         p7zip-full cpio linux-libc-dev-sparc64-cross qemu-user
 
-COPY linux-sparc64.sh /
-RUN /linux-sparc64.sh
-
 ENV CARGO_TARGET_SPARC64_UNKNOWN_LINUX_GNU_LINKER=sparc64-linux-gnu-gcc \
     CARGO_TARGET_SPARC64_UNKNOWN_LINUX_GNU_RUNNER="qemu-sparc64 -L /usr/sparc64-linux-gnu" \
     CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \

ci/run.sh

@@ -9,6 +9,9 @@ target="$1"
 
 export RUST_BACKTRACE="${RUST_BACKTRACE:-1}"
 
+# For logging
+uname -a
+
 cmd="cargo test --target $target ${LIBC_CI_ZBUILD_STD+"-Zbuild-std"}"
 test_flags="--skip check_style"
 

ci/style.sh

@@ -31,14 +31,21 @@ while IFS= read -r file; do
     # wouldn't be correct for something like `all(any(...), ...)`).
     perl -pi -0777 -e 's/if #\[cfg\((.*?)\)\]/if cfg_tmp!([$1])/gms' "$file"
 
+    # The `c_enum!` macro allows anonymous enums without names, which
+    # isn't valid syntax. Replace it with a dummy name and an indicator
+    # comment on the preceding line (which is where rustfmt puts it. Also
+    # rust-lang/rustfmt#5464).
+    perl -pi -e 's/^(\s*)(.*)enum #anon\b/$1\/\* FMT-ANON-ENUM \*\/\n$1$2enum _fmt_anon/g' "$file"
+
     # Format the file. We need to invoke `rustfmt` directly since `cargo fmt`
     # can't figure out the module tree with the hacks in place.
     failed=false
-    rustfmt --config-path rustfmt.toml "$file" ${check:+"$check"} || failed=true
+    rustfmt "$file" ${check:+"$check"} || failed=true
 
     # Restore all changes to the files.
     perl -pi -e 's/fn (\w+)_fmt_tmp\(\)/$1!/g' "$file"
     perl -pi -0777 -e 's/cfg_tmp!\(\[(.*?)\]\)/#[cfg($1)]/gms' "$file"
+    perl -pi -0777 -e 's/\/\* FMT-ANON-ENUM \*\/(?:\n\s*)?(.*?)enum _fmt_anon/$1enum #anon/gms' "$file"
 
     # Defer emitting the failure until after the files get reset
     if [ "$failed" != "false" ]; then

ci/wasi.sh

@@ -11,8 +11,8 @@ apt-get install -y --no-install-recommends \
 
 # Wasmtime is used to execute tests and wasi-sdk is used to compile tests.
 # Download appropriate versions here and configure various flags below.
-wasmtime=35.0.0
-wasi_sdk=25
+wasmtime=38.0.2
+wasi_sdk=27
 
 curl -L https://github.com/bytecodealliance/wasmtime/releases/download/v$wasmtime/wasmtime-v$wasmtime-x86_64-linux.tar.xz |
     tar xJf -