release: v0.8.5 — non-x86 UEFI fix + M6-3 part 1

UnbreakableMJ · claude · UnbreakableMJ · commit dfc42f037846 · 2026-04-24T23:55:06.000+03:00
Fixes the non-x86 UEFI build regression v0.8.4's release workflow exposed, and bundles the M6-3 part 1 TSC instrumentation. v0.8.4 shipped the GH Release page with only the x86-64 assets because the AArch64 / RISC-V 64 / LoongArch64 cross builds failed on strict compilation: the Linux-Boot-Protocol dispatch in zamak-uefi/src/main.rs (added in M2-12) wasn't gated to target_arch = "x86_64", so `handoff::jump_to_linux_kernel` looked like a missing item on non-x86 targets. The CI `cross` job had been masking this with `|| true` since v0.6.x. Fixed by: - `#[cfg(target_arch = "x86_64")]` on `KernelHandoff::Linux`, `load_linux_kernel()`, `uefi_mem_ty_to_e820()`, the `linux_boot` import, the `PROTOCOL=linux` dispatch branch, and the Linux match arm. - Removing `|| true` from the `cross` job in both `.github/workflows/ci.yml` and the `.forgejo/workflows/ci.yml` mirror. All four UEFI targets now build clean under `-D warnings`. v0.8.5 also picks up the M6-3 part 1 instrumentation (already on main since ce6f861): `zamak-uefi` emits ZAMAK_PHASE= / ZAMAK_TSC_MHZ= lines on COM1 at six boot checkpoints, and `zamak-cli bench parse-serial` consumes the captured log to report cycles + ns per phase. See CHANGELOG.md. 12 workspace crates bumped 0.8.4 → 0.8.5. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml
@@ -147,10 +147,15 @@ jobs:
           components: rust-src
           targets: ${{ matrix.target }}
       - name: cargo build --target ${{ matrix.target }}
+        # The `|| true` tolerance was removed in v0.8.5 — with the
+        # current source tree all four UEFI targets build clean
+        # under `-D warnings`, and silent failures had previously
+        # let a broken commit (missing `#[cfg(target_arch=...)]` on
+        # the Linux handoff) reach a tag without CI noticing.
         run: |
           cargo build -p zamak-uefi --target ${{ matrix.target }} \
             -Z build-std=core,alloc,compiler_builtins \
-            -Z build-std-features=compiler-builtins-mem || true
+            -Z build-std-features=compiler-builtins-mem
 
   size-gate:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -147,10 +147,15 @@ jobs:
           components: rust-src
           targets: ${{ matrix.target }}
       - name: cargo build --target ${{ matrix.target }}
+        # The `|| true` tolerance was removed in v0.8.5 — with the
+        # current source tree all four UEFI targets build clean
+        # under `-D warnings`, and silent failures had previously
+        # let a broken commit (missing `#[cfg(target_arch=...)]` on
+        # the Linux handoff) reach a tag without CI noticing.
         run: |
           cargo build -p zamak-uefi --target ${{ matrix.target }} \
             -Z build-std=core,alloc,compiler_builtins \
-            -Z build-std-features=compiler-builtins-mem || true
+            -Z build-std-features=compiler-builtins-mem
 
   size-gate:
     runs-on: ubuntu-latest
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,37 @@ All dates use ISO 8601 format (YYYY-MM-DD).
 
 ## [Unreleased]
 
