Fix preload instruction isel. Only v7 supports pli, and only v7 with mp extension...

[oota-llvm.git] / lib / System / Program.cpp

diff --git a/lib/System/Program.cpp b/lib/System/Program.cpp
index a3049d46fd654bc9b9d6c1fbefa8164381511a7e..90aba763fa976b98f34efe3ce60567ce3959f3f7 100644 (file)
--- a/lib/System/Program.cpp
+++ b/lib/System/Program.cpp
@@ -13,8 +13,7 @@
 
 #include "llvm/System/Program.h"
 #include "llvm/Config/config.h"
-
-namespace llvm {
+using namespace llvm;
 using namespace sys;
 
 //===----------------------------------------------------------------------===//
@@ -32,7 +31,7 @@ Program::ExecuteAndWait(const Path& path,
                         std::string* ErrMsg) {
   Program prg;
   if (prg.Execute(path, args, envp, redirects, memoryLimit, ErrMsg))
-    return prg.Wait(secondsToWait, ErrMsg);
+    return prg.Wait(path, secondsToWait, ErrMsg);
   else
     return -1;
 }
@@ -48,9 +47,6 @@ Program::ExecuteNoWait(const Path& path,
   prg.Execute(path, args, envp, redirects, memoryLimit, ErrMsg);
 }
 
-
-}
-
 // Include the platform-specific parts of this class.
 #ifdef LLVM_ON_UNIX
 #include "Unix/Program.inc"