aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorgingerBill <bill@gingerbill.org>2018-01-20 16:16:59 +0000
committergingerBill <bill@gingerbill.org>2018-01-20 16:16:59 +0000
commit8b288a207254112a3b42ecbef46cecef9f28e811 (patch)
tree726fa799edeea0b6ed9f7ae255335d6c46ddd7ba /src/main.cpp
parent4e90644527adc531134d74d5a5eb1d5cafb6bc95 (diff)
Reimplement opt stage
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp64
1 files changed, 32 insertions, 32 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 512a67f14..be5dd4669 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -719,42 +719,42 @@ int main(int arg_count, char **arg_ptr) {
i32 exit_code = 0;
- // timings_start_section(&timings, str_lit("llvm-opt"));
- // #if defined(GB_SYSTEM_WINDOWS)
- // // For more passes arguments: http://llvm.org/docs/Passes.html
- // exit_code = system_exec_command_line_app("llvm-opt", false,
- // "\"%.*sbin/opt\" \"%.*s\".ll -o \"%.*s\".bc %.*s "
- // "-mem2reg "
- // "-memcpyopt "
- // "-die "
- // "",
- // LIT(build_context.ODIN_ROOT),
- // LIT(output_base), LIT(output_base),
- // LIT(build_context.opt_flags));
- // if (exit_code != 0) {
- // return exit_code;
- // }
- // #else
- // // NOTE(zangent): This is separate because it seems that LLVM tools are packaged
- // // with the Windows version, while they will be system-provided on MacOS and GNU/Linux
- // exit_code = system_exec_command_line_app("llvm-opt", false,
- // "opt \"%.*s.ll\" -o \"%.*s\".bc %.*s "
- // "-mem2reg "
- // "-memcpyopt "
- // "-die "
- // "",
- // LIT(output_base), LIT(output_base),
- // LIT(build_context.opt_flags));
- // if (exit_code != 0) {
- // return exit_code;
- // }
- // #endif
+ timings_start_section(&timings, str_lit("llvm-opt"));
+ #if defined(GB_SYSTEM_WINDOWS)
+ // For more passes arguments: http://llvm.org/docs/Passes.html
+ exit_code = system_exec_command_line_app("llvm-opt", false,
+ "\"%.*sbin/opt\" \"%.*s\".ll -o \"%.*s\".bc %.*s "
+ "-mem2reg "
+ "-memcpyopt "
+ "-die "
+ "",
+ LIT(build_context.ODIN_ROOT),
+ LIT(output_base), LIT(output_base),
+ LIT(build_context.opt_flags));
+ if (exit_code != 0) {
+ return exit_code;
+ }
+ #else
+ // NOTE(zangent): This is separate because it seems that LLVM tools are packaged
+ // with the Windows version, while they will be system-provided on MacOS and GNU/Linux
+ exit_code = system_exec_command_line_app("llvm-opt", false,
+ "opt \"%.*s.ll\" -o \"%.*s\".bc %.*s "
+ "-mem2reg "
+ "-memcpyopt "
+ "-die "
+ "",
+ LIT(output_base), LIT(output_base),
+ LIT(build_context.opt_flags));
+ if (exit_code != 0) {
+ return exit_code;
+ }
+ #endif
#if defined(GB_SYSTEM_WINDOWS)
timings_start_section(&timings, str_lit("llvm-llc"));
// For more arguments: http://llvm.org/docs/CommandGuide/llc.html
exit_code = system_exec_command_line_app("llvm-llc", false,
- "\"%.*sbin/llc\" \"%.*s.ll\" -filetype=obj -O%d "
+ "\"%.*sbin/llc\" \"%.*s.bc\" -filetype=obj -O%d "
"-o \"%.*s.obj\" "
"%.*s "
// "-debug-pass=Arguments "
@@ -829,7 +829,7 @@ int main(int arg_count, char **arg_ptr) {
timings_start_section(&timings, str_lit("llvm-llc"));
// For more arguments: http://llvm.org/docs/CommandGuide/llc.html
exit_code = system_exec_command_line_app("llc", false,
- "llc \"%.*s.ll\" -filetype=obj -relocation-model=pic -O%d "
+ "llc \"%.*s.bc\" -filetype=obj -relocation-model=pic -O%d "
"%.*s "
// "-debug-pass=Arguments "
"%s"