maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Add support for programs with a null argv[0] 

llvm-svn: 25379
This commit is contained in:
Chris Lattner 2006-01-17 00:32:28 +00:00
parent bec9d720b0
commit f64762c26e
2 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
llvm/lib/Support/CommandLine.cpp
View File

@ -448,8 +448,11 @@ void cl::ParseCommandLineOptions(int &argc, char **argv,
}
if (Handler == 0) {
std::cerr << ProgramName << ": Unknown command line argument '" << argv[i]
<< "'. Try: '" << argv[0] << " --help'\n";
if (ProgramName)
std::cerr << ProgramName << ": Unknown command line argument '"
<< argv[i] << "'. Try: '" << argv[0] << " --help'\n";
else
std::cerr << "Unknown command line argument '" << argv[i] << "'.\n";
ErrorParsing = true;
continue;
}
@ -485,17 +488,28 @@ void cl::ParseCommandLineOptions(int &argc, char **argv,
// Check and handle positional arguments now...
if (NumPositionalRequired > PositionalVals.size()) {
std::cerr << ProgramName
<< ": Not enough positional command line arguments specified!\n"
<< "Must specify at least " << NumPositionalRequired
<< " positional arguments: See: " << argv[0] << " --help\n";
if (ProgramName)
std::cerr << ProgramName
<< ": Not enough positional command line arguments specified!\n"
<< "Must specify at least " << NumPositionalRequired
<< " positional arguments: See: " << argv[0] << " --help\n";
else
std::cerr << "Not enough positional command line arguments specified!\n"
<< "Must specify at least " << NumPositionalRequired
<< " positional arguments.";
ErrorParsing = true;
} else if (!HasUnlimitedPositionals
&& PositionalVals.size() > PositionalOpts.size()) {
std::cerr << ProgramName
<< ": Too many positional arguments specified!\n"
<< "Can specify at most " << PositionalOpts.size()
<< " positional arguments: See: " << argv[0] << " --help\n";
if (ProgramName)
std::cerr << ProgramName
<< ": Too many positional arguments specified!\n"
<< "Can specify at most " << PositionalOpts.size()
<< " positional arguments: See: " << argv[0] << " --help\n";
else
std::cerr << "Too many positional arguments specified!\n"
<< "Can specify at most " << PositionalOpts.size()
<< " positional arguments.\n";
ErrorParsing = true;
} else if (ConsumeAfterOpt == 0) {

8
llvm/lib/Support/ToolRunner.cpp
View File

@ -394,7 +394,15 @@ int GCC::ExecuteProgram(const std::string &ProgramFile,
sys::Path OutputBinary (ProgramFile+".gcc.exe");
OutputBinary.makeUnique();
GCCArgs.push_back(OutputBinary.c_str()); // Output to the right file...
GCCArgs.push_back("-lz");
GCCArgs.push_back("-lm"); // Hard-code the math library...
GCCArgs.push_back("-x");
GCCArgs.push_back("none");
GCCArgs.push_back("/usr/local/lib/NAGWare/quickfit.o");
GCCArgs.push_back("-Xlinker");
GCCArgs.push_back("-flat_namespace");
GCCArgs.push_back("/usr/local/lib/NAGWare/libf97.dylib");
GCCArgs.push_back("/usr/local/lib/NAGWare/libf96.a");
GCCArgs.push_back("-O2"); // Optimize the program a bit...
#if defined (HAVE_LINK_R)
GCCArgs.push_back("-Wl,-R."); // Search this dir for .so files