This is an archive of the discontinued LLVM Phabricator instance.

Differential D35477

[ELF] - Print options aliases in --help
ClosedPublic

Authored by grimar on Jul 17 2017, 4:01 AM.

Details

Reviewers
ruiu
• rafael
Commits
rG6977ec689961: [ELF] - Print options aliases in --help
rLLD309089: [ELF] - Print options aliases in --help
rL309089: [ELF] - Print options aliases in --help
Summary

This is PR 30422,
previously LLD did not render all option aliases in --help.
With this patch it will.

Diff Detail

Repository
rL LLVM

Event Timeline

grimar created this revision.Jul 17 2017, 4:01 AM
Herald added a subscriber: emaste. · View Herald TranscriptJul 17 2017, 4:01 AM
grimar added a parent revision: D35476: [libOption] - Add flag allowing to print options aliases in help text..Jul 17 2017, 4:01 AM
ruiu edited edge metadata.Jul 17 2017, 11:51 AM

Maybe you can show just everything so that we can stop thinking which one we should show?

grimar added a comment.Jul 18 2017, 4:35 AM
In D35477#811671, @ruiu wrote:

Maybe you can show just everything so that we can stop thinking which one we should show?

Uploaded sample output without hidden options here:
https://justpaste.it/192pb

grimar planned changes to this revision.Jul 18 2017, 6:21 AM
grimar mentioned this in D35560: [ELF] - Fix a little mess in Options.td.Jul 18 2017, 7:25 AM
grimar added a parent revision: D35560: [ELF] - Fix a little mess in Options.td.
grimar updated this revision to Diff 107875.Jul 24 2017, 3:02 AM
grimar edited the summary of this revision. (Show Details)
  • With currently used --help rendering approach, this one

becomes trivial single line change. (still depends on D35476 though).

grimar updated this revision to Diff 108049.Jul 25 2017, 4:43 AM
  • Added testcase.
grimar planned changes to this revision.Jul 25 2017, 4:43 AM
grimar updated this revision to Diff 108051.Jul 25 2017, 4:49 AM
  • Uploaded correct diff now.
grimar updated this revision to Diff 108099.Jul 25 2017, 9:11 AM
  • Reduced testcase.
ruiu accepted this revision.Jul 25 2017, 11:08 AM

LGTM

test/ELF/help.s
1 ↗(On Diff #108099)

Remove -check-prefix as this test contains only one test.

This revision is now accepted and ready to land.Jul 25 2017, 11:08 AM
Closed by commit rL309089: [ELF] - Print options aliases in --help (authored by grimar). · Explain WhyJul 26 2017, 2:21 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
trunk/
ELF/
3 lines
test/
ELF/
5 lines

Diff 108234

lld/trunk/ELF/DriverUtils.cpp

Show First 20 Lines • Show All 110 Lines • ▼ Show 20 Linesopt::InputArgList ELFOptTable::parse(ArrayRef<const char *> Argv) {
for (auto *Arg : Args.filtered(OPT_UNKNOWN)) for (auto *Arg : Args.filtered(OPT_UNKNOWN))
error("unknown argument: " + Arg->getSpelling()); error("unknown argument: " + Arg->getSpelling());
return Args; return Args;
} }
void elf::printHelp(const char *Argv0) { void elf::printHelp(const char *Argv0) {
ELFOptTable Table; ELFOptTable Table;
Table.PrintHelp(outs(), Argv0, "lld", false); Table.PrintHelp(outs(), Argv0, "lld", false /*ShowHidden*/,
true /*ShowAllAliases*/);
outs() << "\n"; outs() << "\n";
// Scripts generated by Libtool versions up to at least 2.4.6 (the most // Scripts generated by Libtool versions up to at least 2.4.6 (the most
// recent version as of March 2017) expect /: supported targets:.* elf/ // recent version as of March 2017) expect /: supported targets:.* elf/
// in a message for the -help option. If it doesn't match, the scripts // in a message for the -help option. If it doesn't match, the scripts
// assume that the linker doesn't support very basic features such as // assume that the linker doesn't support very basic features such as
// shared libraries. Therefore, we need to print out at least "elf". // shared libraries. Therefore, we need to print out at least "elf".
// Here, we print out all the targets that we support. // Here, we print out all the targets that we support.
▲ Show 20 Lines • Show All 81 Lines • Show Last 20 Lines

lld/trunk/test/ELF/help.s

# RUN: ld.lld --help 2>&1 | FileCheck %s
# CHECK: OPTIONS:
# CHECK: --output=<value> Path to file to write output
# CHECK: --output <value> Path to file to write output
# CHECK: -o <path> Path to file to write output