Merge pull request #4378 from tgross35/backport-enoki

[0.2] Backports

Author: tgross35

.github/workflows/ci.yaml

@@ -7,8 +7,12 @@ on:
       - libc-0.2
 
 env:
+  CARGO_TERM_COLOR: always
   CARGO_TERM_VERBOSE: true
   LIBC_CI: 1
+  RUSTDOCFLAGS: -Dwarnings
+  RUSTFLAGS: -Dwarnings
+  RUST_BACKTRACE: full
 
 defaults:
   run:
@@ -42,6 +46,12 @@ 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
 

ci/docker/loongarch64-unknown-linux-musl/Dockerfile

@@ -1,14 +1,16 @@
 FROM ubuntu:24.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-        ca-certificates curl gcc git libc6-dev make qemu-user xz-utils
+    ca-certificates curl gcc gcc-14-loongarch64-linux-gnu git libc6-dev \
+    make qemu-user xz-utils patch rsync
 
-COPY install-musl-cross.sh /
-RUN /install-musl-cross.sh loongarch64-unknown-linux-musl
+COPY install-musl.sh /
+RUN /install-musl.sh loongarch64
 
-ENV CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_MUSL_LINKER=loongarch64-unknown-linux-musl-gcc \
+ENV CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_MUSL_LINKER=musl-gcc \
     CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_MUSL_RUNNER="qemu-loongarch64" \
-    CC_loongarch64_unknown_linux_musl=loongarch64-unknown-linux-musl-gcc \
+    CC_loongarch64_unknown_linux_musl=musl-gcc \
     CFLAGS_loongarch64_unknown_linux_musl="-mabi=lp64d -fPIC" \
-    QEMU_LD_PREFIX=/loongarch64-unknown-linux-musl/loongarch64-unknown-linux-musl/sysroot \
-    PATH=$PATH:/loongarch64-unknown-linux-musl/bin:/rust/bin
+    RUSTFLAGS="-Ctarget-feature=+crt-static" \
+    QEMU_LD_PREFIX=/musl-loongarch64 \
+    PATH=$PATH:/musl-loongarch64/bin:/rust/bin

ci/install-musl-cross.sh

@@ -5,7 +5,15 @@
 
 set -eux
 
-musl_version=1.1.24
+case ${1} in
+    loongarch64)
+        musl_version=1.2.5
+        ;;
+    *)
+        musl_version=1.1.24
+        ;;
+esac
+
 musl="musl-${musl_version}"
 
 # Download, configure, build, and install musl:
@@ -53,6 +61,13 @@ case ${1} in
           ./configure --prefix="/musl-${musl_arch}" --enable-wrapper=yes
         make install -j4
         ;;
+    loongarch64)
+        musl_arch=loongarch64
+        kernel_arch=loongarch
+        CC=loongarch64-linux-gnu-gcc-14 \
+          ./configure --prefix="/musl-${musl_arch}" --enable-wrapper=yes
+        make install -j4
+        ;;
     *)
         echo "Unknown target arch: \"${1}\""
         exit 1

ci/install-musl.sh

@@ -12,10 +12,9 @@ description = """
 A test crate for the libc crate.
 """
 
-[dependencies.libc]
-path = ".."
-version = "0.2.171"
-default-features = false
+[dependencies]
+cfg-if = "1.0.0"
+libc = { path = "..", version = "0.2.171", default-features = false }
 
 [dev-dependencies]
 syn = { version = "2.0.91", features = ["full", "visit"] }

libc-test/Cargo.toml

