X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FSupport%2FSystemUtils.cpp;h=80d6e4cba9fb6a59e8383b2ca1589862d625b077;hb=ebb5a971d903aa4479bb2a21472597319a9b0086;hp=dfb87755f7b609a681c46e6a2ebc562969093b02;hpb=436f23ebf58418611f798faf7e00de05c7a42e21;p=oota-llvm.git

diff --git a/lib/Support/SystemUtils.cpp b/lib/Support/SystemUtils.cpp
index dfb87755f7b..80d6e4cba9f 100644
--- a/lib/Support/SystemUtils.cpp
+++ b/lib/Support/SystemUtils.cpp
@@ -1,10 +1,10 @@
 //===- SystemUtils.cpp - Utilities for low-level system tasks -------------===//
-// 
+//
 //                     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.
+//
 //===----------------------------------------------------------------------===//
 //
 // This file contains functions used to do a variety of low-level, often
@@ -12,19 +12,23 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/Support/Streams.h"
 #include "llvm/Support/SystemUtils.h"
-#include "llvm/System/Program.h"
 #include "llvm/System/Process.h"
-#include <iostream>
-
+#include "llvm/System/Program.h"
+#include <ostream>
 using namespace llvm;
 
-bool llvm::CheckBytecodeOutputToConsole(std::ostream* stream_to_check) {
-  if (stream_to_check == &std::cout && sys::Process::StandardOutIsDisplayed()) {
-    std::cerr << "WARNING: You're attempting to print out a bytecode file.\n";
-    std::cerr << "This is inadvisable as it may cause display problems. If\n";
-    std::cerr << "you REALLY want to taste LLVM bytecode first-hand, you can\n";
-    std::cerr << "force output with the `-f' option.\n\n";
+bool llvm::CheckBitcodeOutputToConsole(std::ostream* stream_to_check,
+                                       bool print_warning) {
+  if (stream_to_check == cout.stream() &&
+      sys::Process::StandardOutIsDisplayed()) {
+    if (print_warning) {
+      cerr << "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;
@@ -39,14 +43,14 @@ bool llvm::CheckBytecodeOutputToConsole(std::ostream* stream_to_check) {
 #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  
+  // 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();
+  Result.eraseComponent();
   if (!Result.isEmpty()) {
-    Result.appendFile(ExeName);
-    if (Result.executable()) 
+    Result.appendComponent(ExeName);
+    if (Result.canExecute())
       return Result;
   }