Commit f2564318385ea90b08af044ae32ddef26e6346bd | zig

src/Compilation.zig+39-18

 @@ -1410,7 +1410,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
                 .inherited = .{},
                 .global = options.config,
                 .parent = options.root_mod,
-                .builtin_mod = options.root_mod.deps.get("builtin").?,
+                .builtin_mod = options.root_mod.getBuiltinDependency(),
             });
             const zcu = try arena.create(Module);
 @@ -3830,6 +3830,7 @@ pub fn obtainCObjectCacheManifest(
     // that apply both to @cImport and compiling C objects. No linking stuff here!
     // Also nothing that applies only to compiling .zig code.
     man.hash.add(owner_mod.sanitize_c);
+    man.hash.add(owner_mod.sanitize_thread);
     man.hash.addListOfBytes(owner_mod.cc_argv);
     man.hash.add(comp.config.link_libcpp);
 @@ -3970,10 +3971,13 @@ pub fn cImport(comp: *Compilation, c_src: []const u8, owner_mod: *Package.Module
         const dep_basename = std.fs.path.basename(out_dep_path);
         try man.addDepFilePost(zig_cache_tmp_dir, dep_basename);
-        if (comp.whole_cache_manifest) |whole_cache_manifest| {
+        switch (comp.cache_use) {
-            comp.whole_cache_manifest_mutex.lock();
+            .whole => |whole| if (whole.cache_manifest) |whole_cache_manifest| {
-            defer comp.whole_cache_manifest_mutex.unlock();
+                whole.cache_manifest_mutex.lock();
-            try whole_cache_manifest.addDepFilePost(zig_cache_tmp_dir, dep_basename);
+                defer whole.cache_manifest_mutex.unlock();
+                try whole_cache_manifest.addDepFilePost(zig_cache_tmp_dir, dep_basename);
+            },
+            .incremental => {},
         }
         const digest = man.final();
 @@ -4425,10 +4429,15 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_obj_prog_node: *std.P
             const dep_basename = std.fs.path.basename(dep_file_path);
             // Add the files depended on to the cache system.
             try man.addDepFilePost(zig_cache_tmp_dir, dep_basename);
-            if (comp.whole_cache_manifest) |whole_cache_manifest| {
+            switch (comp.cache_use) {
-                comp.whole_cache_manifest_mutex.lock();
+                .whole => |whole| {
-                defer comp.whole_cache_manifest_mutex.unlock();
+                    if (whole.cache_manifest) |whole_cache_manifest| {
-                try whole_cache_manifest.addDepFilePost(zig_cache_tmp_dir, dep_basename);
+                        whole.cache_manifest_mutex.lock();
+                        defer whole.cache_manifest_mutex.unlock();
+                        try whole_cache_manifest.addDepFilePost(zig_cache_tmp_dir, dep_basename);
+                    }
+                },
+                .incremental => {},
             }
             // Just to save disk space, we delete the file because it is never needed again.
             zig_cache_tmp_dir.deleteFile(dep_basename) catch |err| {
 @@ -4724,10 +4733,13 @@ fn updateWin32Resource(comp: *Compilation, win32_resource: *Win32Resource, win32
         const dep_basename = std.fs.path.basename(out_dep_path);
         // Add the files depended on to the cache system.
         try man.addDepFilePost(zig_cache_tmp_dir, dep_basename);
-        if (comp.whole_cache_manifest) |whole_cache_manifest| {
+        switch (comp.cache_use) {
-            comp.whole_cache_manifest_mutex.lock();
+            .whole => |whole| if (whole.cache_manifest) |whole_cache_manifest| {
-            defer comp.whole_cache_manifest_mutex.unlock();
+                whole.cache_manifest_mutex.lock();
-            try whole_cache_manifest.addDepFilePost(zig_cache_tmp_dir, dep_basename);
+                defer whole.cache_manifest_mutex.unlock();
+                try whole_cache_manifest.addDepFilePost(zig_cache_tmp_dir, dep_basename);
+            },
+            .incremental => {},
         }
         // Just to save disk space, we delete the file because it is never needed again.
         zig_cache_tmp_dir.deleteFile(dep_basename) catch |err| {
 @@ -4799,10 +4811,13 @@ fn updateWin32Resource(comp: *Compilation, win32_resource: *Win32Resource, win32
         for (dependencies_list.items) |dep_file_path| {
             try man.addFilePost(dep_file_path);
-            if (comp.whole_cache_manifest) |whole_cache_manifest| {
+            switch (comp.cache_use) {
-                comp.whole_cache_manifest_mutex.lock();
+                .whole => |whole| if (whole.cache_manifest) |whole_cache_manifest| {
-                defer comp.whole_cache_manifest_mutex.unlock();
+                    whole.cache_manifest_mutex.lock();
-                try whole_cache_manifest.addFilePost(dep_file_path);
+                    defer whole.cache_manifest_mutex.unlock();
+                    try whole_cache_manifest.addFilePost(dep_file_path);
+                },
+                .incremental => {},
             }
         }
 @@ -6247,7 +6262,9 @@ pub fn build_crt_file(
     output_mode: std.builtin.OutputMode,
     misc_task_tag: MiscTask,
     prog_node: *std.Progress.Node,
-    c_source_files: []const CSourceFile,
+    /// These elements have to get mutated to add the owner module after it is
+    /// created within this function.
+    c_source_files: []CSourceFile,
 ) !void {
     const tracy_trace = trace(@src());
     defer tracy_trace.end();
 @@ -6305,6 +6322,10 @@ pub fn build_crt_file(
         .builtin_mod = null,
     });
+    for (c_source_files) |*item| {
+        item.owner = root_mod;
+    }
     const sub_compilation = try Compilation.create(gpa, .{
         .local_cache_directory = comp.global_cache_directory,
         .global_cache_directory = comp.global_cache_directory,

src/Module.zig+1-1

...	@@ -5275,7 +5275,7 @@ pub fn populateTestFunctions(	...	@@ -5275,7 +5275,7 @@ pub fn populateTestFunctions(
5275	) !void {	5275	) !void {
5276	const gpa = mod.gpa;	5276	const gpa = mod.gpa;
5277	const ip = &mod.intern_pool;	5277	const ip = &mod.intern_pool;
5278	const builtin_mod = mod.main_mod.deps.get("builtin").?;	5278	const builtin_mod = mod.main_mod.getBuiltinDependency();
5279	const builtin_file = (mod.importPkg(builtin_mod) catch unreachable).file;	5279	const builtin_file = (mod.importPkg(builtin_mod) catch unreachable).file;
5280	const root_decl = mod.declPtr(builtin_file.root_decl.unwrap().?);	5280	const root_decl = mod.declPtr(builtin_file.root_decl.unwrap().?);
5281	const builtin_namespace = mod.namespacePtr(root_decl.src_namespace);	5281	const builtin_namespace = mod.namespacePtr(root_decl.src_namespace);

src/Package/Module.zig+41-35

 @@ -310,7 +310,39 @@ pub fn create(arena: Allocator, options: CreateOptions) !*Package.Module {
         break :b buf.items[0 .. buf.items.len - 1 :0].ptr;
     };
-    const builtin_mod = options.builtin_mod orelse b: {
+    const mod = try arena.create(Module);
+    mod.* = .{
+        .root = options.paths.root,
+        .root_src_path = options.paths.root_src_path,
+        .fully_qualified_name = options.fully_qualified_name,
+        .resolved_target = .{
+            .result = target,
+            .is_native_os = resolved_target.is_native_os,
+            .is_native_abi = resolved_target.is_native_abi,
+            .llvm_cpu_features = llvm_cpu_features,
+        },
+        .optimize_mode = optimize_mode,
+        .single_threaded = single_threaded,
+        .error_tracing = error_tracing,
+        .valgrind = valgrind,
+        .pic = pic,
+        .strip = strip,
+        .omit_frame_pointer = omit_frame_pointer,
+        .stack_check = stack_check,
+        .stack_protector = stack_protector,
+        .code_model = code_model,
+        .red_zone = red_zone,
+        .sanitize_c = sanitize_c,
+        .sanitize_thread = sanitize_thread,
+        .unwind_tables = unwind_tables,
+        .cc_argv = options.cc_argv,
+        .structured_cfg = structured_cfg,
+        .builtin_file = null,
+    };
+    const opt_builtin_mod = options.builtin_mod orelse b: {
+        if (!options.global.have_zcu) break :b null;
         const generated_builtin_source = try Builtin.generate(.{
             .target = target,
             .zig_backend = zig_backend,
 @@ -388,38 +420,10 @@ pub fn create(arena: Allocator, options: CreateOptions) !*Package.Module {
         break :b new;
     };
-    const mod = try arena.create(Module);
+    if (opt_builtin_mod) |builtin_mod| {
-    mod.* = .{
+        try mod.deps.ensureUnusedCapacity(arena, 1);
-        .root = options.paths.root,
+        mod.deps.putAssumeCapacityNoClobber("builtin", builtin_mod);
-        .root_src_path = options.paths.root_src_path,
+    }
-        .fully_qualified_name = options.fully_qualified_name,
-        .resolved_target = .{
-            .result = target,
-            .is_native_os = resolved_target.is_native_os,
-            .is_native_abi = resolved_target.is_native_abi,
-            .llvm_cpu_features = llvm_cpu_features,
-        },
-        .optimize_mode = optimize_mode,
-        .single_threaded = single_threaded,
-        .error_tracing = error_tracing,
-        .valgrind = valgrind,
-        .pic = pic,
-        .strip = strip,
-        .omit_frame_pointer = omit_frame_pointer,
-        .stack_check = stack_check,
-        .stack_protector = stack_protector,
-        .code_model = code_model,
-        .red_zone = red_zone,
-        .sanitize_c = sanitize_c,
-        .sanitize_thread = sanitize_thread,
-        .unwind_tables = unwind_tables,
-        .cc_argv = options.cc_argv,
-        .structured_cfg = structured_cfg,
-        .builtin_file = null,
-    };
-    try mod.deps.ensureUnusedCapacity(arena, 1);
-    mod.deps.putAssumeCapacityNoClobber("builtin", builtin_mod);
     return mod;
 }
 @@ -462,8 +466,10 @@ pub fn createLimited(gpa: Allocator, options: LimitedOptions) Allocator.Error!*P
     return mod;
 }
-pub fn getBuiltinDependency(m: *Module) *Module {
+pub fn getBuiltinDependency(m: Module) *Module {
-    return m.deps.values()[0];
+    const result = m.deps.values()[0];
+    assert(result.isBuiltin());
+    return result;
 }
 const Module = @This();

src/Sema.zig+31-6

...	@@ -5759,14 +5759,39 @@ fn zirCImport(sema: Sema, parent_block: Block, inst: Zir.Inst.Index) CompileEr	...	@@ -5759,14 +5759,39 @@ fn zirCImport(sema: Sema, parent_block: Block, inst: Zir.Inst.Index) CompileEr
5759	};	5759	};
5760	return sema.failWithOwnedErrorMsg(&child_block, msg);	5760	return sema.failWithOwnedErrorMsg(&child_block, msg);
5761	}	5761	}
5762	const c_import_mod = try Package.Module.create(comp.arena.allocator(), .{	5762	const parent_mod = parent_block.ownerModule();
5763	.root = .{	5763	const c_import_mod = Package.Module.create(comp.arena.allocator(), .{
5764	.root_dir = Compilation.Directory.cwd(),	5764	.global_cache_directory = comp.global_cache_directory,
5765	.sub_path = std.fs.path.dirname(c_import_res.out_zig_path) orelse "",	5765	.paths = .{
		5766	.root = .{
		5767	.root_dir = Compilation.Directory.cwd(),
		5768	.sub_path = std.fs.path.dirname(c_import_res.out_zig_path) orelse "",
		5769	},
		5770	.root_src_path = std.fs.path.basename(c_import_res.out_zig_path),
5766	},	5771	},
5767	.root_src_path = std.fs.path.basename(c_import_res.out_zig_path),
5768	.fully_qualified_name = c_import_res.out_zig_path,	5772	.fully_qualified_name = c_import_res.out_zig_path,
5769	});	5773	.cc_argv = parent_mod.cc_argv,
		5774	.inherited = .{},
		5775	.global = comp.config,
		5776	.parent = parent_mod,
		5777	.builtin_mod = parent_mod.getBuiltinDependency(),
		5778	}) catch \|err\| switch (err) {
		5779	// None of these are possible because we are creating a package with
		5780	// the exact same configuration as the parent package, which already
		5781	// passed these checks.
		5782	error.ValgrindUnsupportedOnTarget => unreachable,
		5783	error.TargetRequiresSingleThreaded => unreachable,
		5784	error.BackendRequiresSingleThreaded => unreachable,
		5785	error.TargetRequiresPic => unreachable,
		5786	error.PieRequiresPic => unreachable,
		5787	error.DynamicLinkingRequiresPic => unreachable,
		5788	error.TargetHasNoRedZone => unreachable,
		5789	error.StackCheckUnsupportedByTarget => unreachable,
		5790	error.StackProtectorUnsupportedByTarget => unreachable,
		5791	error.StackProtectorUnavailableWithoutLibC => unreachable,
		5792
		5793	else => \|e\| return e,
		5794	};
5770		5795
5771	const result = mod.importPkg(c_import_mod) catch \|err\|	5796	const result = mod.importPkg(c_import_mod) catch \|err\|
5772	return sema.fail(&child_block, src, "C import failed: {s}", .{@errorName(err)});	5797	return sema.fail(&child_block, src, "C import failed: {s}", .{@errorName(err)});

src/glibc.zig+15-8

 @@ -170,7 +170,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
     defer arena_allocator.deinit();
     const arena = arena_allocator.allocator();
-    const target = comp.getTarget();
+    const target = comp.root_mod.resolved_target.result;
     const target_ver = target.os.version_range.linux.glibc;
     const start_old_init_fini = target_ver.order(.{ .major = 2, .minor = 33, .patch = 0 }) != .gt;
 @@ -196,12 +196,14 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                 "-DASSEMBLER",
                 "-Wa,--noexecstack",
             });
-            return comp.build_crt_file("crti", .Obj, .@"glibc crti.o", prog_node, &.{
+            var files = [_]Compilation.CSourceFile{
                 .{
                     .src_path = try start_asm_path(comp, arena, "crti.S"),
                     .cache_exempt_flags = args.items,
+                    .owner = comp.root_mod,
                 },
-            });
+            };
+            return comp.build_crt_file("crti", .Obj, .@"glibc crti.o", prog_node, &files);
         },
         .crtn_o => {
             var args = std.ArrayList([]const u8).init(arena);
 @@ -215,12 +217,14 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                 "-DASSEMBLER",
                 "-Wa,--noexecstack",
             });
-            return comp.build_crt_file("crtn", .Obj, .@"glibc crtn.o", prog_node, &.{
+            var files = [_]Compilation.CSourceFile{
                 .{
                     .src_path = try start_asm_path(comp, arena, "crtn.S"),
                     .cache_exempt_flags = args.items,
+                    .owner = undefined,
                 },
-            });
+            };
+            return comp.build_crt_file("crtn", .Obj, .@"glibc crtn.o", prog_node, &files);
         },
         .scrt1_o => {
             const start_o: Compilation.CSourceFile = blk: {
 @@ -244,6 +248,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                 break :blk .{
                     .src_path = try start_asm_path(comp, arena, src_path),
                     .cache_exempt_flags = args.items,
+                    .owner = undefined,
                 };
             };
             const abi_note_o: Compilation.CSourceFile = blk: {
 @@ -263,11 +268,11 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                 break :blk .{
                     .src_path = try lib_path(comp, arena, lib_libc_glibc ++ "csu" ++ path.sep_str ++ "abi-note.S"),
                     .cache_exempt_flags = args.items,
+                    .owner = undefined,
                 };
             };
-            return comp.build_crt_file("Scrt1", .Obj, .@"glibc Scrt1.o", prog_node, &.{
+            var files = [_]Compilation.CSourceFile{ start_o, abi_note_o };
-                start_o, abi_note_o,
+            return comp.build_crt_file("Scrt1", .Obj, .@"glibc Scrt1.o", prog_node, &files);
-            });
         },
         .libc_nonshared_a => {
             const s = path.sep_str;
 @@ -364,6 +369,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                 files_buf[files_index] = .{
                     .src_path = try lib_path(comp, arena, dep.path),
                     .cache_exempt_flags = args.items,
+                    .owner = undefined,
                 };
                 files_index += 1;
             }
 @@ -1065,6 +1071,7 @@ fn buildSharedLib(
     const c_source_files = [1]Compilation.CSourceFile{
         .{
             .src_path = try path.join(arena, &[_][]const u8{ bin_directory.path.?, asm_file_basename }),
+            .owner = undefined,
         },
     };

src/libcxx.zig+93-89

 @@ -138,6 +138,50 @@ pub fn buildLibCXX(comp: *Compilation, prog_node: *std.Progress.Node) !void {
     const abi_namespace_arg = try std.fmt.allocPrint(arena, "-D_LIBCPP_ABI_NAMESPACE=__{d}", .{
         @intFromEnum(comp.libcxx_abi_version),
     });
+    const optimize_mode = comp.compilerRtOptMode();
+    const strip = comp.compilerRtStrip();
+    const config = try Compilation.Config.resolve(.{
+        .output_mode = output_mode,
+        .link_mode = link_mode,
+        .resolved_target = comp.root_mod.resolved_target,
+        .is_test = false,
+        .have_zcu = false,
+        .emit_bin = true,
+        .root_optimize_mode = optimize_mode,
+        .root_strip = strip,
+        .link_libc = true,
+        .lto = comp.config.lto,
+    });
+    const root_mod = try Module.create(arena, .{
+        .global_cache_directory = comp.global_cache_directory,
+        .paths = .{
+            .root = .{ .root_dir = comp.zig_lib_directory },
+            .root_src_path = "",
+        },
+        .fully_qualified_name = "root",
+        .inherited = .{
+            .resolved_target = comp.root_mod.resolved_target,
+            .strip = strip,
+            .stack_check = false,
+            .stack_protector = 0,
+            .sanitize_c = false,
+            .sanitize_thread = comp.config.any_sanitize_thread,
+            .red_zone = comp.root_mod.red_zone,
+            .omit_frame_pointer = comp.root_mod.omit_frame_pointer,
+            .valgrind = false,
+            .optimize_mode = optimize_mode,
+            .structured_cfg = comp.root_mod.structured_cfg,
+            .pic = comp.root_mod.pic,
+        },
+        .global = config,
+        .cc_argv = &.{},
+        .parent = null,
+        .builtin_mod = null,
+    });
     var c_source_files = try std.ArrayList(Compilation.CSourceFile).initCapacity(arena, libcxx_files.len);
     for (libcxx_files) |cxx_src| {
 @@ -224,52 +268,10 @@ pub fn buildLibCXX(comp: *Compilation, prog_node: *std.Progress.Node) !void {
             .src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxx", cxx_src }),
             .extra_flags = cflags.items,
             .cache_exempt_flags = cache_exempt_flags.items,
+            .owner = root_mod,
         });
     }
-    const optimize_mode = comp.compilerRtOptMode();
-    const strip = comp.compilerRtStrip();
-    const config = try Compilation.Config.resolve(.{
-        .output_mode = output_mode,
-        .link_mode = link_mode,
-        .resolved_target = comp.root_mod.resolved_target,
-        .is_test = false,
-        .have_zcu = false,
-        .emit_bin = true,
-        .root_optimize_mode = optimize_mode,
-        .root_strip = strip,
-        .link_libc = true,
-        .lto = comp.config.lto,
-    });
-    const root_mod = try Module.create(arena, .{
-        .global_cache_directory = comp.global_cache_directory,
-        .paths = .{
-            .root = .{ .root_dir = comp.zig_lib_directory },
-            .root_src_path = "",
-        },
-        .fully_qualified_name = "root",
-        .inherited = .{
-            .resolved_target = comp.root_mod.resolved_target,
-            .strip = strip,
-            .stack_check = false,
-            .stack_protector = 0,
-            .sanitize_c = false,
-            .sanitize_thread = comp.config.any_sanitize_thread,
-            .red_zone = comp.root_mod.red_zone,
-            .omit_frame_pointer = comp.root_mod.omit_frame_pointer,
-            .valgrind = false,
-            .optimize_mode = optimize_mode,
-            .structured_cfg = comp.root_mod.structured_cfg,
-            .pic = comp.root_mod.pic,
-        },
-        .global = config,
-        .cc_argv = &.{},
-        .parent = null,
-        .builtin_mod = null,
-    });
     const sub_compilation = try Compilation.create(comp.gpa, .{
         .local_cache_directory = comp.global_cache_directory,
         .global_cache_directory = comp.global_cache_directory,
 @@ -339,6 +341,53 @@ pub fn buildLibCXXABI(comp: *Compilation, prog_node: *std.Progress.Node) !void {
     const abi_namespace_arg = try std.fmt.allocPrint(arena, "-D_LIBCPP_ABI_NAMESPACE=__{d}", .{
         @intFromEnum(comp.libcxx_abi_version),
     });
+    const optimize_mode = comp.compilerRtOptMode();
+    const strip = comp.compilerRtStrip();
+    const unwind_tables = true;
+    const config = try Compilation.Config.resolve(.{
+        .output_mode = output_mode,
+        .link_mode = link_mode,
+        .resolved_target = comp.root_mod.resolved_target,
+        .is_test = false,
+        .have_zcu = false,
+        .emit_bin = true,
+        .root_optimize_mode = optimize_mode,
+        .root_strip = strip,
+        .link_libc = true,
+        .any_unwind_tables = unwind_tables,
+        .lto = comp.config.lto,
+    });
+    const root_mod = try Module.create(arena, .{
+        .global_cache_directory = comp.global_cache_directory,
+        .paths = .{
+            .root = .{ .root_dir = comp.zig_lib_directory },
+            .root_src_path = "",
+        },
+        .fully_qualified_name = "root",
+        .inherited = .{
+            .resolved_target = comp.root_mod.resolved_target,
+            .strip = strip,
+            .stack_check = false,
+            .stack_protector = 0,
+            .sanitize_c = false,
+            .sanitize_thread = comp.config.any_sanitize_thread,
+            .red_zone = comp.root_mod.red_zone,
+            .omit_frame_pointer = comp.root_mod.omit_frame_pointer,
+            .valgrind = false,
+            .optimize_mode = optimize_mode,
+            .structured_cfg = comp.root_mod.structured_cfg,
+            .unwind_tables = unwind_tables,
+            .pic = comp.root_mod.pic,
+        },
+        .global = config,
+        .cc_argv = &.{},
+        .parent = null,
+        .builtin_mod = null,
+    });
     var c_source_files = try std.ArrayList(Compilation.CSourceFile).initCapacity(arena, libcxxabi_files.len);
     for (libcxxabi_files) |cxxabi_src| {
 @@ -406,55 +455,10 @@ pub fn buildLibCXXABI(comp: *Compilation, prog_node: *std.Progress.Node) !void {
             .src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxxabi", cxxabi_src }),
             .extra_flags = cflags.items,
             .cache_exempt_flags = cache_exempt_flags.items,
+            .owner = root_mod,
         });
     }
-    const optimize_mode = comp.compilerRtOptMode();
-    const strip = comp.compilerRtStrip();
-    const unwind_tables = true;
-    const config = try Compilation.Config.resolve(.{
-        .output_mode = output_mode,
-        .link_mode = link_mode,
-        .resolved_target = comp.root_mod.resolved_target,
-        .is_test = false,
-        .have_zcu = false,
-        .emit_bin = true,
-        .root_optimize_mode = optimize_mode,
-        .root_strip = strip,
-        .link_libc = true,
-        .any_unwind_tables = unwind_tables,
-        .lto = comp.config.lto,
-    });
-    const root_mod = try Module.create(arena, .{
-        .global_cache_directory = comp.global_cache_directory,
-        .paths = .{
-            .root = .{ .root_dir = comp.zig_lib_directory },
-            .root_src_path = "",
-        },
-        .fully_qualified_name = "root",
-        .inherited = .{
-            .resolved_target = comp.root_mod.resolved_target,
-            .strip = strip,
-            .stack_check = false,
-            .stack_protector = 0,
-            .sanitize_c = false,
-            .sanitize_thread = comp.config.any_sanitize_thread,
-            .red_zone = comp.root_mod.red_zone,
-            .omit_frame_pointer = comp.root_mod.omit_frame_pointer,
-            .valgrind = false,
-            .optimize_mode = optimize_mode,
-            .structured_cfg = comp.root_mod.structured_cfg,
-            .unwind_tables = unwind_tables,
-            .pic = comp.root_mod.pic,
-        },
-        .global = config,
-        .cc_argv = &.{},
-        .parent = null,
-        .builtin_mod = null,
-    });
     const sub_compilation = try Compilation.create(comp.gpa, .{
         .local_cache_directory = comp.global_cache_directory,
         .global_cache_directory = comp.global_cache_directory,

src/libtsan.zig+54-48

 @@ -34,6 +34,52 @@ pub fn buildTsan(comp: *Compilation, prog_node: *std.Progress.Node) !void {
         .basename = basename,
     };
+    const optimize_mode = comp.compilerRtOptMode();
+    const strip = comp.compilerRtStrip();
+    const config = try Compilation.Config.resolve(.{
+        .output_mode = output_mode,
+        .link_mode = link_mode,
+        .resolved_target = comp.root_mod.resolved_target,
+        .is_test = false,
+        .have_zcu = false,
+        .emit_bin = true,
+        .root_optimize_mode = optimize_mode,
+        .root_strip = strip,
+        .link_libc = true,
+    });
+    const common_flags = [_][]const u8{
+        "-DTSAN_CONTAINS_UBSAN=0",
+    };
+    const root_mod = try Module.create(arena, .{
+        .global_cache_directory = comp.global_cache_directory,
+        .paths = .{
+            .root = .{ .root_dir = comp.zig_lib_directory },
+            .root_src_path = "",
+        },
+        .fully_qualified_name = "root",
+        .inherited = .{
+            .resolved_target = comp.root_mod.resolved_target,
+            .strip = strip,
+            .stack_check = false,
+            .stack_protector = 0,
+            .sanitize_c = false,
+            .sanitize_thread = false,
+            .red_zone = comp.root_mod.red_zone,
+            .omit_frame_pointer = comp.root_mod.omit_frame_pointer,
+            .valgrind = false,
+            .optimize_mode = optimize_mode,
+            .structured_cfg = comp.root_mod.structured_cfg,
+            .pic = true,
+        },
+        .global = config,
+        .cc_argv = &common_flags,
+        .parent = null,
+        .builtin_mod = null,
+    });
     var c_source_files = std.ArrayList(Compilation.CSourceFile).init(arena);
     try c_source_files.ensureUnusedCapacity(tsan_sources.len);
 @@ -50,8 +96,9 @@ pub fn buildTsan(comp: *Compilation, prog_node: *std.Progress.Node) !void {
         try cflags.append("-fno-rtti");
         c_source_files.appendAssumeCapacity(.{
-            .src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "tsan", tsan_src }),
+            .src_path = try comp.zig_lib_directory.join(arena, &.{ "tsan", tsan_src }),
             .extra_flags = cflags.items,
+            .owner = root_mod,
         });
     }
 @@ -74,6 +121,7 @@ pub fn buildTsan(comp: *Compilation, prog_node: *std.Progress.Node) !void {
         c_source_files.appendAssumeCapacity(.{
             .src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "tsan", tsan_src }),
             .extra_flags = cflags.items,
+            .owner = root_mod,
         });
     }
     {
 @@ -94,6 +142,7 @@ pub fn buildTsan(comp: *Compilation, prog_node: *std.Progress.Node) !void {
         c_source_files.appendAssumeCapacity(.{
             .src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "tsan", asm_source }),
             .extra_flags = cflags.items,
+            .owner = root_mod,
         });
     }
 @@ -117,6 +166,7 @@ pub fn buildTsan(comp: *Compilation, prog_node: *std.Progress.Node) !void {
                 "tsan", "sanitizer_common", common_src,
             }),
             .extra_flags = cflags.items,
+            .owner = root_mod,
         });
     }
 @@ -141,6 +191,7 @@ pub fn buildTsan(comp: *Compilation, prog_node: *std.Progress.Node) !void {
                 "tsan", "sanitizer_common", c_src,
             }),
             .extra_flags = cflags.items,
+            .owner = root_mod,
         });
     }
 @@ -161,6 +212,7 @@ pub fn buildTsan(comp: *Compilation, prog_node: *std.Progress.Node) !void {
                 "tsan", "sanitizer_common", c_src,
             }),
             .extra_flags = cflags.items,
