From 2405df5cf77e55da178e367d4c016f9405508d6d Mon Sep 17 00:00:00 2001 From: SSD <96286755+the-ssd@users.noreply.github.com> Date: Fri, 20 Mar 2026 22:19:32 +0100 Subject: [PATCH 1/4] CI: Add a check for cranelift-codegen (only x86 and aarch64) on no_std tagets --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fe6c8ec12c0b..8c8112439b10 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -563,6 +563,7 @@ jobs: cargo check -p wasmtime --no-default-features --features runtime,gc,component-model,pulley,async,debug,debug-builtins,demangle,anyhow && cargo check -p cranelift-control --no-default-features && cargo check -p cranelift-assembler-x64 --lib && + cargo check -p cranelift-codegen --no-default-features -F x86,arm64 && cargo check -p pulley-interpreter --features encode,decode,disas,interp && cargo check -p wasmtime-wasi-io --no-default-features # Use `cross` for illumos to have a C compiler/linker available. From 452467a4a2abb268514c2984febfaf9f67fab137 Mon Sep 17 00:00:00 2001 From: SSD <96286755+the-ssd@users.noreply.github.com> Date: Sat, 21 Mar 2026 11:58:41 +0100 Subject: [PATCH 2/4] Change -F to --features --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8c8112439b10..0555efaa4928 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -563,7 +563,7 @@ jobs: cargo check -p wasmtime --no-default-features --features runtime,gc,component-model,pulley,async,debug,debug-builtins,demangle,anyhow && cargo check -p cranelift-control --no-default-features && cargo check -p cranelift-assembler-x64 --lib && - cargo check -p cranelift-codegen --no-default-features -F x86,arm64 && + cargo check -p cranelift-codegen --no-default-features --features x86,arm64 && cargo check -p pulley-interpreter --features encode,decode,disas,interp && cargo check -p wasmtime-wasi-io --no-default-features # Use `cross` for illumos to have a C compiler/linker available. From 350bdaa8edda4df9ae092fde5273c811ac4561a4 Mon Sep 17 00:00:00 2001 From: SSD Date: Mon, 23 Mar 2026 18:37:35 +0100 Subject: [PATCH 3/4] Fix CI: remove unused imports when building without unwind --- cranelift/codegen/src/isa/aarch64/mod.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cranelift/codegen/src/isa/aarch64/mod.rs b/cranelift/codegen/src/isa/aarch64/mod.rs index e90a8aecfa57..2ce09337da7d 100644 --- a/cranelift/codegen/src/isa/aarch64/mod.rs +++ b/cranelift/codegen/src/isa/aarch64/mod.rs @@ -5,9 +5,13 @@ use crate::ir::{self, Function, Type}; use crate::isa::aarch64::settings as aarch64_settings; #[cfg(feature = "unwind")] use crate::isa::unwind::systemv; +#[cfg(feature = "unwind")] +use crate::machinst::CompiledCode; +#[cfg(feature = "unwind")] +use target_lexicon::OperatingSystem; use crate::isa::{Builder as IsaBuilder, FunctionAlignment, IsaFlagsHashKey, TargetIsa}; use crate::machinst::{ - CompiledCode, CompiledCodeStencil, MachInst, MachTextSectionBuilder, Reg, SigSet, + CompiledCodeStencil, MachInst, MachTextSectionBuilder, Reg, SigSet, TextSectionBuilder, VCode, compile, }; use crate::result::CodegenResult; @@ -16,7 +20,7 @@ use alloc::string::String; use alloc::{boxed::Box, vec::Vec}; use core::fmt; use cranelift_control::ControlPlane; -use target_lexicon::{Aarch64Architecture, Architecture, OperatingSystem, Triple}; +use target_lexicon::{Aarch64Architecture, Architecture, Triple}; // New backend: mod abi; From 758a3fe75b6a8f4b81b33511e40bb48a52fc0df0 Mon Sep 17 00:00:00 2001 From: SSD Date: Tue, 24 Mar 2026 21:47:57 +0100 Subject: [PATCH 4/4] Cargo fmt --- cranelift/codegen/src/isa/aarch64/mod.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cranelift/codegen/src/isa/aarch64/mod.rs b/cranelift/codegen/src/isa/aarch64/mod.rs index 2ce09337da7d..119641b33b3d 100644 --- a/cranelift/codegen/src/isa/aarch64/mod.rs +++ b/cranelift/codegen/src/isa/aarch64/mod.rs @@ -5,14 +5,12 @@ use crate::ir::{self, Function, Type}; use crate::isa::aarch64::settings as aarch64_settings; #[cfg(feature = "unwind")] use crate::isa::unwind::systemv; +use crate::isa::{Builder as IsaBuilder, FunctionAlignment, IsaFlagsHashKey, TargetIsa}; #[cfg(feature = "unwind")] use crate::machinst::CompiledCode; -#[cfg(feature = "unwind")] -use target_lexicon::OperatingSystem; -use crate::isa::{Builder as IsaBuilder, FunctionAlignment, IsaFlagsHashKey, TargetIsa}; use crate::machinst::{ - CompiledCodeStencil, MachInst, MachTextSectionBuilder, Reg, SigSet, - TextSectionBuilder, VCode, compile, + CompiledCodeStencil, MachInst, MachTextSectionBuilder, Reg, SigSet, TextSectionBuilder, VCode, + compile, }; use crate::result::CodegenResult; use crate::settings as shared_settings; @@ -20,6 +18,8 @@ use alloc::string::String; use alloc::{boxed::Box, vec::Vec}; use core::fmt; use cranelift_control::ControlPlane; +#[cfg(feature = "unwind")] +use target_lexicon::OperatingSystem; use target_lexicon::{Aarch64Architecture, Architecture, Triple}; // New backend: