mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-06-19 16:42:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stack-canaries] added protection modes

Browse Source
This commit is contained in:
A1029384756
2026-06-12 22:57:39 -04:00
parent 47cf0d3f42
commit 2373fabe47
3 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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:`.
@@ -599,7 +607,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;

10
src/llvm_backend_proc.cpp
View File

@@ -160,6 +160,16 @@ gb_internal lbProcedure *lb_create_procedure(lbModule *m, Entity *entity, bool i
lb_add_attribute_to_proc(m, p->value, "nonlazybind");
}
switch (build_context.stack_protector) {
case StackProtector_Default:
case StackProtector_Ssp:
lb_add_attribute_to_proc(m, p->value, "ssp");
case StackProtector_SspReq:
lb_add_attribute_to_proc(m, p->value, "sspreq");
case StackProtector_SspStrong:
lb_add_attribute_to_proc(m, p->value, "sspstrong");
}
if (build_context.disable_unwind) {
lb_add_attribute_to_proc(m, p->value, "nounwind");
}

35
src/main.cpp
View File

@@ -354,6 +354,7 @@ enum BuildFlagKind {
BuildFlag_NoThreadLocal,
BuildFlag_RelocMode,
BuildFlag_StackProtector,
BuildFlag_DisableRedZone,
BuildFlag_DisableUnwind,
@@ -587,6 +588,7 @@ gb_internal bool parse_build_flags(Array<String> args) {
add_flag(&build_flags, BuildFlag_MinimumOSVersion, str_lit("minimum-os-version"), BuildFlagParam_String, Command__does_build | Command_bundle_android);
add_flag(&build_flags, BuildFlag_RelocMode, str_lit("reloc-mode"), BuildFlagParam_String, Command__does_build);
add_flag(&build_flags, BuildFlag_StackProtector, str_lit("stack-protector"), BuildFlagParam_String, Command__does_build);
add_flag(&build_flags, BuildFlag_DisableRedZone, str_lit("disable-red-zone"), BuildFlagParam_None, Command__does_build);
add_flag(&build_flags, BuildFlag_DisableUnwind, str_lit("disable-unwind"), BuildFlagParam_None, Command__does_build);
@@ -1431,6 +1433,29 @@ gb_internal bool parse_build_flags(Array<String> args) {
break;
}
case BuildFlag_StackProtector: {
GB_ASSERT(value.kind == ExactValue_String);
String v = value.value_string;
if (v == "default") {
build_context.stack_protector = StackProtector_Default;
} else if (v == "none") {
build_context.stack_protector = StackProtector_None;
} else if (v == "base") {
build_context.stack_protector = StackProtector_Ssp;
} else if (v == "all") {
build_context.stack_protector = StackProtector_SspReq;
} else if (v == "strong") {
build_context.stack_protector = StackProtector_SspStrong;
} else {
gb_printf_err("-stack-protector flag expected one of the following\n");
gb_printf_err("\tdefault\n");
gb_printf_err("\tnone\n");
gb_printf_err("\tbase\n");
gb_printf_err("\tall\n");
gb_printf_err("\tstrong\n");
bad_flags = true;
}
}
case BuildFlag_DisableRedZone:
build_context.disable_red_zone = true;
break;
@@ -2986,6 +3011,16 @@ gb_internal int print_show_help(String const arg0, String command, String option
print_usage_line(3, "-reloc-mode:dynamic-no-pic");
}
if (print_flag("-stack-protector:<string>")) {
print_usage_line(2, "Specifies the stack protector.");
print_usage_line(2, "Available options:");
print_usage_line(3, "-stack-protector:default");
print_usage_line(3, "-stack-protector:none");
print_usage_line(3, "-stack-protector:base");
print_usage_line(3, "-stack-protector:all");
print_usage_line(3, "-stack-protector:strong");
}
#if defined(GB_SYSTEM_WINDOWS)
if (print_flag("-resource:<filepath>")) {
print_usage_line(2, "[Windows only]");