mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-19 22:05:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

macho: minor fixes and sanitize input *_zig segment/sections names

Browse Source
This commit is contained in:
Jakub Konka 2024-02-02 23:42:38 +01:00
parent 9fc1685c1c
commit dc6db3b309
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/link/MachO/Atom.zig
View File

@ -119,9 +119,19 @@ pub fn getThunk(self: Atom, macho_file: *MachO) *Thunk {
pub fn initOutputSection(sect: macho.section_64, macho_file: *MachO) !u8 {
const segname, const sectname, const flags = blk: {
// Sanitize names produced by Zig self-hosted backends.
// TODO perhaps we simply should emit different names instead?
const segname = if (mem.indexOf(u8, sect.segName(), "_ZIG")) |idx|
sect.segName()[0..idx]
else
sect.segName();
const sectname = if (mem.indexOf(u8, sect.sectName(), "_zig")) |idx|
sect.sectName()[0..idx]
else
sect.sectName();
if (sect.isCode()) break :blk .{
"__TEXT",
sect.sectName(),
sectname,
macho.S_REGULAR | macho.S_ATTR_PURE_INSTRUCTIONS | macho.S_ATTR_SOME_INSTRUCTIONS,
};
@ -132,15 +142,15 @@ pub fn initOutputSection(sect: macho.section_64, macho_file: *MachO) !u8 {
=> break :blk .{ "__TEXT", "__const", macho.S_REGULAR },
macho.S_CSTRING_LITERALS => {
if (mem.startsWith(u8, sect.sectName(), "__objc")) break :blk .{
sect.segName(), sect.sectName(), macho.S_REGULAR,
if (mem.startsWith(u8, sectname, "__objc")) break :blk .{
segname, sectname, macho.S_REGULAR,
};
break :blk .{ "__TEXT", "__cstring", macho.S_CSTRING_LITERALS };
},
macho.S_MOD_INIT_FUNC_POINTERS,
macho.S_MOD_TERM_FUNC_POINTERS,
=> break :blk .{ "__DATA_CONST", sect.sectName(), sect.flags },
=> break :blk .{ "__DATA_CONST", sectname, sect.flags },
macho.S_LITERAL_POINTERS,
macho.S_ZEROFILL,
@ -149,17 +159,15 @@ pub fn initOutputSection(sect: macho.section_64, macho_file: *MachO) !u8 {
macho.S_THREAD_LOCAL_VARIABLE_POINTERS,
macho.S_THREAD_LOCAL_REGULAR,
macho.S_THREAD_LOCAL_ZEROFILL,
=> break :blk .{ sect.segName(), sect.sectName(), sect.flags },
=> break :blk .{ segname, sectname, sect.flags },
macho.S_COALESCED => break :blk .{
sect.segName(),
sect.sectName(),
segname,
sectname,
macho.S_REGULAR,
},
macho.S_REGULAR => {
const segname = sect.segName();
const sectname = sect.sectName();
if (mem.eql(u8, segname, "__DATA")) {
if (mem.eql(u8, sectname, "__const") or
mem.eql(u8, sectname, "__cfstring") or
@ -173,7 +181,7 @@ pub fn initOutputSection(sect: macho.section_64, macho_file: *MachO) !u8 {
break :blk .{ segname, sectname, sect.flags };
},
else => break :blk .{ sect.segName(), sect.sectName(), sect.flags },
else => break :blk .{ segname, sectname, sect.flags },
}
};
const osec = macho_file.getSectionByName(segname, sectname) orelse try macho_file.addSection(

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

@ -196,8 +196,10 @@ pub fn resolveSymbols(self: *ZigObject, macho_file: *MachO) void {
const atom = macho_file.getAtom(atom_index).?;
break :blk nlist.n_value - atom.getInputAddress(macho_file);
} else nlist.n_value;
const out_n_sect = if (nlist.sect()) macho_file.getAtom(atom_index).?.out_n_sect else 0;
symbol.value = value;
symbol.atom = atom_index;
symbol.out_n_sect = out_n_sect;
symbol.nlist_idx = nlist_idx;
symbol.file = self.index;
symbol.flags.weak = nlist.weakDef();