authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-05-26 12:18:13-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-05-26 12:18:13-04:00
log8efb3f5e197edf2debebf0557c74fef2541cc117
tree93fa03300c5442cfb17db9dd99c64975ca71f734
parent1f96a866769423e363f1c48654c0f51ecf75db58

update to latest LLVM API

2 files changed, 2 insertions(+), 3 deletions(-)

src/translate_c.cpp+1-2
...@@ -4658,7 +4658,6 @@ int parse_h_file(ImportTableEntry *import, ZigList<ErrorMsg *> *errors, const ch...@@ -4658,7 +4658,6 @@ int parse_h_file(ImportTableEntry *import, ZigList<ErrorMsg *> *errors, const ch
46584658
4659 std::shared_ptr<PCHContainerOperations> pch_container_ops = std::make_shared<PCHContainerOperations>();4659 std::shared_ptr<PCHContainerOperations> pch_container_ops = std::make_shared<PCHContainerOperations>();
46604660
4661 bool skip_function_bodies = false;
4662 bool only_local_decls = true;4661 bool only_local_decls = true;
4663 bool capture_diagnostics = true;4662 bool capture_diagnostics = true;
4664 bool user_files_are_volatile = true;4663 bool user_files_are_volatile = true;
...@@ -4671,7 +4670,7 @@ int parse_h_file(ImportTableEntry *import, ZigList<ErrorMsg *> *errors, const ch...@@ -4671,7 +4670,7 @@ int parse_h_file(ImportTableEntry *import, ZigList<ErrorMsg *> *errors, const ch
4671 &clang_argv.at(0), &clang_argv.last(),4670 &clang_argv.at(0), &clang_argv.last(),
4672 pch_container_ops, diags, resources_path,4671 pch_container_ops, diags, resources_path,
4673 only_local_decls, capture_diagnostics, None, true, 0, TU_Complete,4672 only_local_decls, capture_diagnostics, None, true, 0, TU_Complete,
4674 false, false, allow_pch_with_compiler_errors, skip_function_bodies,4673 false, false, allow_pch_with_compiler_errors, SkipFunctionBodiesScope::None,
4675 single_file_parse, user_files_are_volatile, for_serialization, None, &err_unit,4674 single_file_parse, user_files_are_volatile, for_serialization, None, &err_unit,
4676 nullptr));4675 nullptr));
46774676
src/zig_llvm.cpp+1-1
...@@ -162,7 +162,7 @@ bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machine_ref, LLVMM...@@ -162,7 +162,7 @@ bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machine_ref, LLVMM
162 abort();162 abort();
163 }163 }
164164
165 if (target_machine->addPassesToEmitFile(MPM, dest, ft)) {165 if (target_machine->addPassesToEmitFile(MPM, dest, nullptr, ft)) {
166 *error_message = strdup("TargetMachine can't emit a file of this type");166 *error_message = strdup("TargetMachine can't emit a file of this type");
167 return true;167 return true;
168 }168 }