diff options
| author | Jacob Young <jacobly0@users.noreply.github.com> | 2024-04-20 14:46:29 -0400 |
|---|---|---|
| committer | Jacob Young <jacobly0@users.noreply.github.com> | 2024-04-20 14:48:06 -0400 |
| commit | de68a3ad43775acc5cea373b4280f8880a2760e8 (patch) | |
| tree | 16f82b09129d4199ac6324552e53e1d56de251d2 /src | |
| parent | c7ffdbcd41f45d23328f1b40d90420ff29ed66af (diff) | |
| download | zig-de68a3ad43775acc5cea373b4280f8880a2760e8.tar.gz zig-de68a3ad43775acc5cea373b4280f8880a2760e8.zip | |
Elf: fix unaligned segments on non-linux
Linux isn't the only OS that `mmap`s segments.
Diffstat (limited to 'src')
| -rw-r--r-- | src/link/Elf.zig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/link/Elf.zig b/src/link/Elf.zig index 03451d140e..94983375ed 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -623,7 +623,7 @@ pub fn initMetadata(self: *Elf, options: InitMetadataOptions) !void { const ptr_size = self.ptrWidthBytes(); const target = self.base.comp.root_mod.resolved_target.result; const ptr_bit_width = target.ptrBitWidth(); - const is_linux = target.os.tag == .linux; + const has_os = target.os.tag != .freestanding; const zig_object = self.zigObjectPtr().?; const fillSection = struct { @@ -661,7 +661,7 @@ pub fn initMetadata(self: *Elf, options: InitMetadataOptions) !void { if (self.phdr_zig_got_index == null) { // We really only need ptr alignment but since we are using PROGBITS, linux requires // page align. - const alignment = if (is_linux) self.page_size else @as(u16, ptr_size); + const alignment = if (has_os) self.page_size else @as(u16, ptr_size); const filesz = @as(u64, ptr_size) * options.symbol_count_hint; const off = self.findFreeSpace(filesz, alignment); self.phdr_zig_got_index = try self.addPhdr(.{ @@ -676,7 +676,7 @@ pub fn initMetadata(self: *Elf, options: InitMetadataOptions) !void { } if (self.phdr_zig_load_ro_index == null) { - const alignment = if (is_linux) self.page_size else @as(u16, ptr_size); + const alignment = if (has_os) self.page_size else @as(u16, ptr_size); const filesz: u64 = 1024; const off = self.findFreeSpace(filesz, alignment); self.phdr_zig_load_ro_index = try self.addPhdr(.{ @@ -691,7 +691,7 @@ pub fn initMetadata(self: *Elf, options: InitMetadataOptions) !void { } if (self.phdr_zig_load_rw_index == null) { - const alignment = if (is_linux) self.page_size else @as(u16, ptr_size); + const alignment = if (has_os) self.page_size else @as(u16, ptr_size); const filesz: u64 = 1024; const off = self.findFreeSpace(filesz, alignment); self.phdr_zig_load_rw_index = try self.addPhdr(.{ @@ -706,7 +706,7 @@ pub fn initMetadata(self: *Elf, options: InitMetadataOptions) !void { } if (self.phdr_zig_load_zerofill_index == null) { - const alignment = if (is_linux) self.page_size else @as(u16, ptr_size); + const alignment = if (has_os) self.page_size else @as(u16, ptr_size); self.phdr_zig_load_zerofill_index = try self.addPhdr(.{ .type = elf.PT_LOAD, .addr = if (ptr_bit_width >= 32) 0x14000000 else 0xf000, |