+            .owner = root_mod,
         });
     }
 @@ -189,56 +241,10 @@ pub fn buildTsan(comp: *Compilation, prog_node: *std.Progress.Node) !void {
                 "tsan", "interception", c_src,
             }),
             .extra_flags = cflags.items,
+            .owner = root_mod,
         });
     }
-    const common_flags = [_][]const u8{
-        "-DTSAN_CONTAINS_UBSAN=0",
-    };
-    const optimize_mode = comp.compilerRtOptMode();
-    const strip = comp.compilerRtStrip();
-    const config = try Compilation.Config.resolve(.{
-        .output_mode = output_mode,
-        .link_mode = link_mode,
-        .resolved_target = comp.root_mod.resolved_target,
-        .is_test = false,
-        .have_zcu = false,
-        .emit_bin = true,
-        .root_optimize_mode = optimize_mode,
-        .root_strip = strip,
-        .link_libc = true,
-    });
-    const root_mod = try Module.create(arena, .{
-        .global_cache_directory = comp.global_cache_directory,
-        .paths = .{
-            .root = .{ .root_dir = comp.zig_lib_directory },
-            .root_src_path = "",
-        },
-        .fully_qualified_name = "root",
-        .inherited = .{
-            .resolved_target = comp.root_mod.resolved_target,
-            .strip = strip,
-            .stack_check = false,
-            .stack_protector = 0,
-            .sanitize_c = false,
-            .sanitize_thread = false,
-            .red_zone = comp.root_mod.red_zone,
-            .omit_frame_pointer = comp.root_mod.omit_frame_pointer,
-            .valgrind = false,
-            .optimize_mode = optimize_mode,
-            .structured_cfg = comp.root_mod.structured_cfg,
-            .pic = true,
-            .cc_argv = &common_flags,
-        },
-        .global = config,
-        .cc_argv = &.{},
-        .parent = null,
-        .builtin_mod = null,
-    });
     const sub_compilation = try Compilation.create(comp.gpa, .{
         .local_cache_directory = comp.global_cache_directory,
         .global_cache_directory = comp.global_cache_directory,

src/libunwind.zig+6-4

...	@@ -33,7 +33,8 @@ pub fn buildStaticLib(comp: Compilation, prog_node: std.Progress.Node) !void {	...	@@ -33,7 +33,8 @@ pub fn buildStaticLib(comp: Compilation, prog_node: std.Progress.Node) !void {
33	// Disable LTO to avoid https://github.com/llvm/llvm-project/issues/56825	33	// Disable LTO to avoid https://github.com/llvm/llvm-project/issues/56825
34	.lto = false,	34	.lto = false,
35	});	35	});
36	const root_mod = Module.create(.{	36	const root_mod = try Module.create(arena, .{
		37	.global_cache_directory = comp.global_cache_directory,
37	.paths = .{	38	.paths = .{
38	.root = .{ .root_dir = comp.zig_lib_directory },	39	.root = .{ .root_dir = comp.zig_lib_directory },
39	.root_src_path = "",	40	.root_src_path = "",
...	@@ -55,6 +56,8 @@ pub fn buildStaticLib(comp: Compilation, prog_node: std.Progress.Node) !void {	...	@@ -55,6 +56,8 @@ pub fn buildStaticLib(comp: Compilation, prog_node: std.Progress.Node) !void {
55	},	56	},
56	.global = config,	57	.global = config,
57	.cc_argv = &.{},	58	.cc_argv = &.{},
		59	.parent = null,
		60	.builtin_mod = null,
58	});	61	});
59		62
60	const root_name = "unwind";	63	const root_name = "unwind";
...	@@ -117,6 +120,7 @@ pub fn buildStaticLib(comp: Compilation, prog_node: std.Progress.Node) !void {	...	@@ -117,6 +120,7 @@ pub fn buildStaticLib(comp: Compilation, prog_node: std.Progress.Node) !void {
117	c_source_files[i] = .{	120	c_source_files[i] = .{
118	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{unwind_src}),	121	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{unwind_src}),
119	.extra_flags = cflags.items,	122	.extra_flags = cflags.items,
		123	.owner = root_mod,
120	};	124	};
121	}	125	}
122	const sub_compilation = try Compilation.create(comp.gpa, .{	126	const sub_compilation = try Compilation.create(comp.gpa, .{
...	@@ -132,7 +136,6 @@ pub fn buildStaticLib(comp: Compilation, prog_node: std.Progress.Node) !void {	...	@@ -132,7 +136,6 @@ pub fn buildStaticLib(comp: Compilation, prog_node: std.Progress.Node) !void {
132	.thread_pool = comp.thread_pool,	136	.thread_pool = comp.thread_pool,
133	.libc_installation = comp.libc_installation,	137	.libc_installation = comp.libc_installation,
134	.emit_bin = emit_bin,	138	.emit_bin = emit_bin,
135	.link_mode = link_mode,
136	.function_sections = comp.function_sections,	139	.function_sections = comp.function_sections,
137	.c_source_files = &c_source_files,	140	.c_source_files = &c_source_files,
138	.verbose_cc = comp.verbose_cc,	141	.verbose_cc = comp.verbose_cc,
...	@@ -150,8 +153,7 @@ pub fn buildStaticLib(comp: Compilation, prog_node: std.Progress.Node) !void {	...	@@ -150,8 +153,7 @@ pub fn buildStaticLib(comp: Compilation, prog_node: std.Progress.Node) !void {
150	try comp.updateSubCompilation(sub_compilation, .libunwind, prog_node);	153	try comp.updateSubCompilation(sub_compilation, .libunwind, prog_node);
151		154
152	assert(comp.libunwind_static_lib == null);	155	assert(comp.libunwind_static_lib == null);
153		156	comp.libunwind_static_lib = try sub_compilation.toCrtFile();
154	comp.libunwind_static_lib = try sub_compilation.toOwnedLock();
155	}	157	}
156		158
157	const unwind_src_list = [_][]const u8{	159	const unwind_src_list = [_][]const u8{

src/link/Coff.zig+4

...	@@ -18,6 +18,8 @@ major_subsystem_version: u16,	...	@@ -18,6 +18,8 @@ major_subsystem_version: u16,
18	minor_subsystem_version: u16,	18	minor_subsystem_version: u16,
19	lib_dirs: []const []const u8,	19	lib_dirs: []const []const u8,
20	entry_addr: ?u32,	20	entry_addr: ?u32,
		21	module_definition_file: ?[]const u8,
		22	pdb_out_path: ?[]const u8,
21		23
22	ptr_width: PtrWidth,	24	ptr_width: PtrWidth,
23	page_size: u32,	25	page_size: u32,
...	@@ -425,6 +427,8 @@ pub fn createEmpty(	...	@@ -425,6 +427,8 @@ pub fn createEmpty(
425	.lib_dirs = options.lib_dirs,	427	.lib_dirs = options.lib_dirs,
426	.entry_addr = math.cast(u32, options.entry_addr orelse 0) orelse	428	.entry_addr = math.cast(u32, options.entry_addr orelse 0) orelse
427	return error.EntryAddressTooBig,	429	return error.EntryAddressTooBig,
		430	.module_definition_file = options.module_definition_file,
		431	.pdb_out_path = options.pdb_out_path,
428	};	432	};
429		433
430	const use_llvm = comp.config.use_llvm;	434	const use_llvm = comp.config.use_llvm;

src/link/Coff/lld.zig+8-15

 @@ -82,7 +82,7 @@ pub fn linkWithLLD(self: *Coff, comp: *Compilation, prog_node: *std.Progress.Nod
         try man.addOptionalFile(module_obj_path);
         man.hash.addOptionalBytes(comp.config.entry);
         man.hash.add(self.base.stack_size);
-        man.hash.addOptional(self.image_base);
+        man.hash.add(self.image_base);
         man.hash.addListOfBytes(self.lib_dirs);
         man.hash.add(comp.skip_linker_dependencies);
         if (comp.config.link_libc) {
 @@ -102,10 +102,10 @@ pub fn linkWithLLD(self: *Coff, comp: *Compilation, prog_node: *std.Progress.Nod
         man.hash.add(self.tsaware);
         man.hash.add(self.nxcompat);
         man.hash.add(self.dynamicbase);
-        man.hash.addOptional(self.base.allow_shlib_undefined);
+        man.hash.add(self.base.allow_shlib_undefined);
         // strip does not need to go into the linker hash because it is part of the hash namespace
-        man.hash.addOptional(self.major_subsystem_version);
+        man.hash.add(self.major_subsystem_version);
-        man.hash.addOptional(self.minor_subsystem_version);
+        man.hash.add(self.minor_subsystem_version);
         man.hash.addOptional(comp.version);
         try man.addOptionalFile(self.module_definition_file);
 @@ -237,7 +237,7 @@ pub fn linkWithLLD(self: *Coff, comp: *Compilation, prog_node: *std.Progress.Nod
         try argv.append(try allocPrint(arena, "-OUT:{s}", .{full_out_path}));
-        if (self.implib_emit) |emit| {
+        if (comp.implib_emit) |emit| {
             const implib_out_path = try emit.directory.join(arena, &[_][]const u8{emit.sub_path});
             try argv.append(try allocPrint(arena, "-IMPLIB:{s}", .{implib_out_path}));
         }
 @@ -310,16 +310,9 @@ pub fn linkWithLLD(self: *Coff, comp: *Compilation, prog_node: *std.Progress.Nod
         const Mode = enum { uefi, win32 };
         const mode: Mode = mode: {
             if (resolved_subsystem) |subsystem| {
-                const subsystem_suffix = ss: {
+                const subsystem_suffix = try allocPrint(arena, ",{d}.{d}", .{
-                    if (self.major_subsystem_version) |major| {
+                    self.major_subsystem_version, self.minor_subsystem_version,
-                        if (self.minor_subsystem_version) |minor| {
+                });
-                            break :ss try allocPrint(arena, ",{d}.{d}", .{ major, minor });
-                        } else {
-                            break :ss try allocPrint(arena, ",{d}", .{major});
-                        }
-                    }
-                    break :ss "";
-                };
                 switch (subsystem) {
                     .Console => {

src/link/Elf.zig+11-9

...	@@ -23,6 +23,8 @@ soname: ?[]const u8,	...	@@ -23,6 +23,8 @@ soname: ?[]const u8,
23	bind_global_refs_locally: bool,	23	bind_global_refs_locally: bool,
24	linker_script: ?[]const u8,	24	linker_script: ?[]const u8,
25	version_script: ?[]const u8,	25	version_script: ?[]const u8,
		26	print_icf_sections: bool,
		27	print_map: bool,
26		28
27	ptr_width: PtrWidth,	29	ptr_width: PtrWidth,
28		30
...	@@ -307,6 +309,8 @@ pub fn createEmpty(	...	@@ -307,6 +309,8 @@ pub fn createEmpty(
307	.bind_global_refs_locally = options.bind_global_refs_locally,	309	.bind_global_refs_locally = options.bind_global_refs_locally,
308	.linker_script = options.linker_script,	310	.linker_script = options.linker_script,
309	.version_script = options.version_script,	311	.version_script = options.version_script,
		312	.print_icf_sections = options.print_icf_sections,
		313	.print_map = options.print_map,
310	};	314	};
311	if (use_llvm and comp.config.have_zcu) {	315	if (use_llvm and comp.config.have_zcu) {
312	self.llvm_object = try LlvmObject.create(arena, comp);	316	self.llvm_object = try LlvmObject.create(arena, comp);
...	@@ -1294,12 +1298,9 @@ pub fn flushModule(self: Elf, comp: Compilation, prog_node: *std.Progress.Node	...	@@ -1294,12 +1298,9 @@ pub fn flushModule(self: Elf, comp: Compilation, prog_node: *std.Progress.Node
1294		1298
1295	// Look for entry address in objects if not set by the incremental compiler.	1299	// Look for entry address in objects if not set by the incremental compiler.
1296	if (self.entry_index == null) {	1300	if (self.entry_index == null) {
1297	const entry: ?[]const u8 = entry: {	1301	if (comp.config.entry) \|name\| {
1298	if (comp.config.entry) \|entry\| break :entry entry;	1302	self.entry_index = self.globalByName(name);
1299	if (!self.base.isDynLib()) break :entry "_start";	1303	}
1300	break :entry null;
1301	};
1302	self.entry_index = if (entry) \|name\| self.globalByName(name) else null;
1303	}	1304	}
1304		1305
1305	if (self.base.gc_sections) {	1306	if (self.base.gc_sections) {
...	@@ -2420,7 +2421,7 @@ fn linkWithLLD(self: Elf, comp: Compilation, prog_node: *std.Progress.Node) !v	...	@@ -2420,7 +2421,7 @@ fn linkWithLLD(self: Elf, comp: Compilation, prog_node: *std.Progress.Node) !v
2420	// We can skip hashing libc and libc++ components that we are in charge of building from Zig	2421	// We can skip hashing libc and libc++ components that we are in charge of building from Zig
2421	// installation sources because they are always a product of the compiler version + target information.	2422	// installation sources because they are always a product of the compiler version + target information.
2422	man.hash.addOptionalBytes(comp.config.entry);	2423	man.hash.addOptionalBytes(comp.config.entry);
2423	man.hash.addOptional(self.image_base);	2424	man.hash.add(self.image_base);
2424	man.hash.add(self.base.gc_sections);	2425	man.hash.add(self.base.gc_sections);
2425	man.hash.addOptional(self.sort_section);	2426	man.hash.addOptional(self.sort_section);
2426	man.hash.add(self.eh_frame_hdr);	2427	man.hash.add(self.eh_frame_hdr);
...	@@ -5896,7 +5897,7 @@ pub fn addSymbol(self: *Elf) !Symbol.Index {	...	@@ -5896,7 +5897,7 @@ pub fn addSymbol(self: *Elf) !Symbol.Index {
5896	break :blk index;	5897	break :blk index;
5897	} else {	5898	} else {
5898	log.debug(" (allocating symbol index {d})", .{self.symbols.items.len});	5899	log.debug(" (allocating symbol index {d})", .{self.symbols.items.len});
5899	const index = @as(Symbol.Index, @intCast(self.symbols.items.len));	5900	const index: Symbol.Index = @intCast(self.symbols.items.len);
5900	_ = self.symbols.addOneAssumeCapacity();	5901	_ = self.symbols.addOneAssumeCapacity();
5901	break :blk index;	5902	break :blk index;
5902	}	5903	}
...	@@ -5961,6 +5962,7 @@ pub fn getOrPutGlobal(self: *Elf, name: []const u8) !GetOrPutGlobalResult {	...	@@ -5961,6 +5962,7 @@ pub fn getOrPutGlobal(self: *Elf, name: []const u8) !GetOrPutGlobalResult {
5961	const gop = try self.resolver.getOrPut(gpa, name_off);	5962	const gop = try self.resolver.getOrPut(gpa, name_off);
5962	if (!gop.found_existing) {	5963	if (!gop.found_existing) {
5963	const index = try self.addSymbol();	5964	const index = try self.addSymbol();
		5965	log.debug("added symbol '{s}' at index {d}", .{ name, index });
5964	const global = self.symbol(index);	5966	const global = self.symbol(index);
5965	global.name_offset = name_off;	5967	global.name_offset = name_off;
5966	global.flags.global = true;	5968	global.flags.global = true;
...	@@ -5996,7 +5998,7 @@ pub fn getOrCreateComdatGroupOwner(self: *Elf, name: [:0]const u8) !GetOrCreateC	...	@@ -5996,7 +5998,7 @@ pub fn getOrCreateComdatGroupOwner(self: *Elf, name: [:0]const u8) !GetOrCreateC
5996	const off = try self.strings.insert(gpa, name);	5998	const off = try self.strings.insert(gpa, name);
5997	const gop = try self.comdat_groups_table.getOrPut(gpa, off);	5999	const gop = try self.comdat_groups_table.getOrPut(gpa, off);
5998	if (!gop.found_existing) {	6000	if (!gop.found_existing) {
5999	const index = @as(ComdatGroupOwner.Index, @intCast(self.comdat_groups_owners.items.len));	6001	const index: ComdatGroupOwner.Index = @intCast(self.comdat_groups_owners.items.len);
6000	const owner = try self.comdat_groups_owners.addOne(gpa);	6002	const owner = try self.comdat_groups_owners.addOne(gpa);
6001	owner.* = .{};	6003	owner.* = .{};
6002	gop.value_ptr.* = index;	6004	gop.value_ptr.* = index;

src/main.zig+1-1

...	@@ -3481,7 +3481,7 @@ fn buildOutputType(	...	@@ -3481,7 +3481,7 @@ fn buildOutputType(
3481	defer if (!comp_destroyed) comp.destroy();	3481	defer if (!comp_destroyed) comp.destroy();
3482		3482
3483	if (show_builtin) {	3483	if (show_builtin) {
3484	const builtin_mod = comp.root_mod.deps.get("builtin").?;	3484	const builtin_mod = comp.root_mod.getBuiltinDependency();
3485	const source = builtin_mod.builtin_file.?.source;	3485	const source = builtin_mod.builtin_file.?.source;
3486	return std.io.getStdOut().writeAll(source);	3486	return std.io.getStdOut().writeAll(source);
3487	}	3487	}

src/mingw.zig+17-4

...	@@ -41,14 +41,16 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr	...	@@ -41,14 +41,16 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr
41	//"-D_UNICODE",	41	//"-D_UNICODE",
42	//"-DWPRFLAG=1",	42	//"-DWPRFLAG=1",
43	});	43	});
44	return comp.build_crt_file("crt2", .Obj, .@"mingw-w64 crt2.o", prog_node, &.{	44	var files = [_]Compilation.CSourceFile{
45	.{	45	.{
46	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{	46	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
47	"libc", "mingw", "crt", "crtexe.c",	47	"libc", "mingw", "crt", "crtexe.c",
48	}),	48	}),
49	.extra_flags = args.items,	49	.extra_flags = args.items,
		50	.owner = undefined,
50	},	51	},
51	});	52	};
		53	return comp.build_crt_file("crt2", .Obj, .@"mingw-w64 crt2.o", prog_node, &files);
52	},	54	},
53		55
54	.dllcrt2_o => {	56	.dllcrt2_o => {
...	@@ -60,14 +62,16 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr	...	@@ -60,14 +62,16 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr
60	"-U__CRTDLL__",	62	"-U__CRTDLL__",
61	"-D__MSVCRT__",	63	"-D__MSVCRT__",
62	});	64	});
63	return comp.build_crt_file("dllcrt2", .Obj, .@"mingw-w64 dllcrt2.o", prog_node, &.{	65	var files = [_]Compilation.CSourceFile{
64	.{	66	.{
65	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{	67	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
66	"libc", "mingw", "crt", "crtdll.c",	68	"libc", "mingw", "crt", "crtdll.c",
67	}),	69	}),
68	.extra_flags = args.items,	70	.extra_flags = args.items,
		71	.owner = undefined,
69	},	72	},
70	});	73	};
		74	return comp.build_crt_file("dllcrt2", .Obj, .@"mingw-w64 dllcrt2.o", prog_node, &files);
71	},	75	},
72		76
73	.mingw32_lib => {	77	.mingw32_lib => {
...	@@ -97,6 +101,7 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr	...	@@ -97,6 +101,7 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr
97	"libc", "mingw", "crt", dep,	101	"libc", "mingw", "crt", dep,
98	}),	102	}),
99	.extra_flags = args.items,	103	.extra_flags = args.items,
		104	.owner = undefined,
100	};	105	};
101	}	106	}
102	return comp.build_crt_file("mingw32", .Lib, .@"mingw-w64 mingw32.lib", prog_node, &c_source_files);	107	return comp.build_crt_file("mingw32", .Lib, .@"mingw-w64 mingw32.lib", prog_node, &c_source_files);
...	@@ -125,6 +130,7 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr	...	@@ -125,6 +130,7 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr
125	(try c_source_files.addOne()).* = .{	130	(try c_source_files.addOne()).* = .{
126	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libc", "mingw", dep }),	131	.src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libc", "mingw", dep }),
127	.extra_flags = extra_flags,	132	.extra_flags = extra_flags,
		133	.owner = undefined,
128	};	134	};
129	}	135	}
130	if (comp.getTarget().cpu.arch == .x86) {	136	if (comp.getTarget().cpu.arch == .x86) {
...	@@ -134,6 +140,7 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr	...	@@ -134,6 +140,7 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr
134	"libc", "mingw", dep,	140	"libc", "mingw", dep,
135	}),	141	}),
136	.extra_flags = extra_flags,	142	.extra_flags = extra_flags,
		143	.owner = undefined,
137	};	144	};
138	}	145	}
139	} else {	146	} else {
...	@@ -143,6 +150,7 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr	...	@@ -143,6 +150,7 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr
143	"libc", "mingw", dep,	150	"libc", "mingw", dep,
144	}),	151	}),
145	.extra_flags = extra_flags,	152	.extra_flags = extra_flags,
		153	.owner = undefined,
