From 8ebebbd134f8ea6a1b6c74257abc06565287cfe2 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 3 Oct 2023 14:54:32 -0700 Subject: [PATCH] std.macho: remove alignment from LoadCommandIterator --- lib/std/Build/Step/CheckObject.zig | 4 ++-- lib/std/macho.zig | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/std/Build/Step/CheckObject.zig b/lib/std/Build/Step/CheckObject.zig index 26d3e89552b381e9a75d4d5ed3f6f299afce5516..2534298854f3d15dbef6148a1e8bd61b77384bec 100644 --- a/lib/std/Build/Step/CheckObject.zig +++ b/lib/std/Build/Step/CheckObject.zig @@ -539,7 +539,7 @@ const MachODumper = struct { strings: []const u8, }; - fn parseAndDump(step: *Step, bytes: []align(@alignOf(u64)) const u8) ![]const u8 { + fn parseAndDump(step: *Step, bytes: []const u8) ![]const u8 { const gpa = step.owner.allocator; var stream = std.io.fixedBufferStream(bytes); const reader = stream.reader(); @@ -556,7 +556,7 @@ const MachODumper = struct { var sections = std.ArrayList(macho.section_64).init(gpa); var imports = std.ArrayList([]const u8).init(gpa); - var it = LoadCommandIterator{ + var it: LoadCommandIterator = .{ .ncmds = hdr.ncmds, .buffer = bytes[@sizeOf(macho.mach_header_64)..][0..hdr.sizeofcmds], }; diff --git a/lib/std/macho.zig b/lib/std/macho.zig index 5cd632b3a6ca5309a39c9868874da51b2f4b481a..50f43a9507eb50f8a021c0fa20f008db40aa33c3 100644 --- a/lib/std/macho.zig +++ b/lib/std/macho.zig @@ -1853,7 +1853,7 @@ pub const data_in_code_entry = extern struct { pub const LoadCommandIterator = struct { ncmds: usize, - buffer: []align(@alignOf(u64)) const u8, + buffer: []const u8, index: usize = 0, pub const LoadCommand = struct { -- 2.54.0