summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Trick <atrick@apple.com>2011-05-11 16:44:08 +0000
committerAndrew Trick <atrick@apple.com>2011-05-11 16:44:08 +0000
commit69005e5953c97b7fda8da8071f1cb2b326cbef63 (patch)
treec3f96999a247775b6a520c9e9d5dffa30b195764
parent55aeb55aa3aa71289e4a37acb0af9fb56be7e3f6 (diff)
downloadbcm5719-llvm-69005e5953c97b7fda8da8071f1cb2b326cbef63.tar.gz
bcm5719-llvm-69005e5953c97b7fda8da8071f1cb2b326cbef63.zip
Typo and missing checkin from r131186.
llvm-svn: 131187
-rw-r--r--llvm/lib/Support/Windows/Program.inc3
-rw-r--r--llvm/tools/bugpoint/ToolRunner.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/Support/Windows/Program.inc b/llvm/lib/Support/Windows/Program.inc
index 350363cf710..b685bb8b851 100644
--- a/llvm/lib/Support/Windows/Program.inc
+++ b/llvm/lib/Support/Windows/Program.inc
@@ -332,7 +332,8 @@ Program::Execute(const Path& path,
int
Program::Wait(const Path &path,
unsigned secondsToWait,
- std::string* ErrMsg) {
+ std::string* ErrMsg,
+ const char* /*SignalPrefix*/) {
if (Data_ == 0) {
MakeErrMsg(ErrMsg, "Process not started!");
return -1;
diff --git a/llvm/tools/bugpoint/ToolRunner.cpp b/llvm/tools/bugpoint/ToolRunner.cpp
index 9c3e6121f23..f9d8603b5a6 100644
--- a/llvm/tools/bugpoint/ToolRunner.cpp
+++ b/llvm/tools/bugpoint/ToolRunner.cpp
@@ -52,7 +52,7 @@ namespace {
// Add a prefix to ErrMsg if the program is terminated by a signal to
// distinguish compiled program crashes from other execution
-// failures. Miscompilation likely to results in SIGSEGV.
+// failures. Miscompilation likely results in SIGSEGV.
static const char *SignalPrefix = "Signal - ";
/// RunProgramWithTimeout - This function provides an alternate interface
OpenPOWER on IntegriCloud