[llvm-branch-commits] [cfe-branch] r309285 - Revert r304899 and r304836: It's not clear printing all targets with --version is the right thing to do (see discussion on D33900)

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Jul 27 09:20:45 2017
New Revision: 309285

URL: http://llvm.org/viewvc/llvm-project?rev=309285&view=rev
Log:
Revert r304899 and r304836: It's not clear printing all targets with --version is the right thing to do (see discussion on D33900)

Modified:
    cfe/branches/release_50/lib/Driver/Driver.cpp
    cfe/branches/release_50/tools/clang-format/ClangFormat.cpp
    cfe/branches/release_50/tools/clang-offload-bundler/ClangOffloadBundler.cpp

Modified: cfe/branches/release_50/lib/Driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_50/lib/Driver/Driver.cpp?rev=309285&r1=309284&r2=309285&view=diff
==============================================================================
--- cfe/branches/release_50/lib/Driver/Driver.cpp (original)
+++ cfe/branches/release_50/lib/Driver/Driver.cpp Thu Jul 27 09:20:45 2017
@@ -69,7 +69,6 @@
 #include "llvm/Support/PrettyStackTrace.h"
 #include "llvm/Support/Process.h"
 #include "llvm/Support/Program.h"
-#include "llvm/Support/TargetRegistry.h"
 #include "llvm/Support/raw_ostream.h"
 #include <map>
 #include <memory>
@@ -1193,10 +1192,6 @@ bool Driver::HandleImmediateArgs(const C
   if (C.getArgs().hasArg(options::OPT__version)) {
     // Follow gcc behavior and use stdout for --version and stderr for -v.
     PrintVersion(C, llvm::outs());
-
-    // Print registered targets.
-    llvm::outs() << '\n';
-    llvm::TargetRegistry::printRegisteredTargetsForVersion(llvm::outs());
     return false;
   }
 

Modified: cfe/branches/release_50/tools/clang-format/ClangFormat.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_50/tools/clang-format/ClangFormat.cpp?rev=309285&r1=309284&r2=309285&view=diff
==============================================================================
--- cfe/branches/release_50/tools/clang-format/ClangFormat.cpp (original)
+++ cfe/branches/release_50/tools/clang-format/ClangFormat.cpp Thu Jul 27 09:20:45 2017
@@ -328,7 +328,8 @@ static bool format(StringRef FileName) {
 }  // namespace format
 }  // namespace clang
 
-static void PrintVersion(raw_ostream &OS) {
+static void PrintVersion() {
+  raw_ostream &OS = outs();
   OS << clang::getClangToolFullVersion("clang-format") << '\n';
 }
 

Modified: cfe/branches/release_50/tools/clang-offload-bundler/ClangOffloadBundler.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_50/tools/clang-offload-bundler/ClangOffloadBundler.cpp?rev=309285&r1=309284&r2=309285&view=diff
==============================================================================
--- cfe/branches/release_50/tools/clang-offload-bundler/ClangOffloadBundler.cpp (original)
+++ cfe/branches/release_50/tools/clang-offload-bundler/ClangOffloadBundler.cpp Thu Jul 27 09:20:45 2017
@@ -915,7 +915,8 @@ static bool UnbundleFiles() {
   return false;
 }
 
-static void PrintVersion(raw_ostream &OS) {
+static void PrintVersion() {
+  raw_ostream &OS = outs();
   OS << clang::getClangToolFullVersion("clang-offload-bundler") << '\n';
 }