Remove the SUPPORT_ALIASARGS define

It is not needed after LLVM r187546.

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

diff --git a/include/clang/Driver/CC1AsOptions.h b/include/clang/Driver/CC1AsOptions.h
index 4dde89c465ecccd2e1fd5665b6144957d21bde13..345f50a57d5f726852f89b8104814312ec9a71b6 100644 (file)
--- a/include/clang/Driver/CC1AsOptions.h
+++ b/include/clang/Driver/CC1AsOptions.h
@@ -24,10 +24,8 @@ namespace cc1asoptions {
     OPT_INVALID = 0, // This is not an option ID.
 #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 cb6a38fd706e715d5c8eebfc4cd61437e7c13afb..28948be96dec1d431bf41fd5707571ef45bf9395 100644 (file)
--- a/include/clang/Driver/Options.h
+++ b/include/clang/Driver/Options.h
@@ -37,10 +37,8 @@ enum ID {
     OPT_INVALID = 0, // This is not an option ID.
 #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 7e4e718ebd7146c64394a9b4a94df6264f15c5d3..22180c92ca7fc1593b61915f0a4061a8d03c843f 100644 (file)
--- a/lib/Driver/CC1AsOptions.cpp
+++ b/lib/Driver/CC1AsOptions.cpp
@@ -25,9 +25,7 @@ static const OptTable::Info CC1AsInfoTable[] = {
                HELPTEXT, METAVAR)   \
   { PREFIX, NAME, HELPTEXT, METAVAR, OPT_##ID, Option::KIND##Class, PARAM, \
     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 b5407bb50a65704136ddda9e075ef32d7d310e82..6ff1cbafb3bcf4d7e7d06a252853cd6a01aeb08f 100644 (file)
--- a/lib/Driver/DriverOptions.cpp
+++ b/lib/Driver/DriverOptions.cpp
@@ -25,9 +25,7 @@ static const OptTable::Info InfoTable[] = {
                HELPTEXT, METAVAR)   \
   { PREFIX, NAME, HELPTEXT, METAVAR, OPT_##ID, Option::KIND##Class, PARAM, \
     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
 };