diff --git a/src/build_settings.cpp b/src/build_settings.cpp index d67c53f25..2a40d0cf5 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -279,7 +279,6 @@ enum RelocMode : u8 { }; enum StackProtector : u8 { - StackProtector_Default, StackProtector_None, StackProtector_Ssp, StackProtector_SspReq, @@ -1955,17 +1954,14 @@ gb_internal void init_build_context(TargetMetrics *cross_target, Subtarget subta } 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_None; - } + metrics->os == TargetOs_darwin || + metrics->os == TargetOs_linux || + metrics->os == TargetOs_freebsd || + metrics->os == TargetOs_openbsd || + metrics->os == TargetOs_netbsd) { + // -stack-protector is supported } else { - if (bc->stack_protector != StackProtector_Default && - bc->stack_protector != StackProtector_None) { + if (bc->stack_protector != StackProtector_None) { gb_printf_err("-stack-protector is not supported on this target\n"); gb_exit(1); } diff --git a/src/main.cpp b/src/main.cpp index b38220c93..b32cbca65 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1441,9 +1441,7 @@ gb_internal bool parse_build_flags(Array args) { 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") { + if (v == "none") { build_context.stack_protector = StackProtector_None; } else if (v == "base") { build_context.stack_protector = StackProtector_Ssp; @@ -1453,7 +1451,6 @@ gb_internal bool parse_build_flags(Array args) { 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");