| author |  Jacob Young <jacobly@ziglang.org> 2023-04-29 17:57:23-04:00 |
| committer | Jacob Young <jacobly@ziglang.org> 2023-05-01 19:22:52-04:00 |
| log | 10a4c2269d110d636e7817677fb50c6f418bff34 |
| tree | cb12008328679cf0f02657fa36a5fff24a8aafe0 |
| parent | c81878978a41f117818ac5b4918cd952f123bad7 |
x86_64: enable normal start/test_runner logic on more targets
3 files changed, 7 insertions(+), 2 deletions(-)
lib- test
- src
lib/std/start.zig+1-1
| ... | @@ -18,7 +18,7 @@ const start_sym_name = if (native_arch.isMIPS()) "__start" else "_start"; | ... | @@ -18,7 +18,7 @@ const start_sym_name = if (native_arch.isMIPS()) "__start" else "_start"; |
| 18 | // Until then, we have simplified logic here for self-hosted. TODO remove this once | 18 | // Until then, we have simplified logic here for self-hosted. TODO remove this once |
| 19 | // self-hosted is capable enough to handle all of the real start.zig logic. | 19 | // self-hosted is capable enough to handle all of the real start.zig logic. |
| 20 | pub const simplified_logic = | 20 | pub const simplified_logic = |
| 21 | (builtin.zig_backend == .stage2_x86_64 and (builtin.link_libc or builtin.os.tag == .plan9)) or | 21 | (builtin.zig_backend == .stage2_x86_64 and builtin.os.tag == .plan9) or |
| 22 | builtin.zig_backend == .stage2_x86 or | 22 | builtin.zig_backend == .stage2_x86 or |
| 23 | builtin.zig_backend == .stage2_aarch64 or | 23 | builtin.zig_backend == .stage2_aarch64 or |
| 24 | builtin.zig_backend == .stage2_arm or | 24 | builtin.zig_backend == .stage2_arm or |
lib/test_runner.zig-1
| ... | @@ -13,7 +13,6 @@ var fba = std.heap.FixedBufferAllocator.init(&cmdline_buffer); | ... | @@ -13,7 +13,6 @@ var fba = std.heap.FixedBufferAllocator.init(&cmdline_buffer); |
| 13 | 13 | ||
| 14 | pub fn main() void { | 14 | pub fn main() void { |
| 15 | if (builtin.zig_backend == .stage2_wasm or | 15 | if (builtin.zig_backend == .stage2_wasm or |
| 16 | (builtin.zig_backend == .stage2_x86_64 and builtin.os.tag != .linux) or | ||
| 17 | builtin.zig_backend == .stage2_aarch64) | 16 | builtin.zig_backend == .stage2_aarch64) |
| 18 | { | 17 | { |
| 19 | return mainSimple() catch @panic("test failure"); | 18 | return mainSimple() catch @panic("test failure"); |
test/src/Cases.zig+6
| ... | @@ -396,6 +396,12 @@ fn addFromDirInner( | ... | @@ -396,6 +396,12 @@ fn addFromDirInner( |
| 396 | // Other backends don't support new liveness format | 396 | // Other backends don't support new liveness format |
| 397 | continue; | 397 | continue; |
| 398 | } | 398 | } |
| 399 | if (backend == .stage2 and target.getOsTag() == .macos and | ||
| 400 | target.getCpuArch() == .x86_64 and builtin.cpu.arch == .aarch64) | ||
| 401 | { | ||
| 402 | // Rosetta has issues with ZLD | ||
| 403 | continue; | ||
| 404 | } | ||
| 399 | 405 | ||
| 400 | const next = ctx.cases.items.len; | 406 | const next = ctx.cases.items.len; |
| 401 | try ctx.cases.append(.{ | 407 | try ctx.cases.append(.{ |