From 9b24d96173603d11dd36c6c98136c97ebf882d16 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Fri, 26 Sep 2025 13:50:17 +0000
Subject: [PATCH 1/3] Re-enable Cirrus CI

---
 .cirrus.yml | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index ee5de8b42..1ec99eb3d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,21 +1,20 @@
-# FIXME re-enable once https://github.com/rust-lang/rust/issues/134863 is fixed.
-# task:
-#   name: freebsd
-#   freebsd_instance:
-#     image: freebsd-13-2-release-amd64
-#   setup_rust_script:
-#     - pkg install -y git-tiny binutils
-#     - curl https://sh.rustup.rs -sSf --output rustup.sh
-#     - sh rustup.sh --default-toolchain none -y --profile=minimal
-#   target_cache:
-#     folder: build/cg_clif
-#   prepare_script:
-#     - . $HOME/.cargo/env
-#     - ./y.sh prepare
-#   test_script:
-#     - . $HOME/.cargo/env
-#     # Disabling incr comp reduces cache size and incr comp doesn't save as much
-#     # on CI anyway.
-#     - export CARGO_BUILD_INCREMENTAL=false
-#     # Skip rand as it fails on FreeBSD due to rust-random/rand#1355
-#     - ./y.sh test --skip-test test.rust-random/rand
+task:
+  name: freebsd
+  freebsd_instance:
+    image: freebsd-13-2-release-amd64
+  setup_rust_script:
+    - pkg install -y git-tiny binutils
+    - curl https://sh.rustup.rs -sSf --output rustup.sh
+    - sh rustup.sh --default-toolchain none -y --profile=minimal
+  target_cache:
+    folder: build/cg_clif
+  prepare_script:
+    - . $HOME/.cargo/env
+    - ./y.sh prepare
+  test_script:
+    - . $HOME/.cargo/env
+    # Disabling incr comp reduces cache size and incr comp doesn't save as much
+    # on CI anyway.
+    - export CARGO_BUILD_INCREMENTAL=false
+    # Skip rand as it fails on FreeBSD due to rust-random/rand#1355
+    - ./y.sh test --skip-test test.rust-random/rand

From f2798d6233d21d95550a5fa1d762365aba383b09 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Fri, 26 Sep 2025 13:56:59 +0000
Subject: [PATCH 2/3] Workaround for TLS issue on FreeBSD

---
 .cirrus.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.cirrus.yml b/.cirrus.yml
index 1ec99eb3d..855276995 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -16,5 +16,8 @@ task:
     # Disabling incr comp reduces cache size and incr comp doesn't save as much
     # on CI anyway.
     - export CARGO_BUILD_INCREMENTAL=false
+    # FIXME(rust-lang/rust#134863) necessary to avoid error when dlopening proc
+    # macros during compilation of cg_clif.
+    - export LD_STATIC_TLS_EXTRA=4096
     # Skip rand as it fails on FreeBSD due to rust-random/rand#1355
     - ./y.sh test --skip-test test.rust-random/rand

From 099e5d2572f9920022b9286f9d330c3d5a562c11 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Wed, 1 Oct 2025 11:50:21 +0000
Subject: [PATCH 3/3] Update Cirrus CI to FreeBSD 14.2

---
 .cirrus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 855276995..3ed89bece 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,7 +1,7 @@
 task:
   name: freebsd
   freebsd_instance:
-    image: freebsd-13-2-release-amd64
+    image_family: freebsd-14-2
   setup_rust_script:
     - pkg install -y git-tiny binutils
     - curl https://sh.rustup.rs -sSf --output rustup.sh