authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-08-25 02:44:57+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-08-26 00:11:27+02:00
logb2578329afc672f24503cbf580ff73a4a1625f28
treed0f1e5f02231a78c5a00616ec5767b240a254a43
parent9ef2208e4b2a51f9c800295674265a33804bbc8a
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

zig cc: don't pass -mcmodel for assembly files

It does nothing but generate a warning for these.

1 files changed, 4 insertions(+), 4 deletions(-)

src/Compilation.zig+4-4
...@@ -6843,10 +6843,6 @@ pub fn addCCArgs(...@@ -6843,10 +6843,6 @@ pub fn addCCArgs(
6843 try argv.append("-municode");6843 try argv.append("-municode");
6844 }6844 }
68456845
6846 if (mod.code_model != .default) {
6847 try argv.append(try std.fmt.allocPrint(arena, "-mcmodel={s}", .{@tagName(mod.code_model)}));
6848 }
6849
6850 try argv.ensureUnusedCapacity(2);6846 try argv.ensureUnusedCapacity(2);
6851 switch (comp.config.debug_format) {6847 switch (comp.config.debug_format) {
6852 .strip => {},6848 .strip => {},
...@@ -7136,6 +7132,10 @@ pub fn addCCArgs(...@@ -7136,6 +7132,10 @@ pub fn addCCArgs(
7136 .ll,7132 .ll,
7137 .bc,7133 .bc,
7138 => {7134 => {
7135 if (mod.code_model != .default) {
7136 try argv.append(try std.fmt.allocPrint(arena, "-mcmodel={s}", .{@tagName(mod.code_model)}));
7137 }
7138
7139 if (target_util.clangSupportsTargetCpuArg(target)) {7139 if (target_util.clangSupportsTargetCpuArg(target)) {
7140 if (target.cpu.model.llvm_name) |llvm_name| {7140 if (target.cpu.model.llvm_name) |llvm_name| {
7141 try argv.appendSlice(&[_][]const u8{7141 try argv.appendSlice(&[_][]const u8{