mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-12 20:37:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

elf+aarch64: resolve TLS LE model

Browse Source
This commit is contained in:
Jakub Konka 2024-03-07 23:01:06 +01:00
parent 69f9f359dd
commit c1dbf01aa3
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/link/Elf/Atom.zig
View File

@ -1592,6 +1592,8 @@ const aarch64 = struct {
_ = it;
const r_type: elf.R_AARCH64 = @enumFromInt(rel.r_type());
const is_dyn_lib = elf_file.base.isDynLib();
switch (r_type) {
.ABS64 => {
try atom.scanReloc(symbol, rel, dynAbsRelocAction(symbol, elf_file), elf_file);
@ -1629,6 +1631,12 @@ const aarch64 = struct {
.LDST128_ABS_LO12_NC,
=> {},
.TLSLE_ADD_TPREL_HI12,
.TLSLE_ADD_TPREL_LO12_NC,
=> {
if (is_dyn_lib) try atom.reportPicError(symbol, rel, elf_file);
},
else => try atom.reportUnhandledRelocError(rel, elf_file),
}
}
@ -1650,7 +1658,6 @@ const aarch64 = struct {
const cwriter = stream.writer();
const P, const A, const S, const GOT, const G, const TP, const DTP, const ZIG_GOT = args;
_ = TP;
_ = DTP;
_ = ZIG_GOT;
@ -1736,6 +1743,17 @@ const aarch64 = struct {
try aarch64_util.writePageOffset(kind, taddr, code[r_offset..][0..4]);
},
.TLSLE_ADD_TPREL_HI12 => {
const value = math.cast(i12, (S + A - TP) >> 12) orelse
return error.Overflow;
try aarch64_util.writeAddInst(@bitCast(value), code[rel.r_offset..][0..4]);
},
.TLSLE_ADD_TPREL_LO12_NC => {
const value: i12 = @truncate(S + A - TP);
try aarch64_util.writeAddInst(@bitCast(value), code[rel.r_offset..][0..4]);
},
else => try atom.reportUnhandledRelocError(rel, elf_file),
}
}

11
src/link/aarch64.zig
View File

@ -95,6 +95,17 @@ pub fn writeBranchImm(disp: i28, code: *[4]u8) !void {
mem.writeInt(u32, code, inst.toU32(), .little);
}
pub fn writeAddInst(value: u12, code: *[4]u8) !void {
var inst = Instruction{
.add_subtract_immediate = mem.bytesToValue(std.meta.TagPayload(
Instruction,
Instruction.add_subtract_immediate,
), code),
};
inst.add_subtract_immediate.imm12 = value;
mem.writeInt(u32, code, inst.toU32(), .little);
}
const assert = std.debug.assert;
const bits = @import("../arch/aarch64/bits.zig");
const builtin = @import("builtin");