146	};	154	};
147	}	155	}
148	}	156	}
...	@@ -175,6 +183,7 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr	...	@@ -175,6 +183,7 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr
175	"libc", "mingw", dep,	183	"libc", "mingw", dep,
176	}),	184	}),
177	.extra_flags = extra_flags,	185	.extra_flags = extra_flags,
		186	.owner = undefined,
178	};	187	};
179	}	188	}
180	const target = comp.getTarget();	189	const target = comp.getTarget();
...	@@ -185,6 +194,7 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr	...	@@ -185,6 +194,7 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr
185	"libc", "mingw", dep,	194	"libc", "mingw", dep,
186	}),	195	}),
187	.extra_flags = extra_flags,	196	.extra_flags = extra_flags,
		197	.owner = undefined,
188	};	198	};
189	}	199	}
190	} else if (target.cpu.arch.isARM()) {	200	} else if (target.cpu.arch.isARM()) {
...	@@ -194,6 +204,7 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr	...	@@ -194,6 +204,7 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr
194	"libc", "mingw", dep,	204	"libc", "mingw", dep,
195	}),	205	}),
196	.extra_flags = extra_flags,	206	.extra_flags = extra_flags,
		207	.owner = undefined,
197	};	208	};
198	}	209	}
199	} else if (target.cpu.arch.isAARCH64()) {	210	} else if (target.cpu.arch.isAARCH64()) {
...	@@ -203,6 +214,7 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr	...	@@ -203,6 +214,7 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr
203	"libc", "mingw", dep,	214	"libc", "mingw", dep,
204	}),	215	}),
205	.extra_flags = extra_flags,	216	.extra_flags = extra_flags,
		217	.owner = undefined,
