diff options
| author | Jakub Konka <kubkon@jakubkonka.com> | 2024-02-09 00:20:11 +0100 |
|---|---|---|
| committer | Jakub Konka <kubkon@jakubkonka.com> | 2024-02-09 00:20:11 +0100 |
| commit | 925273bcc8b92b84e1880a20e25fa8507ac904bd (patch) | |
| tree | e502c8ae25c102f1067ae0edd4616f105dd7bad4 /src/link/MachO.zig | |
| parent | 738853459062ccfa9fdea7434b7746e6fe172e3a (diff) | |
| download | zig-925273bcc8b92b84e1880a20e25fa8507ac904bd.tar.gz zig-925273bcc8b92b84e1880a20e25fa8507ac904bd.zip | |
macho: align memory size with file size when emitting relocatable
Diffstat (limited to 'src/link/MachO.zig')
| -rw-r--r-- | src/link/MachO.zig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/link/MachO.zig b/src/link/MachO.zig index 54a64946b5..1b0ba6a31b 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -3223,6 +3223,12 @@ fn detectAllocCollision(self: *MachO, start: u64, size: u64) ?u64 { } fn detectAllocCollisionVirtual(self: *MachO, start: u64, size: u64) ?u64 { + // Conservatively commit one page size as reserved space for the headers as we + // expect it to grow and everything else be moved in flush anyhow. + const header_size = self.getPageSize(); + if (start < header_size) + return header_size; + const end = start + padToIdeal(size); if (self.base.isRelocatable()) { @@ -3234,12 +3240,6 @@ fn detectAllocCollisionVirtual(self: *MachO, start: u64, size: u64) ?u64 { } } } else { - // Conservatively commit one page size as reserved space for the headers as we - // expect it to grow and everything else be moved in flush anyhow. - const header_size = self.getPageSize(); - if (start < header_size) - return header_size; - for (self.segments.items) |seg| { const increased_size = padToIdeal(seg.vmsize); const test_end = seg.vmaddr +| increased_size; |
