X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FSupport%2FSystemUtils.cpp;h=2036364dc51d99a58e02615b5a8261bdf809be99;hb=b9536ac581d0d74b29c11dcb33e22200b22b86b1;hp=97ae156bdd41514cd09d517a174db4a4d682fdd9;hpb=b5cd8459df43f71bd73161e7330a45e7bea7a464;p=oota-llvm.git

diff --git a/lib/Support/SystemUtils.cpp b/lib/Support/SystemUtils.cpp
index 97ae156bdd4..2036364dc51 100644
--- a/lib/Support/SystemUtils.cpp
+++ b/lib/Support/SystemUtils.cpp
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -13,44 +13,21 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/SystemUtils.h"
-#include "llvm/System/Process.h"
-#include "llvm/System/Program.h"
-#include <iostream>
+#include "llvm/Support/Process.h"
+#include "llvm/Support/Program.h"
+#include "llvm/Support/raw_ostream.h"
 using namespace llvm;
 
-bool llvm::CheckBytecodeOutputToConsole(std::ostream* stream_to_check,
-                                        bool print_warning) {
-  if (stream_to_check == &std::cout && sys::Process::StandardOutIsDisplayed()) {
+bool llvm::CheckBitcodeOutputToConsole(raw_ostream &stream_to_check,
+                                       bool print_warning) {
+  if (stream_to_check.is_displayed()) {
     if (print_warning) {
-      std::cerr << "WARNING: You're attempting to print out a bytecode file.\n"
-                   "This is inadvisable as it may cause display problems. If\n"
-                   "you REALLY want to taste LLVM bytecode first-hand, you\n"
-                   "can force output with the `-f' option.\n\n";
+      errs() << "WARNING: You're attempting to print out a bitcode file.\n"
+                "This is inadvisable as it may cause display problems. If\n"
+                "you REALLY want to taste LLVM bitcode first-hand, you\n"
+                "can force output with the `-f' option.\n\n";
     }
     return true;
   }
   return false;
 }
-
-/// FindExecutable - Find a named executable, giving the argv[0] of program
-/// being executed. This allows us to find another LLVM tool if it is built
-/// into the same directory, but that directory is neither the current
-/// directory, nor in the PATH.  If the executable cannot be found, return an
-/// empty string.
-///
-#undef FindExecutable   // needed on windows :(
-sys::Path llvm::FindExecutable(const std::string &ExeName,
-                               const std::string &ProgramPath) {
-  // First check the directory that the calling program is in.  We can do this
-  // if ProgramPath contains at least one / character, indicating that it is a
-  // relative path to bugpoint itself.
-  sys::Path Result ( ProgramPath );
-  Result.elideFile();
-  if (!Result.isEmpty()) {
-    Result.appendFile(ExeName);
-    if (Result.executable())
-      return Result;
-  }
-
-  return sys::Program::FindProgramByName(ExeName);
-}