206	};	218	};
207	}	219	}
208	} else {	220	} else {
...	@@ -238,6 +250,7 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr	...	@@ -238,6 +250,7 @@ pub fn buildCRTFile(comp: Compilation, crt_file: CRTFile, prog_node: std.Progr
238	"libc", "mingw", "libsrc", dep,	250	"libc", "mingw", "libsrc", dep,
239	}),	251	}),
240	.extra_flags = extra_flags,	252	.extra_flags = extra_flags,
		253	.owner = undefined,
241	};	254	};
242	}	255	}
243	return comp.build_crt_file("uuid", .Lib, .@"mingw-w64 uuid.lib", prog_node, &c_source_files);	256	return comp.build_crt_file("uuid", .Lib, .@"mingw-w64 uuid.lib", prog_node, &c_source_files);

src/musl.zig+26-13

 @@ -34,12 +34,14 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
             try args.appendSlice(&[_][]const u8{
                 "-Qunused-arguments",
             });
-            return comp.build_crt_file("crti", .Obj, .@"musl crti.o", prog_node, &.{
+            var files = [_]Compilation.CSourceFile{
                 .{
                     .src_path = try start_asm_path(comp, arena, "crti.s"),
                     .extra_flags = args.items,
+                    .owner = undefined,
                 },
-            });
+            };
+            return comp.build_crt_file("crti", .Obj, .@"musl crti.o", prog_node, &files);
         },
         .crtn_o => {
             var args = std.ArrayList([]const u8).init(arena);
 @@ -47,12 +49,14 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
             try args.appendSlice(&[_][]const u8{
                 "-Qunused-arguments",
             });
-            return comp.build_crt_file("crtn", .Obj, .@"musl crtn.o", prog_node, &.{
+            var files = [_]Compilation.CSourceFile{
                 .{
                     .src_path = try start_asm_path(comp, arena, "crtn.s"),
                     .extra_flags = args.items,
+                    .owner = undefined,
                 },
-            });
+            };
+            return comp.build_crt_file("crtn", .Obj, .@"musl crtn.o", prog_node, &files);
         },
         .crt1_o => {
             var args = std.ArrayList([]const u8).init(arena);
 @@ -61,14 +65,16 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                 "-fno-stack-protector",
                 "-DCRT",
             });
