diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2025-04-05 01:46:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-05 01:46:13 -0400 |
| commit | 0cd31fc7ff157551cfbba5da35cd79f118d2a2e3 (patch) | |
| tree | a308488f5d85184c8ec402fb3f55f1cf2704443e /tools | |
| parent | 8acedfd5baabab705946ad097746f9183ef62420 (diff) | |
| parent | cefe65c1b8abe65a22d4b68410db1be264fdeda0 (diff) | |
| download | zig-0cd31fc7ff157551cfbba5da35cd79f118d2a2e3.tar.gz zig-0cd31fc7ff157551cfbba5da35cd79f118d2a2e3.zip | |
Merge pull request #22780 from ziglang/llvm20
LLVM 20
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/update_clang_options.zig | 4 | ||||
| -rw-r--r-- | tools/update_cpu_features.zig | 36 |
2 files changed, 25 insertions, 15 deletions
diff --git a/tools/update_clang_options.zig b/tools/update_clang_options.zig index 2573d173a9..5b8d5ae4f7 100644 --- a/tools/update_clang_options.zig +++ b/tools/update_clang_options.zig @@ -285,6 +285,10 @@ const known_options = [_]KnownOpt{ .ident = "sanitize", }, .{ + .name = "fno-sanitize", + .ident = "no_sanitize", + }, + .{ .name = "T", .ident = "linker_script", }, diff --git a/tools/update_cpu_features.zig b/tools/update_cpu_features.zig index e8b3a5431e..9ac7b7ef2a 100644 --- a/tools/update_cpu_features.zig +++ b/tools/update_cpu_features.zig @@ -779,6 +779,10 @@ const targets = [_]ArchTarget{ .zig_name = "v9_5a", }, .{ + .llvm_name = "armv9.6-a", + .zig_name = "v9_6a", + }, + .{ .llvm_name = "armv9-a", .zig_name = "v9a", }, @@ -894,6 +898,10 @@ const targets = [_]ArchTarget{ .llvm_name = "v9.5a", .zig_name = "has_v9_5a", }, + .{ + .llvm_name = "v9.6a", + .zig_name = "has_v9_6a", + }, }, .extra_cpus = &.{ .{ @@ -1092,25 +1100,23 @@ const targets = [_]ArchTarget{ .name = "WebAssembly", .td_name = "WebAssembly", }, - .extra_features = &.{ + // For whatever reason, LLVM's WebAssembly backend sets these implied features in code + // rather than making them proper dependencies, so fix that here... + .feature_overrides = &.{ .{ - .zig_name = "nontrapping_bulk_memory_len0", - .desc = "Bulk memory operations with a zero length do not trap", - .deps = &.{"bulk_memory"}, + .llvm_name = "bulk-memory", + .extra_deps = &.{"bulk_memory_opt"}, + }, + .{ + .llvm_name = "reference-types", + .extra_deps = &.{"call_indirect_overlong"}, }, }, - .extra_cpus = &.{ + .extra_features = &.{ .{ - .llvm_name = null, - .zig_name = "lime1", - .features = &.{ - "bulk_memory", - "extended_const", - "multivalue", - "mutable_globals", - "nontrapping_fptoint", - "sign_ext", - }, + .zig_name = "nontrapping_bulk_memory_len0", + .desc = "Bulk memory operations with a zero length do not trap", + .deps = &.{"bulk_memory_opt"}, }, }, }, |