summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeresa Johnson <tejohnson@google.com>2015-11-03 15:10:50 +0000
committerTeresa Johnson <tejohnson@google.com>2015-11-03 15:10:50 +0000
commit04e5877430a33022ebd23187efc65c6fdf100fe7 (patch)
treece06cb6078b2ba37a75624acb1969aad5e10d539
parent127f669913dfc0b8952ef5c3428030df7769f761 (diff)
downloadbcm5719-llvm-04e5877430a33022ebd23187efc65c6fdf100fe7.tar.gz
bcm5719-llvm-04e5877430a33022ebd23187efc65c6fdf100fe7.zip
Pass enum instead of bool to new linkInModule call in llvm-link
A new call I added to linkInModule from llvm-link in r251866 was still passing in a boolean for an argument that was changed to an enum in r246561. I didn't catch this in my merge since the bool false matched the flag value it mapped to. llvm-svn: 251925
-rw-r--r--llvm/tools/llvm-link/llvm-link.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/tools/llvm-link/llvm-link.cpp b/llvm/tools/llvm-link/llvm-link.cpp
index 718d57a343f..8d0ce0a040f 100644
--- a/llvm/tools/llvm-link/llvm-link.cpp
+++ b/llvm/tools/llvm-link/llvm-link.cpp
@@ -215,7 +215,7 @@ static bool importFunctions(const char *argv0, LLVMContext &Context,
}
// Link in the specified function.
- if (L.linkInModule(M.get(), false, Index.get(), F))
+ if (L.linkInModule(M.get(), Linker::Flags::None, Index.get(), F))
return false;
}
return true;
OpenPOWER on IntegriCloud