[0.2] Backports

.cirrus.yml

@@ -16,7 +16,7 @@ task:
         image: freebsd-15-0-release-amd64-ufs
     - name: nightly freebsd-14 x86_64
       freebsd_instance:
-        image: freebsd-14-3-release-amd64-ufs
+        image: freebsd-14-4-release-amd64-ufs
     - name: nightly freebsd-15 x86_64
       freebsd_instance:
         image: freebsd-15-0-release-amd64-ufs

.github/workflows/ci.yaml

@@ -36,7 +36,7 @@ jobs:
     name: Clippy on ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-24.04, macos-15, windows-2025]
+        os: [ubuntu-24.04, macos-26, windows-2025]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 10
     steps:
@@ -109,7 +109,7 @@ jobs:
       matrix:
         include:
           - target: aarch64-apple-darwin
-            os: macos-15
+            os: macos-26
           - target: aarch64-pc-windows-msvc
             os: windows-11-arm
           - target: aarch64-unknown-linux-gnu
@@ -209,7 +209,7 @@ jobs:
           - target: wasm32-wasip1
           - target: wasm32-wasip2
           - target: x86_64-apple-darwin
-            os: macos-15-intel
+            os: macos-26-intel
           - target: x86_64-linux-android
           # FIXME: Exec format error (os error 8)
           # - target: x86_64-unknown-linux-gnux32
@@ -273,7 +273,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: test on Solaris
-        uses: vmactions/solaris-vm@v1.3.1
+        uses: vmactions/solaris-vm@v1.3.2
         if: contains(matrix.target, 'solaris')
         with:
           release: "11.4-gcc"

ci/verify-build.py

@@ -287,14 +287,16 @@ def do_semver_checks(cfg: Cfg, target: Target) -> bool:
                 "--features=std,extra_traits",
                 "--release-type=patch",
             ],
-            check=True,
+            check=False,
         )
         # Don't return here so we still get the same rustdoc-json-base tests even while
         # running on the host.
 
     if cfg.baseline_crate_dir is None:
-        eprint("Non-host target: --baseline-crate-dir must be specified to \
-            run semver-checks")
+        eprint(
+            "Non-host target: --baseline-crate-dir must be specified to \
+            run semver-checks"
+        )
         sys.exit(1)
 
     # Since semver-checks doesn't work with `--target`, we build the json ourself and

libc-test/build.rs

@@ -342,6 +342,9 @@ fn test_apple(target: &str) {
 
             // FIXME(macos): The size is changed in recent macOSes.
             "malloc_introspection_t" if x86_64 => true,
+
+            // FIXME(macos): The size is changed in macOS 26.
+            "vm_statistics64" => true,
             _ => false,
         }
     });
@@ -358,6 +361,21 @@ fn test_apple(target: &str) {
             // https://github.com/apple-oss-distributions/xnu/commit/e6231be02a03711ca404e5121a151b24afbff733
             "TIOCREMOTE" => true,
 
+            // FIXME(macos): bumped up on macOS 26
+            // https://github.com/apple-oss-distributions/xnu/commit/f6217f891ac0bb64f3d375211650a4c1ff8ca1ea
+            "ELAST" => true,
+
+            // FIXME(macos): bumped up on macOS 26, it's sizeof `vm_statistics64_data_t`
+            "HOST_VM_INFO64_COUNT" => true,
+
+            _ => false,
+        }
+    });
+
+    cfg.skip_alias(move |ty| {
+        match ty.ident() {
+            // FIXME(macos): The size is changed in macOS 26.
+            "vm_statistics64_data_t" => true,
             _ => false,
         }
     });
@@ -2875,6 +2893,9 @@ fn test_freebsd(target: &str) {
             // Added in FreeBSD 15
             "AT_HWCAP3" | "AT_HWCAP4" if Some(15) > freebsd_ver => true,
 
+            // Added in FreeBSD 15
+            "DTYPE_INOTIFY" | "DTYPE_JAILDESC" if Some(15) > freebsd_ver => true,
+
             _ => false,
         }
     });
