mirror of
https://github.com/Ed94/Odin.git
synced 2026-08-06 07:38:48 +00:00
Simplify use of pie
This commit is contained in:
@@ -257,12 +257,6 @@ enum RelocMode : u8 {
|
|||||||
RelocMode_DynamicNoPIC,
|
RelocMode_DynamicNoPIC,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum LinkPIE : u8 {
|
|
||||||
LinkPIE_Default,
|
|
||||||
LinkPIE_No,
|
|
||||||
LinkPIE_Yes,
|
|
||||||
};
|
|
||||||
|
|
||||||
enum BuildPath : u8 {
|
enum BuildPath : u8 {
|
||||||
BuildPath_Main_Package, // Input Path to the package directory (or file) we're building.
|
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:`.
|
BuildPath_RC, // Input Path for .rc file, can be set with `-resource:`.
|
||||||
@@ -473,7 +467,6 @@ struct BuildContext {
|
|||||||
bool print_linker_flags;
|
bool print_linker_flags;
|
||||||
|
|
||||||
RelocMode reloc_mode;
|
RelocMode reloc_mode;
|
||||||
LinkPIE link_pie;
|
|
||||||
bool disable_red_zone;
|
bool disable_red_zone;
|
||||||
|
|
||||||
isize max_error_count;
|
isize max_error_count;
|
||||||
|
|||||||
+9
-20
@@ -607,27 +607,16 @@ gb_internal i32 linker_stage(LinkerData *gen) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (build_context.link_pie) {
|
if (build_context.build_mode == BuildMode_Executable && build_context.reloc_mode == RelocMode_PIC) {
|
||||||
case (LinkPIE_Default):
|
// Do not disable PIE, let the linker choose. (most likely you want it enabled)
|
||||||
if (build_context.build_mode != BuildMode_DynamicLibrary) {
|
} else if (build_context.build_mode != BuildMode_DynamicLibrary) {
|
||||||
if (build_context.metrics.os != TargetOs_openbsd
|
if (build_context.metrics.os != TargetOs_openbsd
|
||||||
&& build_context.metrics.os != TargetOs_haiku
|
&& build_context.metrics.os != TargetOs_haiku
|
||||||
&& build_context.metrics.arch != TargetArch_riscv64
|
&& build_context.metrics.arch != TargetArch_riscv64
|
||||||
) {
|
) {
|
||||||
// OpenBSD and Haiku default to PIE executable. do not pass -no-pie for it.
|
// OpenBSD and Haiku default to PIE executable. do not pass -no-pie for it.
|
||||||
link_settings = gb_string_appendc(link_settings, "-no-pie ");
|
link_settings = gb_string_appendc(link_settings, "-no-pie ");
|
||||||
}
|
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
case (LinkPIE_Yes):
|
|
||||||
if (build_context.build_mode != BuildMode_Executable) {
|
|
||||||
compiler_error("linking NON-EXECUTABLE as pie (position independent EXECUTABLE)");
|
|
||||||
}
|
|
||||||
link_settings = gb_string_appendc(link_settings, "-pie ");
|
|
||||||
break;
|
|
||||||
case (LinkPIE_No):
|
|
||||||
link_settings = gb_string_appendc(link_settings, "-no-pie ");
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
gbString platform_lib_str = gb_string_make(heap_allocator(), "");
|
gbString platform_lib_str = gb_string_make(heap_allocator(), "");
|
||||||
|
|||||||
@@ -360,7 +360,6 @@ enum BuildFlagKind {
|
|||||||
BuildFlag_NoThreadLocal,
|
BuildFlag_NoThreadLocal,
|
||||||
|
|
||||||
BuildFlag_RelocMode,
|
BuildFlag_RelocMode,
|
||||||
BuildFlag_LinkPIE,
|
|
||||||
BuildFlag_DisableRedZone,
|
BuildFlag_DisableRedZone,
|
||||||
|
|
||||||
BuildFlag_DisallowDo,
|
BuildFlag_DisallowDo,
|
||||||
@@ -571,7 +570,6 @@ 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);
|
add_flag(&build_flags, BuildFlag_MinimumOSVersion, str_lit("minimum-os-version"), BuildFlagParam_String, Command__does_build);
|
||||||
|
|
||||||
add_flag(&build_flags, BuildFlag_RelocMode, str_lit("reloc-mode"), BuildFlagParam_String, Command__does_build);
|
add_flag(&build_flags, BuildFlag_RelocMode, str_lit("reloc-mode"), BuildFlagParam_String, Command__does_build);
|
||||||
add_flag(&build_flags, BuildFlag_LinkPIE, str_lit("link-pie"), 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_DisableRedZone, str_lit("disable-red-zone"), BuildFlagParam_None, Command__does_build);
|
||||||
|
|
||||||
add_flag(&build_flags, BuildFlag_DisallowDo, str_lit("disallow-do"), BuildFlagParam_None, Command__does_check);
|
add_flag(&build_flags, BuildFlag_DisallowDo, str_lit("disallow-do"), BuildFlagParam_None, Command__does_check);
|
||||||
@@ -1334,25 +1332,6 @@ gb_internal bool parse_build_flags(Array<String> args) {
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case BuildFlag_LinkPIE: {
|
|
||||||
GB_ASSERT(value.kind == ExactValue_String);
|
|
||||||
String v = value.value_string;
|
|
||||||
if (v == "default") {
|
|
||||||
build_context.link_pie = LinkPIE_Default;
|
|
||||||
} else if (v == "yes" || v == "true") {
|
|
||||||
build_context.link_pie = LinkPIE_Yes;
|
|
||||||
} else if (v == "no" || v == "false") {
|
|
||||||
build_context.link_pie = LinkPIE_No;
|
|
||||||
} else {
|
|
||||||
gb_printf_err("-link-pie flag expected one of the following\n");
|
|
||||||
gb_printf_err("\tdefault\n");
|
|
||||||
gb_printf_err("\tyes, true\n");
|
|
||||||
gb_printf_err("\tno, false\n");
|
|
||||||
bad_flags = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case BuildFlag_DisableRedZone:
|
case BuildFlag_DisableRedZone:
|
||||||
build_context.disable_red_zone = true;
|
build_context.disable_red_zone = true;
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user