authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-08-03 16:13:01+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-08-30 06:36:41+02:00
log8c47dda7df2ff123699856eea513a266952b91bf
treed0b70cf17c85776ffb189e7fe3dcde7a25264a35
parentc0cfe571f9723ec078e05c6aab5b1066d167f02e
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

zig cc: pass CPU features to Clang using the new -Xclangas when assembling

Unfortunately, we cannot yet remove the special-casing for RISC-V CPU features, so that code stays. Closes #10411.

1 files changed, 37 insertions(+), 32 deletions(-)

src/Compilation.zig+37-32
......@@ -6798,6 +6798,43 @@ pub fn addCCArgs(
67986798 else => {},
67996799 }
68006800
6801 const xclang_flag = switch (ext) {
6802 .assembly, .assembly_with_cpp => "-Xclangas",
6803 else => "-Xclang",
6804 };
6805
6806 if (target_util.clangSupportsTargetCpuArg(target)) {
6807 if (target.cpu.model.llvm_name) |llvm_name| {
6808 try argv.appendSlice(&[_][]const u8{
6809 xclang_flag, "-target-cpu", xclang_flag, llvm_name,
6810 });
6811 }
6812 }
6813
6814 // It would be really nice if there was a more compact way to communicate this info to Clang.
6815 const all_features_list = target.cpu.arch.allFeaturesList();
6816 try argv.ensureUnusedCapacity(all_features_list.len * 4);
6817 for (all_features_list, 0..) |feature, index_usize| {
6818 const index = @as(std.Target.Cpu.Feature.Set.Index, @intCast(index_usize));
6819 const is_enabled = target.cpu.features.isEnabled(index);
6820
6821 if (feature.llvm_name) |llvm_name| {
6822 // We communicate float ABI to Clang through the dedicated options.
6823 if (std.mem.startsWith(u8, llvm_name, "soft-float") or
6824 std.mem.startsWith(u8, llvm_name, "hard-float"))
6825 continue;
6826
6827 // Ignore these until we figure out how to handle the concept of omitting features.
6828 // See https://github.com/ziglang/zig/issues/23539
6829 if (target_util.isDynamicAMDGCNFeature(target, feature)) continue;
6830
6831 argv.appendSliceAssumeCapacity(&[_][]const u8{ xclang_flag, "-target-feature", xclang_flag });
6832 const plus_or_minus = "-+"[@intFromBool(is_enabled)];
6833 const arg = try std.fmt.allocPrint(arena, "{c}{s}", .{ plus_or_minus, llvm_name });
6834 argv.appendAssumeCapacity(arg);
6835 }
6836 }
6837
68016838 if (target.cpu.arch.isArm()) {
68026839 try argv.append(if (target.cpu.arch.isThumb()) "-mthumb" else "-mno-thumb");
68036840 }
......@@ -7134,38 +7171,6 @@ pub fn addCCArgs(
71347171 try argv.append(try std.fmt.allocPrint(arena, "-mcmodel={s}", .{@tagName(mod.code_model)}));
71357172 }
71367173
7137 if (target_util.clangSupportsTargetCpuArg(target)) {
7138 if (target.cpu.model.llvm_name) |llvm_name| {
7139 try argv.appendSlice(&[_][]const u8{
7140 "-Xclang", "-target-cpu", "-Xclang", llvm_name,
7141 });
7142 }
7143 }
7144
7145 // It would be really nice if there was a more compact way to communicate this info to Clang.
7146 const all_features_list = target.cpu.arch.allFeaturesList();
7147 try argv.ensureUnusedCapacity(all_features_list.len * 4);
7148 for (all_features_list, 0..) |feature, index_usize| {
7149 const index = @as(std.Target.Cpu.Feature.Set.Index, @intCast(index_usize));
7150 const is_enabled = target.cpu.features.isEnabled(index);
7151
7152 if (feature.llvm_name) |llvm_name| {
7153 // We communicate float ABI to Clang through the dedicated options.
7154 if (std.mem.startsWith(u8, llvm_name, "soft-float") or
7155 std.mem.startsWith(u8, llvm_name, "hard-float"))
7156 continue;
7157
7158 // Ignore these until we figure out how to handle the concept of omitting features.
7159 // See https://github.com/ziglang/zig/issues/23539
7160 if (target_util.isDynamicAMDGCNFeature(target, feature)) continue;
7161
7162 argv.appendSliceAssumeCapacity(&[_][]const u8{ "-Xclang", "-target-feature", "-Xclang" });
7163 const plus_or_minus = "-+"[@intFromBool(is_enabled)];
7164 const arg = try std.fmt.allocPrint(arena, "{c}{s}", .{ plus_or_minus, llvm_name });
7165 argv.appendAssumeCapacity(arg);
7166 }
7167 }
7168
71697174 {
71707175 var san_arg: std.ArrayListUnmanaged(u8) = .empty;
71717176 const prefix = "-fsanitize=";