motiejus/zig
1
Fork 0
Code Releases Activity

Revert "stage2: add support for zig cc assembler -mcpu option"

Browse Source 
This reverts commit afb9f695b1.

I don't think this was ever actually verified to fix the thing it
purported to, and it started causing warnings for unused command line
parameters.
This commit is contained in:
Andrew Kelley
2021-05-23 16:32:22 -07:00
parent ae01c65a58
commit b8f85a805b
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Compilation.zig
View File

@@ -2943,29 +2943,25 @@ pub fn addCCArgs(
try argv.append("-fPIC");
}
},
.shared_library, .ll, .bc, .unknown, .static_library, .object, .zig => {},
.assembly => {
// Argh, why doesn't the assembler accept the list of CPU features?!
// I don't see a way to do this other than hard coding everything.
switch (target.cpu.arch) {
.riscv32, .riscv64 => {
if (std.Target.riscv.featureSetHas(target.cpu.features, .relax)) {
try argv.append("-mrelax");
} else {
try argv.append("-mno-relax");
}
},
else => {
// TODO
},
}
if (target.cpu.model.llvm_name) |ln|
try argv.append(try std.fmt.allocPrint(arena, "-mcpu={s}", .{ln}));
},
.shared_library, .assembly, .ll, .bc, .unknown, .static_library, .object, .zig => {},
}
if (out_dep_path) |p| {
try argv.appendSlice(&[_][]const u8{ "-MD", "-MV", "-MF", p });
}
// Argh, why doesn't the assembler accept the list of CPU features?!
// I don't see a way to do this other than hard coding everything.
switch (target.cpu.arch) {
.riscv32, .riscv64 => {
if (std.Target.riscv.featureSetHas(target.cpu.features, .relax)) {
try argv.append("-mrelax");
} else {
try argv.append("-mno-relax");
}
},
else => {
// TODO
},
}
if (target_util.clangMightShellOutForAssembly(target)) {
try argv.append("-integrated-as");