summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Linker/LinkModules.cpp
diff options
context:
space:
mode:
authorJuergen Ributzka <juergen@apple.com>2015-03-02 18:59:38 +0000
committerJuergen Ributzka <juergen@apple.com>2015-03-02 18:59:38 +0000
commita57d588cb7109c45b63a46ef6598f03745486f98 (patch)
tree24dc8dc3c39c31ca4f35c411678e1ee1fea76c17 /llvm/lib/Linker/LinkModules.cpp
parent468e055f5461f8c6aba108a44ef1e3714609f479 (diff)
downloadbcm5719-llvm-a57d588cb7109c45b63a46ef6598f03745486f98.tar.gz
bcm5719-llvm-a57d588cb7109c45b63a46ef6598f03745486f98.zip
Restore LLVMLinkModules C API until it is properly deprecated.
Add the enum "LLVMLinkerMode" back for backwards-compatibility and add the linker mode parameter back to the "LLVMLinkModules" function. The paramter is ignored and has no effect. Patch provided by: Filip Pizlo Reviewed by: Rafael and Sean llvm-svn: 230988
Diffstat (limited to 'llvm/lib/Linker/LinkModules.cpp')
-rw-r--r--llvm/lib/Linker/LinkModules.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp
index e6d9acc5098..e09f02e7797 100644
--- a/llvm/lib/Linker/LinkModules.cpp
+++ b/llvm/lib/Linker/LinkModules.cpp
@@ -1777,7 +1777,7 @@ bool Linker::LinkModules(Module *Dest, Module *Src) {
//===----------------------------------------------------------------------===//
LLVMBool LLVMLinkModules(LLVMModuleRef Dest, LLVMModuleRef Src,
- unsigned Unused, char **OutMessages) {
+ LLVMLinkerMode Unused, char **OutMessages) {
Module *D = unwrap(Dest);
std::string Message;
raw_string_ostream Stream(Message);
OpenPOWER on IntegriCloud