jimzah/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-28 16:12:33 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

macho: -pagezero_size is always in hex

Browse Source 
This matches the behavior of other linkers out there including
`ld64` and `lld`.
This commit is contained in:
Jakub Konka 2022-06-20 14:26:57 +02:00
parent 753e2b8639
commit 8752db3285
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/link/MachO.zig
View File

@ -4377,7 +4377,7 @@ fn populateMissingMetadata(self: *MachO) !void {
if (self.pagezero_segment_cmd_index == null) blk: {
if (aligned_pagezero_vmsize == 0) break :blk;
if (aligned_pagezero_vmsize != pagezero_vmsize) {
log.warn("requested __PAGEZERO size is not page aligned", .{});
log.warn("requested __PAGEZERO size (0x{x}) is not page aligned", .{pagezero_vmsize});
log.warn(" rounding down to 0x{x}", .{aligned_pagezero_vmsize});
}
self.pagezero_segment_cmd_index = @intCast(u16, self.load_commands.items.len);

18
src/main.zig
View File

@ -447,7 +447,7 @@ const usage_build_generic =
\\ -F[dir] (Darwin) add search path for frameworks
\\ -install_name=[value] (Darwin) add dylib's install name
\\ --entitlements [path] (Darwin) add path to entitlements file for embedding in code signature
\\ -pagezero_size [value] (Darwin) size of the __PAGEZERO segment
\\ -pagezero_size [value] (Darwin) size of the __PAGEZERO segment in hexadecimal notation
\\ --import-memory (WebAssembly) import memory from the environment
\\ --import-table (WebAssembly) import function table from the host environment
\\ --export-table (WebAssembly) export function table to the host environment
@ -914,7 +914,7 @@ fn buildOutputType(
const next_arg = args_iter.next() orelse {
fatal("expected parameter after {s}", .{arg});
};
pagezero_size = std.fmt.parseUnsigned(u64, next_arg, 0) catch |err| {
pagezero_size = std.fmt.parseUnsigned(u64, eatIntPrefix(next_arg, 16), 16) catch |err| {
fatal("unable to parse '{s}': {s}", .{ arg, @errorName(err) });
};
} else if (mem.eql(u8, arg, "-T") or mem.eql(u8, arg, "--script")) {
@ -1662,7 +1662,7 @@ fn buildOutputType(
fatal("expected linker arg after '{s}'", .{arg});
}
const next_arg = linker_args.items[i];
pagezero_size = std.fmt.parseUnsigned(u64, next_arg, 0) catch |err| {
pagezero_size = std.fmt.parseUnsigned(u64, eatIntPrefix(next_arg, 16), 16) catch |err| {
fatal("unable to parse '{s}': {s}", .{ arg, @errorName(err) });
};
} else if (mem.eql(u8, arg, "--gc-sections")) {
@ -5067,6 +5067,18 @@ pub fn cmdChangelist(
try bw.flush();
}
fn eatIntPrefix(arg: []const u8, radix: u8) []const u8 {
if (arg.len > 2 and arg[0] == '0') {
switch (std.ascii.toLower(arg[1])) {
'b' => if (radix == 2) return arg[2..],
'o' => if (radix == 8) return arg[2..],
'x' => if (radix == 16) return arg[2..],
else => {},
}
}
return arg;
}
fn parseIntSuffix(arg: []const u8, prefix_len: usize) u64 {
return std.fmt.parseUnsigned(u64, arg[prefix_len..], 0) catch |err| {
fatal("unable to parse '{s}': {s}", .{ arg, @errorName(err) });