Commit fa1d18a15583253d457c39fc38e5bdda8b3f2cf2 | zig

author	Noam Preil <noam@pixelhero.dev> 2020-08-21 07:20:51-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-08-22 12:45:29-07:00
log	fa1d18a15583253d457c39fc38e5bdda8b3f2cf2
tree	7c9ad2d88511693408e535295616a0d1d622f7ec
parent	f2796239baf1b5883e007729e6064e144c443b56

Linker: fix GOT production on 16-bit targets

1 files changed, 10 insertions(+), 4 deletions(-)

src-self-hosted
- link
  - Elf.zig

src-self-hosted/link/Elf.zig+10-4

 @@ -2201,7 +2201,7 @@ fn writeSectHeader(self: *Elf, index: usize) !void {
 fn writeOffsetTableEntry(self: *Elf, index: usize) !void {
     const shdr = &self.sections.items[self.got_section_index.?];
     const phdr = &self.program_headers.items[self.phdr_got_index.?];
-    const entry_size: u16 = self.ptrWidthBytes();
+    const entry_size: u16 = self.base.options.target.cpu.arch.ptrBitWidth() / 8;
     if (self.offset_table_count_dirty) {
         // TODO Also detect virtual address collisions.
         const allocated_size = self.allocatedSize(shdr.sh_offset);
 @@ -2225,17 +2225,23 @@ fn writeOffsetTableEntry(self: *Elf, index: usize) !void {
     }
     const endian = self.base.options.target.cpu.arch.endian();
     const off = shdr.sh_offset + @as(u64, entry_size) * index;
-    switch (self.ptr_width) {
+    switch (entry_size) {
-        .p32 => {
+        2 => {
+            var buf: [2]u8 = undefined;
+            mem.writeInt(u16, &buf, @intCast(u16, self.offset_table.items[index]), endian);
+            try self.base.file.?.pwriteAll(&buf, off);
+        },
+        4 => {
             var buf: [4]u8 = undefined;
             mem.writeInt(u32, &buf, @intCast(u32, self.offset_table.items[index]), endian);
             try self.base.file.?.pwriteAll(&buf, off);
         },
-        .p64 => {
+        8 => {
             var buf: [8]u8 = undefined;
             mem.writeInt(u64, &buf, self.offset_table.items[index], endian);
             try self.base.file.?.pwriteAll(&buf, off);
         },
+        else => unreachable,
     }
 }