mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-12 20:37:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22190 from alexrp/cc-args

Browse Source 
`Compilation`: Don't rely on Clang defaults for options that are user-facing.
This commit is contained in:
Alex Rønne Petersen 2024-12-09 10:46:31 +01:00 committed by GitHub
commit 589f4e9170
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Compilation.zig
View File

@ -5254,17 +5254,10 @@ pub fn addCCArgs(
try argv.append("-fno-caret-diagnostics");
}
if (comp.function_sections) {
try argv.append("-ffunction-sections");
}
try argv.append(if (comp.function_sections) "-ffunction-sections" else "-fno-function-sections");
try argv.append(if (comp.data_sections) "-fdata-sections" else "-fno-data-sections");
if (comp.data_sections) {
try argv.append("-fdata-sections");
}
if (mod.no_builtin) {
try argv.append("-fno-builtin");
}
try argv.append(if (mod.no_builtin) "-fno-builtin" else "-fbuiltin");
if (comp.config.link_libcpp) {
const libcxx_include_path = try std.fs.path.join(arena, &[_][]const u8{
@ -5482,17 +5475,11 @@ pub fn addCCArgs(
}
}
if (mod.red_zone) {
try argv.append("-mred-zone");
} else if (target_util.hasRedZone(target)) {
try argv.append("-mno-red-zone");
if (target_util.hasRedZone(target)) {
try argv.append(if (mod.red_zone) "-mred-zone" else "-mno-red-zone");
}
if (mod.omit_frame_pointer) {
try argv.append("-fomit-frame-pointer");
} else {
try argv.append("-fno-omit-frame-pointer");
}
try argv.append(if (mod.omit_frame_pointer) "-fomit-frame-pointer" else "-fno-omit-frame-pointer");
const ssp_buf_size = mod.stack_protector;
if (ssp_buf_size != 0) {
@ -5629,8 +5616,8 @@ pub fn addCCArgs(
try argv.append("-municode");
}
if (target.cpu.arch.isThumb()) {
try argv.append("-mthumb");
if (target.cpu.arch.isArm()) {
try argv.append(if (target.cpu.arch.isThumb()) "-mthumb" else "-mno-thumb");
}
if (target_util.supports_fpic(target)) {

10
src/target.zig
View File

@ -305,10 +305,16 @@ pub fn defaultCompilerRtOptimizeMode(target: std.Target) std.builtin.OptimizeMod
pub fn hasRedZone(target: std.Target) bool {
return switch (target.cpu.arch) {
.x86_64,
.x86,
.aarch64,
.aarch64_be,
.powerpc,
.powerpcle,
.powerpc64,
.powerpc64le,
.wasm32,
.wasm64,
.x86_64,
.x86,
=> true,
else => false,