motiejus/zig
1
Fork 0
Code Releases Activity

macho: when adding extern fn, check if already resolved

Browse Source 
This way, we will generate valid relocation info in the codegen.
This commit is contained in:
Jakub Konka
2021-09-15 13:15:15 +02:00
parent 0395b35cee
commit 25416d8121
2 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/codegen.zig
View File

@@ -2840,7 +2840,7 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
}
} else if (func_value.castTag(.extern_fn)) |func_payload| {
const decl = func_payload.data;
const where_index = try macho_file.addExternFn(mem.spanZ(decl.name));
const resolv = try macho_file.addExternFn(mem.spanZ(decl.name));
const offset = blk: {
switch (arch) {
.x86_64 => {
@@ -2861,8 +2861,11 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
// Add relocation to the decl.
try macho_file.active_decl.?.link.macho.relocs.append(self.bin_file.allocator, .{
.offset = offset,
.where = .undef,
.where_index = where_index,
.where = switch (resolv.where) {
.local => .local,
.undef => .undef,
},
.where_index = resolv.where_index,
.payload = .{ .branch = .{
.arch = arch,
} },