mirror of
https://github.com/ziglang/zig.git
synced 2024-11-27 15:42:49 +00:00
codegen: fix rebase gone wrong
This commit is contained in:
parent
96441bd829
commit
df9ac485da
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user