[llvm-objdump] Simplify PrintHelpMessage() logic
This relands rL358418. It missed one test that should also use -macho
Note, all the other -private-header -exports-trie tests are used
together with -macho.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@358472 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Object/objdump-export-list.test b/test/Object/objdump-export-list.test
index 74344c1..1728f73 100644
--- a/test/Object/objdump-export-list.test
+++ b/test/Object/objdump-export-list.test
@@ -1,4 +1,5 @@
-RUN: llvm-objdump -exports-trie %p/Inputs/macho-no-exports.dylib | FileCheck %s
+RUN: llvm-objdump -macho -exports-trie %p/Inputs/macho-no-exports.dylib | FileCheck %s
; Test that we don't crash with an empty export list.
-CHECK: macho-no-exports.dylib: file format Mach-O 64-bit x86-64
+CHECK: macho-no-exports.dylib
+CHECK: Exports trie:
diff --git a/test/tools/llvm-objdump/X86/macho-private-header.test b/test/tools/llvm-objdump/X86/macho-private-header.test
index d900725..b904bbc 100644
--- a/test/tools/llvm-objdump/X86/macho-private-header.test
+++ b/test/tools/llvm-objdump/X86/macho-private-header.test
@@ -1,4 +1,4 @@
-// RUN: llvm-objdump -private-header %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
+// RUN: llvm-objdump -macho -private-header %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
CHECK: Mach header
CHECK: magic cputype cpusubtype caps filetype ncmds sizeofcmds flags
diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp
index bc688d6..2606d9b 100644
--- a/tools/llvm-objdump/llvm-objdump.cpp
+++ b/tools/llvm-objdump/llvm-objdump.cpp
@@ -2008,34 +2008,15 @@
if (DisassembleAll || PrintSource || PrintLines)
Disassemble = true;
- 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) {
+ 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 || ObjcMetaData || Rebase || UniversalHeaders ||
+ WeakBind || !FilterSections.empty()))) {
cl::PrintHelpMessage();
return 2;
}