mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-07-22 15:32:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6830 from A1029384756/stack-canaries

Browse Source 
Stack canaries
This commit is contained in:
gingerBill
2026-06-19 09:11:40 +01:00
committed by GitHub
parent 417aa0ea9e 863b2aea80
commit 69daa4d184
5 changed files with 116 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/build_settings.cpp
View File

@@ -278,6 +278,14 @@ enum RelocMode : u8 {
RelocMode_DynamicNoPIC,
};
enum StackProtector : u8 {
StackProtector_Default,
StackProtector_None,
StackProtector_Ssp,
StackProtector_SspReq,
StackProtector_SspStrong,
};
enum BuildPath : u8 {
BuildPath_Main_Package, // Input Path to the package directory (or file) we're building.
BuildPath_RC, // Input Path for .rc file, can be set with `-resource:`.
@@ -601,7 +609,9 @@ struct BuildContext {
bool print_linker_flags;
RelocMode reloc_mode;
RelocMode reloc_mode;
StackProtector stack_protector;
bool disable_red_zone;
bool disable_unwind;
bool no_plt;
@@ -1901,16 +1911,6 @@ gb_internal void init_build_context(TargetMetrics *cross_target, Subtarget subta
}
break;
}
} else if (metrics->os == TargetOs_linux) {
if (bc->reloc_mode == RelocMode_Default) {
bc->reloc_mode = RelocMode_PIC;
}
switch (metrics->arch) {
case TargetArch_arm64:
case TargetArch_amd64:
bc->no_plt = LLVM_VERSION_MAJOR >= 19;
break;
}
} else if (metrics->os == TargetOs_openbsd) {
// Always use PIC for OpenBSD: it defaults to PIE
if (bc->reloc_mode == RelocMode_Default) {
@@ -1939,10 +1939,37 @@ gb_internal void init_build_context(TargetMetrics *cross_target, Subtarget subta
bc->metrics.target_triplet = str_lit("i686-linux-android");
bc->reloc_mode = RelocMode_PIC;
break;
default:
GB_PANIC("Unknown architecture for -subtarget:android");
}
} else if (metrics->os == TargetOs_linux) {
if (bc->reloc_mode == RelocMode_Default) {
bc->reloc_mode = RelocMode_PIC;
}
switch (metrics->arch) {
case TargetArch_arm64:
case TargetArch_amd64:
bc->no_plt = LLVM_VERSION_MAJOR >= 19;
break;
}
}
if (metrics->os == TargetOs_windows ||
metrics->os == TargetOs_darwin ||
metrics->os == TargetOs_linux ||
metrics->os == TargetOs_freebsd ||
metrics->os == TargetOs_openbsd ||
metrics->os == TargetOs_netbsd) {
if (bc->stack_protector == StackProtector_Default) {
bc->stack_protector = StackProtector_SspStrong;
}
} else {
if (bc->stack_protector == StackProtector_Default) {
bc->stack_protector = StackProtector_None;
} else {
gb_printf_err("-stack-protector is not supported on this target\n");
gb_exit(1);
}
}
if (bc->metrics.os == TargetOs_windows) {