diff options
| author | Zachary Turner <zturner@google.com> | 2017-05-11 00:03:52 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2017-05-11 00:03:52 +0000 |
| commit | 3a57fbd6db74b2eb5cd2789036c521f702cb323e (patch) | |
| tree | 844c92ca46463cee221cf988d2cf0f8e16a5c736 /lld/lib/ReaderWriter | |
| parent | ae0317e4a9f4135e900891c4fb010f42c7764400 (diff) | |
| download | bcm5719-llvm-3a57fbd6db74b2eb5cd2789036c521f702cb323e.tar.gz bcm5719-llvm-3a57fbd6db74b2eb5cd2789036c521f702cb323e.zip | |
[Support] Move Parallel algorithms from LLD to LLVM.
Differential Revision: https://reviews.llvm.org/D33024
llvm-svn: 302748
Diffstat (limited to 'lld/lib/ReaderWriter')
| -rw-r--r-- | lld/lib/ReaderWriter/MachO/LayoutPass.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lld/lib/ReaderWriter/MachO/LayoutPass.cpp b/lld/lib/ReaderWriter/MachO/LayoutPass.cpp index 2b5a46cc98f..7bca07eb16d 100644 --- a/lld/lib/ReaderWriter/MachO/LayoutPass.cpp +++ b/lld/lib/ReaderWriter/MachO/LayoutPass.cpp @@ -9,12 +9,12 @@ #include "LayoutPass.h" #include "lld/Core/Instrumentation.h" -#include "lld/Core/Parallel.h" #include "lld/Core/PassManager.h" #include "lld/ReaderWriter/MachOLinkingContext.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/Twine.h" #include "llvm/Support/Debug.h" +#include "llvm/Support/Parallel.h" #include <algorithm> #include <set> #include <utility> @@ -461,7 +461,7 @@ llvm::Error LayoutPass::perform(SimpleFile &mergedFile) { }); std::vector<LayoutPass::SortKey> vec = decorate(atomRange); - sort(parallel::par, vec.begin(), vec.end(), + sort(llvm::parallel::par, vec.begin(), vec.end(), [&](const LayoutPass::SortKey &l, const LayoutPass::SortKey &r) -> bool { return compareAtoms(l, r, _customSorter); }); |
