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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_50@309285 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 4 insertions, 7 deletions

diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index 1d35d6e78c..444bbbc550 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -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 Compilation &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;
   }
 
diff --git a/tools/clang-format/ClangFormat.cpp b/tools/clang-format/ClangFormat.cpp
index f8e2fe186b..14bff19a1a 100644
--- a/tools/clang-format/ClangFormat.cpp
+++ b/tools/clang-format/ClangFormat.cpp
@@ -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';
 }
 
diff --git a/tools/clang-offload-bundler/ClangOffloadBundler.cpp b/tools/clang-offload-bundler/ClangOffloadBundler.cpp
index 95d3fdf14d..49cdd95466 100644
--- a/tools/clang-offload-bundler/ClangOffloadBundler.cpp
+++ b/tools/clang-offload-bundler/ClangOffloadBundler.cpp
@@ -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';
 }