X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FSupport%2FSystemUtils.h;h=399aee51eb7b0ccc1f43fce8dad52f1e16d254d2;hb=57ac1f458a754f30cf500410b438fb260f9b8fe5;hp=856bc20b7c70a73d18fd2fd559bdff76074cc136;hpb=436f23ebf58418611f798faf7e00de05c7a42e21;p=oota-llvm.git

diff --git a/include/llvm/Support/SystemUtils.h b/include/llvm/Support/SystemUtils.h
index 856bc20b7c7..399aee51eb7 100644
--- a/include/llvm/Support/SystemUtils.h
+++ b/include/llvm/Support/SystemUtils.h
@@ -1,10 +1,10 @@
 //===- SystemUtils.h - Utilities to do low-level system stuff ---*- C++ -*-===//
-// 
+//
 //                     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
@@ -15,42 +15,29 @@
 #ifndef LLVM_SUPPORT_SYSTEMUTILS_H
 #define LLVM_SUPPORT_SYSTEMUTILS_H
 
-#include "llvm/System/Program.h"
+#include <string>
 
 namespace llvm {
+  class raw_ostream;
+  namespace sys { class Path; }
 
-/// Determine if the ostream provided is connected to the std::cout and 
-/// displayed or not (to a console window). If so, generate a warning message 
-/// advising against display of bytecode and return true. Otherwise just return
-/// false
+/// Determine if the raw_ostream provided is connected to a terminal. If so,
+/// generate a warning message to errs() advising against display of bitcode
+/// and return true. Otherwise just return false.
 /// @brief Check for output written to a console
-bool CheckBytecodeOutputToConsole(std::ostream* stream_to_check);
-
-/// 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.
+bool CheckBitcodeOutputToConsole(
+  raw_ostream &stream_to_check, ///< The stream to be checked
+  bool print_warning = true     ///< Control whether warnings are printed
+);
+
+/// PrependMainExecutablePath - Prepend the path to the program being executed
+/// to \p ExeName, given the value of argv[0] and the address of main()
+/// itself. This allows us to find another LLVM tool if it is built in the same
+/// directory. An empty string is returned on error; note that this function
+/// just mainpulates the path and doesn't check for executability.
 /// @brief Find a named executable.
-sys::Path FindExecutable(const std::string &ExeName,
-                         const std::string &ProgramPath);
-
-/// RunProgramWithTimeout - This function provides an alternate interface to the
-/// sys::Program::ExecuteAndWait interface.
-/// @see sys:Program::ExecuteAndWait
-inline int RunProgramWithTimeout(const sys::Path &ProgramPath,
-                                const char **Args,
-                                const sys::Path &StdInFile,
-                                const sys::Path &StdOutFile,
-                                const sys::Path &StdErrFile,
-                                unsigned NumSeconds = 0) {
-  const sys::Path* redirects[3];
-  redirects[0] = &StdInFile;
-  redirects[1] = &StdOutFile;
-  redirects[2] = &StdErrFile;
-  
-  return 
-    sys::Program::ExecuteAndWait(ProgramPath, Args, 0, redirects, NumSeconds);
-}
+sys::Path PrependMainExecutablePath(const std::string &ExeName,
+                                    const char *Argv0, void *MainAddr);
 
 } // End llvm namespace