Merge branch 'main' into issues/4340

Author: sanstzu

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

@@ -1253,6 +1253,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,
         }
     });
@@ -4064,8 +4068,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

@@ -3338,6 +3338,7 @@ fwrite_unlocked
 gai_strerror
 genlmsghdr
 getaddrinfo
+getauxval
 getchar
 getchar_unlocked
 getcwd

libc-test/semver/android.txt

@@ -1,5 +1,7 @@
 AF_INET
 AF_INET6
+AF_UNSPEC
+AF_VSOCK
 CLOCK_MONOTONIC
 CLOCK_REALTIME
 DT_BLK

libc-test/semver/hermit.txt

@@ -114,8 +114,10 @@ s! {
     }
 }
 
-pub const AF_INET: i32 = 0;
+pub const AF_UNSPEC: i32 = 0;
+pub const AF_INET: i32 = 3;
 pub const AF_INET6: i32 = 1;
+pub const AF_VSOCK: i32 = 2;
 
 pub const CLOCK_REALTIME: clockid_t = 1;
 pub const CLOCK_MONOTONIC: clockid_t = 4;

src/hermit.rs

@@ -305,7 +305,6 @@ f! {
 }
 
 extern "C" {
-    pub fn getauxval(type_: c_ulong) -> c_ulong;
     pub fn __system_property_wait(
         pi: *const crate::prop_info,
         __old_serial: u32,

src/unix/linux_like/android/b64/mod.rs

@@ -4043,6 +4043,8 @@ extern "C" {
 
     pub fn gettid() -> crate::pid_t;
 
+    pub fn getauxval(type_: c_ulong) -> c_ulong;
+
     /// Only available in API Version 28+
     pub fn getrandom(buf: *mut c_void, buflen: size_t, flags: c_uint) -> ssize_t;
     pub fn getentropy(buf: *mut c_void, buflen: size_t) -> c_int;

src/unix/linux_like/android/mod.rs

@@ -795,7 +795,3 @@ pub const SYS_process_mrelease: c_long = 448;
 pub const SYS_futex_waitv: c_long = 449;
 pub const SYS_set_mempolicy_home_node: c_long = 450;
 pub const SYS_mseal: c_long = 462;
-
-extern "C" {
-    pub fn getrandom(buf: *mut c_void, buflen: size_t, flags: c_uint) -> ssize_t;
-}

src/unix/linux_like/linux/musl/b32/arm/mod.rs

@@ -745,7 +745,3 @@ pub const SYS_process_mrelease: c_long = 448;
 pub const SYS_futex_waitv: c_long = 449;
 pub const SYS_set_mempolicy_home_node: c_long = 450;
 pub const SYS_mseal: c_long = 462;
-
-extern "C" {
-    pub fn getrandom(buf: *mut c_void, buflen: size_t, flags: c_uint) -> ssize_t;
-}

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

@@ -913,7 +913,3 @@ pub const CS: c_int = 13;
 pub const EFL: c_int = 14;
 pub const UESP: c_int = 15;
 pub const SS: c_int = 16;
-
-extern "C" {
-    pub fn getrandom(buf: *mut c_void, buflen: size_t, flags: c_uint) -> ssize_t;
-}

src/unix/linux_like/linux/musl/b32/x86/mod.rs

@@ -81,10 +81,6 @@ pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
 pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
 pub const __SIZEOF_PTHREAD_BARRIER_T: usize = 32;
 
-extern "C" {
-    pub fn getrandom(buf: *mut c_void, buflen: size_t, flags: c_uint) -> ssize_t;
-}
-
 cfg_if! {
     if #[cfg(target_arch = "aarch64")] {
         mod aarch64;

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

@@ -973,6 +973,9 @@ extern "C" {
     pub fn dirname(path: *mut c_char) -> *mut c_char;
     pub fn basename(path: *mut c_char) -> *mut c_char;
 
+    // Addded in `musl` 1.1.20
+    pub fn getrandom(buf: *mut c_void, buflen: size_t, flags: c_uint) -> ssize_t;
+
     // Added in `musl` 1.1.24
     pub fn posix_spawn_file_actions_addchdir_np(
         actions: *mut crate::posix_spawn_file_actions_t,

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

@@ -114,6 +114,42 @@ s! {
     pub struct pthread_condattr_t {
         size: [u8; crate::__SIZEOF_PTHREAD_CONDATTR_T],
     }
+
+    pub struct tcp_info {
+        pub tcpi_state: u8,
+        pub tcpi_ca_state: u8,
+        pub tcpi_retransmits: u8,
+        pub tcpi_probes: u8,
+        pub tcpi_backoff: u8,
+        pub tcpi_options: u8,
+        /// This contains the bitfields `tcpi_snd_wscale` and `tcpi_rcv_wscale`.
+        /// Each is 4 bits.
+        pub tcpi_snd_rcv_wscale: u8,
+        pub tcpi_rto: u32,
+        pub tcpi_ato: u32,
+        pub tcpi_snd_mss: u32,
+        pub tcpi_rcv_mss: u32,
+        pub tcpi_unacked: u32,
+        pub tcpi_sacked: u32,
+        pub tcpi_lost: u32,
+        pub tcpi_retrans: u32,
+        pub tcpi_fackets: u32,
+        pub tcpi_last_data_sent: u32,
+        pub tcpi_last_ack_sent: u32,
+        pub tcpi_last_data_recv: u32,
+        pub tcpi_last_ack_recv: u32,
+        pub tcpi_pmtu: u32,
+        pub tcpi_rcv_ssthresh: u32,
+        pub tcpi_rtt: u32,
+        pub tcpi_rttvar: u32,
+        pub tcpi_snd_ssthresh: u32,
+        pub tcpi_snd_cwnd: u32,
+        pub tcpi_advmss: u32,
+        pub tcpi_reordering: u32,
+        pub tcpi_rcv_rtt: u32,
+        pub tcpi_rcv_space: u32,
+        pub tcpi_total_retrans: u32,
+    }
 }
 
 impl siginfo_t {

src/unix/linux_like/linux/uclibc/mod.rs

@@ -3201,6 +3201,8 @@ extern "C" {
     pub fn arc4random() -> u32;
     pub fn arc4random_buf(buf: *mut c_void, nbytes: size_t);
     pub fn arc4random_uniform(upper_bound: u32) -> u32;
+
+    pub fn secure_getenv(name: *const c_char) -> *mut c_char;
 }
 
 #[link(name = "sendfile")]