diff --git a/src/type.zig b/src/type.zig index 9fe95f99f7..2afff730a7 100644 --- a/src/type.zig +++ b/src/type.zig @@ -1572,11 +1572,6 @@ pub const Type = struct { .wasm64, => 8, - .x86 => if (target.ofmt == .c) 16 else return switch (target.os.tag) { - .windows, .uefi => 8, - else => 4, - }, - // For these, LLVMABIAlignmentOfType(i128) reports 8. Note that 16 // is a relevant number in three cases: // 1. Different machine code instruction when loading into SIMD register. @@ -1599,6 +1594,7 @@ pub const Type = struct { }, // Even LLVMABIAlignmentOfType(i128) agrees on these targets. + .x86, .aarch64, .aarch64_be, .aarch64_32, diff --git a/test/behavior/align.zig b/test/behavior/align.zig index 53c7455dbf..34d76fb4ba 100644 --- a/test/behavior/align.zig +++ b/test/behavior/align.zig @@ -114,44 +114,6 @@ test "alignment and size of structs with 128-bit fields" { .u129_size = 24, }, - .x86 => if (builtin.object_format == .c) .{ - .a_align = 16, - .a_size = 16, - - .b_align = 16, - .b_size = 32, - - .u128_align = 16, - .u128_size = 16, - .u129_align = 16, - .u129_size = 32, - } else switch (builtin.os.tag) { - .windows => .{ - .a_align = 8, - .a_size = 16, - - .b_align = 16, - .b_size = 32, - - .u128_align = 8, - .u128_size = 16, - .u129_align = 8, - .u129_size = 24, - }, - else => .{ - .a_align = 4, - .a_size = 16, - - .b_align = 16, - .b_size = 32, - - .u128_align = 4, - .u128_size = 16, - .u129_align = 4, - .u129_size = 20, - }, - }, - .mips64, .mips64el, .powerpc64, @@ -211,6 +173,7 @@ test "alignment and size of structs with 128-bit fields" { }, }, + .x86, .aarch64, .aarch64_be, .aarch64_32,