-            return comp.build_crt_file("crt1", .Obj, .@"musl crt1.o", prog_node, &.{
+            var files = [_]Compilation.CSourceFile{
                 .{
                     .src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
                         "libc", "musl", "crt", "crt1.c",
                     }),
                     .extra_flags = args.items,
+                    .owner = undefined,
                 },
-            });
+            };
+            return comp.build_crt_file("crt1", .Obj, .@"musl crt1.o", prog_node, &files);
         },
         .rcrt1_o => {
             var args = std.ArrayList([]const u8).init(arena);
 @@ -78,14 +84,16 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                 "-fno-stack-protector",
                 "-DCRT",
             });
-            return comp.build_crt_file("rcrt1", .Obj, .@"musl rcrt1.o", prog_node, &.{
+            var files = [_]Compilation.CSourceFile{
                 .{
                     .src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
                         "libc", "musl", "crt", "rcrt1.c",
                     }),
                     .extra_flags = args.items,
+                    .owner = undefined,
                 },
-            });
+            };
+            return comp.build_crt_file("rcrt1", .Obj, .@"musl rcrt1.o", prog_node, &files);
         },
         .scrt1_o => {
             var args = std.ArrayList([]const u8).init(arena);
 @@ -95,14 +103,16 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                 "-fno-stack-protector",
                 "-DCRT",
             });
