Merge branch 'rust-lang:main' into quinn

.cirrus.yml

@@ -15,7 +15,7 @@ task:
 task:
   name: nightly x86_64-unknown-freebsd-14
   freebsd_instance:
-    image: freebsd-14-0-release-amd64-ufs
+    image: freebsd-14-1-release-amd64-ufs
   setup_script:
     - pkg install -y libnghttp2 curl
     - curl https://sh.rustup.rs -sSf --output rustup.sh

build.rs

@@ -44,14 +44,21 @@ fn main() {
     //
     // On CI, we detect the actual FreeBSD version and match its ABI exactly,
     // running tests to ensure that the ABI is correct.
-    match which_freebsd() {
-        Some(10) if libc_ci => set_cfg("freebsd10"),
-        Some(11) if libc_ci => set_cfg("freebsd11"),
-        Some(12) if libc_ci || rustc_dep_of_std => set_cfg("freebsd12"),
-        Some(13) if libc_ci => set_cfg("freebsd13"),
-        Some(14) if libc_ci => set_cfg("freebsd14"),
-        Some(15) if libc_ci => set_cfg("freebsd15"),
-        Some(_) | None => set_cfg("freebsd11"),
+    let which_freebsd = if libc_ci {
+        which_freebsd().unwrap_or(11)
+    } else if rustc_dep_of_std {
+        12
+    } else {
+        11
+    };
+    match which_freebsd {
+        x if x < 10 => panic!("FreeBSD older than 10 is not supported"),
+        10 => set_cfg("freebsd10"),
+        11 => set_cfg("freebsd11"),
+        12 => set_cfg("freebsd12"),
+        13 => set_cfg("freebsd13"),
+        14 => set_cfg("freebsd14"),
+        _ => set_cfg("freebsd15"),
     }
 
     match emcc_version_code() {

ci/install-rust.sh

@@ -13,12 +13,12 @@ fi
 if [ "$OS" = "windows" ]; then
   : "${TARGET?The TARGET environment variable must be set.}"
   rustup set profile minimal
-  rustup update --force $toolchain-"$TARGET"
-  rustup default $toolchain-"$TARGET"
+  rustup update --force "$toolchain-$TARGET"
+  rustup default "$toolchain-$TARGET"
 else
   rustup set profile minimal
-  rustup update --force $toolchain
-  rustup default $toolchain
+  rustup update --force "$toolchain"
+  rustup default "$toolchain"
 fi
 
 if [ -n "$TARGET" ]; then

libc-test/build.rs

@@ -213,6 +213,7 @@ fn test_apple(target: &str) {
         "netinet/ip.h",
         "netinet/tcp.h",
         "netinet/udp.h",
+        "netinet6/in6_var.h",
         "os/lock.h",
         "os/signpost.h",
         "poll.h",
@@ -351,6 +352,7 @@ fn test_apple(target: &str) {
             // MAXPATHLEN is too big for auto-derive traits on arrays.
             ("vnode_info_path", "vip_path") => true,
             ("ifreq", "ifr_ifru") => true,
+            ("in6_ifreq", "ifr_ifru") => true,
             ("ifkpi", "ifk_data") => true,
             ("ifconf", "ifc_ifcu") => true,
             _ => false,
@@ -2409,6 +2411,9 @@ fn test_freebsd(target: &str) {
             // FIXME: Removed in FreeBSD 15:
             "LOCAL_CONNWAIT" => true,
 
+            // FIXME: The values has been changed in FreeBSD 15:
+            "CLOCK_BOOTTIME" if Some(15) <= freebsd_ver => true,
+
             _ => false,
         }
     });

libc-test/semver/android.txt

@@ -2029,6 +2029,7 @@ RTLD_LAZY
 RTLD_LOCAL
 RTLD_NOLOAD
 RTLD_NOW
+RTLD_NODELETE
 TCA_UNSPEC
 TCA_KIND
 TCA_OPTIONS

libc-test/semver/apple.txt

@@ -428,6 +428,7 @@ FSOPT_REPORT_FULLSIZE
 FSOPT_RETURN_REALDEV
 F_ALLOCATEALL
 F_ALLOCATECONTIG
+F_ALLOCATEPERSIST
 F_BARRIERFSYNC
 F_FREEZE_FS
 F_FULLFSYNC
@@ -1860,6 +1861,7 @@ getxattr
 glob
 glob_t
 globfree
+icmp6_ifstat
 iconv_t
 id_t
 idtype_t
@@ -1873,6 +1875,9 @@ ifkpi
 ifreq
 image_offset
 in6_pktinfo
+in6_addrlifetime
+in6_ifreq
+in6_ifstat
 in_pktinfo
 initgroups
 integer_t
@@ -2156,6 +2161,7 @@ timeval32
 timex
 truncate
 ttyname_r
+u_quad_t
 ucontext_t
 unmount
 useconds_t

libc-test/semver/dragonfly.txt

@@ -1587,3 +1587,5 @@ xucred
 eaccess
 dirname
 basename
+IP_RECVTTL
+IPV6_RECVHOPLIMIT

libc-test/semver/linux.txt

@@ -169,6 +169,7 @@ AT_GID
 AT_HWCAP
 AT_HWCAP2
 AT_IGNORE
+AT_MINSIGSTKSZ
 AT_NOTELF
 AT_NO_AUTOMOUNT
 AT_NULL