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

Simplify use of pie

Browse Source
This commit is contained in:
0dminnimda
2024-11-04 15:39:06 +03:00
committed by flysand7
parent 480f32586e
commit 4f37b34654
3 changed files with 9 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/build_settings.cpp
View File

@@ -257,12 +257,6 @@ enum RelocMode : u8 {
RelocMode_DynamicNoPIC,
};
enum LinkPIE : u8 {
LinkPIE_Default,
LinkPIE_No,
LinkPIE_Yes,
};
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:`.
@@ -473,7 +467,6 @@ struct BuildContext {
bool print_linker_flags;
RelocMode reloc_mode;
LinkPIE link_pie;
bool disable_red_zone;
isize max_error_count;

29
src/linker.cpp
View File

@@ -607,27 +607,16 @@ gb_internal i32 linker_stage(LinkerData *gen) {
}
switch (build_context.link_pie) {
case (LinkPIE_Default):
if (build_context.build_mode != BuildMode_DynamicLibrary) {
if (build_context.metrics.os != TargetOs_openbsd
&& build_context.metrics.os != TargetOs_haiku
&& build_context.metrics.arch != TargetArch_riscv64
) {
// OpenBSD and Haiku default to PIE executable. do not pass -no-pie for it.
link_settings = gb_string_appendc(link_settings, "-no-pie ");
}
if (build_context.build_mode == BuildMode_Executable && build_context.reloc_mode == RelocMode_PIC) {
// Do not disable PIE, let the linker choose. (most likely you want it enabled)
} else if (build_context.build_mode != BuildMode_DynamicLibrary) {
if (build_context.metrics.os != TargetOs_openbsd
&& build_context.metrics.os != TargetOs_haiku
&& build_context.metrics.arch != TargetArch_riscv64
) {
// OpenBSD and Haiku default to PIE executable. do not pass -no-pie for it.
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(), "");

21
src/main.cpp
View File

@@ -360,7 +360,6 @@ enum BuildFlagKind {
BuildFlag_NoThreadLocal,
BuildFlag_RelocMode,
BuildFlag_LinkPIE,
BuildFlag_DisableRedZone,
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_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_DisallowDo, str_lit("disallow-do"), BuildFlagParam_None, Command__does_check);
@@ -1334,25 +1332,6 @@ gb_internal bool parse_build_flags(Array<String> args) {
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:
build_context.disable_red_zone = true;
break;