+## [0.8.5] - 2026-04-24
+
+Bundles the M6-3 part 1 boot-phase instrumentation plus a
+non-x86 UEFI build regression fix that v0.8.4's release
+workflow surfaced (AArch64 / RISC-V / LoongArch cross builds
+failed strict compilation because the Linux-Boot-Protocol
+dispatch added in M2-12 wasn't gated to `target_arch =
+"x86_64"`; the `cross` CI job had been masking it with
+`|| true` since v0.6.x).
+
+v0.8.4's GH Release page has the x86-64 assets only
+(BOOTX64.EFI + CLI binaries + SBOM + SHA256SUMS). Use v0.8.5
+for the full 4-arch UEFI asset set.
+
+### Fixed
+
+- **Non-x86 UEFI strict builds** (`zamak-uefi/src/main.rs`,
+  `zamak-uefi/src/handoff.rs`) — gated `KernelHandoff::Linux`,
+  `load_linux_kernel()`, `uefi_mem_ty_to_e820()`, and the
+  `zamak_core::linux_boot` import behind
+  `#[cfg(target_arch = "x86_64")]` so the compile_error-free
+  build holds on all four UEFI targets. AArch64 Linux booting
+  uses PE/COFF + EFI-stub (a different surface) and was never
+  intended to go through the bzImage path.
+- **CI `cross` job no longer swallows build errors**
+  (`.github` + `.forgejo` workflow mirrors) — removed the
+  `|| true` tolerance on `cargo build -p zamak-uefi`. With the
+  Linux-path gating in place all four targets build clean
+  under `-D warnings`; silent failure had previously let the
+  v0.8.4 tag ship with broken non-x86 binaries.
+
 ### Added
 
 - **M6-3 part 1 — boot-phase TSC instrumentation**. `zamak-uefi`
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/zamak-bios/Cargo.toml b/zamak-bios/Cargo.toml
@@ -2,7 +2,7 @@
 
 [package]
 name = "zamak-bios"
-version = "0.8.4"
+version = "0.8.5"
 edition = "2021"
 license = "GPL-3.0-or-later"
 
@@ -13,8 +13,8 @@ license = "GPL-3.0-or-later"
 smp = []
 
 [dependencies]
-zamak-core = { path = "../zamak-core", version = "0.8.4" }
-zamak-theme = { path = "../zamak-theme", version = "0.8.4" }
+zamak-core = { path = "../zamak-core", version = "0.8.5" }
+zamak-theme = { path = "../zamak-theme", version = "0.8.5" }
 log = "0.4"
 x86_64 = { version = "0.15", default-features = false, features = ["instructions"] }
 limine-protocol = "0.5"
diff --git a/zamak-cli/Cargo.toml b/zamak-cli/Cargo.toml
@@ -2,7 +2,7 @@
 
 [package]
 name = "zamak-cli"
-version = "0.8.4"
+version = "0.8.5"
 edition = "2021"
 description = "Host-side CLI tool for ZAMAK bootloader (MBR install, config enrollment, SBOM)"
 license = "GPL-3.0-or-later"
diff --git a/zamak-core/Cargo.toml b/zamak-core/Cargo.toml
@@ -2,14 +2,14 @@
 
 [package]
 name = "zamak-core"
-version = "0.8.4"
+version = "0.8.5"
 edition = "2021"
 license = "GPL-3.0-or-later"
 
 [dependencies]
-zamak-proto = { path = "../zamak-proto", version = "0.8.4" }
-zamak-macros = { path = "../zamak-macros", version = "0.8.4" }
-zamak-theme = { path = "../zamak-theme", version = "0.8.4" }
+zamak-proto = { path = "../zamak-proto", version = "0.8.5" }
+zamak-macros = { path = "../zamak-macros", version = "0.8.5" }
+zamak-theme = { path = "../zamak-theme", version = "0.8.5" }
 limine-protocol = "0.5"
 goblin = { version = "0.7", default-features = false, features = ["elf64", "elf32", "endian_fd", "alloc"] }
 
diff --git a/zamak-decompressor/Cargo.toml b/zamak-decompressor/Cargo.toml
@@ -2,7 +2,7 @@
 
 [package]
 name = "zamak-decompressor"
-version = "0.8.4"
+version = "0.8.5"
 edition = "2021"
 description = "BIOS stage2 decompressor — inflates zamak-bios.sys to a fixed physical address"
 license = "GPL-3.0-or-later"
diff --git a/zamak-linux-stub-kernel/Cargo.lock b/zamak-linux-stub-kernel/Cargo.lock
diff --git a/zamak-linux-stub-kernel/Cargo.toml b/zamak-linux-stub-kernel/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "zamak-linux-stub-kernel"
-version = "0.8.4"
+version = "0.8.5"
 edition = "2021"
 description = "Stub Linux-Boot-Protocol bzImage for zamak-test's linux-bzimage smoke suite (M2-12). Emits 'Linux version 0.0.0-zamak-stub' on COM1 and exits via QEMU isa-debug-exit."
 license = "GPL-3.0-or-later"
diff --git a/zamak-macros/Cargo.toml b/zamak-macros/Cargo.toml
@@ -2,7 +2,7 @@
 
 [package]
 name = "zamak-macros"
-version = "0.8.4"
+version = "0.8.5"
 edition = "2021"
 description = "Procedural macros for ZAMAK bootloader safety annotations"
 license = "GPL-3.0-or-later"
diff --git a/zamak-proto/Cargo.toml b/zamak-proto/Cargo.toml
@@ -2,7 +2,7 @@
 
 [package]
 name = "zamak-proto"
-version = "0.8.4"
+version = "0.8.5"
 edition = "2021"
 description = "Limine Protocol types and request/response structures for ZAMAK"
 license = "GPL-3.0-or-later"
diff --git a/zamak-stage1/Cargo.toml b/zamak-stage1/Cargo.toml
@@ -2,7 +2,7 @@
 
 [package]
 name = "zamak-stage1"
-version = "0.8.4"
+version = "0.8.5"
 edition = "2021"
 description = "BIOS stage1 MBR boot sector — 512-byte pure global_asm! binary"
 license = "GPL-3.0-or-later"
diff --git a/zamak-test-kernel/Cargo.lock b/zamak-test-kernel/Cargo.lock
diff --git a/zamak-test-kernel/Cargo.toml b/zamak-test-kernel/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "zamak-test-kernel"
-version = "0.8.4"
+version = "0.8.5"
 edition = "2021"
 description = "Minimal Limine-Protocol test kernel for zamak-test end-to-end smoke tests"
 license = "GPL-3.0-or-later"
@@ -20,7 +20,7 @@ name = "zamak-asm-verify-kernel"
 path = "src/asm_verify.rs"
 
 [dependencies]
-zamak-proto = { path = "../zamak-proto", version = "0.8.4" }
+zamak-proto = { path = "../zamak-proto", version = "0.8.5" }
 
 [profile.dev]
 panic = "abort"
diff --git a/zamak-test/Cargo.toml b/zamak-test/Cargo.toml
@@ -2,7 +2,7 @@
 
 [package]
 name = "zamak-test"
-version = "0.8.4"
+version = "0.8.5"
 edition = "2021"
 description = "QEMU integration test harness for the ZAMAK bootloader"
 license = "GPL-3.0-or-later"
diff --git a/zamak-theme/Cargo.toml b/zamak-theme/Cargo.toml
@@ -2,7 +2,7 @@
 
 [package]
 name = "zamak-theme"
-version = "0.8.4"
+version = "0.8.5"
 edition = "2021"
 description = "Theme file parser and color-token resolver for ZAMAK bootloader"
 license = "GPL-3.0-or-later"
diff --git a/zamak-uefi/Cargo.toml b/zamak-uefi/Cargo.toml
@@ -2,16 +2,16 @@
 
 [package]
 name = "zamak-uefi"
-version = "0.8.4"
+version = "0.8.5"
 edition = "2021"
 license = "GPL-3.0-or-later"
 
 [dependencies]
 uefi = "0.24"
 uefi-services = "0.21"
 limine-protocol = "0.5"
-zamak-core = { path = "../zamak-core", version = "0.8.4" }
-zamak-theme = { path = "../zamak-theme", version = "0.8.4" }
+zamak-core = { path = "../zamak-core", version = "0.8.5" }
+zamak-theme = { path = "../zamak-theme", version = "0.8.5" }
 log = "0.4"
 
 # x86-specific crate — only depend on it when we actually target x86-64 so
diff --git a/zamak-uefi/src/main.rs b/zamak-uefi/src/main.rs
@@ -23,6 +23,7 @@ use uefi::table::boot::{AllocateType, MemoryType};
 
 use zamak_core::config;
 use zamak_core::elf;
+#[cfg(target_arch = "x86_64")]
 use zamak_core::linux_boot;
 use zamak_core::protocol;
 use zamak_core::rng::KaslrRng;
@@ -39,12 +40,19 @@ enum KernelHandoff {
     /// address of the 4 KiB zero page to pass in RSI; `entry` is
     /// the 64-bit kernel entry physical address
     /// (`kernel_load_phys + 0x200`).
+    /// x86-64 only — the Linux boot protocol and
+    /// `handoff::jump_to_linux_kernel` are x86-specific. AArch64
+    /// Linux booting uses PE/COFF + EFI stub and is out of scope.
+    #[cfg(target_arch = "x86_64")]
     Linux { boot_params_phys: u64, entry: u64 },
 }
 
 /// Translate a UEFI memory descriptor type to the E820 type code
 /// the Linux kernel expects. See `arch/x86/boot/e820.c` in the
 /// kernel for the canonical table.
+///
+/// x86-64 only: `load_linux_kernel` is the sole caller.
+#[cfg(target_arch = "x86_64")]
 fn uefi_mem_ty_to_e820(ty: uefi::table::boot::MemoryType) -> u32 {
     use uefi::table::boot::MemoryType as M;
     match ty {
@@ -68,6 +76,10 @@ fn uefi_mem_ty_to_e820(ty: uefi::table::boot::MemoryType) -> u32 {
 /// + cmdline (+ optional initrd), and returns a `KernelHandoff::Linux`
 /// variant with stable physical addresses. All allocations go through
 /// UEFI `LOADER_DATA` so they survive ExitBootServices.
+///
+/// x86-64 only: the Linux Boot Protocol entry convention (RSI =
+/// BootParams phys; 64-bit entry at `load + 0x200`) is x86-specific.
+#[cfg(target_arch = "x86_64")]
 fn load_linux_kernel(
     boot_services: &BootServices,
     bzimage: &[u8],
@@ -835,6 +847,14 @@ fn main(image_handle: Handle, mut system_table: SystemTable<Boot>) -> Status {
                         // own boot flow (BootParams + RSI + 64-bit jump);
                         // everything else goes through the ELF / Limine
                         // path.
+                        //
+                        // The Linux leg is x86-64 only; non-x86 UEFI
+                        // builds fall through to the Limine path and let
+                        // the ELF parser decide whether the image is
+                        // valid. Linux on AArch64 uses PE/COFF +
+                        // EFI-stub rather than bzImage, which is a
+                        // separate future surface.
+                        #[cfg(target_arch = "x86_64")]
                         if entry.protocol.eq_ignore_ascii_case("linux") {
                             // Optional initrd: first module, if any.
                             let initrd_blob: Option<Vec<u8>> =
@@ -1042,6 +1062,7 @@ fn main(image_handle: Handle, mut system_table: SystemTable<Boot>) -> Status {
                     handoff::jump_to_kernel(root_phys, entry);
                 }
             }
+            #[cfg(target_arch = "x86_64")]
             KernelHandoff::Linux {
                 boot_params_phys,
                 entry,
