diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2024-05-09 01:52:26 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2024-05-09 01:52:26 -0700 |
| commit | bcb534c295d5cc6fd63caa570cc08e6b148a507c (patch) | |
| tree | 0b17cb1e632d894f50f25e550d5113f232b0e877 /src/link | |
| parent | d9b00ee4ba48717ff6b306a6f9419e7b604ac04b (diff) | |
| parent | 74f52954b9cb40d59d80b839b45bb859146731a7 (diff) | |
| download | zig-bcb534c295d5cc6fd63caa570cc08e6b148a507c.tar.gz zig-bcb534c295d5cc6fd63caa570cc08e6b148a507c.zip | |
Merge branch 'llvm18'
Upgrades the LLVM, Clang, and LLD dependencies to LLVM 18.x
Related to #16270
Diffstat (limited to 'src/link')
| -rw-r--r-- | src/link/C.zig | 4 | ||||
| -rw-r--r-- | src/link/Wasm/types.zig | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/link/C.zig b/src/link/C.zig index 63faf827b0..07814c9e71 100644 --- a/src/link/C.zig +++ b/src/link/C.zig @@ -383,7 +383,9 @@ fn abiDefines(self: *C, target: std.Target) !std.ArrayList(u8) { .msvc => try writer.writeAll("#define ZIG_TARGET_ABI_MSVC\n"), else => {}, } - try writer.print("#define ZIG_TARGET_MAX_INT_ALIGNMENT {d}\n", .{target.maxIntAlignment()}); + try writer.print("#define ZIG_TARGET_MAX_INT_ALIGNMENT {d}\n", .{ + Type.maxIntAlignment(target, false), + }); return defines; } diff --git a/src/link/Wasm/types.zig b/src/link/Wasm/types.zig index 43d3089579..0f9362b8c3 100644 --- a/src/link/Wasm/types.zig +++ b/src/link/Wasm/types.zig @@ -195,6 +195,7 @@ pub const Feature = struct { bulk_memory, exception_handling, extended_const, + multimemory, multivalue, mutable_globals, nontrapping_fptoint, @@ -218,6 +219,7 @@ pub const Feature = struct { .bulk_memory => "bulk-memory", .exception_handling => "exception-handling", .extended_const => "extended-const", + .multimemory => "multimemory", .multivalue => "multivalue", .mutable_globals => "mutable-globals", .nontrapping_fptoint => "nontrapping-fptoint", |