diff options
| author | Jakub Konka <kubkon@jakubkonka.com> | 2023-10-17 17:36:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-17 17:36:40 +0200 |
| commit | eb5276c94eaab238551fdae9a2e77b0133e31cfb (patch) | |
| tree | a8040cc914bb1db73b2484087cf81d5f20bab28c /src/arch/arm/CodeGen.zig | |
| parent | 5039a5db8365413794b0522a51137d3e97d8ba5d (diff) | |
| parent | 742a130ce55ae776372f99b0724c32a462040caf (diff) | |
| download | zig-eb5276c94eaab238551fdae9a2e77b0133e31cfb.tar.gz zig-eb5276c94eaab238551fdae9a2e77b0133e31cfb.zip | |
Merge pull request #17556 from ziglang/elf-link-zig-proper
elf: port 99% of zld ELF linker to Zig proper
Diffstat (limited to 'src/arch/arm/CodeGen.zig')
| -rw-r--r-- | src/arch/arm/CodeGen.zig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/arch/arm/CodeGen.zig b/src/arch/arm/CodeGen.zig index 5afb944474..a7c437bb59 100644 --- a/src/arch/arm/CodeGen.zig +++ b/src/arch/arm/CodeGen.zig @@ -4304,8 +4304,8 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier if (self.bin_file.cast(link.File.Elf)) |elf_file| { const sym_index = try elf_file.getOrCreateMetadataForDecl(func.owner_decl); const sym = elf_file.symbol(sym_index); - _ = try sym.getOrCreateGotEntry(sym_index, elf_file); - const got_addr = @as(u32, @intCast(sym.gotAddress(elf_file))); + _ = try sym.getOrCreateZigGotEntry(sym_index, elf_file); + const got_addr = @as(u32, @intCast(sym.zigGotAddress(elf_file))); try self.genSetReg(Type.usize, .lr, .{ .memory = got_addr }); } else if (self.bin_file.cast(link.File.MachO)) |_| { unreachable; // unsupported architecture for MachO @@ -6135,7 +6135,7 @@ fn genTypedValue(self: *Self, arg_tv: TypedValue) InnerError!MCValue { .mcv => |mcv| switch (mcv) { .none => .none, .undef => .undef, - .load_got, .load_direct, .load_tlv => unreachable, // TODO + .load_got, .load_extern_got, .load_direct, .load_tlv => unreachable, // TODO .immediate => |imm| .{ .immediate = @as(u32, @truncate(imm)) }, .memory => |addr| .{ .memory = addr }, }, |