diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-08-24 15:57:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 15:57:44 -0400 |
| commit | 2a96209c4060bbf8a41fbe34e687a7a4741d2fe1 (patch) | |
| tree | 11594b42c723162c304f5cbce7259c856718458b /src/link | |
| parent | 80b8294bccdbdf3bc0dd9248676e5c9718354125 (diff) | |
| parent | 7b14d614d91df7b9b5d802f34bf628293fc714f0 (diff) | |
| download | zig-2a96209c4060bbf8a41fbe34e687a7a4741d2fe1.tar.gz zig-2a96209c4060bbf8a41fbe34e687a7a4741d2fe1.zip | |
Merge pull request #12574 from Vexu/remove-bit-op-type-param
stage2+stage1: remove type parameter from bit builtins
Diffstat (limited to 'src/link')
| -rw-r--r-- | src/link/MachO/Object.zig | 2 | ||||
| -rw-r--r-- | src/link/Wasm.zig | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/link/MachO/Object.zig b/src/link/MachO/Object.zig index 00fd16054b..d99cfae3b7 100644 --- a/src/link/MachO/Object.zig +++ b/src/link/MachO/Object.zig @@ -391,7 +391,7 @@ pub fn splitIntoAtomsOneShot(self: *Object, macho_file: *MachO, object_id: u32) break :blk cc[start..][0..size]; } else null; const atom_align = if (addr > 0) - math.min(@ctz(u64, addr), sect.@"align") + math.min(@ctz(addr), sect.@"align") else sect.@"align"; const atom = try self.createAtomFromSubsection( diff --git a/src/link/Wasm.zig b/src/link/Wasm.zig index 37e25e4360..727f329f4b 100644 --- a/src/link/Wasm.zig +++ b/src/link/Wasm.zig @@ -3135,12 +3135,12 @@ fn emitSegmentInfo(self: *Wasm, file: fs.File, arena: Allocator) !void { for (self.segment_info.items) |segment_info| { log.debug("Emit segment: {s} align({d}) flags({b})", .{ segment_info.name, - @ctz(u32, segment_info.alignment), + @ctz(segment_info.alignment), segment_info.flags, }); try leb.writeULEB128(writer, @intCast(u32, segment_info.name.len)); try writer.writeAll(segment_info.name); - try leb.writeULEB128(writer, @ctz(u32, segment_info.alignment)); + try leb.writeULEB128(writer, @ctz(segment_info.alignment)); try leb.writeULEB128(writer, segment_info.flags); } |