mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-07 23:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9122 from ziglang/zld-proxies

Browse Source 
zld: clean up stubs resolution, error messages and use ld64 defaults for system libs resolution
This commit is contained in:
Jakub Konka 2021-06-15 14:55:12 +02:00 committed by GitHub
commit 0f4173c5d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/link/MachO.zig
View File

@ -758,10 +758,11 @@ fn linkWithLLD(self: *MachO, comp: *Compilation) !void {
}
}
// Search for static libraries first, then dynamic libraries.
// TODO Respect flags such as -search_paths_first to the linker.
// Assume ld64 default: -search_paths_first
// Look in each directory for a dylib (tbd), and then for archive
// TODO implement alternative: -search_dylibs_first
// TODO text-based API, or .tbd files.
const exts = &[_][]const u8{ "a", "dylib" };
const exts = &[_][]const u8{ "dylib", "a" };
for (search_lib_names.items) |l_name| {
var found = false;

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

@ -1891,7 +1891,6 @@ fn resolveStubsAndGotEntries(self: *Zld) !void {
const relocs = sect.relocs orelse continue;
for (relocs) |rel| {
switch (rel.@"type") {
.unsigned => continue,
.got_page, .got_page_off, .got_load, .got, .pointer_to_got => {
const sym = rel.target.symbol.getTopmostAlias();
if (sym.got_index != null) continue;
@ -2025,12 +2024,9 @@ fn resolveRelocsAndWriteSections(self: *Zld) !void {
const got = dc_seg.sections.items[self.got_section_index.?];
const final = rel.target.symbol.getTopmostAlias();
const got_index = final.got_index orelse {
// TODO remove this when we can link against TAPI files.
log.err("undefined reference to symbol '{s}'", .{final.name});
log.err(" | referenced in {s}", .{
rel.target.symbol.cast(Symbol.Unresolved).?.file.name.?,
});
return error.UndefinedSymbolReference;
log.err("expected GOT index relocating symbol '{s}'", .{final.name});
log.err("this is an internal linker error", .{});
return error.FailedToResolveRelocationTarget;
};
args.target_addr = got.addr + got_index * @sizeOf(u64);
},
@ -2099,16 +2095,14 @@ fn relocTargetAddr(self: *Zld, object: *const Object, target: reloc.Relocation.T
const segment = self.load_commands.items[self.text_segment_cmd_index.?].Segment;
const stubs = segment.sections.items[self.stubs_section_index.?];
const stubs_index = proxy.base.stubs_index orelse {
// TODO remove this when we can link against TAPI files.
log.err("undefined reference to symbol '{s}'", .{final.name});
log.err(" | referenced in {s}", .{
sym.cast(Symbol.Unresolved).?.file.name.?,
});
return error.UndefinedSymbolReference;
log.err("expected stubs index when relocating symbol '{s}'", .{final.name});
log.err("this is an internal linker error", .{});
return error.FailedToResolveRelocationTarget;
};
break :blk stubs.addr + stubs_index * stubs.reserved2;
} else {
log.err("failed to resolve symbol '{s}' as a relocation target", .{sym.name});
log.err("this is an internal linker error", .{});
return error.FailedToResolveRelocationTarget;
}
},