ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-06-13 01:21:38 -07:00
Code Issues Packages Projects Releases Wiki Activity

Default to "smart" linker behaviour; Add -min-link-libs to use minimize link libs if wanted

Browse Source
This commit is contained in:
gingerBill
2024-04-04 16:11:26 +01:00
parent d248cddf90
commit 0e5a482c42
3 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/build_settings.cpp
+3 -1
View File
@@ -412,7 +412,9 @@ struct BuildContext {
bool dynamic_map_calls;
bool obfuscate_source_code_locations;
bool obfuscate_source_code_locations;
bool min_link_libs;
RelocMode reloc_mode;
bool disable_red_zone;
src/linker.cpp
+27 -33
View File
@@ -139,9 +139,9 @@ gb_internal i32 linker_stage(LinkerData *gen) {
}
StringSet libs = {};
string_set_init(&libs, 64);
defer (string_set_destroy(&libs));
StringSet min_libs_set = {};
string_set_init(&min_libs_set, 64);
defer (string_set_destroy(&min_libs_set));
StringSet asm_files = {};
string_set_init(&asm_files, 64);
@@ -149,6 +149,11 @@ gb_internal i32 linker_stage(LinkerData *gen) {
for (Entity *e : gen->foreign_libraries) {
GB_ASSERT(e->kind == Entity_LibraryName);
// NOTE(bill): Add these before the linking values
String extra_linker_flags = string_trim_whitespace(e->LibraryName.extra_linker_flags);
if (extra_linker_flags.len != 0) {
lib_str = gb_string_append_fmt(lib_str, " %.*s", LIT(extra_linker_flags));
}
for_array(i, e->LibraryName.paths) {
String lib = string_trim_whitespace(e->LibraryName.paths[i]);
// IMPORTANT NOTE(bill): calling `string_to_lower` here is not an issue because
@@ -162,12 +167,11 @@ gb_internal i32 linker_stage(LinkerData *gen) {
if (!string_set_update(&asm_files, lib)) {
String asm_file = asm_files.entries[i].value;
String obj_file = concatenate_strings(permanent_allocator(), asm_file, str_lit(".obj"));
String obj_format;
#if defined(GB_ARCH_64_BIT)
obj_format = str_lit("win64");
#elif defined(GB_ARCH_32_BIT)
String obj_format = str_lit("win64");
#if defined(GB_ARCH_32_BIT)
obj_format = str_lit("win32");
#endif // GB_ARCH_*_BIT
#endif
result = system_exec_command_line_app("nasm",
"\"%.*s\\bin\\nasm\\windows\\nasm.exe\" \"%.*s\" "
"-f \"%.*s\" "
@@ -185,21 +189,13 @@ gb_internal i32 linker_stage(LinkerData *gen) {
}
array_add(&gen->output_object_paths, obj_file);
}
} else {
if (!string_set_update(&libs, lib)) {
lib_str = gb_string_append_fmt(lib_str, " \"%.*s\"", LIT(lib));
}
} else if (!string_set_update(&min_libs_set, lib) ||
!build_context.min_link_libs) {
lib_str = gb_string_append_fmt(lib_str, " \"%.*s\"", LIT(lib));
}
}
}
for (Entity *e : gen->foreign_libraries) {
GB_ASSERT(e->kind == Entity_LibraryName);
if (e->LibraryName.extra_linker_flags.len != 0) {
lib_str = gb_string_append_fmt(lib_str, " %.*s", LIT(e->LibraryName.extra_linker_flags));
}
}
if (build_context.build_mode == BuildMode_DynamicLibrary) {
link_settings = gb_string_append_fmt(link_settings, " /DLL");
} else {
@@ -318,12 +314,17 @@ gb_internal i32 linker_stage(LinkerData *gen) {
string_set_init(&asm_files, 64);
defer (string_set_destroy(&asm_files));
StringSet libs = {};
string_set_init(&libs, 64);
defer (string_set_destroy(&libs));
StringSet min_libs_set = {};
string_set_init(&min_libs_set, 64);
defer (string_set_destroy(&min_libs_set));
for (Entity *e : gen->foreign_libraries) {
GB_ASSERT(e->kind == Entity_LibraryName);
// NOTE(bill): Add these before the linking values
String extra_linker_flags = string_trim_whitespace(e->LibraryName.extra_linker_flags);
if (extra_linker_flags.len != 0) {
lib_str = gb_string_append_fmt(lib_str, " %.*s", LIT(extra_linker_flags));
}
for (String lib : e->LibraryName.paths) {
lib = string_trim_whitespace(lib);
if (lib.len == 0) {
@@ -336,19 +337,19 @@ gb_internal i32 linker_stage(LinkerData *gen) {
String asm_file = lib;
String obj_file = concatenate_strings(permanent_allocator(), asm_file, str_lit(".o"));
String obj_format;
#if defined(GB_ARCH_64_BIT)
#if defined(GB_ARCH_64_BIT)
if (is_osx) {
obj_format = str_lit("macho64");
} else {
obj_format = str_lit("elf64");
}
#elif defined(GB_ARCH_32_BIT)
#elif defined(GB_ARCH_32_BIT)
if (is_osx) {
obj_format = str_lit("macho32");
} else {
obj_format = str_lit("elf32");
}
#endif // GB_ARCH_*_BIT
#endif // GB_ARCH_*_BIT
if (is_osx) {
// `as` comes with MacOS.
@@ -383,7 +384,7 @@ gb_internal i32 linker_stage(LinkerData *gen) {
}
array_add(&gen->output_object_paths, obj_file);
} else {
if (string_set_update(&libs, lib)) {
if (string_set_update(&min_libs_set, lib) && build_context.min_link_libs) {
continue;
}
@@ -433,13 +434,6 @@ gb_internal i32 linker_stage(LinkerData *gen) {
}
}
for (Entity *e : gen->foreign_libraries) {
GB_ASSERT(e->kind == Entity_LibraryName);
if (e->LibraryName.extra_linker_flags.len != 0) {
lib_str = gb_string_append_fmt(lib_str, " %.*s", LIT(e->LibraryName.extra_linker_flags));
}
}
gbString object_files = gb_string_make(heap_allocator(), "");
defer (gb_string_free(object_files));
for (String object_path : gen->output_object_paths) {
src/main.cpp
+13
View File
@@ -296,6 +296,8 @@ enum BuildFlagKind {
BuildFlag_ErrorPosStyle,
BuildFlag_MaxErrorCount,
BuildFlag_MinLinkLibs,
// internal use only
BuildFlag_InternalIgnoreLazy,
BuildFlag_InternalIgnoreLLVMBuild,
@@ -485,6 +487,8 @@ gb_internal bool parse_build_flags(Array<String> args) {
add_flag(&build_flags, BuildFlag_ErrorPosStyle, str_lit("error-pos-style"), BuildFlagParam_String, Command_all);
add_flag(&build_flags, BuildFlag_MaxErrorCount, str_lit("max-error-count"), BuildFlagParam_Integer, Command_all);
add_flag(&build_flags, BuildFlag_MinLinkLibs, str_lit("min-link-libs"), BuildFlagParam_None, Command__does_build);
add_flag(&build_flags, BuildFlag_InternalIgnoreLazy, str_lit("internal-ignore-lazy"), BuildFlagParam_None, Command_all);
add_flag(&build_flags, BuildFlag_InternalIgnoreLLVMBuild, str_lit("internal-ignore-llvm-build"),BuildFlagParam_None, Command_all);
@@ -1215,6 +1219,10 @@ gb_internal bool parse_build_flags(Array<String> args) {
break;
}
case BuildFlag_MinLinkLibs:
build_context.min_link_libs = true;
break;
case BuildFlag_InternalIgnoreLazy:
build_context.ignore_lazy = true;
break;
@@ -2008,6 +2016,11 @@ gb_internal void print_show_help(String const arg0, String const &command) {
print_usage_line(2, "If not set, the default max error count is %d.", DEFAULT_MAX_ERROR_COLLECTOR_COUNT);
print_usage_line(0, "");
print_usage_line(1, "-min-link-libs");
print_usage_line(2, "If set, the number of linked libraries will be minimized to prevent duplications.");
print_usage_line(2, "This is useful for so called \"dumb\" linkers compared to \"smart\" linkers.");
print_usage_line(0, "");
print_usage_line(1, "-foreign-error-procedures");
print_usage_line(2, "States that the error procedures used in the runtime are defined in a separate translation unit.");
print_usage_line(0, "");