@@ -3997,8 +4018,9 @@ fn test_linux(target: &str) {
             "linux/can.h",
             "linux/can/bcm.h",
             "linux/can/error.h",
-            "linux/can/raw.h",
             "linux/can/j1939.h",
+            "linux/can/netlink.h",
+            "linux/can/raw.h",
             "linux/cn_proc.h",
             "linux/connector.h",
             "linux/dccp.h",
@@ -4295,6 +4317,10 @@ fn test_linux(target: &str) {
             // FIXME(musl): New fields in newer versions
             "utmpx" if !old_musl => true,
 
+            // FIXME(linux): Requires >= 6.16 kernel headers.
+            // On 64 bits the size did not change, skip only for 32 bits.
+            "ptrace_syscall_info" if pointer_width == 32 => true,
+
             _ => false,
         }
     });
@@ -4662,6 +4688,7 @@ fn test_linux(target: &str) {
     });
 
     let c_enums = [
+        "can_state",
         "membarrier_cmd",
         "pid_type",
         "proc_cn_event",
@@ -4862,7 +4889,9 @@ fn test_linux(target: &str) {
                 true
             }
             // the `u` field is in fact an anonymous union
-            ("ptrace_syscall_info", "u" | "pad") if gnu => true,
+            ("ptrace_syscall_info", "u") if gnu => true,
+            // FIXME(linux): `flags` requires >= 6.16 kernel headers
+            ("ptrace_syscall_info", "flags") if gnu => true,
             // the vregs field is a `__uint128_t` C's type.
             ("user_fpsimd_struct", "vregs") => true,
             // Linux >= 5.11 tweaked the `svm_zero` field of the `sockaddr_vm` struct.

libc-test/semver/android.txt

@@ -3449,6 +3449,7 @@ epoll_create1
 epoll_ctl
 epoll_event
 epoll_wait
+ethhdr
 eventfd
 eventfd_read
 eventfd_write

libc-test/semver/dragonfly.txt

@@ -500,6 +500,7 @@ IPV6_RECVPKTINFO
 IPV6_RECVTCLASS
 IPV6_TCLASS
 IP_HDRINCL
+IP_MINTTL
 IP_RECVDSTADDR
 IP_RECVIF
 IP_RECVTTL

libc-test/semver/freebsd.txt

@@ -669,6 +669,7 @@ IP_BINDANY
 IP_BINDMULTI
 IP_DONTFRAG
 IP_HDRINCL
+IP_MINTTL
 IP_ORIGDSTADDR
 IP_RECVDSTADDR
 IP_RECVIF
@@ -2434,4 +2435,5 @@ vmtotal
 wait4
 waitid
 xallocx
+xfile
 xucred

libc-test/semver/linux-gnu.txt

@@ -597,6 +597,7 @@ dlvsym
 eaccess
 endutxent
 epoll_pwait2
+ethhdr
 euidaccess
 execveat
 explicit_bzero

libc-test/semver/linux-riscv64gc.txt

@@ -80,3 +80,4 @@ TIOCSRS485
 flock64
 fsblkcnt64_t
 fsfilcnt64_t
+max_align_t

libc-test/semver/linux.txt

@@ -234,6 +234,17 @@ CANXL_SEC
 CANXL_XLF
 CAN_BCM
 CAN_BUS_OFF_THRESHOLD
+CAN_CTRLMODE_3_SAMPLES
+CAN_CTRLMODE_BERR_REPORTING
+CAN_CTRLMODE_CC_LEN8_DLC
+CAN_CTRLMODE_FD
+CAN_CTRLMODE_FD_NON_ISO
+CAN_CTRLMODE_LISTENONLY
+CAN_CTRLMODE_LOOPBACK
+CAN_CTRLMODE_ONE_SHOT
+CAN_CTRLMODE_PRESUME_ACK
+CAN_CTRLMODE_TDC_AUTO
+CAN_CTRLMODE_TDC_MANUAL
 CAN_EFF_FLAG
 CAN_EFF_ID_BITS
 CAN_EFF_MASK
@@ -321,6 +332,13 @@ CAN_RAW_XL_FRAMES
 CAN_RTR_FLAG
 CAN_SFF_ID_BITS
 CAN_SFF_MASK
+CAN_STATE_BUS_OFF
+CAN_STATE_ERROR_ACTIVE
+CAN_STATE_ERROR_PASSIVE
+CAN_STATE_ERROR_WARNING
+CAN_STATE_SLEEPING
+CAN_STATE_STOPPED
+CAN_TERMINATION_DISABLED
 CAN_TP16
 CAN_TP20
 CBAUD
@@ -1055,6 +1073,36 @@ IFLA_AF_SPEC
 IFLA_ALLMULTI
 IFLA_ALT_IFNAME
 IFLA_BROADCAST
+IFLA_CAN_BERR_COUNTER
+IFLA_CAN_BITRATE_CONST
+IFLA_CAN_BITRATE_MAX
+IFLA_CAN_BITTIMING
+IFLA_CAN_BITTIMING_CONST
+IFLA_CAN_CLOCK
+IFLA_CAN_CTRLMODE
+IFLA_CAN_CTRLMODE_EXT
+IFLA_CAN_CTRLMODE_SUPPORTED
+IFLA_CAN_CTRLMODE_UNSPEC
+IFLA_CAN_DATA_BITRATE_CONST
+IFLA_CAN_DATA_BITTIMING
+IFLA_CAN_DATA_BITTIMING_CONST
+IFLA_CAN_RESTART
+IFLA_CAN_RESTART_MS
+IFLA_CAN_STATE
+IFLA_CAN_TDC
+IFLA_CAN_TDC_TDCF
+IFLA_CAN_TDC_TDCF_MAX
+IFLA_CAN_TDC_TDCF_MIN
+IFLA_CAN_TDC_TDCO
+IFLA_CAN_TDC_TDCO_MAX
+IFLA_CAN_TDC_TDCO_MIN
+IFLA_CAN_TDC_TDCV
+IFLA_CAN_TDC_TDCV_MAX
+IFLA_CAN_TDC_TDCV_MIN
+IFLA_CAN_TDC_UNSPEC
+IFLA_CAN_TERMINATION
+IFLA_CAN_TERMINATION_CONST
+IFLA_CAN_UNSPEC
 IFLA_CARRIER
 IFLA_CARRIER_CHANGES
 IFLA_CARRIER_DOWN_COUNT
@@ -3959,9 +4007,16 @@ bcm_timeval
 blkcnt64_t
 brk
 bsearch
+can_berr_counter
+can_bittiming
+can_bittiming_const
+can_clock
+can_ctrlmode
+can_device_stats
 can_err_mask_t
 can_filter
 can_frame
+can_state
 canfd_frame
 canid_t
 canxl_frame
@@ -4093,6 +4148,7 @@ if_freenameindex
 if_nameindex
 ifaddrs
 ifconf
+ifinfomsg
 ifreq
 in6_ifreq
 in6_pktinfo

libc-test/semver/netbsd.txt

@@ -119,7 +119,9 @@ CLD_KILLED
 CLD_STOPPED
 CLD_TRAPPED
 CLOCK_PROCESS_CPUTIME_ID
+CLOCK_PROF
 CLOCK_THREAD_CPUTIME_ID
+CLOCK_VIRTUAL
 CMSG_DATA
 CMSG_FIRSTHDR
 CMSG_LEN

libc-test/semver/redox.txt

@@ -97,6 +97,7 @@ EUNATCH
 EUSERS
 EXFULL
 FIONREAD
+F_DUPFD_CLOEXEC
 IMAXBEL
 IPPROTO_ICMP
 IPPROTO_IDP
@@ -109,6 +110,8 @@ IPPROTO_TCP
 IPPROTO_UDP
 IPV6_ADD_MEMBERSHIP
 IPV6_DROP_MEMBERSHIP
+IPV6_JOIN_GROUP
+IPV6_LEAVE_GROUP
 IP_RECVTOS
 IP_TOS
 IUCLC
@@ -162,6 +165,7 @@ RLIMIT_STACK
 RLIM_INFINITY
 RLIM_SAVED_CUR
 RLIM_SAVED_MAX
+RTLD_NOLOAD
 RUSAGE_BOTH
 RUSAGE_CHILDREN
 RUSAGE_SELF
@@ -187,7 +191,10 @@ SO_REUSEPORT
 SO_SNDBUFFORCE
 TCFLSH
 TCGETS
+TCP_KEEPCNT
 TCP_KEEPIDLE
+TCP_KEEPINTVL
+TCP_MAXSEG
 TCSETS
 TIOCGPGRP
 TIOCSCTTY