fix ci and update freebsd image

rust-lang · Apr 20, 2023 · 4cba6f3 · 4cba6f3
1 parent 44325c4
commit 4cba6f3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -15,7 +15,7 @@ task:
 task:
   name: nightly x86_64-unknown-freebsd-13
   freebsd_instance:
-    image_family: freebsd-13-1
+    image_family: freebsd-13-2
   setup_script:
     - pkg install -y libnghttp2 curl
     - curl https://sh.rustup.rs -sSf --output rustup.sh

diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -2286,6 +2286,9 @@ fn test_freebsd(target: &str) {
             // Added in FreeBSD 14
             "EV_KEEPUDATA" if Some(14) > freebsd_ver => true,
 
+            // Added in FreeBSD 13.2
+            "AT_USRSTACKBASE" | "AT_USRSTACKLIM" if Some(13) > freebsd_ver => true,
+
             _ => false,
         }
     });

diff --git a/libc-test/semver/freebsd.txt b/libc-test/semver/freebsd.txt
@@ -109,8 +109,6 @@ AT_REMOVEDIR
 AT_RESOLVE_BENEATH
 AT_SYMLINK_FOLLOW
 AT_SYMLINK_NOFOLLOW
-AT_USRSTACKBASE
-AT_USRSTACKLIM
 AT_UID
 B14400
 B28800