ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes for \*nix backend

Browse Source
This commit is contained in:
gingerBill
2020-06-10 13:38:17 +01:00
parent 6ea0910213
commit 97d3d4ff6f
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/llvm_backend.cpp
+1 -1
View File
@@ -9121,7 +9121,7 @@ lbValue lb_build_expr(lbProcedure *p, Ast *expr) {
} else if (e != nullptr && e->kind == Entity_Variable) { } else if (e != nullptr && e->kind == Entity_Variable) {
return lb_addr_load(p, lb_build_addr(p, expr)); return lb_addr_load(p, lb_build_addr(p, expr));
} }
gb_printf_err("Error in: %.*s(%td:%td) %s\n", LIT(p->name), i->token.pos.line, i->token.pos.column); gb_printf_err("Error in: %.*s(%td:%td)\n", LIT(p->name), i->token.pos.line, i->token.pos.column);
String pkg = {}; String pkg = {};
if (e->pkg) { if (e->pkg) {
pkg = e->pkg->name; pkg = e->pkg->name;
src/main.cpp
+6 -13
View File
@@ -321,8 +321,8 @@ i32 linker_stage(lbGenerator *gen) {
gbString lib_str = gb_string_make(heap_allocator(), "-L/"); gbString lib_str = gb_string_make(heap_allocator(), "-L/");
defer (gb_string_free(lib_str)); defer (gb_string_free(lib_str));
for_array(i, ir_gen.module.foreign_library_paths) { for_array(i, gen->module.foreign_library_paths) {
String lib = ir_gen.module.foreign_library_paths[i]; String lib = gen->module.foreign_library_paths[i];
// NOTE(zangent): Sometimes, you have to use -framework on MacOS. // NOTE(zangent): Sometimes, you have to use -framework on MacOS.
// This allows you to specify '-f' in a #foreign_system_library, // This allows you to specify '-f' in a #foreign_system_library,
@@ -446,14 +446,6 @@ i32 linker_stage(lbGenerator *gen) {
} }
#endif #endif
if (build_context.show_timings) {
show_timings(&checker, timings);
}
remove_temp_files(output_base);
#endif #endif
} }
@@ -1403,7 +1395,7 @@ i32 exec_llvm_llc(String output_base) {
build_context.optimization_level, build_context.optimization_level,
LIT(build_context.llc_flags), LIT(build_context.llc_flags),
build_context.cross_compiling ? "-mtriple=" : "", build_context.cross_compiling ? "-mtriple=" : "",
(int) (build_context.cross_compiling ? build_context.metrics.target_triplet.len : 0), cast(int)(build_context.cross_compiling ? build_context.metrics.target_triplet.len : 0),
build_context.metrics.target_triplet.text); build_context.metrics.target_triplet.text);
#endif #endif
} }
@@ -1422,7 +1414,7 @@ void print_show_help(String const arg0, String const &command) {
} else if (command == "check") { } else if (command == "check") {
print_usage_line(1, "check parse and type check .odin file"); print_usage_line(1, "check parse and type check .odin file");
} else if (command == "query") { } else if (command == "query") {
print_usage_line(1, "query parse, type check, and output a .json file containing information about the program"); print_usage_line(1, "query [experimental] parse, type check, and output a .json file containing information about the program");
} else if (command == "docs") { } else if (command == "docs") {
print_usage_line(1, "docs generate documentation for a .odin file"); print_usage_line(1, "docs generate documentation for a .odin file");
} else if (command == "version") { } else if (command == "version") {
@@ -1819,7 +1811,8 @@ int main(int arg_count, char const **arg_ptr) {
return system_exec_command_line_app("odin run", "%.*s.exe %.*s", LIT(gen.output_base), LIT(run_args_string)); return system_exec_command_line_app("odin run", "%.*s.exe %.*s", LIT(gen.output_base), LIT(run_args_string));
#else #else
//NOTE(thebirk): This whole thing is a little leaky //NOTE(thebirk): This whole thing is a little leaky
String complete_path = concatenate_strings(heap_allocator(), output_base, output_ext); String output_ext = {};
String complete_path = concatenate_strings(heap_allocator(), gen.output_base, output_ext);
complete_path = path_to_full_path(heap_allocator(), complete_path); complete_path = path_to_full_path(heap_allocator(), complete_path);
return system_exec_command_line_app("odin run", "\"%.*s\" %.*s", LIT(complete_path), LIT(run_args_string)); return system_exec_command_line_app("odin run", "\"%.*s\" %.*s", LIT(complete_path), LIT(run_args_string));
#endif #endif