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: annotate weak imports when linking with weak lib/framework

Browse Source
This commit is contained in:
Jakub Konka 2022-06-28 09:12:43 +02:00
parent f353b59efa
commit cd5dcfbf41
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/link/MachO.zig
View File

@ -3117,6 +3117,10 @@ fn resolveSymbolsInDylibs(self: *MachO) !void {
undef.n_type |= macho.N_EXT; undef.n_type |= macho.N_EXT;
undef.n_desc = @intCast(u16, ordinal + 1) * macho.N_SYMBOL_RESOLVER; undef.n_desc = @intCast(u16, ordinal + 1) * macho.N_SYMBOL_RESOLVER;
if (dylib.weak) {
undef.n_desc |= macho.N_WEAK_REF;
}
if (self.unresolved.fetchSwapRemove(resolv.where_index)) |entry| outer_blk: { if (self.unresolved.fetchSwapRemove(resolv.where_index)) |entry| outer_blk: {
switch (entry.value) { switch (entry.value) {
.none => {}, .none => {},
@ -5806,11 +5810,16 @@ fn writeDyldInfoData(self: *MachO) !void {
}, },
.undef => { .undef => {
const bind_sym = self.undefs.items[resolv.where_index]; const bind_sym = self.undefs.items[resolv.where_index];
var flags: u4 = 0;
if (bind_sym.weakRef()) {
flags |= @truncate(u4, macho.BIND_SYMBOL_FLAGS_WEAK_IMPORT);
}
try bind_pointers.append(.{ try bind_pointers.append(.{
.offset = binding.offset + base_offset, .offset = binding.offset + base_offset,
.segment_id = match.seg, .segment_id = match.seg,
.dylib_ordinal = @divExact(@bitCast(i16, bind_sym.n_desc), macho.N_SYMBOL_RESOLVER), .dylib_ordinal = @divTrunc(@bitCast(i16, bind_sym.n_desc), macho.N_SYMBOL_RESOLVER),
.name = self.getString(bind_sym.n_strx), .name = self.getString(bind_sym.n_strx),
.bind_flags = flags,
}); });
}, },
} }
@ -5828,11 +5837,16 @@ fn writeDyldInfoData(self: *MachO) !void {
}, },
.undef => { .undef => {
const bind_sym = self.undefs.items[resolv.where_index]; const bind_sym = self.undefs.items[resolv.where_index];
var flags: u4 = 0;
if (bind_sym.weakRef()) {
flags |= @truncate(u4, macho.BIND_SYMBOL_FLAGS_WEAK_IMPORT);
}
try lazy_bind_pointers.append(.{ try lazy_bind_pointers.append(.{
.offset = binding.offset + base_offset, .offset = binding.offset + base_offset,
.segment_id = match.seg, .segment_id = match.seg,
.dylib_ordinal = @divExact(@bitCast(i16, bind_sym.n_desc), macho.N_SYMBOL_RESOLVER), .dylib_ordinal = @divTrunc(@bitCast(i16, bind_sym.n_desc), macho.N_SYMBOL_RESOLVER),
.name = self.getString(bind_sym.n_strx), .name = self.getString(bind_sym.n_strx),
.bind_flags = flags,
}); });
}, },
} }

5
src/link/MachO/bind.zig
View File

@ -7,6 +7,7 @@ pub const Pointer = struct {
segment_id: u16, segment_id: u16,
dylib_ordinal: ?i64 = null, dylib_ordinal: ?i64 = null,
name: ?[]const u8 = null, name: ?[]const u8 = null,
bind_flags: u4 = 0,
}; };
pub fn rebaseInfoSize(pointers: []const Pointer) !u64 { pub fn rebaseInfoSize(pointers: []const Pointer) !u64 {
@ -73,7 +74,7 @@ pub fn writeBindInfo(pointers: []const Pointer, writer: anytype) !void {
} }
try writer.writeByte(macho.BIND_OPCODE_SET_TYPE_IMM | @truncate(u4, macho.BIND_TYPE_POINTER)); try writer.writeByte(macho.BIND_OPCODE_SET_TYPE_IMM | @truncate(u4, macho.BIND_TYPE_POINTER));
try writer.writeByte(macho.BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM); // TODO Sometimes we might want to add flags. try writer.writeByte(macho.BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM | pointer.bind_flags);
try writer.writeAll(pointer.name.?); try writer.writeAll(pointer.name.?);
try writer.writeByte(0); try writer.writeByte(0);
@ -127,7 +128,7 @@ pub fn writeLazyBindInfo(pointers: []const Pointer, writer: anytype) !void {
try writer.writeByte(macho.BIND_OPCODE_SET_DYLIB_SPECIAL_IMM | @truncate(u4, @bitCast(u64, pointer.dylib_ordinal.?))); try writer.writeByte(macho.BIND_OPCODE_SET_DYLIB_SPECIAL_IMM | @truncate(u4, @bitCast(u64, pointer.dylib_ordinal.?)));
} }
try writer.writeByte(macho.BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM); // TODO Sometimes we might want to add flags. try writer.writeByte(macho.BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM | pointer.bind_flags);
try writer.writeAll(pointer.name.?); try writer.writeAll(pointer.name.?);
try writer.writeByte(0); try writer.writeByte(0);