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

macho: handle weird case of entrypoint being a stub

Browse Source
This commit is contained in:
Jakub Konka 2023-03-31 22:39:41 +02:00
parent f2587de4e9
commit 6f83a741d8
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/link/MachO/ZldAtom.zig
View File

@ -389,7 +389,7 @@ pub fn addGotEntry(zld: *Zld, target: SymbolWithLoc) !void {
try zld.got_table.putNoClobber(gpa, target, got_index);
}
fn addStub(zld: *Zld, target: SymbolWithLoc) !void {
pub fn addStub(zld: *Zld, target: SymbolWithLoc) !void {
const target_sym = zld.getSymbol(target);
if (!target_sym.undf()) return;
if (zld.stubs_table.contains(target)) return;

22
src/link/MachO/zld.zig
View File

@ -4042,6 +4042,16 @@ pub fn linkWithZld(macho_file: *MachO, comp: *Compilation, prog_node: *std.Progr
try zld.createTentativeDefAtoms();
try zld.createStubHelperPreambleAtom();
if (zld.options.output_mode == .Exe) {
const global = zld.getEntryPoint();
if (zld.getSymbol(global).undf()) {
// We do one additional check here in case the entry point was found in one of the dylibs.
// (I actually have no idea what this would imply but it is a possible outcome and so we
// support it.)
try Atom.addStub(&zld, global);
}
}
for (zld.objects.items) |object| {
for (object.atoms.items) |atom_index| {
const atom = zld.getAtom(atom_index);
@ -4153,8 +4163,18 @@ pub fn linkWithZld(macho_file: *MachO, comp: *Compilation, prog_node: *std.Progr
const seg = zld.segments.items[seg_id];
const global = zld.getEntryPoint();
const sym = zld.getSymbol(global);
const addr: u64 = if (sym.undf()) blk: {
// In this case, the symbol has been resolved in one of dylibs and so we point
// to the stub as its vmaddr value.
const stub_atom_index = zld.getStubsAtomIndexForSymbol(global).?;
const stub_atom = zld.getAtom(stub_atom_index);
const stub_sym = zld.getSymbol(stub_atom.getSymbolWithLoc());
break :blk stub_sym.n_value;
} else sym.n_value;
try lc_writer.writeStruct(macho.entry_point_command{
.entryoff = @intCast(u32, sym.n_value - seg.vmaddr),
.entryoff = @intCast(u32, addr - seg.vmaddr),
.stacksize = options.stack_size_override orelse 0,
});
} else {