From 32ebceea95d22d399bc979370e5ce4cc3ca7d0ef Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Thu, 11 Jan 2024 21:30:32 +0100
Subject: macho: sort sections; use Atom.Alignment for alignment; init segments

---
 src/link/MachO/Object.zig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/link/MachO/Object.zig')

diff --git a/src/link/MachO/Object.zig b/src/link/MachO/Object.zig
index 9d39621d16..a6f865901e 100644
--- a/src/link/MachO/Object.zig
+++ b/src/link/MachO/Object.zig
@@ -346,7 +346,7 @@ fn addAtom(self: *Object, args: AddAtomArgs, macho_file: *MachO) !Atom.Index {
     atom.name = try macho_file.strings.insert(gpa, args.name);
     atom.n_sect = args.n_sect;
     atom.size = args.size;
-    atom.alignment = args.alignment;
+    atom.alignment = Atom.Alignment.fromLog2Units(args.alignment);
     atom.off = args.off;
     try self.atoms.append(gpa, atom_index);
     return atom_index;
@@ -1120,13 +1120,13 @@ pub fn convertTentativeDefinitions(self: *Object, macho_file: *MachO) !void {
         atom.name = try macho_file.strings.insert(gpa, name);
         atom.file = self.index;
         atom.size = nlist.n_value;
-        atom.alignment = (nlist.n_desc >> 8) & 0x0f;
+        atom.alignment = Atom.Alignment.fromLog2Units((nlist.n_desc >> 8) & 0x0f);
 
         const n_sect = try self.addSection(gpa, "__DATA", "__common");
         const sect = &self.sections.items(.header)[n_sect];
         sect.flags = macho.S_ZEROFILL;
         sect.size = atom.size;
-        sect.@"align" = atom.alignment;
+        sect.@"align" = atom.alignment.toLog2Units();
         atom.n_sect = n_sect;
 
         sym.value = 0;
-- 
cgit v1.2.3