authorgravatar for squeek502@hotmail.comRyan Liptak <squeek502@hotmail.com> 2025-11-07 19:15:55-08:00
committergravatar for squeek502@hotmail.comRyan Liptak <squeek502@hotmail.com> 2025-11-07 19:15:55-08:00
logf587209e04f93ac36fdd2e4b4f831e87b240f9ae
tree8f3d30ee72e5167ab52c6a8bf8ffbc3e8042b0f5
parent74d2536715c4d4c27d7075b9675fa330e5be02cf

Move/coalesce CompressDebugSections enum to `std.zig.CompressDebugSections`

6 files changed, 13 insertions(+), 11 deletions(-)

lib/std/Build/Step/Compile.zig+1-2
......@@ -34,8 +34,7 @@ kind: Kind,
3434major_only_filename: ?[]const u8,
3535name_only_filename: ?[]const u8,
3636formatted_panics: ?bool = null,
37// keep in sync with src/link.zig:CompressDebugSections
38compress_debug_sections: enum { none, zlib, zstd } = .none,
37compress_debug_sections: std.zig.CompressDebugSections = .none,
3938verbose_link: bool,
4039verbose_cc: bool,
4140bundle_compiler_rt: ?bool = null,
lib/std/zig.zig+2
......@@ -377,6 +377,8 @@ pub const Subsystem = enum {
377377 pub const EfiRuntimeDriver: Subsystem = .efi_runtime_driver;
378378};
379379
380pub const CompressDebugSections = enum { none, zlib, zstd };
381
380382/// Renders a `std.Target.Cpu` value into a textual representation that can be parsed
381383/// via the `-mcpu` flag passed to the Zig compiler.
382384/// Appends the result to `buffer`.
src/Compilation.zig+1-1
......@@ -1730,7 +1730,7 @@ pub const CreateOptions = struct {
17301730 linker_tsaware: bool = false,
17311731 linker_nxcompat: bool = false,
17321732 linker_dynamicbase: bool = true,
1733 linker_compress_debug_sections: ?link.File.Lld.Elf.CompressDebugSections = null,
1733 linker_compress_debug_sections: ?std.zig.CompressDebugSections = null,
17341734 linker_module_definition_file: ?[]const u8 = null,
17351735 linker_sort_section: ?link.File.Lld.Elf.SortSection = null,
17361736 major_subsystem_version: ?u16 = null,
src/link.zig+1-1
......@@ -428,7 +428,7 @@ pub const File = struct {
428428 tsaware: bool,
429429 nxcompat: bool,
430430 dynamicbase: bool,
431 compress_debug_sections: Lld.Elf.CompressDebugSections,
431 compress_debug_sections: std.zig.CompressDebugSections,
432432 bind_global_refs_locally: bool,
433433 import_symbols: bool,
434434 import_table: bool,
src/link/Lld.zig+3-2
......@@ -95,11 +95,12 @@ pub const Elf = struct {
9595 soname: ?[]const u8,
9696 allow_undefined_version: bool,
9797 enable_new_dtags: ?bool,
98 compress_debug_sections: CompressDebugSections,
98 compress_debug_sections: std.zig.CompressDebugSections,
9999 bind_global_refs_locally: bool,
100100 pub const HashStyle = enum { sysv, gnu, both };
101101 pub const SortSection = enum { name, alignment };
102 pub const CompressDebugSections = enum { none, zlib, zstd };
102 /// Deprecated; use 'std.zig.CompressDebugSections' instead. To be removed after 0.16.0 is tagged.
103 pub const CompressDebugSections = std.zig.CompressDebugSections;
103104
104105 fn init(comp: *Compilation, options: link.File.OpenOptions) !Elf {
105106 const PtrWidth = enum { p32, p64 };
src/main.zig+5-5
......@@ -850,7 +850,7 @@ fn buildOutputType(
850850 var disable_c_depfile = false;
851851 var linker_sort_section: ?link.File.Lld.Elf.SortSection = null;
852852 var linker_gc_sections: ?bool = null;
853 var linker_compress_debug_sections: ?link.File.Lld.Elf.CompressDebugSections = null;
853 var linker_compress_debug_sections: ?std.zig.CompressDebugSections = null;
854854 var linker_allow_shlib_undefined: ?bool = null;
855855 var allow_so_scripts: bool = false;
856856 var linker_bind_global_refs_locally: ?bool = null;
......@@ -1167,11 +1167,11 @@ fn buildOutputType(
11671167 } else if (mem.eql(u8, arg, "-install_name")) {
11681168 install_name = args_iter.nextOrFatal();
11691169 } else if (mem.cutPrefix(u8, arg, "--compress-debug-sections=")) |param| {
1170 linker_compress_debug_sections = std.meta.stringToEnum(link.File.Lld.Elf.CompressDebugSections, param) orelse {
1170 linker_compress_debug_sections = std.meta.stringToEnum(std.zig.CompressDebugSections, param) orelse {
11711171 fatal("expected --compress-debug-sections=[none|zlib|zstd], found '{s}'", .{param});
11721172 };
11731173 } else if (mem.eql(u8, arg, "--compress-debug-sections")) {
1174 linker_compress_debug_sections = link.File.Lld.Elf.CompressDebugSections.zlib;
1174 linker_compress_debug_sections = .zlib;
11751175 } else if (mem.eql(u8, arg, "-pagezero_size")) {
11761176 const next_arg = args_iter.nextOrFatal();
11771177 pagezero_size = std.fmt.parseUnsigned(u64, eatIntPrefix(next_arg, 16), 16) catch |err| {
......@@ -2335,7 +2335,7 @@ fn buildOutputType(
23352335 if (it.only_arg.len == 0) {
23362336 linker_compress_debug_sections = .zlib;
23372337 } else {
2338 linker_compress_debug_sections = std.meta.stringToEnum(link.File.Lld.Elf.CompressDebugSections, it.only_arg) orelse {
2338 linker_compress_debug_sections = std.meta.stringToEnum(std.zig.CompressDebugSections, it.only_arg) orelse {
23392339 fatal("expected [none|zlib|zstd] after --compress-debug-sections, found '{s}'", .{it.only_arg});
23402340 };
23412341 }
......@@ -2523,7 +2523,7 @@ fn buildOutputType(
25232523 try linker_export_symbol_names.append(arena, linker_args_it.nextOrFatal());
25242524 } else if (mem.eql(u8, arg, "--compress-debug-sections")) {
25252525 const arg1 = linker_args_it.nextOrFatal();
2526 linker_compress_debug_sections = std.meta.stringToEnum(link.File.Lld.Elf.CompressDebugSections, arg1) orelse {
2526 linker_compress_debug_sections = std.meta.stringToEnum(std.zig.CompressDebugSections, arg1) orelse {
25272527 fatal("expected [none|zlib|zstd] after --compress-debug-sections, found '{s}'", .{arg1});
25282528 };
25292529 } else if (mem.cutPrefix(u8, arg, "-z")) |z_rest| {