aboutsummaryrefslogtreecommitdiff
path: root/src/link/MachO.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2024-12-03 17:35:47 -0800
committerAndrew Kelley <andrew@ziglang.org>2025-01-15 15:11:35 -0800
commitda25ed95fce32449f70942ea77aa5e00e75dbbdd (patch)
tree6e9e979184325aa9f4d73e0c29de5e1f55f5e4f5 /src/link/MachO.zig
parent6235cc3da4d2c6ebf7fd31242e8d82d39f5c81cf (diff)
downloadzig-da25ed95fce32449f70942ea77aa5e00e75dbbdd.tar.gz
zig-da25ed95fce32449f70942ea77aa5e00e75dbbdd.zip
macho linker conforms to explicit error sets, again
Diffstat (limited to 'src/link/MachO.zig')
-rw-r--r--src/link/MachO.zig8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/link/MachO.zig b/src/link/MachO.zig
index 6090f6381a..d93867695d 100644
--- a/src/link/MachO.zig
+++ b/src/link/MachO.zig
@@ -3423,7 +3423,7 @@ fn initMetadata(self: *MachO, options: InitMetadataOptions) !void {
};
}
-pub fn growSection(self: *MachO, sect_index: u8, needed_size: u64) error{ OutOfMemory, LinkFailure }!void {
+pub fn growSection(self: *MachO, sect_index: u8, needed_size: u64) !void {
if (self.base.isRelocatable()) {
try self.growSectionRelocatable(sect_index, needed_size);
} else {
@@ -3431,7 +3431,7 @@ pub fn growSection(self: *MachO, sect_index: u8, needed_size: u64) error{ OutOfM
}
}
-fn growSectionNonRelocatable(self: *MachO, sect_index: u8, needed_size: u64) error{ OutOfMemory, LinkFailure }!void {
+fn growSectionNonRelocatable(self: *MachO, sect_index: u8, needed_size: u64) !void {
const diags = &self.base.comp.link_diags;
const sect = &self.sections.items(.header)[sect_index];
@@ -3480,7 +3480,7 @@ fn growSectionNonRelocatable(self: *MachO, sect_index: u8, needed_size: u64) err
seg.vmsize = needed_size;
}
-fn growSectionRelocatable(self: *MachO, sect_index: u8, needed_size: u64) error{ OutOfMemory, LinkFailure }!void {
+fn growSectionRelocatable(self: *MachO, sect_index: u8, needed_size: u64) !void {
const sect = &self.sections.items(.header)[sect_index];
if (!sect.isZerofill()) {
@@ -3490,7 +3490,7 @@ fn growSectionRelocatable(self: *MachO, sect_index: u8, needed_size: u64) error{
sect.size = 0;
// Must move the entire section.
- const alignment = try self.alignPow(sect.@"align");
+ const alignment = try math.powi(u32, 2, sect.@"align");
const new_offset = try self.findFreeSpace(needed_size, alignment);
const new_addr = self.findFreeSpaceVirtual(needed_size, alignment);