RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-12-04 09:54:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Conform to the documented interface by null terminating argument lists!

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@20167 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2005-02-13 23:10:45 +00:00
parent ed5fa58a07
commit 7456e3ce38
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/llvm-ld/llvm-ld.cpp
View File

@ -225,6 +225,7 @@ static int GenerateAssembly(const std::string &OutputFilename,
args.push_back( "-o");
args.push_back( OutputFilename.c_str() );
args.push_back( InputFilename.c_str() );
args.push_back(0);
return sys::Program::ExecuteAndWait(llc,&args[0]);
}
@ -241,6 +242,7 @@ static int GenerateCFile(const std::string &OutputFile,
args.push_back( "-o");
args.push_back( OutputFile.c_str() );
args.push_back( InputFile.c_str() );
args.push_back(0);
return sys::Program::ExecuteAndWait(llc, &args[0]);
}
@ -300,6 +302,7 @@ static int GenerateNative(const std::string &OutputFilename,
args.push_back("-l");
args.push_back(Libraries[index].c_str());
}
args.push_back(0);
// Run the compiler to assembly and link together the program.
return sys::Program::ExecuteAndWait(gcc, &args[0], (const char**)clean_env);

12
tools/llvmc/CompilerDriver.cpp
View File

@ -394,22 +394,20 @@ private:
// Invoke the program
const char** Args = (const char**)
alloca(sizeof(const char*)*action->args.size());
for (unsigned i = 0; i != action->args.size(); ++i) {
alloca(sizeof(const char*)*(action->args.size()+1));
for (unsigned i = 0; i != action->args.size(); ++i)
Args[i] = action->args[i].c_str();
}
Args[action->args.size()] = 0; // null terminate list.
if (isSet(TIME_ACTIONS_FLAG)) {
Timer timer(action->program.toString());
timer.startTimer();
int resultCode =
sys::Program::ExecuteAndWait(action->program,Args);
int resultCode = sys::Program::ExecuteAndWait(action->program, Args);
timer.stopTimer();
timer.print(timer,std::cerr);
return resultCode == 0;
}
else
return 0 ==
sys::Program::ExecuteAndWait(action->program, Args);
return 0 == sys::Program::ExecuteAndWait(action->program, Args);
}
return true;
}