From 10a4c2269d110d636e7817677fb50c6f418bff34 Mon Sep 17 00:00:00 2001 From: Jacob Young Date: Sat, 29 Apr 2023 17:57:23 -0400 Subject: [PATCH] x86_64: enable normal start/test_runner logic on more targets --- lib/std/start.zig | 2 +- lib/test_runner.zig | 1 - test/src/Cases.zig | 6 ++++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/std/start.zig b/lib/std/start.zig index 45e2e7da43..4177c9ba01 100644 --- a/lib/std/start.zig +++ b/lib/std/start.zig @@ -18,7 +18,7 @@ const start_sym_name = if (native_arch.isMIPS()) "__start" else "_start"; // Until then, we have simplified logic here for self-hosted. TODO remove this once // self-hosted is capable enough to handle all of the real start.zig logic. pub const simplified_logic = - (builtin.zig_backend == .stage2_x86_64 and (builtin.link_libc or builtin.os.tag == .plan9)) or + (builtin.zig_backend == .stage2_x86_64 and builtin.os.tag == .plan9) or builtin.zig_backend == .stage2_x86 or builtin.zig_backend == .stage2_aarch64 or builtin.zig_backend == .stage2_arm or diff --git a/lib/test_runner.zig b/lib/test_runner.zig index f5bb0150a7..8e29d90433 100644 --- a/lib/test_runner.zig +++ b/lib/test_runner.zig @@ -13,7 +13,6 @@ var fba = std.heap.FixedBufferAllocator.init(&cmdline_buffer); pub fn main() void { if (builtin.zig_backend == .stage2_wasm or - (builtin.zig_backend == .stage2_x86_64 and builtin.os.tag != .linux) or builtin.zig_backend == .stage2_aarch64) { return mainSimple() catch @panic("test failure"); diff --git a/test/src/Cases.zig b/test/src/Cases.zig index defe248fe6..4b023f45b0 100644 --- a/test/src/Cases.zig +++ b/test/src/Cases.zig @@ -396,6 +396,12 @@ fn addFromDirInner( // Other backends don't support new liveness format continue; } + if (backend == .stage2 and target.getOsTag() == .macos and + target.getCpuArch() == .x86_64 and builtin.cpu.arch == .aarch64) + { + // Rosetta has issues with ZLD + continue; + } const next = ctx.cases.items.len; try ctx.cases.append(.{