summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Collingbourne <peter@pcc.me.uk>2015-08-27 21:52:36 +0000
committerPeter Collingbourne <peter@pcc.me.uk>2015-08-27 21:52:36 +0000
commit402fbecc1a2b4fbfa8ef1acef0a10868ad0232d9 (patch)
treed41e8962f91d0a765162d5a84345238801950fe7
parentb0fed48b7825176e47b1b932904dcc65eb7562dd (diff)
downloadbcm5719-llvm-402fbecc1a2b4fbfa8ef1acef0a10868ad0232d9.tar.gz
bcm5719-llvm-402fbecc1a2b4fbfa8ef1acef0a10868ad0232d9.zip
Core: Start using llvm/Support/thread.h to work around MSVC <thread> issues.
llvm-svn: 246219
-rw-r--r--lld/include/lld/Core/Parallel.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/lld/include/lld/Core/Parallel.h b/lld/include/lld/Core/Parallel.h
index 91fde2fbcd0..c31a1ece6f4 100644
--- a/lld/include/lld/Core/Parallel.h
+++ b/lld/include/lld/Core/Parallel.h
@@ -14,18 +14,12 @@
#include "lld/Core/LLVM.h"
#include "lld/Core/range.h"
#include "llvm/Support/MathExtras.h"
-
-#ifdef _MSC_VER
-// concrt.h depends on eh.h for __uncaught_exception declaration
-// even if we disable exceptions.
-#include <eh.h>
-#endif
+#include "llvm/Support/thread.h"
#include <algorithm>
#include <atomic>
#include <condition_variable>
#include <mutex>
-#include <thread>
#include <stack>
#ifdef _MSC_VER
OpenPOWER on IntegriCloud