diff options
| author | Alex Lorenz <arphaman@gmail.com> | 2019-04-15 20:16:19 +0000 |
|---|---|---|
| committer | Alex Lorenz <arphaman@gmail.com> | 2019-04-15 20:16:19 +0000 |
| commit | 16256123d006069edacf7ee4b65e5b82d723a3cd (patch) | |
| tree | 20ba873e1783d8b1d377b1719c5bf41fe771d5d6 /llvm/tools/llvm-objdump/llvm-objdump.cpp | |
| parent | 13532ea62340ee8f54353aa4d0f309c1e0d1ebd3 (diff) | |
| download | llvm-16256123d006069edacf7ee4b65e5b82d723a3cd.zip llvm-16256123d006069edacf7ee4b65e5b82d723a3cd.tar.gz llvm-16256123d006069edacf7ee4b65e5b82d723a3cd.tar.bz2 | |
Revert r358418: "[llvm-objdump] Simplify PrintHelpMessage() logic"
This reverts commit r358418 as it broke `test/Object/objdump-export-list`
on Darwin.
llvm-svn: 358443
Diffstat (limited to 'llvm/tools/llvm-objdump/llvm-objdump.cpp')
| -rw-r--r-- | llvm/tools/llvm-objdump/llvm-objdump.cpp | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index 47a2347..afd137f 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -2021,15 +2021,34 @@ int main(int argc, char **argv) { if (DisassembleAll || PrintSource || PrintLines) Disassemble = true; - if (!ArchiveHeaders && !Disassemble && DwarfDumpType == DIDT_Null && - !DynamicRelocations && !FileHeaders && !PrivateHeaders && !RawClangAST && - !Relocations && !SectionHeaders && !SectionContents && !SymbolTable && - !UnwindInfo && !FaultMapSection && - !(MachOOpt && - (Bind || DataInCode || DylibId || DylibsUsed || ExportsTrie || - FirstPrivateHeader || IndirectSymbols || InfoPlist || LazyBind || - LinkOptHints || Rebase || ObjcMetaData || UniversalHeaders || - WeakBind || !FilterSections.empty()))) { + if (!Disassemble + && !Relocations + && !DynamicRelocations + && !SectionHeaders + && !SectionContents + && !SymbolTable + && !UnwindInfo + && !PrivateHeaders + && !FileHeaders + && !FirstPrivateHeader + && !ExportsTrie + && !Rebase + && !Bind + && !LazyBind + && !WeakBind + && !RawClangAST + && !(UniversalHeaders && MachOOpt) + && !ArchiveHeaders + && !(IndirectSymbols && MachOOpt) + && !(DataInCode && MachOOpt) + && !(LinkOptHints && MachOOpt) + && !(InfoPlist && MachOOpt) + && !(DylibsUsed && MachOOpt) + && !(DylibId && MachOOpt) + && !(ObjcMetaData && MachOOpt) + && !(!FilterSections.empty() && MachOOpt) + && !FaultMapSection + && DwarfDumpType == DIDT_Null) { cl::PrintHelpMessage(); return 2; } |