diff options
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | src/codegen.cpp | 2 | ||||
| -rw-r--r-- | src/zig_llvm.cpp | 52 | ||||
| -rw-r--r-- | src/zig_llvm.hpp | 3 |
4 files changed, 3 insertions, 57 deletions
@@ -42,9 +42,10 @@ make ## Roadmap - * Math expression + * variables and parameters * Export .so library * Multiple files + * Type checking * inline assembly and syscalls * running code at compile time * print! macro that takes var args diff --git a/src/codegen.cpp b/src/codegen.cpp index 4dbe6f7130..dd1f8a4722 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -1313,7 +1313,7 @@ void code_gen_link(CodeGen *g, const char *out_file) { } char *err_msg = nullptr; - if (LLVMZigTargetMachineEmitToFile(g->target_machine, g->module, buf_ptr(&out_file_o), + if (LLVMTargetMachineEmitToFile(g->target_machine, g->module, buf_ptr(&out_file_o), LLVMObjectFile, &err_msg)) { zig_panic("unable to write object file: %s", err_msg); diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp index cde28c13b5..78f4d81544 100644 --- a/src/zig_llvm.cpp +++ b/src/zig_llvm.cpp @@ -115,58 +115,6 @@ void LLVMZigOptimizeModule(LLVMTargetMachineRef targ_machine_ref, LLVMModuleRef MPM->run(*module); } -static LLVMBool LLVMZigTargetMachineEmit(LLVMTargetMachineRef targ_machine_ref, LLVMModuleRef module_ref, - raw_pwrite_stream &out_stream, LLVMCodeGenFileType codegen, char **err_msg) -{ - TargetMachine* target_machine = reinterpret_cast<TargetMachine*>(targ_machine_ref); - Module* module = unwrap(module_ref); - TargetLibraryInfoImpl tlii(Triple(module->getTargetTriple())); - - legacy::PassManager pass; - - pass.add(new TargetLibraryInfoWrapperPass(tlii)); - - const DataLayout *td = target_machine->getDataLayout(); - - if (!td) { - *err_msg = strdup("No DataLayout in TargetMachine"); - return true; - } - module->setDataLayout(*td); - - - TargetMachine::CodeGenFileType ft; - switch (codegen) { - case LLVMAssemblyFile: - ft = TargetMachine::CGFT_AssemblyFile; - break; - default: - ft = TargetMachine::CGFT_ObjectFile; - break; - } - if (target_machine->addPassesToEmitFile(pass, out_stream, ft)) { - *err_msg = strdup("TargetMachine can't emit a file of this type"); - return true; - } - - pass.run(*module); - - out_stream.flush(); - return false; -} - -LLVMBool LLVMZigTargetMachineEmitToFile(LLVMTargetMachineRef targ_machine_ref, LLVMModuleRef module_ref, - const char* filename, LLVMCodeGenFileType codegen, char** err_msg) -{ - std::error_code error_code; - raw_fd_ostream dest(filename, error_code, sys::fs::F_None); - if (error_code) { - *err_msg = strdup(error_code.message().c_str()); - return true; - } - return LLVMZigTargetMachineEmit(targ_machine_ref, module_ref, dest, codegen, err_msg); -} - LLVMValueRef LLVMZigBuildCall(LLVMBuilderRef B, LLVMValueRef Fn, LLVMValueRef *Args, unsigned NumArgs, unsigned CC, const char *Name) { diff --git a/src/zig_llvm.hpp b/src/zig_llvm.hpp index be1bf64d9a..e67be49625 100644 --- a/src/zig_llvm.hpp +++ b/src/zig_llvm.hpp @@ -21,9 +21,6 @@ void LLVMZigInitializeUnreachableBlockElimPass(LLVMPassRegistryRef R); char *LLVMZigGetHostCPUName(void); char *LLVMZigGetNativeFeatures(void); -LLVMBool LLVMZigTargetMachineEmitToFile(LLVMTargetMachineRef target_machine, LLVMModuleRef module, - const char* filename, LLVMCodeGenFileType codegen, char** error_msg); - void LLVMZigOptimizeModule(LLVMTargetMachineRef targ_machine_ref, LLVMModuleRef module_ref); LLVMValueRef LLVMZigBuildCall(LLVMBuilderRef B, LLVMValueRef Fn, LLVMValueRef *Args, |