| ... | ... | @@ -1566,19 +1566,24 @@ pub fn flushStaticLib(self: *Elf, comp: *Compilation) link.File.FlushError!void |
| 1566 | 1566 | state_log.debug("{}", .{self.dumpState()}); |
| 1567 | 1567 | } |
| 1568 | 1568 | |
| 1569 | | // Save object paths in strtab. |
| 1569 | // Save object paths in filenames strtab. |
| 1570 | var ar_strtab = std.ArrayList(u8).init(gpa); |
| 1571 | defer ar_strtab.deinit(); |
| 1572 | |
| 1570 | 1573 | var files = std.AutoHashMap(File.Index, struct { u32, u64, u64 }).init(gpa); |
| 1571 | 1574 | defer files.deinit(); |
| 1572 | 1575 | try files.ensureUnusedCapacity(@intCast(self.objects.items.len + 1)); |
| 1573 | 1576 | |
| 1574 | 1577 | if (self.zigObjectPtr()) |zig_object| { |
| 1575 | | files.putAssumeCapacityNoClobber(zig_object.index, .{ try self.ar_strtab.insert(gpa, zig_object.path), 0, 0 }); |
| 1578 | const off = @as(u32, @intCast(ar_strtab.items.len)); |
| 1579 | try ar_strtab.writer().print("{s}/\n", .{zig_object.path}); |
| 1580 | files.putAssumeCapacityNoClobber(zig_object.index, .{ off, 0, 0 }); |
| 1576 | 1581 | } |
| 1577 | 1582 | |
| 1578 | 1583 | // Encode ar symtab in 64bit format. |
| 1579 | 1584 | var ar_symtab = std.ArrayList(u8).init(gpa); |
| 1580 | 1585 | defer ar_symtab.deinit(); |
| 1581 | | try ar_symtab.ensureTotalCapacityPrecise(8 * (3 * self.ar_symtab.items.len + 1)); |
| 1586 | try ar_symtab.ensureUnusedCapacity(8 * (self.ar_symtab.items.len + 1)); |
| 1582 | 1587 | |
| 1583 | 1588 | // Number of symbols |
| 1584 | 1589 | ar_symtab.writer().writeInt(u64, @as(u64, @intCast(self.ar_symtab.items.len)), .big) catch unreachable; |
| ... | ... | @@ -1590,14 +1595,15 @@ pub fn flushStaticLib(self: *Elf, comp: *Compilation) link.File.FlushError!void |
| 1590 | 1595 | |
| 1591 | 1596 | // ASCII offsets into the strtab. |
| 1592 | 1597 | for (self.ar_symtab.items) |entry| { |
| 1593 | | ar_symtab.writer().print("/{d}", .{entry.off}) catch unreachable; |
| 1598 | const name = self.ar_strtab.getAssumeExists(entry.off); |
| 1599 | try ar_symtab.writer().print("{s}\x00", .{name}); |
| 1594 | 1600 | } |
| 1595 | 1601 | |
| 1596 | 1602 | // Align to 8bytes if required |
| 1597 | 1603 | { |
| 1598 | 1604 | const end = ar_symtab.items.len; |
| 1599 | 1605 | const aligned = mem.alignForward(usize, end, 8); |
| 1600 | | ar_symtab.writer().writeByteNTimes(0, aligned - end) catch unreachable; |
| 1606 | try ar_symtab.writer().writeByteNTimes(0, aligned - end); |
| 1601 | 1607 | } |
| 1602 | 1608 | |
| 1603 | 1609 | assert(mem.isAligned(ar_symtab.items.len, 8)); |
| ... | ... | @@ -1610,7 +1616,7 @@ pub fn flushStaticLib(self: *Elf, comp: *Compilation) link.File.FlushError!void |
| 1610 | 1616 | // Symtab |
| 1611 | 1617 | file_off += @sizeOf(Archive.ar_hdr) + @as(u64, @intCast(ar_symtab.items.len)); |
| 1612 | 1618 | // Strtab |
| 1613 | | file_off += @sizeOf(Archive.ar_hdr) + @as(u64, @intCast(self.ar_strtab.buffer.items.len)); |
| 1619 | file_off += @sizeOf(Archive.ar_hdr) + @as(u64, @intCast(ar_strtab.items.len)); |
| 1614 | 1620 | // And because we are nice, we will align to 8 bytes. |
| 1615 | 1621 | file_off = mem.alignForward(u64, file_off, 8); |
| 1616 | 1622 | |
| ... | ... | @@ -1655,12 +1661,12 @@ pub fn flushStaticLib(self: *Elf, comp: *Compilation) link.File.FlushError!void |
| 1655 | 1661 | const hdr = setArHdr(.{ |
| 1656 | 1662 | .kind = .strtab, |
| 1657 | 1663 | .name_off = 0, |
| 1658 | | .size = @intCast(mem.alignForward(usize, self.ar_strtab.buffer.items.len, 8)), |
| 1664 | .size = @intCast(mem.alignForward(usize, ar_strtab.items.len, 8)), |
| 1659 | 1665 | }); |
| 1660 | 1666 | try self.base.file.?.pwriteAll(mem.asBytes(&hdr), pos); |
| 1661 | 1667 | pos += @sizeOf(Archive.ar_hdr); |
| 1662 | | try self.base.file.?.pwriteAll(self.ar_strtab.buffer.items, pos); |
| 1663 | | pos += self.ar_strtab.buffer.items.len; |
| 1668 | try self.base.file.?.pwriteAll(ar_strtab.items, pos); |
| 1669 | pos += ar_strtab.items.len; |
| 1664 | 1670 | } |
| 1665 | 1671 | |
| 1666 | 1672 | // Zig object if defined |
Jakub Konka <kubkon@jakubkonka.com> 2023-11-02 21:44:27+01:00