diff options
author | James Molloy <james.molloy@arm.com> | 2012-05-01 14:57:16 +0000 |
---|---|---|
committer | James Molloy <james.molloy@arm.com> | 2012-05-01 14:57:16 +0000 |
commit | bfd7a525bcf372004787cb641b8c1566b9e8aba5 (patch) | |
tree | 436f4c8c8171d939b39fbdd9fa7f61e2da237584 /tools/driver | |
parent | d1fda0393b50c9c1ea25925725916da3ce13c1e2 (diff) | |
download | clang-bfd7a525bcf372004787cb641b8c1566b9e8aba5.tar.gz |
Unify Options.td and CC1Options.td, in a first step towards unifying the serialization logic in Frontend and Driver.
Reviewed by Eric, Doug and Chandler, and here: http://llvm.org/reviews/r/7/
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@155916 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/driver')
-rw-r--r-- | tools/driver/cc1_main.cpp | 4 | ||||
-rw-r--r-- | tools/driver/driver.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/driver/cc1_main.cpp b/tools/driver/cc1_main.cpp index a211090085..f8e8a6b4f6 100644 --- a/tools/driver/cc1_main.cpp +++ b/tools/driver/cc1_main.cpp @@ -15,7 +15,7 @@ #include "clang/Driver/Arg.h" #include "clang/Driver/ArgList.h" -#include "clang/Driver/CC1Options.h" +#include "clang/Driver/Options.h" #include "clang/Driver/DriverDiagnostic.h" #include "clang/Driver/OptTable.h" #include "clang/Frontend/CompilerInstance.h" @@ -58,7 +58,7 @@ static int cc1_test(DiagnosticsEngine &Diags, llvm::errs() << "\n"; // Parse the arguments. - OptTable *Opts = createCC1OptTable(); + OptTable *Opts = createDriverOptTable(); unsigned MissingArgIndex, MissingArgCount; InputArgList *Args = Opts->ParseArgs(ArgBegin, ArgEnd, MissingArgIndex, MissingArgCount); diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp index a07738458a..7813f355e4 100644 --- a/tools/driver/driver.cpp +++ b/tools/driver/driver.cpp @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// #include "clang/Driver/ArgList.h" -#include "clang/Driver/CC1Options.h" +#include "clang/Driver/Options.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" #include "clang/Driver/Option.h" @@ -378,7 +378,7 @@ int main(int argc_, const char **argv_) { DiagnosticOptions DiagOpts; { // Note that ParseDiagnosticArgs() uses the cc1 option table. - OwningPtr<OptTable> CC1Opts(createCC1OptTable()); + OwningPtr<OptTable> CC1Opts(createDriverOptTable()); unsigned MissingArgIndex, MissingArgCount; OwningPtr<InputArgList> Args(CC1Opts->ParseArgs(argv.begin()+1, argv.end(), MissingArgIndex, MissingArgCount)); |