| author |  Jakub Konka <kubkon@jakubkonka.com> 2023-09-13 20:11:23+02:00 |
| committer | Jakub Konka <kubkon@jakubkonka.com> 2023-09-13 21:51:43+02:00 |
| log | d37cb6062163e45bee8d95890a2f94fb477c8547 |
| tree | f3db809b5f41bb741301748ae69dba2a281d916c |
| parent | ce88df497c096f5a35200d975de855ba4502a4d8 |
elf: re-enable linking compiler_rt
2 files changed, 4 insertions(+), 5 deletions(-)
src/link/Elf.zig+3-4
| ... | @@ -1082,10 +1082,9 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node | ... | @@ -1082,10 +1082,9 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node |
| 1082 | if (comp.compiler_rt_obj) |x| break :blk x.full_object_path; | 1082 | if (comp.compiler_rt_obj) |x| break :blk x.full_object_path; |
| 1083 | break :blk null; | 1083 | break :blk null; |
| 1084 | }; | 1084 | }; |
| 1085 | _ = compiler_rt_path; | 1085 | if (compiler_rt_path) |path| { |
| 1086 | // if (compiler_rt_path) |path| { | 1086 | try positionals.append(.{ .path = path }); |
| 1087 | // try positionals.append(.{ .path = path }); | 1087 | } |
| 1088 | // } | ||
| 1089 | 1088 | ||
| 1090 | for (positionals.items) |obj| { | 1089 | for (positionals.items) |obj| { |
| 1091 | const in_file = try std.fs.cwd().openFile(obj.path, .{}); | 1090 | const in_file = try std.fs.cwd().openFile(obj.path, .{}); |
src/link/Elf/file.zig+1-1
| ... | @@ -84,7 +84,7 @@ pub const File = union(enum) { | ... | @@ -84,7 +84,7 @@ pub const File = union(enum) { |
| 84 | 84 | ||
| 85 | pub fn markLive(file: File, elf_file: *Elf) void { | 85 | pub fn markLive(file: File, elf_file: *Elf) void { |
| 86 | switch (file) { | 86 | switch (file) { |
| 87 | .zig_module, .linker_defined => {}, | 87 | .zig_module, .linker_defined => unreachable, |
| 88 | inline else => |x| x.markLive(elf_file), | 88 | inline else => |x| x.markLive(elf_file), |
| 89 | } | 89 | } |
| 90 | } | 90 | } |