Update Clang sources to r73879.vendor/clang/clang-r73879

2 files changed, 8 insertions, 2 deletions

diff --git a/tools/clang-cc/clang-cc.cpp b/tools/clang-cc/clang-cc.cpp
index 840f0157cf98..39d839e4d8f2 100644
--- a/tools/clang-cc/clang-cc.cpp
+++ b/tools/clang-cc/clang-cc.cpp
@@ -67,6 +67,7 @@
 #include "llvm/System/Process.h"
 #include "llvm/System/Program.h"
 #include "llvm/System/Signals.h"
+#include "llvm/Target/TargetSelect.h"
 #include <cstdlib>
 #if HAVE_SYS_TYPES_H
 #  include <sys/types.h>
@@ -139,7 +140,7 @@ namespace llvm {
       }
 
       std::string::size_type FirstColon = ArgValue.rfind(':', SecondColon-1);
-      if (SecondColon == std::string::npos) {
+      if (FirstColon == std::string::npos) {
         std::fprintf(stderr, "%s\n", ExpectedFormat);
         return true;
       }
@@ -2142,6 +2143,9 @@ int main(int argc, char **argv) {
   llvm::cl::ParseCommandLineOptions(argc, argv,
                               "LLVM 'Clang' Compiler: http://clang.llvm.org\n");
 
+  llvm::InitializeAllTargets();
+  llvm::InitializeAllAsmPrinters();
+  
   if (TimeReport)
     ClangFrontendTimer = new llvm::Timer("Clang front-end time");
   
@@ -2305,7 +2309,6 @@ int main(int argc, char **argv) {
     
       // Initialize builtin info.
       PP->getBuiltinInfo().InitializeBuiltins(PP->getIdentifierTable(),
-                                              PP->getTargetInfo(),
                                               PP->getLangOptions().NoBuiltin);
     }
 
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index fc7464afe052..f170aa2fa38c 100644
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -10,3 +10,6 @@ set(LLVM_LINK_COMPONENTS system support bitreader bitwriter)
 add_clang_executable(clang
   driver.cpp
   )
+
+add_dependencies(clang clang-cc)
+