This is an archive of the discontinued LLVM Phabricator instance.

Differential D51109

[Driver][cc1][cc1as] Call OptTable::PrintHelp with explicit " [options] file..."
ClosedPublic

Authored by MaskRay on Aug 22 2018, 10:22 AM.

Details

Reviewers
rupprecht
alexander-shaposhnikov
jhenderson
Commits
rGd0028238302d: [Driver][cc1][cc1as] Call OptTable::PrintHelp with explicit " [options] file..."
rC344098: [Driver][cc1][cc1as] Call OptTable::PrintHelp with explicit " [options] file..."
rL344098: [Driver][cc1][cc1as] Call OptTable::PrintHelp with explicit " [options] file..."
Summary

This is to accommodate a change in llvm/lib/Option/OptTable.cpp D51009

Diff Detail

Event Timeline

MaskRay created this revision.Aug 22 2018, 10:22 AM
Herald added a subscriber: cfe-commits. · View Herald TranscriptAug 22 2018, 10:22 AM
Harbormaster completed remote builds in B21794: Diff 161989.Aug 22 2018, 10:23 AM
MaskRay added a reviewer: Restricted Project.Aug 22 2018, 10:34 AM
MaskRay updated this revision to Diff 162478.Aug 24 2018, 2:15 PM

[Driver] Change MipsLinux default linker from "lld" to "ld.lld"

Herald added subscribers: atanasyan, jrtc27, sdardis. · View Herald TranscriptAug 24 2018, 2:15 PM
Harbormaster completed remote builds in B21891: Diff 162478.Aug 24 2018, 2:15 PM
MaskRay updated this revision to Diff 162488.Aug 24 2018, 3:26 PM

Sorry I messed up with my branches :( I shall create https://reviews.llvm.org/D51234 but arc diff'ed to a different one

Harbormaster completed remote builds in B21895: Diff 162488.Aug 24 2018, 3:26 PM
MaskRay added a comment.Aug 30 2018, 11:24 AM

Ping

jrtc27 removed a subscriber: jrtc27.Aug 31 2018, 4:16 AM
MaskRay updated this revision to Diff 168898.Oct 9 2018, 4:20 PM
MaskRay retitled this revision from [cc1][cc1as] Call OptTable::PrintHelp with explicit " [options] <inputs>" to [cc1][cc1as] Call OptTable::PrintHelp with explicit " [options] file...".
MaskRay removed a reviewer: Restricted Project.
MaskRay removed subscribers: sdardis, atanasyan.

Refresh the commit and update title

Harbormaster completed remote builds in B23615: Diff 168898.Oct 9 2018, 4:21 PM
MaskRay updated this revision to Diff 168913.Oct 9 2018, 5:06 PM
MaskRay retitled this revision from [cc1][cc1as] Call OptTable::PrintHelp with explicit " [options] file..." to [Driver][cc1][cc1as] Call OptTable::PrintHelp with explicit " [options] file...".

Another reference in driver

Harbormaster completed remote builds in B23624: Diff 168913.Oct 9 2018, 5:08 PM
rupprecht accepted this revision.Oct 9 2018, 5:15 PM
This revision is now accepted and ready to land.Oct 9 2018, 5:15 PM
Closed by commit rL344098: [Driver][cc1][cc1as] Call OptTable::PrintHelp with explicit " [options] file..." (authored by MaskRay). · Explain WhyOct 9 2018, 5:18 PM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptOct 9 2018, 5:18 PM

Revision Contents

PathSize
lib/
Driver/
ToolChains/
2 lines
FrontendTool/
2 lines
tools/
driver/
3 lines

Diff 162478

lib/Driver/ToolChains/MipsLinux.h

Show First 20 Lines • Show All 43 Lines • ▼ Show 20 Linespublic:
std::string computeSysRoot() const override; std::string computeSysRoot() const override;
RuntimeLibType GetDefaultRuntimeLibType() const override { RuntimeLibType GetDefaultRuntimeLibType() const override {
return GCCInstallation.isValid() ? RuntimeLibType::RLT_Libgcc return GCCInstallation.isValid() ? RuntimeLibType::RLT_Libgcc
: RuntimeLibType::RLT_CompilerRT; : RuntimeLibType::RLT_CompilerRT;
} }
const char *getDefaultLinker() const override { const char *getDefaultLinker() const override {
return "lld"; return "ld.lld";
} }
private: private:
Multilib SelectedMultilib; Multilib SelectedMultilib;
std::string LibSuffix; std::string LibSuffix;
}; };
} // end namespace toolchains } // end namespace toolchains
} // end namespace driver } // end namespace driver
} // end namespace clang } // end namespace clang
#endif // LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_MIPS_LINUX_H #endif // LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_MIPS_LINUX_H

lib/FrontendTool/ExecuteCompilerInvocation.cpp

Show First 20 Lines • Show All 176 Lines • ▼ Show 20 Lines#endif
return Act; return Act;
} }
bool ExecuteCompilerInvocation(CompilerInstance *Clang) { bool ExecuteCompilerInvocation(CompilerInstance *Clang) {
// Honor -help. // Honor -help.
if (Clang->getFrontendOpts().ShowHelp) { if (Clang->getFrontendOpts().ShowHelp) {
std::unique_ptr<OptTable> Opts = driver::createDriverOptTable(); std::unique_ptr<OptTable> Opts = driver::createDriverOptTable();
Opts->PrintHelp(llvm::outs(), "clang -cc1", Opts->PrintHelp(llvm::outs(), "clang -cc1 [options] <inputs>",
"LLVM 'Clang' Compiler: http://clang.llvm.org", "LLVM 'Clang' Compiler: http://clang.llvm.org",
/*Include=*/driver::options::CC1Option, /*Include=*/driver::options::CC1Option,
/*Exclude=*/0, /*ShowAllAliases=*/false); /*Exclude=*/0, /*ShowAllAliases=*/false);
return true; return true;
} }
// Honor -version. // Honor -version.
// //
▲ Show 20 Lines • Show All 70 Lines • Show Last 20 Lines

tools/driver/cc1as_main.cpp

Show First 20 Lines • Show All 528 Lines • ▼ Show 20 Linesint cc1as_main(ArrayRef<const char *> Argv, const char *Argv0, void *MainAddr) {
// Parse the arguments. // Parse the arguments.
AssemblerInvocation Asm; AssemblerInvocation Asm;
if (!AssemblerInvocation::CreateFromArgs(Asm, Argv, Diags)) if (!AssemblerInvocation::CreateFromArgs(Asm, Argv, Diags))
return 1; return 1;
if (Asm.ShowHelp) { if (Asm.ShowHelp) {
std::unique_ptr<OptTable> Opts(driver::createDriverOptTable()); std::unique_ptr<OptTable> Opts(driver::createDriverOptTable());
Opts->PrintHelp(llvm::outs(), "clang -cc1as", "Clang Integrated Assembler", Opts->PrintHelp(llvm::outs(), "clang -cc1as [options] <inputs>",
"Clang Integrated Assembler",
/*Include=*/driver::options::CC1AsOption, /*Exclude=*/0, /*Include=*/driver::options::CC1AsOption, /*Exclude=*/0,
/*ShowAllAliases=*/false); /*ShowAllAliases=*/false);
return 0; return 0;
} }
// Honor -version. // Honor -version.
// //
// FIXME: Use a better -version message? // FIXME: Use a better -version message?
Show All 27 Lines