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

macho: re-enable calculating num of relocs for ZigObject

Browse Source
This commit is contained in:
Jakub Konka 2024-07-12 15:35:01 +02:00
parent 2579c55d49
commit cba04ff244
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/link/MachO/ZigObject.zig
View File

@ -433,6 +433,16 @@ pub fn resolveRelocs(self: *ZigObject, macho_file: *MachO) !void {
if (has_error) return error.ResolveFailed;
}
pub fn calcNumRelocs(self: *ZigObject, macho_file: *MachO) void {
for (self.getAtoms()) |atom_index| {
const atom = self.getAtom(atom_index) orelse continue;
if (!atom.flags.alive) continue;
if (!macho_file.isZigSection(atom.out_n_sect) and !macho_file.isDebugSection(atom.out_n_sect)) continue;
const header = &macho_file.sections.items(.header)[atom.out_n_sect];
header.nreloc += atom.calcNumRelocs(macho_file);
}
}
pub fn calcSymtabSize(self: *ZigObject, macho_file: *MachO) void {
const tracy = trace(@src());
defer tracy.end();

20
src/link/MachO/relocatable.zig
View File

@ -369,6 +369,11 @@ fn calcSectionSizes(macho_file: *MachO) !void {
calcSectionSize(macho_file, @intCast(i));
}
if (macho_file.getZigObject()) |zo| {
// TODO this will create a race
zo.calcNumRelocs(macho_file);
}
if (macho_file.eh_frame_sect_index) |_| {
try calcEhFrameSize(macho_file);
}
@ -382,19 +387,10 @@ fn calcSectionSizes(macho_file: *MachO) !void {
try macho_file.data_in_code.updateSize(macho_file);
calcCompactUnwindSize(macho_file);
if (macho_file.unwind_info_sect_index) |_| {
calcCompactUnwindSize(macho_file);
}
calcSymtabSize(macho_file);
// TODO
// if (macho_file.getZigObject()) |zo| {
// for (zo.atoms.items) |atom_index| {
// const atom = macho_file.getAtom(atom_index) orelse continue;
// if (!atom.flags.alive) continue;
// const header = &macho_file.sections.items(.header)[atom.out_n_sect];
// if (!macho_file.isZigSection(atom.out_n_sect) and !macho_file.isDebugSection(atom.out_n_sect)) continue;
// header.nreloc += atom.calcNumRelocs(macho_file);
// }
// }
}
fn calcSectionSize(macho_file: *MachO, sect_id: u8) void {