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

[cleanup] Factor out handling CC1 tools. NFC. 

llvm-svn: 215759
This commit is contained in:
Sean Silva 2014-08-15 19:23:47 +00:00
parent e1e749322f
commit 9a6bdf8187
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
clang/tools/driver/driver.cpp
View File

@ -357,6 +357,19 @@ static void SetInstallDir(SmallVectorImpl<const char *> &argv,
TheDriver.setInstalledDir(InstalledPath); TheDriver.setInstalledDir(InstalledPath);
} }
static int HandleCC1Tool(SmallVectorImpl<const char *> &argv, StringRef Tool) {
if (Tool == "")
return cc1_main(argv.data()+2, argv.data()+argv.size(), argv[0],
(void*) (intptr_t) GetExecutablePath);
if (Tool == "as")
return cc1as_main(argv.data()+2, argv.data()+argv.size(), argv[0],
(void*) (intptr_t) GetExecutablePath);
// Reject unknown tools.
llvm::errs() << "error: unknown integrated tool '" << Tool << "'\n";
return 1;
}
int main(int argc_, const char **argv_) { int main(int argc_, const char **argv_) {
llvm::sys::PrintStackTraceOnErrorSignal(); llvm::sys::PrintStackTraceOnErrorSignal();
llvm::PrettyStackTraceProgram X(argc_, argv_); llvm::PrettyStackTraceProgram X(argc_, argv_);
@ -375,20 +388,8 @@ int main(int argc_, const char **argv_) {
llvm::cl::ExpandResponseFiles(Saver, llvm::cl::TokenizeGNUCommandLine, argv); llvm::cl::ExpandResponseFiles(Saver, llvm::cl::TokenizeGNUCommandLine, argv);
// Handle -cc1 integrated tools. // Handle -cc1 integrated tools.
if (argv.size() > 1 && StringRef(argv[1]).startswith("-cc1")) { if (argv.size() > 1 && StringRef(argv[1]).startswith("-cc1"))
StringRef Tool = argv[1] + 4; return HandleCC1Tool(argv, argv[1] + 4);
if (Tool == "")
return cc1_main(argv.data()+2, argv.data()+argv.size(), argv[0],
(void*) (intptr_t) GetExecutablePath);
if (Tool == "as")
return cc1as_main(argv.data()+2, argv.data()+argv.size(), argv[0],
(void*) (intptr_t) GetExecutablePath);
// Reject unknown tools.
llvm::errs() << "error: unknown integrated tool '" << Tool << "'\n";
return 1;
}
bool CanonicalPrefixes = true; bool CanonicalPrefixes = true;
for (int i = 1, size = argv.size(); i < size; ++i) { for (int i = 1, size = argv.size(); i < size; ++i) {