diff options
| author | Jacob Young <jacobly0@users.noreply.github.com> | 2025-07-27 19:55:05 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2025-07-28 09:03:17 -0700 |
| commit | c334956a54c691ad7e76341193d2d46df18090ef (patch) | |
| tree | dbaaa5f600487979cb17c1f5f6c549a946b30347 /lib/std | |
| parent | dea3ed7f59347e87a1b8fa237202873988084ae8 (diff) | |
| download | zig-c334956a54c691ad7e76341193d2d46df18090ef.tar.gz zig-c334956a54c691ad7e76341193d2d46df18090ef.zip | |
aarch64: workaround some optional/union issues
Diffstat (limited to 'lib/std')
| -rw-r--r-- | lib/std/builtin.zig | 9 | ||||
| -rw-r--r-- | lib/std/start.zig | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/std/builtin.zig b/lib/std/builtin.zig index 54376426e2..f79bc2fe72 100644 --- a/lib/std/builtin.zig +++ b/lib/std/builtin.zig @@ -895,8 +895,8 @@ pub const VaList = switch (builtin.cpu.arch) { .windows => *u8, .ios, .macos, .tvos, .watchos, .visionos => *u8, else => switch (builtin.zig_backend) { - .stage2_aarch64 => VaListAarch64, - else => @compileError("disabled due to miscompilations"), + else => VaListAarch64, + .stage2_llvm => @compileError("disabled due to miscompilations"), }, }, .arm, .armeb, .thumb, .thumbeb => switch (builtin.os.tag) { @@ -921,7 +921,10 @@ pub const VaList = switch (builtin.cpu.arch) { .wasm32, .wasm64 => *anyopaque, .x86 => *u8, .x86_64 => switch (builtin.os.tag) { - .windows => @compileError("disabled due to miscompilations"), // *u8, + .windows => switch (builtin.zig_backend) { + else => *u8, + .stage2_llvm => @compileError("disabled due to miscompilations"), + }, else => VaListX86_64, }, .xtensa => VaListXtensa, diff --git a/lib/std/start.zig b/lib/std/start.zig index 43355d34f4..f889885c84 100644 --- a/lib/std/start.zig +++ b/lib/std/start.zig @@ -626,7 +626,6 @@ pub inline fn callMain() u8 { const result = root.main() catch |err| { switch (builtin.zig_backend) { - .stage2_aarch64, .stage2_powerpc, .stage2_riscv64, => { |