mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-13 02:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

macho: fix stub writing in self-hosted setting

Browse Source
This commit is contained in:
Jakub Konka 2021-08-26 13:45:28 +02:00
parent d19d3342c2
commit 432fb7054d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/link/MachO.zig
View File

@ -2626,11 +2626,12 @@ fn resolveSymbols(self: *MachO) !void {
undef.n_type |= macho.N_EXT;
undef.n_desc = @intCast(u16, ordinal + 1) * macho.N_SYMBOL_RESOLVER;
if (self.unresolved.fetchSwapRemove(resolv.where_index)) |entry| {
if (self.unresolved.fetchSwapRemove(resolv.where_index)) |entry| outer_blk: {
switch (entry.value) {
.none => {},
.got => return error.TODOGotHint,
.stub => {
if (self.stubs_map.contains(resolv.where_index)) break :outer_blk;
const stub_helper_atom = blk: {
const atom = try self.createStubHelperAtom();
const match = MatchingSection{
@ -2654,7 +2655,7 @@ fn resolveSymbols(self: *MachO) !void {
try self.writeAtom(atom, match);
break :blk atom;
};
{
const stub_atom = blk: {
const atom = try self.createStubAtom(laptr_atom.local_sym_index);
const match = MatchingSection{
.seg = self.text_segment_cmd_index.?,
@ -2662,7 +2663,9 @@ fn resolveSymbols(self: *MachO) !void {
};
_ = try self.allocateAtom(atom, match);
try self.writeAtom(atom, match);
}
break :blk atom;
};
try self.stubs_map.putNoClobber(self.base.allocator, resolv.where_index, stub_atom);
},
}
}