diff options
| author | Chris Lattner <sabre@nondot.org> | 2006-01-17 00:32:28 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2006-01-17 00:32:28 +0000 |
| commit | 79959d21c7b2fb7bb970949b9a5227036cd50d39 (patch) | |
| tree | f7268d66c5700144ff7b91007ec371f4ce3256b3 | |
| parent | 42ef0bc6fb41a5002510ea9c7e684f415e86d650 (diff) | |
Add support for programs with a null argv[0]
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@25379 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Support/CommandLine.cpp | 34 | ||||
| -rw-r--r-- | lib/Support/ToolRunner.cpp | 8 | ||||
| -rw-r--r-- | tools/bugpoint/ToolRunner.cpp | 8 |
3 files changed, 40 insertions, 10 deletions
diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp index 6aa6c09129..1644308077 100644 --- a/lib/Support/CommandLine.cpp +++ b/lib/Support/CommandLine.cpp @@ -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) { diff --git a/lib/Support/ToolRunner.cpp b/lib/Support/ToolRunner.cpp index 6480c23cd8..5eb763a88a 100644 --- a/lib/Support/ToolRunner.cpp +++ b/lib/Support/ToolRunner.cpp @@ -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 diff --git a/tools/bugpoint/ToolRunner.cpp b/tools/bugpoint/ToolRunner.cpp index 6480c23cd8..5eb763a88a 100644 --- a/tools/bugpoint/ToolRunner.cpp +++ b/tools/bugpoint/ToolRunner.cpp @@ -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 |