diff options
author | dim <dim@FreeBSD.org> | 2015-02-25 18:25:34 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2015-02-25 18:25:34 +0000 |
commit | ea50228cd2ebf54c0ec67624d82c47a11b807869 (patch) | |
tree | 04d79cf27b19565c7fe5e8a5f476f91e6cde20e0 /lib/Linker/LinkModules.cpp | |
parent | 49b6407b6cc89756540e2097c1cf8b9bb4a422e1 (diff) | |
download | FreeBSD-src-ea50228cd2ebf54c0ec67624d82c47a11b807869.zip FreeBSD-src-ea50228cd2ebf54c0ec67624d82c47a11b807869.tar.gz |
Vendor import of llvm RELEASE_360/final tag r230434 (effectively, 3.6.0 release):
https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_360/final@230434
Diffstat (limited to 'lib/Linker/LinkModules.cpp')
-rw-r--r-- | lib/Linker/LinkModules.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index 767d465..d5170ad 100644 --- a/lib/Linker/LinkModules.cpp +++ b/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); |