mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-09 11:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

elf+aarch64: handle TLSDESC non-relaxed

Browse Source
This commit is contained in:
Jakub Konka 2024-03-08 14:20:35 +01:00
parent 109d2321b0
commit 310cef0972
2 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/link/Elf.zig
View File

@ -2105,7 +2105,6 @@ fn scanRelocs(self: *Elf) !void {
}
if (sym.flags.needs_tlsdesc) {
log.debug("'{s}' needs TLSDESC", .{sym.name(self)});
try self.dynsym.addSymbol(index, self);
try self.got.addTlsDescSymbol(index, self);
}
}
@ -4497,7 +4496,7 @@ fn writeAtoms(self: *Elf) !void {
const buffer = try gpa.alloc(u8, sh_size);
defer gpa.free(buffer);
const padding_byte: u8 = if (shdr.sh_type == elf.SHT_PROGBITS and
shdr.sh_flags & elf.SHF_EXECINSTR != 0)
shdr.sh_flags & elf.SHF_EXECINSTR != 0 and self.getTarget().cpu.arch == .x86_64)
0xcc // int3
else
0;

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

@ -1622,6 +1622,22 @@ const aarch64 = struct {
}
},
.TLSLE_ADD_TPREL_HI12,
.TLSLE_ADD_TPREL_LO12_NC,
=> {
if (is_dyn_lib) try atom.reportPicError(symbol, rel, elf_file);
},
.TLSDESC_ADR_PAGE21,
.TLSDESC_LD64_LO12,
.TLSDESC_ADD_LO12,
=> {
const should_relax = elf_file.base.isStatic() or (!is_dyn_lib and !symbol.flags.import);
if (!should_relax and true) { // TODO
symbol.flags.needs_tlsdesc = true;
}
},
.ADD_ABS_LO12_NC,
.ADR_PREL_LO21,
.LDST8_ABS_LO12_NC,
@ -1629,14 +1645,9 @@ const aarch64 = struct {
.LDST32_ABS_LO12_NC,
.LDST64_ABS_LO12_NC,
.LDST128_ABS_LO12_NC,
.TLSDESC_CALL,
=> {},
.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),
}
}
@ -1757,6 +1768,36 @@ const aarch64 = struct {
aarch64_util.writeAddImmInst(@bitCast(value), code[rel.r_offset..][0..4]);
},
.TLSDESC_ADR_PAGE21 => {
assert(target.flags.has_tlsdesc); // TODO relax
const S_: i64 = @intCast(target.tlsDescAddress(elf_file));
const saddr: u64 = @intCast(P);
const taddr: u64 = @intCast(S_ + A);
relocs_log.debug(" [{x} => {x}]", .{ P, taddr });
const pages: u21 = @bitCast(try aarch64_util.calcNumberOfPages(saddr, taddr));
aarch64_util.writeAdrpInst(pages, code[rel.r_offset..][0..4]);
},
.TLSDESC_LD64_LO12 => {
const S_: i64 = @intCast(target.tlsDescAddress(elf_file));
const taddr: u64 = @intCast(S_ + A);
relocs_log.debug(" [{x} => {x}]", .{ P, taddr });
const offset: u12 = try math.divExact(u12, @truncate(taddr), 8);
aarch64_util.writeLoadStoreRegInst(offset, code[rel.r_offset..][0..4]);
},
.TLSDESC_ADD_LO12 => {
const S_: i64 = @intCast(target.tlsDescAddress(elf_file));
const taddr: u64 = @intCast(S_ + A);
relocs_log.debug(" [{x} => {x}]", .{ P, taddr });
const offset: u12 = @truncate(taddr);
aarch64_util.writeAddImmInst(offset, code[rel.r_offset..][0..4]);
},
.TLSDESC_CALL => if (!target.flags.has_tlsdesc) {
mem.writeInt(u32, code[rel.r_offset..][0..4], aarch64_util.Instruction.nop().toU32(), .little);
},
else => try atom.reportUnhandledRelocError(rel, elf_file),
}
}