From f81b4d4d2139f4a2adecc7141fef89d34c51071f Mon Sep 17 00:00:00 2001
From: Hans Wennborg <hans@hanshq.net>
Date: Wed, 10 May 2017 16:25:54 +0000
Subject: [PATCH] Fix -DLLVM_ENABLE_THREADS=OFF build of lld after r302613

llvm-svn: 302690
---
 lld/include/lld/Core/Parallel.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lld/include/lld/Core/Parallel.h b/lld/include/lld/Core/Parallel.h
index a514b2e..20b7741 100644
--- a/lld/include/lld/Core/Parallel.h
+++ b/lld/include/lld/Core/Parallel.h
@@ -38,10 +38,10 @@ struct is_execution_policy
 constexpr sequential_execution_policy seq{};
 constexpr parallel_execution_policy par{};
 
-#if LLVM_ENABLE_THREADS
-
 namespace detail {
 
+#if LLVM_ENABLE_THREADS
+
 #if defined(_MSC_VER)
 template <class RandomAccessIterator, class Comparator>
 void parallel_sort(RandomAccessIterator Start, RandomAccessIterator End,
@@ -148,12 +148,13 @@ void parallel_for_each_n(IndexTy Begin, IndexTy End, FuncTy Fn) {
 
 #endif
 
+#endif
+
 template <typename Iter>
 using DefComparator =
     std::less<typename std::iterator_traits<Iter>::value_type>;
 
 } // namespace detail
-#endif
 
 // sequential algorithm implementations.
 template <class Policy, class RandomAccessIterator,
@@ -182,7 +183,7 @@ void for_each_n(Policy policy, IndexTy Begin, IndexTy End, FuncTy Fn) {
 
 // Parallel algorithm implementations, only available when LLVM_ENABLE_THREADS
 // is true.
-#if defined(LLVM_ENABLE_THREADS)
+#if LLVM_ENABLE_THREADS
 template <class RandomAccessIterator,
           class Comparator = detail::DefComparator<RandomAccessIterator>>
 void sort(parallel_execution_policy policy, RandomAccessIterator Start,
-- 
2.7.4