Commit bf60496
authored
fix: use explicit zig arch targets instead of native (#21682)
## Summary
Supersedes #21685. Fixes SIGILL crashes on ARM64 Mac devcontainers
caused by zig's `-target native` detecting host CPU features (SVE on
Graviton) and emitting instructions Apple Silicon can't execute.
#21611 tried to fix this with `-march=generic` from cmake, but that's
not a valid AArch64 flag — zig silently ignored it. #21685 fixed ARM
only; this PR also fixes x86 and simplifies the architecture targeting:
- **zig wrappers**: Replace `-target native` with explicit
`aarch64`/`x86_64` targets on both architectures, preventing
host-specific CPU feature detection (SVE, AVX-512, etc.). Error on
unsupported architectures.
- **arch.cmake**: Hardcode `-march=skylake` on x86, skip on ARM. Remove
`TARGET_ARCH` variable and auto-detection logic entirely.
- **CMakePresets.json**: Remove all `TARGET_ARCH` entries from
cross-compile presets (invalid `generic` on arm64-linux, redundant
`skylake` on amd64-linux/windows).
## Note on TARGET_ARCH removal
`TARGET_ARCH` was originally introduced in #2660 (Oct 2023) so the
`publish-bb.yml` GitHub Actions workflow could target `westmere` for
broader x86 compatibility when shipping standalone bb binaries. That
workflow was deleted in #12347 (Feb 2025), so there are no remaining
consumers of configurable arch targeting.
If bb binaries are ever distributed to end users on pre-skylake x86
hardware again, this would need to be reintroduced (e.g. via
`-DCMAKE_CXX_FLAGS=-march=westmere` or a new variable). For now, all
consumers are assumed to be on modern hardware where skylake is the
minimum.
## Test plan
- [ ] CI barretenberg build passes on ARM and x86
- [ ] M3 devcontainer: `NO_CACHE=1` rebuild produces working binaries
(no SIGILL)4 files changed
Lines changed: 17 additions & 25 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
489 | 489 | | |
490 | 490 | | |
491 | 491 | | |
492 | | - | |
493 | 492 | | |
494 | 493 | | |
495 | 494 | | |
| |||
503 | 502 | | |
504 | 503 | | |
505 | 504 | | |
506 | | - | |
507 | 505 | | |
508 | 506 | | |
509 | 507 | | |
| |||
554 | 552 | | |
555 | 553 | | |
556 | 554 | | |
557 | | - | |
558 | 555 | | |
559 | 556 | | |
560 | 557 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
20 | 13 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | | - | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
| 12 | + | |
12 | 13 | | |
13 | 14 | | |
14 | 15 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | | - | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
| 12 | + | |
12 | 13 | | |
13 | 14 | | |
14 | 15 | | |
| |||
0 commit comments