Merge branch 'main' into use-sa_sigaction

Author: xingxue-ibm

.cirrus.yml

@@ -12,13 +12,13 @@ task:
       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

README.md

@@ -65,7 +65,7 @@ but this is not guaranteed.
 You can see the platform(target)-specific docs on [docs.rs], select a platform
 you want to see.
 
-See [`ci/build.sh`](https://github.com/rust-lang/libc/blob/HEAD/ci/build.sh) for
+See [`ci/verify-build.sh`](https://github.com/rust-lang/libc/blob/HEAD/ci/verify-build.sh) for
 the platforms on which `libc` is guaranteed to build for each Rust toolchain.
 The test-matrix at [GitHub Actions] and [Cirrus CI] show the platforms in which
 `libc` tests are run.

build.rs

@@ -5,7 +5,7 @@ use std::{env, str};
 // need to know all the possible cfgs that this script will set. If you need to set another cfg
 // make sure to add it to this list as well.
 const ALLOWED_CFGS: &'static [&'static str] = &[
-    "emscripten_new_stat_abi",
+    "emscripten_old_stat_abi",
     "espidf_time32",
     "freebsd10",
     "freebsd11",
@@ -75,9 +75,9 @@ fn main() {
     }
 
     match emcc_version_code() {
-        Some(v) if (v >= 30142) => set_cfg("emscripten_new_stat_abi"),
-        // Non-Emscripten or version < 3.1.42.
-        Some(_) | None => (),
+        Some(v) if (v < 30142) => set_cfg("emscripten_old_stat_abi"),
+        // Non-Emscripten or version >= 3.1.42.
+        _ => (),
     }
 
     let linux_time_bits64 = env::var("RUST_LIBC_UNSTABLE_LINUX_TIME_BITS64").is_ok();

ci/emscripten.sh

@@ -3,7 +3,7 @@
 set -eux
 
 # Note: keep in sync with:
-# https://github.com/rust-lang/rust/blob/master/src/ci/docker/scripts/emscripten.sh
+# https://github.com/rust-lang/rust/blob/master/src/doc/rustc/src/platform-support/wasm32-unknown-emscripten.md#requirements
 emsdk_version=3.1.68
 
 git clone https://github.com/emscripten-core/emsdk.git /emsdk-portable