Option parsing: remove non-SUPPORT_ALIASARGS fall-back

The clients of this code have been updated to all support AliasArgs.

This depends on Clang r187538 and lld r187541.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@187546 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Hans Wennborg 2013-07-31 23:28:51 +00:00
parent 9dd8c0cffe
commit a15d5db7f2
2 changed files with 2 additions and 16 deletions

View File

@ -17,8 +17,6 @@
using namespace llvm;
using namespace llvm::opt;
#define SUPPORT_ALIASARGS // FIXME: Remove when no longer necessary.
enum ID {
OPT_INVALID = 0, // This is not an option ID.
#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \

View File

@ -152,22 +152,11 @@ void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
OS << "/////////\n";
OS << "// Groups\n\n";
OS << "#ifdef OPTION\n";
// FIXME: Remove when option parsing clients are updated.
OS << "#ifdef SUPPORT_ALIASARGS\n";
OS << "#define OPTIONX OPTION\n";
OS << "#else\n";
OS << "#define OPTIONX(prefix, name, id, kind, group, alias, aliasargs, "
<< "flags, param, helptext, metavar) "
<< "OPTION(prefix, name, id, kind, "
<< "group, alias, flags, param, helptext, metavar)\n";
OS << "#endif\n";
for (unsigned i = 0, e = Groups.size(); i != e; ++i) {
const Record &R = *Groups[i];
// Start a single option entry.
OS << "OPTIONX(";
OS << "OPTION(";
// The option prefix;
OS << "0";
@ -210,7 +199,7 @@ void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
const Record &R = *Opts[i];
// Start a single option entry.
OS << "OPTIONX(";
OS << "OPTION(";
// The option prefix;
std::vector<std::string> prf = R.getValueAsListOfStrings("Prefixes");
@ -287,7 +276,6 @@ void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
OS << ")\n";
}
OS << "#undef OPTIONX\n"; // FIXME: Remove when option clients are updated.
OS << "#endif\n";
}
} // end namespace llvm