From 05cbe3bcbc92a96409200151d08e791a8d83fd76 Mon Sep 17 00:00:00 2001 From: dim Date: Wed, 25 Feb 2015 18:50:24 +0000 Subject: Merge llvm 3.6.0 final from ^/vendor/llvm/dist, merge clang 3.6.0 final from ^/vendor/clang/dist, and resolve conflicts. --- contrib/llvm/lib/Linker/LinkModules.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/llvm/lib/Linker/LinkModules.cpp') diff --git a/contrib/llvm/lib/Linker/LinkModules.cpp b/contrib/llvm/lib/Linker/LinkModules.cpp index 767d465..d5170ad 100644 --- a/contrib/llvm/lib/Linker/LinkModules.cpp +++ b/contrib/llvm/lib/Linker/LinkModules.cpp @@ -1749,7 +1749,7 @@ bool Linker::LinkModules(Module *Dest, Module *Src) { //===----------------------------------------------------------------------===// LLVMBool LLVMLinkModules(LLVMModuleRef Dest, LLVMModuleRef Src, - unsigned Unused, char **OutMessages) { + LLVMLinkerMode Mode, char **OutMessages) { Module *D = unwrap(Dest); std::string Message; raw_string_ostream Stream(Message); -- cgit v1.1