Auto merge of #148691 - bjorn3:sync_cg_clif-2025-11-08, r=bjorn3

Subtree sync for rustc_codegen_cranelift

The highlights this time are 4 Cranelift updates, some refactorings and a couple of bugfixes.

Author: bors

compiler/rustc_codegen_cranelift/.cirrus.yml

@@ -1,21 +1,23 @@
-# 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_family: freebsd-14-2
+  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
+    # 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

compiler/rustc_codegen_cranelift/.github/workflows/abi-cafe.yml

@@ -28,7 +28,7 @@ jobs:
           - os: ubuntu-24.04-arm
             env:
               TARGET_TRIPLE: aarch64-unknown-linux-gnu
-          - os: macos-13
+          - os: macos-15-intel
             env:
               TARGET_TRIPLE: x86_64-apple-darwin
           - os: macos-latest

compiler/rustc_codegen_cranelift/.github/workflows/main.yml

@@ -56,7 +56,7 @@ jobs:
           - os: ubuntu-24.04-arm
             env:
               TARGET_TRIPLE: aarch64-unknown-linux-gnu
-          - os: macos-13
+          - os: macos-15-intel
             env:
               TARGET_TRIPLE: x86_64-apple-darwin
           - os: macos-latest
@@ -187,7 +187,7 @@ jobs:
           - os: ubuntu-24.04-arm
             env:
               TARGET_TRIPLE: aarch64-unknown-linux-gnu
-          - os: macos-13
+          - os: macos-15-intel
             env:
               TARGET_TRIPLE: x86_64-apple-darwin
           - os: macos-latest
@@ -231,7 +231,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     timeout-minutes: 10
-    if: ${{ github.ref == 'refs/heads/master' }}
+    if: ${{ github.ref == 'refs/heads/main' }}
     needs: [rustfmt, test, bench, dist]
 
     permissions:

compiler/rustc_codegen_cranelift/.vscode/settings.json

@@ -20,13 +20,13 @@
             "crates": [
                 {
                     "root_module": "./example/mini_core.rs",
-                    "edition": "2015",
+                    "edition": "2024",
                     "deps": [],
                     "cfg": [],
                 },
                 {
                     "root_module": "./example/mini_core_hello_world.rs",
-                    "edition": "2015",
+                    "edition": "2024",
                     "deps": [
                         {
                             "crate": 0,
@@ -37,7 +37,7 @@
                 },
                 {
                     "root_module": "./example/std_example.rs",
-                    "edition": "2015",
+                    "edition": "2024",
                     "deps": [],
                     "cfg": [],
                 },