jimzah/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-27 07:32:44 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

codegen: fix rebase gone wrong

Browse Source
This commit is contained in:
Jakub Konka 2024-08-17 08:31:16 +02:00
parent 96441bd829
commit df9ac485da
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/codegen.zig
View File

@ -911,14 +911,14 @@ fn genNavRef(
if (is_extern) { if (is_extern) {
const sym_index = try macho_file.getGlobalSymbol(name.toSlice(ip), lib_name.toSlice(ip)); const sym_index = try macho_file.getGlobalSymbol(name.toSlice(ip), lib_name.toSlice(ip));
zo.symbols.items[sym_index].flags.is_extern_ptr = true; zo.symbols.items[sym_index].flags.is_extern_ptr = true;
return GenResult.mcv(.{ .lea_symbol = sym_index }); return .{ .mcv = .{ .lea_symbol = sym_index } };
} }
const sym_index = try zo.getOrCreateMetadataForNav(macho_file, nav_index); const sym_index = try zo.getOrCreateMetadataForNav(macho_file, nav_index);
const sym = zo.symbols.items[sym_index]; const sym = zo.symbols.items[sym_index];
if (!single_threaded and is_threadlocal) { if (!single_threaded and is_threadlocal) {
return .{ .mcv = .{ .load_tlv = sym.nlist_idx } }; return .{ .mcv = .{ .load_tlv = sym.nlist_idx } };
} }
return GenResult.mcv(.{ .lea_symbol = sym.nlist_idx }); return .{ .mcv = .{ .lea_symbol = sym.nlist_idx } };
} else if (lf.cast(.coff)) |coff_file| { } else if (lf.cast(.coff)) |coff_file| {
if (is_extern) { if (is_extern) {
// TODO audit this // TODO audit this