-            return comp.build_crt_file("Scrt1", .Obj, .@"musl Scrt1.o", prog_node, &.{
+            var files = [_]Compilation.CSourceFile{
                 .{
                     .src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
                         "libc", "musl", "crt", "Scrt1.c",
                     }),
                     .extra_flags = args.items,
+                    .owner = undefined,
                 },
-            });
+            };
+            return comp.build_crt_file("Scrt1", .Obj, .@"musl Scrt1.o", prog_node, &files);
         },
         .libc_a => {
             // When there is a src/<arch>/foo.* then it should substitute for src/foo.*
 @@ -186,6 +196,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                 c_source_file.* = .{
                     .src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libc", src_file }),
                     .extra_flags = args.items,
+                    .owner = undefined,
                 };
             }
             return comp.build_crt_file("c", .Lib, .@"musl libc.a", prog_node, c_source_files.items);
 @@ -235,7 +246,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                     .structured_cfg = comp.root_mod.structured_cfg,
                 },
                 .global = config,
-                .cc_argv = &.{},
+                .cc_argv = cc_argv,
                 .parent = null,
                 .builtin_mod = null,
             });
 @@ -261,9 +272,11 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                 .verbose_llvm_cpu_features = comp.verbose_llvm_cpu_features,
                 .clang_passthrough_mode = comp.clang_passthrough_mode,
                 .c_source_files = &[_]Compilation.CSourceFile{
-                    .{ .src_path = try comp.zig_lib_directory.join(arena, &.{ "libc", "musl", "libc.S" }) },
+                    .{
+                        .src_path = try comp.zig_lib_directory.join(arena, &.{ "libc", "musl", "libc.S" }),
+                        .owner = root_mod,
+                    },
                 },
