authorgravatar for squeek502@hotmail.comRyan Liptak <squeek502@hotmail.com> 2025-11-08 02:34:44-08:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2025-11-08 02:34:44-08:00
logbe4eaed7c41fb194014d862648ff586797e39e84
tree0125e7d1e36f1b5b342fbbb5901ddc2650b6267b
parent43eb9b52ccac894023800115e8395cdb413be14a
parentda77d306b637f9ecd4ad4657978b22063c9ecf1d
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #25860 from squeek502/coalesce-to-std-zig

Move/coalesce `CompressDebugSections` and `RcIncludes` enums to `std.zig`

6 files changed, 30 insertions(+), 29 deletions(-)

lib/std/Build/Step/Compile.zig+2-4
......@@ -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,
......@@ -67,13 +66,12 @@ installed_headers: std.array_list.Managed(HeaderInstallation),
6766/// created otherwise.
6867installed_headers_include_tree: ?*Step.WriteFile = null,
6968
70// keep in sync with src/Compilation.zig:RcIncludes
7169/// Behavior of automatic detection of include directories when compiling .rc files.
7270/// any: Use MSVC if available, fall back to MinGW.
7371/// msvc: Use MSVC include paths (must be present on the system).
7472/// gnu: Use MinGW include paths (distributed with Zig).
7573/// none: Do not use any autodetected include paths.
76rc_includes: enum { any, msvc, gnu, none } = .any,
74rc_includes: std.zig.RcIncludes = .any,
7775
7876/// (Windows) .manifest file to embed in the compilation
7977/// Set via options; intended to be read-only after that.
lib/std/zig.zig+13
......@@ -377,6 +377,19 @@ pub const Subsystem = enum {
377377 pub const EfiRuntimeDriver: Subsystem = .efi_runtime_driver;
378378};
379379
380pub const CompressDebugSections = enum { none, zlib, zstd };
381
382pub const RcIncludes = enum {
383 /// Use MSVC if available, fall back to MinGW.
384 any,
385 /// Use MSVC include paths (MSVC install + Windows SDK, must be present on the system).
386 msvc,
387 /// Use MinGW include paths (distributed with Zig).
388 gnu,
389 /// Do not use any autodetected include paths.
390 none,
391};
392
380393/// Renders a `std.Target.Cpu` value into a textual representation that can be parsed
381394/// via the `-mcpu` flag passed to the Zig compiler.
382395/// Appends the result to `buffer`.
src/Compilation.zig+3-14
......@@ -195,7 +195,7 @@ self_exe_path: ?[]const u8,
195195dirs: Directories,
196196libc_include_dir_list: []const []const u8,
197197libc_framework_dir_list: []const []const u8,
198rc_includes: RcIncludes,
198rc_includes: std.zig.RcIncludes,
199199mingw_unicode_entry_point: bool,
200200thread_pool: *ThreadPool,
201201
......@@ -954,17 +954,6 @@ pub const RcSourceFile = struct {
954954 extra_flags: []const []const u8 = &.{},
955955};
956956
957pub const RcIncludes = enum {
958 /// Use MSVC if available, fall back to MinGW.
959 any,
960 /// Use MSVC include paths (MSVC install + Windows SDK, must be present on the system).
961 msvc,
962 /// Use MinGW include paths (distributed with Zig).
963 gnu,
964 /// Do not use any autodetected include paths.
965 none,
966};
967
968957const Job = union(enum) {
969958 /// Given the generated AIR for a function, put it onto the code generation queue.
970959 /// This `Job` exists (instead of the `link.ZcuTask` being directly queued) to ensure that
......@@ -1680,7 +1669,7 @@ pub const CreateOptions = struct {
16801669 c_source_files: []const CSourceFile = &.{},
16811670 rc_source_files: []const RcSourceFile = &.{},
16821671 manifest_file: ?[]const u8 = null,
1683 rc_includes: RcIncludes = .any,
1672 rc_includes: std.zig.RcIncludes = .any,
16841673 link_inputs: []const link.Input = &.{},
16851674 framework_dirs: []const []const u8 = &[0][]const u8{},
16861675 frameworks: []const Framework = &.{},
......@@ -1730,7 +1719,7 @@ pub const CreateOptions = struct {
17301719 linker_tsaware: bool = false,
17311720 linker_nxcompat: bool = false,
17321721 linker_dynamicbase: bool = true,
1733 linker_compress_debug_sections: ?link.File.Lld.Elf.CompressDebugSections = null,
1722 linker_compress_debug_sections: ?std.zig.CompressDebugSections = null,
17341723 linker_module_definition_file: ?[]const u8 = null,
17351724 linker_sort_section: ?link.File.Lld.Elf.SortSection = null,
17361725 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+8-8
......@@ -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;
......@@ -918,7 +918,7 @@ fn buildOutputType(
918918 var extra_cflags: std.ArrayListUnmanaged([]const u8) = .empty;
919919 var extra_rcflags: std.ArrayListUnmanaged([]const u8) = .empty;
920920 var symbol_wrap_set: std.StringArrayHashMapUnmanaged(void) = .empty;
921 var rc_includes: Compilation.RcIncludes = .any;
921 var rc_includes: std.zig.RcIncludes = .any;
922922 var manifest_file: ?[]const u8 = null;
923923 var linker_export_symbol_names: std.ArrayListUnmanaged([]const u8) = .empty;
924924
......@@ -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| {
......@@ -6787,8 +6787,8 @@ fn accessFrameworkPath(
67876787 return false;
67886788}
67896789
6790fn parseRcIncludes(arg: []const u8) Compilation.RcIncludes {
6791 return std.meta.stringToEnum(Compilation.RcIncludes, arg) orelse
6790fn parseRcIncludes(arg: []const u8) std.zig.RcIncludes {
6791 return std.meta.stringToEnum(std.zig.RcIncludes, arg) orelse
67926792 fatal("unsupported rc includes type: '{s}'", .{arg});
67936793}
67946794