@@ -13,7 +13,7 @@ fn src_hotfix_dir() -> PathBuf {
 
 fn do_cc() {
     let target = env::var("TARGET").unwrap();
-    if cfg!(unix) {
+    if cfg!(unix) || target.contains("cygwin") {
         let exclude = ["redox", "wasi", "wali"];
         if !exclude.iter().any(|x| target.contains(x)) {
             let mut cmsg = cc::Build::new();
@@ -700,6 +700,7 @@ fn test_cygwin(target: &str) {
         "dlfcn.h",
         "errno.h",
         "fcntl.h",
+        "fnmatch.h",
         "grp.h",
         "iconv.h",
         "langinfo.h",
@@ -710,11 +711,13 @@ fn test_cygwin(target: &str) {
         "netinet/tcp.h",
         "poll.h",
         "pthread.h",
+        "pty.h",
         "pwd.h",
         "resolv.h",
         "sched.h",
         "semaphore.h",
         "signal.h",
+        "spawn.h",
         "stddef.h",
         "stdlib.h",
         "string.h",
@@ -734,6 +737,7 @@ fn test_cygwin(target: &str) {
         "sys/uio.h",
         "sys/un.h",
         "sys/utsname.h",
+        "sys/vfs.h",
         "syslog.h",
         "termios.h",
         "unistd.h",
@@ -853,7 +857,7 @@ fn test_cygwin(target: &str) {
         }
     });
 
-    cfg.generate("../src/lib.rs", "main.rs");
+    cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs");
 }
 
 fn test_windows(target: &str) {
@@ -1049,6 +1053,13 @@ fn test_solarish(target: &str) {
     cfg.define("__EXTENSIONS__", None);
     cfg.define("_LCONV_C99", None);
 
+    // FIXME(solaris): This should be removed once new Nix crate is released.
+    // See comment in src/unix/solarish/solaris.rs for these.
+    if is_solaris {
+        cfg.define("O_DIRECT", Some("0x2000000"));
+        cfg.define("SIGINFO", Some("41"));
+    }
+
     headers! {
         cfg:
         "aio.h",
@@ -1307,6 +1318,10 @@ fn test_solarish(target: &str) {
             // https://github.com/gnzlbg/ctest/issues/68
             "lio_listio" => true,
 
+            // Exists on illumos too but, for now, is
+            // [a recent addition](https://www.illumos.org/issues/17094).
+            "secure_getenv" if is_illumos => true,
+
             _ => false,
         }
     });
@@ -4136,8 +4151,7 @@ fn test_linux(target: &str) {
             "epoll_params" => true,
 
             // FIXME(linux): Requires >= 6.12 kernel headers.
-            "dmabuf_cmsg" |
-            "dmabuf_token" => true,
+            "dmabuf_cmsg" | "dmabuf_token" => true,
 
             _ => false,
         }

libc-test/build.rs

@@ -1793,8 +1793,11 @@ NLMSG_MIN_TYPE
 NLMSG_NOOP
 NLMSG_OVERRUN
 NLM_F_ACK
+NLM_F_ACK_TLVS
 NLM_F_APPEND
 NLM_F_ATOMIC
+NLM_F_BULK
+NLM_F_CAPPED
 NLM_F_CREATE
 NLM_F_DUMP
 NLM_F_DUMP_FILTERED
@@ -1803,6 +1806,7 @@ NLM_F_ECHO
 NLM_F_EXCL
 NLM_F_MATCH
 NLM_F_MULTI
+NLM_F_NONREC
 NLM_F_REPLACE
 NLM_F_REQUEST
 NLM_F_ROOT
@@ -2222,10 +2226,16 @@ SCM_CREDENTIALS
 SCM_RIGHTS
 SCM_TIMESTAMP
 SCM_TIMESTAMPING
+SECCOMP_ADDFD_FLAG_SEND
+SECCOMP_ADDFD_FLAG_SETFD
 SECCOMP_FILTER_FLAG_LOG
 SECCOMP_FILTER_FLAG_NEW_LISTENER
 SECCOMP_FILTER_FLAG_SPEC_ALLOW
 SECCOMP_FILTER_FLAG_TSYNC
+SECCOMP_FILTER_FLAG_TSYNC_ESRCH
+SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV
+SECCOMP_GET_ACTION_AVAIL
+SECCOMP_GET_NOTIF_SIZES
 SECCOMP_MODE_DISABLED
 SECCOMP_MODE_FILTER
 SECCOMP_MODE_STRICT
@@ -2241,6 +2251,9 @@ SECCOMP_RET_LOG
 SECCOMP_RET_TRACE
 SECCOMP_RET_TRAP
 SECCOMP_RET_USER_NOTIF
+SECCOMP_SET_MODE_FILTER
+SECCOMP_SET_MODE_STRICT
+SECCOMP_USER_NOTIF_FLAG_CONTINUE
 SEEK_CUR
 SEEK_DATA
 SEEK_END
@@ -3325,6 +3338,7 @@ fwrite_unlocked
 gai_strerror
 genlmsghdr
 getaddrinfo
+getauxval
 getchar
 getchar_unlocked
 getcwd