vendor/lld/lld-trunk-r300422

3 files changed, 23 insertions, 3 deletions

diff --git a/include/lld/Core/Parallel.h b/include/lld/Core/Parallel.h
index f241453a4d395..64b4f2ab04d8d 100644
--- a/include/lld/Core/Parallel.h
+++ b/include/lld/Core/Parallel.h
@@ -318,12 +318,11 @@ void parallel_for(IndexTy Begin, IndexTy End, FuncTy Fn) {
 
   TaskGroup Tg;
   IndexTy I = Begin;
-  for (; I < End; I += TaskSize) {
+  for (; I + TaskSize < End; I += TaskSize) {
     Tg.spawn([=, &Fn] {
       for (IndexTy J = I, E = I + TaskSize; J != E; ++J)
         Fn(J);
     });
-    Begin += TaskSize;
   }
   Tg.spawn([=, &Fn] {
     for (IndexTy J = I; J < End; ++J)
diff --git a/include/lld/Core/TargetOptionsCommandFlags.h b/include/lld/Core/TargetOptionsCommandFlags.h
new file mode 100644
index 0000000000000..9ba99d94b9572
--- /dev/null
+++ b/include/lld/Core/TargetOptionsCommandFlags.h
@@ -0,0 +1,20 @@
+//===-- TargetOptionsCommandFlags.h ----------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// Helper to create TargetOptions from command line flags.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Support/CodeGen.h"
+#include "llvm/Target/TargetOptions.h"
+
+namespace lld {
+llvm::TargetOptions InitTargetOptionsFromCodeGenFlags();
+llvm::CodeModel::Model GetCodeModelFromCMModel();
+}
diff --git a/include/lld/Driver/Driver.h b/include/lld/Driver/Driver.h
index a3265c85716a5..4ba0994e88b9b 100644
--- a/include/lld/Driver/Driver.h
+++ b/include/lld/Driver/Driver.h
@@ -15,7 +15,8 @@
 
 namespace lld {
 namespace coff {
-bool link(llvm::ArrayRef<const char *> Args);
+bool link(llvm::ArrayRef<const char *> Args,
+          llvm::raw_ostream &Diag = llvm::errs());
 }
 
 namespace elf {