diff options
| author | Matthew Lugg <mlugg@mlugg.co.uk> | 2025-01-24 05:11:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-24 05:11:26 +0000 |
| commit | f77e1b86225cd49c2d04dfa6ca4a7ede315dc0b1 (patch) | |
| tree | c30cddc29ae1f1162f3ec38fcaf89b94ecb4e6dd /src/main.zig | |
| parent | d916954bee0f477bcada0693d4aa952197cf1eef (diff) | |
| parent | 180db2bf23f05a02876d4567cac3b04842c11acb (diff) | |
| download | zig-f77e1b86225cd49c2d04dfa6ca4a7ede315dc0b1.tar.gz zig-f77e1b86225cd49c2d04dfa6ca4a7ede315dc0b1.zip | |
Merge pull request #22578 from mlugg/stack-trace-tests-x86_64
tests: enable stack trace tests for x86_64-selfhosted
Diffstat (limited to 'src/main.zig')
| -rw-r--r-- | src/main.zig | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/main.zig b/src/main.zig index 7d035ab135..ae7c2229aa 100644 --- a/src/main.zig +++ b/src/main.zig @@ -575,6 +575,7 @@ const usage_build_generic = \\ 0x[hexstring] Maximum 32 bytes \\ none (default) Disable build-id \\ --eh-frame-hdr Enable C++ exception handling by passing --eh-frame-hdr to linker + \\ --no-eh-frame-hdr Disable C++ exception handling by passing --no-eh-frame-hdr to linker \\ --emit-relocs Enable output of relocation sections for post build tools \\ -z [arg] Set linker extension flags \\ nodelete Indicate that the object cannot be deleted from a process @@ -1582,6 +1583,8 @@ fn buildOutputType( fatal("unable to parse '{s}': {s}", .{ arg, @errorName(err) }); } else if (mem.eql(u8, arg, "--eh-frame-hdr")) { link_eh_frame_hdr = true; + } else if (mem.eql(u8, arg, "--no-eh-frame-hdr")) { + link_eh_frame_hdr = false; } else if (mem.eql(u8, arg, "--dynamicbase")) { linker_dynamicbase = true; } else if (mem.eql(u8, arg, "--no-dynamicbase")) { @@ -2846,12 +2849,7 @@ fn buildOutputType( create_module.opts.any_fuzz = true; if (mod_opts.unwind_tables) |uwt| switch (uwt) { .none => {}, - .sync => if (create_module.opts.any_unwind_tables == .none) { - create_module.opts.any_unwind_tables = .sync; - }, - .@"async" => { - create_module.opts.any_unwind_tables = .@"async"; - }, + .sync, .@"async" => create_module.opts.any_unwind_tables = true, }; if (mod_opts.strip == false) create_module.opts.any_non_stripped = true; @@ -7563,12 +7561,7 @@ fn handleModArg( create_module.opts.any_fuzz = true; if (mod_opts.unwind_tables) |uwt| switch (uwt) { .none => {}, - .sync => if (create_module.opts.any_unwind_tables == .none) { - create_module.opts.any_unwind_tables = .sync; - }, - .@"async" => { - create_module.opts.any_unwind_tables = .@"async"; - }, + .sync, .@"async" => create_module.opts.any_unwind_tables = true, }; if (mod_opts.strip == false) create_module.opts.any_non_stripped = true; |