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,...@@ -34,8 +34,7 @@ kind: Kind,
34major_only_filename: ?[]const u8,34major_only_filename: ?[]const u8,
35name_only_filename: ?[]const u8,35name_only_filename: ?[]const u8,
36formatted_panics: ?bool = null,36formatted_panics: ?bool = null,
37// keep in sync with src/link.zig:CompressDebugSections37compress_debug_sections: std.zig.CompressDebugSections = .none,
38compress_debug_sections: enum { none, zlib, zstd } = .none,
39verbose_link: bool,38verbose_link: bool,
40verbose_cc: bool,39verbose_cc: bool,
41bundle_compiler_rt: ?bool = null,40bundle_compiler_rt: ?bool = null,
lib/std/zig.zig+2
...@@ -377,6 +377,8 @@ pub const Subsystem = enum {...@@ -377,6 +377,8 @@ pub const Subsystem = enum {
377 pub const EfiRuntimeDriver: Subsystem = .efi_runtime_driver;377 pub const EfiRuntimeDriver: Subsystem = .efi_runtime_driver;
378};378};
379379
380pub const CompressDebugSections = enum { none, zlib, zstd };
381
380/// Renders a `std.Target.Cpu` value into a textual representation that can be parsed382/// Renders a `std.Target.Cpu` value into a textual representation that can be parsed
381/// via the `-mcpu` flag passed to the Zig compiler.383/// via the `-mcpu` flag passed to the Zig compiler.
382/// Appends the result to `buffer`.384/// Appends the result to `buffer`.
src/Compilation.zig+1-1
...@@ -1730,7 +1730,7 @@ pub const CreateOptions = struct {...@@ -1730,7 +1730,7 @@ pub const CreateOptions = struct {
1730 linker_tsaware: bool = false,1730 linker_tsaware: bool = false,
1731 linker_nxcompat: bool = false,1731 linker_nxcompat: bool = false,
1732 linker_dynamicbase: bool = true,1732 linker_dynamicbase: bool = true,
1733 linker_compress_debug_sections: ?link.File.Lld.Elf.CompressDebugSections = null,1733 linker_compress_debug_sections: ?std.zig.CompressDebugSections = null,
1734 linker_module_definition_file: ?[]const u8 = null,1734 linker_module_definition_file: ?[]const u8 = null,
1735 linker_sort_section: ?link.File.Lld.Elf.SortSection = null,1735 linker_sort_section: ?link.File.Lld.Elf.SortSection = null,
1736 major_subsystem_version: ?u16 = null,1736 major_subsystem_version: ?u16 = null,
src/link.zig+1-1
...@@ -428,7 +428,7 @@ pub const File = struct {...@@ -428,7 +428,7 @@ pub const File = struct {
428 tsaware: bool,428 tsaware: bool,
429 nxcompat: bool,429 nxcompat: bool,
430 dynamicbase: bool,430 dynamicbase: bool,
431 compress_debug_sections: Lld.Elf.CompressDebugSections,431 compress_debug_sections: std.zig.CompressDebugSections,
432 bind_global_refs_locally: bool,432 bind_global_refs_locally: bool,
433 import_symbols: bool,433 import_symbols: bool,
434 import_table: bool,434 import_table: bool,
src/link/Lld.zig+3-2
...@@ -95,11 +95,12 @@ pub const Elf = struct {...@@ -95,11 +95,12 @@ pub const Elf = struct {
95 soname: ?[]const u8,95 soname: ?[]const u8,
96 allow_undefined_version: bool,96 allow_undefined_version: bool,
97 enable_new_dtags: ?bool,97 enable_new_dtags: ?bool,
98 compress_debug_sections: CompressDebugSections,98 compress_debug_sections: std.zig.CompressDebugSections,
99 bind_global_refs_locally: bool,99 bind_global_refs_locally: bool,
100 pub const HashStyle = enum { sysv, gnu, both };100 pub const HashStyle = enum { sysv, gnu, both };
101 pub const SortSection = enum { name, alignment };101 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
104 fn init(comp: *Compilation, options: link.File.OpenOptions) !Elf {105 fn init(comp: *Compilation, options: link.File.OpenOptions) !Elf {
105 const PtrWidth = enum { p32, p64 };106 const PtrWidth = enum { p32, p64 };
src/main.zig+5-5
...@@ -850,7 +850,7 @@ fn buildOutputType(...@@ -850,7 +850,7 @@ fn buildOutputType(
850 var disable_c_depfile = false;850 var disable_c_depfile = false;
851 var linker_sort_section: ?link.File.Lld.Elf.SortSection = null;851 var linker_sort_section: ?link.File.Lld.Elf.SortSection = null;
852 var linker_gc_sections: ?bool = null;852 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;
854 var linker_allow_shlib_undefined: ?bool = null;854 var linker_allow_shlib_undefined: ?bool = null;
855 var allow_so_scripts: bool = false;855 var allow_so_scripts: bool = false;
856 var linker_bind_global_refs_locally: ?bool = null;856 var linker_bind_global_refs_locally: ?bool = null;
...@@ -1167,11 +1167,11 @@ fn buildOutputType(...@@ -1167,11 +1167,11 @@ fn buildOutputType(
1167 } else if (mem.eql(u8, arg, "-install_name")) {1167 } else if (mem.eql(u8, arg, "-install_name")) {
1168 install_name = args_iter.nextOrFatal();1168 install_name = args_iter.nextOrFatal();
1169 } else if (mem.cutPrefix(u8, arg, "--compress-debug-sections=")) |param| {1169 } 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 {
1171 fatal("expected --compress-debug-sections=[none|zlib|zstd], found '{s}'", .{param});1171 fatal("expected --compress-debug-sections=[none|zlib|zstd], found '{s}'", .{param});
1172 };1172 };
1173 } else if (mem.eql(u8, arg, "--compress-debug-sections")) {1173 } 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;
1175 } else if (mem.eql(u8, arg, "-pagezero_size")) {1175 } else if (mem.eql(u8, arg, "-pagezero_size")) {
1176 const next_arg = args_iter.nextOrFatal();1176 const next_arg = args_iter.nextOrFatal();
1177 pagezero_size = std.fmt.parseUnsigned(u64, eatIntPrefix(next_arg, 16), 16) catch |err| {1177 pagezero_size = std.fmt.parseUnsigned(u64, eatIntPrefix(next_arg, 16), 16) catch |err| {
...@@ -2335,7 +2335,7 @@ fn buildOutputType(...@@ -2335,7 +2335,7 @@ fn buildOutputType(
2335 if (it.only_arg.len == 0) {2335 if (it.only_arg.len == 0) {
2336 linker_compress_debug_sections = .zlib;2336 linker_compress_debug_sections = .zlib;
2337 } else {2337 } 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 {
2339 fatal("expected [none|zlib|zstd] after --compress-debug-sections, found '{s}'", .{it.only_arg});2339 fatal("expected [none|zlib|zstd] after --compress-debug-sections, found '{s}'", .{it.only_arg});
2340 };2340 };
2341 }2341 }
...@@ -2523,7 +2523,7 @@ fn buildOutputType(...@@ -2523,7 +2523,7 @@ fn buildOutputType(
2523 try linker_export_symbol_names.append(arena, linker_args_it.nextOrFatal());2523 try linker_export_symbol_names.append(arena, linker_args_it.nextOrFatal());
2524 } else if (mem.eql(u8, arg, "--compress-debug-sections")) {2524 } else if (mem.eql(u8, arg, "--compress-debug-sections")) {
2525 const arg1 = linker_args_it.nextOrFatal();2525 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 {
2527 fatal("expected [none|zlib|zstd] after --compress-debug-sections, found '{s}'", .{arg1});2527 fatal("expected [none|zlib|zstd] after --compress-debug-sections, found '{s}'", .{arg1});
2528 };2528 };
2529 } else if (mem.cutPrefix(u8, arg, "-z")) |z_rest| {2529 } else if (mem.cutPrefix(u8, arg, "-z")) |z_rest| {