authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-08-29 15:19:19-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-08-29 15:19:19-07:00
logf52ee1607ab6e055e7e3225ca521a75f7e208364
treefd9cf3836a0e2eeeea72fc3f821992a4163dff38
parentd841d2c27e468017d7191da5b37c917499b5d1d1
parente8edc4cf831229f9acfa07001f385bac7fec89b0

Merge remote-tracking branch 'origin/master' into llvm15

3 files changed, 3 insertions(+), 0 deletions(-)

src/Compilation.zig+1
......@@ -2516,6 +2516,7 @@ fn addNonIncrementalStuffToCacheManifest(comp: *Compilation, man: *Cache.Manifes
25162516 man.hash.addOptionalBytes(comp.bin_file.options.soname);
25172517 man.hash.addOptional(comp.bin_file.options.version);
25182518 link.hashAddSystemLibs(&man.hash, comp.bin_file.options.system_libs);
2519 man.hash.addListOfBytes(comp.bin_file.options.force_undefined_symbols.keys());
25192520 man.hash.addOptional(comp.bin_file.options.allow_shlib_undefined);
25202521 man.hash.add(comp.bin_file.options.bind_global_refs_locally);
25212522 man.hash.add(comp.bin_file.options.tsan);
src/link/Coff.zig+1
......@@ -1032,6 +1032,7 @@ fn linkWithLLD(self: *Coff, comp: *Compilation, prog_node: *std.Progress.Node) !
10321032 }
10331033 }
10341034 link.hashAddSystemLibs(&man.hash, self.base.options.system_libs);
1035 man.hash.addListOfBytes(self.base.options.force_undefined_symbols.keys());
10351036 man.hash.addOptional(self.base.options.subsystem);
10361037 man.hash.add(self.base.options.is_test);
10371038 man.hash.add(self.base.options.tsaware);
src/link/Elf.zig+1
......@@ -1349,6 +1349,7 @@ fn linkWithLLD(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node) !v
13491349 man.hash.addOptionalBytes(self.base.options.soname);
13501350 man.hash.addOptional(self.base.options.version);
13511351 link.hashAddSystemLibs(&man.hash, self.base.options.system_libs);
1352 man.hash.addListOfBytes(self.base.options.force_undefined_symbols.keys());
13521353 man.hash.add(allow_shlib_undefined);
13531354 man.hash.add(self.base.options.bind_global_refs_locally);
13541355 man.hash.add(self.base.options.compress_debug_sections);