diff --git a/src/codegen/c.zig b/src/codegen/c.zig index c63cb27529122ed6ee60d2add180619a726f9c4d..05ceb3037914e983e8b6493b5d479cc518595236 100644 --- a/src/codegen/c.zig +++ b/src/codegen/c.zig @@ -2541,7 +2541,7 @@ fn airMinMax(f: *Function, inst: Air.Inst.Index, operator: [*:0]const u8) !CValu try f.writeCValue(writer, lhs); try writer.print("{s}", .{operator}); try f.writeCValue(writer, rhs); - try writer.writeAll(") "); + try writer.writeAll(") ? "); try f.writeCValue(writer, lhs); try writer.writeAll(" : "); try f.writeCValue(writer, rhs); diff --git a/src/link/C/zig.h b/src/link/C/zig.h index ce22b5221f4cffdafc8653c7ee719d672ae2bd34..7259ba19cee8ef6b4ad668cac6d08a5e0748325f 100644 --- a/src/link/C/zig.h +++ b/src/link/C/zig.h @@ -1,3 +1,5 @@ +#undef linux + #if __STDC_VERSION__ >= 201112L #define zig_noreturn _Noreturn #define zig_threadlocal thread_local diff --git a/test/behavior/bugs/2114.zig b/test/behavior/bugs/2114.zig index 1fc7016f4495df1a5059d4ced8975ace779eae5d..5a71c92e8ef6b9e34e40dbe1068b03aa53eef899 100644 --- a/test/behavior/bugs/2114.zig +++ b/test/behavior/bugs/2114.zig @@ -7,11 +7,11 @@ fn ctz(x: anytype) usize { } test "fixed" { - try testClz(); - comptime try testClz(); + try testCtz(); + comptime try testCtz(); } -fn testClz() !void { +fn testCtz() !void { try expect(ctz(@as(u128, 0x40000000000000000000000000000000)) == 126); try expect(math.rotl(u128, @as(u128, 0x40000000000000000000000000000000), @as(u8, 1)) == @as(u128, 0x80000000000000000000000000000000)); try expect(ctz(@as(u128, 0x80000000000000000000000000000000)) == 127);