diff options
| author | rdivacky <rdivacky@FreeBSD.org> | 2010-05-27 15:17:06 +0000 |
|---|---|---|
| committer | rdivacky <rdivacky@FreeBSD.org> | 2010-05-27 15:17:06 +0000 |
| commit | 53992adde3eda3ccf9da63bc7e45673f043de18f (patch) | |
| tree | 3558f327a6f9ab59c5d7a06528d84e1560445247 /tools/driver/driver.cpp | |
| parent | 7e411337c0ed226dace6e07f1420486768161308 (diff) | |
| download | FreeBSD-src-53992adde3eda3ccf9da63bc7e45673f043de18f.zip FreeBSD-src-53992adde3eda3ccf9da63bc7e45673f043de18f.tar.gz | |
Update clang to r104832.
Diffstat (limited to 'tools/driver/driver.cpp')
| -rw-r--r-- | tools/driver/driver.cpp | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp index 3f1cca1..c4b12cb 100644 --- a/tools/driver/driver.cpp +++ b/tools/driver/driver.cpp @@ -170,15 +170,28 @@ static void ApplyQAOverride(std::vector<const char*> &Args, extern int cc1_main(const char **ArgBegin, const char **ArgEnd, const char *Argv0, void *MainAddr); +extern int cc1as_main(const char **ArgBegin, const char **ArgEnd, + const char *Argv0, void *MainAddr); int main(int argc, const char **argv) { llvm::sys::PrintStackTraceOnErrorSignal(); llvm::PrettyStackTraceProgram X(argc, argv); - // Dispatch to cc1_main if appropriate. - if (argc > 1 && llvm::StringRef(argv[1]) == "-cc1") - return cc1_main(argv+2, argv+argc, argv[0], - (void*) (intptr_t) GetExecutablePath); + // Handle -cc1 integrated tools. + if (argc > 1 && llvm::StringRef(argv[1]).startswith("-cc1")) { + llvm::StringRef Tool = argv[1] + 4; + + if (Tool == "") + return cc1_main(argv+2, argv+argc, argv[0], + (void*) (intptr_t) GetExecutablePath); + if (Tool == "as") + return cc1as_main(argv+2, argv+argc, argv[0], + (void*) (intptr_t) GetExecutablePath); + + // Reject unknown tools. + llvm::errs() << "error: unknown integrated tool '" << Tool << "'\n"; + return 1; + } bool CanonicalPrefixes = true; for (int i = 1; i < argc; ++i) { |
