Option parsing tables: pick up AliasArgs from the OPTION macro.

This depends on LLVM r187537.

The SUPPORT_ALIASARGS macro will be removed once all option parsing
clients have been updated.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@187538 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Driver/CC1AsOptions.h b/include/clang/Driver/CC1AsOptions.h
index 6d748488af771a67e25ef78b82962d01ac88fd05..4dde89c465ecccd2e1fd5665b6144957d21bde13 100644 (file)
--- a/include/clang/Driver/CC1AsOptions.h
+++ b/include/clang/Driver/CC1AsOptions.h
@@ -22,10 +22,12 @@ namespace driver {
 namespace cc1asoptions {
   enum ID {
     OPT_INVALID = 0, // This is not an option ID.
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM, \
+#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
                HELPTEXT, METAVAR) OPT_##ID,
+#define SUPPORT_ALIASARGS // FIXME: Remove when LLVM is updated.
 #include "clang/Driver/CC1AsOptions.inc"
     LastOption
+#undef SUPPORT_ALIASARGS
 #undef OPTION
   };
 }

diff --git a/include/clang/Driver/Options.h b/include/clang/Driver/Options.h
index 0af8d3fe9e5e7b00ea952c993c03765fc1dc7efe..cb6a38fd706e715d5c8eebfc4cd61437e7c13afb 100644 (file)
--- a/include/clang/Driver/Options.h
+++ b/include/clang/Driver/Options.h
@@ -35,10 +35,12 @@ enum ClangFlags {
 
 enum ID {
     OPT_INVALID = 0, // This is not an option ID.
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM, \
+#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
                HELPTEXT, METAVAR) OPT_##ID,
+#define SUPPORT_ALIASARGS // FIXME: Remove when LLVM is updated.
 #include "clang/Driver/Options.inc"
     LastOption
+#undef SUPPORT_ALIASARGS
 #undef OPTION
   };
 }

diff --git a/lib/Driver/CC1AsOptions.cpp b/lib/Driver/CC1AsOptions.cpp
index eb5776d506766cca5301197c401d1b46afc453ee..7e4e718ebd7146c64394a9b4a94df6264f15c5d3 100644 (file)
--- a/lib/Driver/CC1AsOptions.cpp
+++ b/lib/Driver/CC1AsOptions.cpp
@@ -21,11 +21,13 @@ using namespace clang::driver::cc1asoptions;
 #undef PREFIX
 
 static const OptTable::Info CC1AsInfoTable[] = {
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM, \
+#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
                HELPTEXT, METAVAR)   \
   { PREFIX, NAME, HELPTEXT, METAVAR, OPT_##ID, Option::KIND##Class, PARAM, \
-    FLAGS, OPT_##GROUP, OPT_##ALIAS },
+    FLAGS, OPT_##GROUP, OPT_##ALIAS, ALIASARGS },
+#define SUPPORT_ALIASARGS // FIXME: Remove when LLVM is updated.
 #include "clang/Driver/CC1AsOptions.inc"
+#undef SUPPORT_ALIASARGS
 #undef OPTION
 };
 

diff --git a/lib/Driver/DriverOptions.cpp b/lib/Driver/DriverOptions.cpp
index 95518ee48b59c769adeb0578fc2aaf83e64908c0..b5407bb50a65704136ddda9e075ef32d7d310e82 100644 (file)
--- a/lib/Driver/DriverOptions.cpp
+++ b/lib/Driver/DriverOptions.cpp
@@ -21,11 +21,13 @@ using namespace llvm::opt;
 #undef PREFIX
 
 static const OptTable::Info InfoTable[] = {
-#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, FLAGS, PARAM, \
+#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \
                HELPTEXT, METAVAR)   \
   { PREFIX, NAME, HELPTEXT, METAVAR, OPT_##ID, Option::KIND##Class, PARAM, \
-    FLAGS, OPT_##GROUP, OPT_##ALIAS },
+    FLAGS, OPT_##GROUP, OPT_##ALIAS, ALIASARGS },
+#define SUPPORT_ALIASARGS // FIXME: Remove when LLVM is updated.
 #include "clang/Driver/Options.inc"
+#undef SUPPORT_ALIASARGS
 #undef OPTION
 };