diff --git a/clang/include/clang/Driver/CC1AsOptions.h b/clang/include/clang/Driver/CC1AsOptions.h
index 4dde89c465ec..345f50a57d5f 100644
--- a/clang/include/clang/Driver/CC1AsOptions.h
+++ b/clang/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/clang/include/clang/Driver/Options.h b/clang/include/clang/Driver/Options.h
index cb6a38fd706e..28948be96dec 100644
--- a/clang/include/clang/Driver/Options.h
+++ b/clang/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/clang/lib/Driver/CC1AsOptions.cpp b/clang/lib/Driver/CC1AsOptions.cpp
index 7e4e718ebd71..22180c92ca7f 100644
--- a/clang/lib/Driver/CC1AsOptions.cpp
+++ b/clang/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/clang/lib/Driver/DriverOptions.cpp b/clang/lib/Driver/DriverOptions.cpp
index b5407bb50a65..6ff1cbafb3bc 100644
--- a/clang/lib/Driver/DriverOptions.cpp
+++ b/clang/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
 };