-                .cc_argv = cc_argv,
                 .skip_linker_dependencies = true,
                 .soname = "libc.so",
             });

src/wasi_libc.zig+16-4

 @@ -74,27 +74,31 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
             var args = std.ArrayList([]const u8).init(arena);
             try addCCArgs(comp, arena, &args, .{});
             try addLibcBottomHalfIncludes(comp, arena, &args);
-            return comp.build_crt_file("crt1-reactor", .Obj, .@"wasi crt1-reactor.o", prog_node, &.{
+            var files = [_]Compilation.CSourceFile{
                 .{
                     .src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
                         "libc", try sanitize(arena, crt1_reactor_src_file),
                     }),
                     .extra_flags = args.items,
+                    .owner = undefined,
                 },
-            });
+            };
+            return comp.build_crt_file("crt1-reactor", .Obj, .@"wasi crt1-reactor.o", prog_node, &files);
         },
         .crt1_command_o => {
             var args = std.ArrayList([]const u8).init(arena);
             try addCCArgs(comp, arena, &args, .{});
             try addLibcBottomHalfIncludes(comp, arena, &args);
-            return comp.build_crt_file("crt1-command", .Obj, .@"wasi crt1-command.o", prog_node, &.{
+            var files = [_]Compilation.CSourceFile{
                 .{
                     .src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{
                         "libc", try sanitize(arena, crt1_command_src_file),
                     }),
                     .extra_flags = args.items,
+                    .owner = undefined,
                 },
-            });
+            };
+            return comp.build_crt_file("crt1-command", .Obj, .@"wasi crt1-command.o", prog_node, &files);
         },
         .libc_a => {
             var libc_sources = std.ArrayList(Compilation.CSourceFile).init(arena);
 @@ -109,6 +113,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                             "libc", try sanitize(arena, file_path),
                         }),
                         .extra_flags = args.items,
