From 0e152b76ac0da0f8132091202eba9f6cebd0e616 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Wed, 7 Sep 2022 23:16:42 +0200 Subject: [PATCH] tests: force LLD off for stage2 backends until auto-select deems worthy --- src/test.zig | 9 ++++----- test/tests.zig | 9 ++------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/test.zig b/src/test.zig index dfe5f5c866..e824b59066 100644 --- a/src/test.zig +++ b/src/test.zig @@ -1548,13 +1548,12 @@ pub const TestContext = struct { .self_exe_path = std.testing.zig_exe_path, // TODO instead of turning off color, pass in a std.Progress.Node .color = .off, - // TODO: We set these to no so that we don't fallback to LLD for incremental linking context. This is because - // our own COFF linker doesn't yet support these options. - .want_unwind_tables = switch (case.backend) { - .stage2 => if (target.os.tag == .windows) false else null, + // TODO: force self-hosted linkers with stage2 backend to avoid LLD creeping in + // until the auto-select mechanism deems them worthy + .use_lld = switch (case.backend) { + .stage2 => false, else => null, }, - .emit_implib = null, }); defer comp.destroy(); diff --git a/test/tests.zig b/test/tests.zig index f46a3acbb5..53e58156a4 100644 --- a/test/tests.zig +++ b/test/tests.zig @@ -701,13 +701,8 @@ pub fn addPkgTests( else => { these_tests.use_stage1 = false; these_tests.use_llvm = false; - - if (test_target.target.getOsTag() == .windows) { - // TODO: We set these to no so that we don't fallback to LLD for incremental linking context. This is because - // our own COFF linker doesn't yet support these options. - these_tests.emit_implib = .no_emit; - these_tests.use_unwind_tables = false; - } + // TODO: force self-hosted linkers to avoid LLD creeping in until the auto-select mechanism deems them worthy + these_tests.use_lld = false; }, };