This is an archive of the discontinued LLVM Phabricator instance.

Differential D43527

Handle --version before handling --mllvm.
ClosedPublic

Authored by ruiu on Feb 20 2018, 1:32 PM.

Details

Reviewers
sbc100
Commits
rGeecdaaac2794: Handle --version before handling --mllvm.
rLLD325952: Handle --version before handling --mllvm.
rL325952: Handle --version before handling --mllvm.
Summary

Because there's no point to handle --mllvm before --version.

Diff Detail

Repository
rL LLVM

Event Timeline

ruiu created this revision.Feb 20 2018, 1:32 PM
Herald added a subscriber: aheejin. · View Herald TranscriptFeb 20 2018, 1:32 PM
Harbormaster completed remote builds in B15219: Diff 135134.Feb 20 2018, 1:34 PM
sbc100 accepted this revision.Feb 20 2018, 2:20 PM
This revision is now accepted and ready to land.Feb 20 2018, 2:20 PM
Closed by commit rL325952: Handle --version before handling --mllvm. (authored by ruiu). · Explain WhyFeb 23 2018, 12:26 PM
Closed by commit rLLD325952: Handle --version before handling --mllvm. (authored by ruiu). · Explain Why
This revision was automatically updated to reflect the committed changes.
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
trunk/
wasm/
11 lines

Diff 135679

lld/trunk/wasm/Driver.cpp

Show First 20 Lines • Show All 227 Lines • ▼ Show 20 Linesvoid LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
opt::InputArgList Args = Parser.parse(ArgsArr.slice(1)); opt::InputArgList Args = Parser.parse(ArgsArr.slice(1));
// Handle --help // Handle --help
if (Args.hasArg(OPT_help)) { if (Args.hasArg(OPT_help)) {
printHelp(ArgsArr[0]); printHelp(ArgsArr[0]);
return; return;
} }
// Handle --version
if (Args.hasArg(OPT_version) || Args.hasArg(OPT_v)) {
outs() << getLLDVersion() << "\n";
return;
}
// Parse and evaluate -mllvm options. // Parse and evaluate -mllvm options.
std::vector<const char *> V; std::vector<const char *> V;
V.push_back("wasm-ld (LLVM option parsing)"); V.push_back("wasm-ld (LLVM option parsing)");
for (auto *Arg : Args.filtered(OPT_mllvm)) for (auto *Arg : Args.filtered(OPT_mllvm))
V.push_back(Arg->getValue()); V.push_back(Arg->getValue());
cl::ParseCommandLineOptions(V.size(), V.data()); cl::ParseCommandLineOptions(V.size(), V.data());
errorHandler().ErrorLimit = args::getInteger(Args, OPT_error_limit, 20); errorHandler().ErrorLimit = args::getInteger(Args, OPT_error_limit, 20);
if (Args.hasArg(OPT_version) || Args.hasArg(OPT_v)) {
outs() << getLLDVersion() << "\n";
return;
}
Config->AllowUndefined = Args.hasArg(OPT_allow_undefined); Config->AllowUndefined = Args.hasArg(OPT_allow_undefined);
Config->CheckSignatures = Config->CheckSignatures =
Args.hasFlag(OPT_check_signatures, OPT_no_check_signatures, false); Args.hasFlag(OPT_check_signatures, OPT_no_check_signatures, false);
Config->Entry = getEntry(Args, Args.hasArg(OPT_relocatable) ? "" : "_start"); Config->Entry = getEntry(Args, Args.hasArg(OPT_relocatable) ? "" : "_start");
Config->ImportMemory = Args.hasArg(OPT_import_memory); Config->ImportMemory = Args.hasArg(OPT_import_memory);
Config->OutputFile = Args.getLastArgValue(OPT_o); Config->OutputFile = Args.getLastArgValue(OPT_o);
Config->Relocatable = Args.hasArg(OPT_relocatable); Config->Relocatable = Args.hasArg(OPT_relocatable);
Config->GcSections = Config->GcSections =
▲ Show 20 Lines • Show All 113 Lines • Show Last 20 Lines