+                        .owner = undefined,
                     });
                 }
             }
 @@ -125,6 +130,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                             "libc", try sanitize(arena, file_path),
                         }),
                         .extra_flags = args.items,
+                        .owner = undefined,
                     });
                 }
             }
 @@ -141,6 +147,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                             "libc", try sanitize(arena, file_path),
                         }),
                         .extra_flags = args.items,
+                        .owner = undefined,
                     });
                 }
             }
 @@ -159,6 +166,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                         "libc", try sanitize(arena, file_path),
                     }),
                     .extra_flags = args.items,
+                    .owner = undefined,
                 });
             }
             try comp.build_crt_file("wasi-emulated-process-clocks", .Lib, .@"libwasi-emulated-process-clocks.a", prog_node, emu_clocks_sources.items);
 @@ -175,6 +183,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                         "libc", try sanitize(arena, file_path),
                     }),
                     .extra_flags = args.items,
+                    .owner = undefined,
                 });
             }
             try comp.build_crt_file("wasi-emulated-getpid", .Lib, .@"libwasi-emulated-getpid.a", prog_node, emu_getpid_sources.items);
 @@ -191,6 +200,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                         "libc", try sanitize(arena, file_path),
                     }),
                     .extra_flags = args.items,
+                    .owner = undefined,
                 });
             }
             try comp.build_crt_file("wasi-emulated-mman", .Lib, .@"libwasi-emulated-mman.a", prog_node, emu_mman_sources.items);
 @@ -208,6 +218,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                             "libc", try sanitize(arena, file_path),
                         }),
                         .extra_flags = args.items,
+                        .owner = undefined,
                     });
                 }
             }
 @@ -224,6 +235,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
                             "libc", try sanitize(arena, file_path),
                         }),
                         .extra_flags = args.items,
+                        .owner = undefined,
                     });
                 }
             }

author	Andrew Kelley <andrew@ziglang.org> 2023-12-16 15:22:31-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2024-01-01 17:51:20-07:00
log	f2564318385ea90b08af044ae32ddef26e6346bd
tree	acb36d3268bace51f780a872f40b04da092591de
parent	57afdfc8fae667e69850650ebb8606805d0d2272

fix compilation errors when enabling llvm