[llvm] r354002 - Revert "[llvm-objdump] Allow short options without arguments to be grouped"
Matthew Voss via llvm-commits
llvm-commits at lists.llvm.org
Wed Feb 13 17:39:43 PST 2019
Author: ormris
Date: Wed Feb 13 17:39:43 2019
New Revision: 354002
URL: http://llvm.org/viewvc/llvm-project?rev=354002&view=rev
Log:
Revert "[llvm-objdump] Allow short options without arguments to be grouped"
Reverted due to failures on the llvm-hexagon-elf.
This reverts commit 77e1f27476c89f65eeb496d131065177e6417f23.
Removed:
llvm/trunk/test/tools/llvm-objdump/option-grouping.test
Modified:
llvm/trunk/test/tools/llvm-objdump/X86/disasm-specific-funcs.test
llvm/trunk/tools/llvm-objdump/MachODump.cpp
llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp
Modified: llvm/trunk/test/tools/llvm-objdump/X86/disasm-specific-funcs.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/X86/disasm-specific-funcs.test?rev=354002&r1=354001&r2=354002&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objdump/X86/disasm-specific-funcs.test (original)
+++ llvm/trunk/test/tools/llvm-objdump/X86/disasm-specific-funcs.test Wed Feb 13 17:39:43 2019
@@ -1,5 +1,5 @@
// RUN: yaml2obj -o %t.out %p/Inputs/simple-executable-x86_64.yaml
-// RUN: llvm-objdump -d %t.out -disassemble-functions=main | FileCheck %s
+// RUN: llvm-objdump -d %t.out -df=main | FileCheck %s
// CHECK: Disassembly of section .anothertext:
// CHECK-NEXT: main:
Removed: llvm/trunk/test/tools/llvm-objdump/option-grouping.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/option-grouping.test?rev=354001&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objdump/option-grouping.test (original)
+++ llvm/trunk/test/tools/llvm-objdump/option-grouping.test (removed)
@@ -1,2 +0,0 @@
-// RUN: llvm-objdump -DRafdghprstux %p/Inputs/private-headers-x86_64.elf 2>&1 | FileCheck %s
-// CHECK-NOT: Unknown command line argument
Modified: llvm/trunk/tools/llvm-objdump/MachODump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/MachODump.cpp?rev=354002&r1=354001&r2=354002&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/MachODump.cpp (original)
+++ llvm/trunk/tools/llvm-objdump/MachODump.cpp Wed Feb 13 17:39:43 2019
@@ -59,7 +59,7 @@ using namespace llvm;
using namespace object;
static cl::opt<bool>
- UseDbg("g", cl::Grouping,
+ UseDbg("g",
cl::desc("Print line information from debug info if available"));
static cl::opt<std::string> DSYMFile("dsym",
Modified: llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp?rev=354002&r1=354001&r2=354002&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp (original)
+++ llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp Wed Feb 13 17:39:43 2019
@@ -79,8 +79,7 @@ cl::opt<bool>
llvm::AllHeaders("all-headers",
cl::desc("Display all available header information"));
static cl::alias AllHeadersShort("x", cl::desc("Alias for --all-headers"),
- cl::NotHidden, cl::Grouping,
- cl::aliasopt(AllHeaders));
+ cl::NotHidden, cl::aliasopt(AllHeaders));
static cl::list<std::string>
InputFilenames(cl::Positional, cl::desc("<input object files>"),cl::ZeroOrMore);
@@ -89,25 +88,22 @@ cl::opt<bool>
llvm::Disassemble("disassemble",
cl::desc("Display assembler mnemonics for the machine instructions"));
static cl::alias Disassembled("d", cl::desc("Alias for --disassemble"),
- cl::NotHidden, cl::Grouping,
- cl::aliasopt(Disassemble));
+ cl::NotHidden, cl::aliasopt(Disassemble));
cl::opt<bool>
llvm::DisassembleAll("disassemble-all",
cl::desc("Display assembler mnemonics for the machine instructions"));
static cl::alias DisassembleAlld("D", cl::desc("Alias for --disassemble-all"),
- cl::NotHidden, cl::Grouping,
- cl::aliasopt(DisassembleAll));
+ cl::NotHidden, cl::aliasopt(DisassembleAll));
cl::opt<bool> llvm::Demangle("demangle", cl::desc("Demangle symbols names"),
cl::init(false));
static cl::alias DemangleShort("C", cl::desc("Alias for --demangle"),
- cl::NotHidden, cl::Grouping,
- cl::aliasopt(llvm::Demangle));
+ cl::NotHidden, cl::aliasopt(llvm::Demangle));
static cl::list<std::string>
-DisassembleFunctions("disassemble-functions",
+DisassembleFunctions("df",
cl::CommaSeparated,
cl::desc("List of functions to disassemble"));
static StringSet<> DisasmFuncsSet;
@@ -116,14 +112,14 @@ cl::opt<bool>
llvm::Relocations("reloc",
cl::desc("Display the relocation entries in the file"));
static cl::alias RelocationsShort("r", cl::desc("Alias for --reloc"),
- cl::NotHidden, cl::Grouping,
+ cl::NotHidden,
cl::aliasopt(llvm::Relocations));
cl::opt<bool>
llvm::DynamicRelocations("dynamic-reloc",
cl::desc("Display the dynamic relocation entries in the file"));
static cl::alias DynamicRelocationsd("R", cl::desc("Alias for --dynamic-reloc"),
- cl::NotHidden, cl::Grouping,
+ cl::NotHidden,
cl::aliasopt(DynamicRelocations));
cl::opt<bool>
@@ -131,12 +127,12 @@ cl::opt<bool>
cl::desc("Display the content of each section"));
static cl::alias SectionContentsShort("s",
cl::desc("Alias for --full-contents"),
- cl::NotHidden, cl::Grouping,
+ cl::NotHidden,
cl::aliasopt(SectionContents));
cl::opt<bool> llvm::SymbolTable("syms", cl::desc("Display the symbol table"));
static cl::alias SymbolTableShort("t", cl::desc("Alias for --syms"),
- cl::NotHidden, cl::Grouping,
+ cl::NotHidden,
cl::aliasopt(llvm::SymbolTable));
cl::opt<bool>
@@ -161,7 +157,7 @@ llvm::RawClangAST("raw-clang-ast",
static cl::opt<bool>
MachOOpt("macho", cl::desc("Use MachO specific object file parser"));
static cl::alias MachOm("m", cl::desc("Alias for --macho"), cl::NotHidden,
- cl::Grouping, cl::aliasopt(MachOOpt));
+ cl::aliasopt(MachOOpt));
cl::opt<std::string>
llvm::TripleName("triple", cl::desc("Target triple to disassemble for, "
@@ -186,7 +182,7 @@ static cl::alias SectionHeadersShort("he
cl::aliasopt(SectionHeaders));
static cl::alias SectionHeadersShorter("h",
cl::desc("Alias for --section-headers"),
- cl::NotHidden, cl::Grouping,
+ cl::NotHidden,
cl::aliasopt(SectionHeaders));
static cl::opt<bool>
@@ -217,8 +213,7 @@ cl::opt<bool>
llvm::UnwindInfo("unwind-info", cl::desc("Display unwind information"));
static cl::alias UnwindInfoShort("u", cl::desc("Alias for --unwind-info"),
- cl::NotHidden, cl::Grouping,
- cl::aliasopt(UnwindInfo));
+ cl::NotHidden, cl::aliasopt(UnwindInfo));
cl::opt<bool>
llvm::PrivateHeaders("private-headers",
@@ -231,7 +226,7 @@ llvm::FirstPrivateHeader("private-header
static cl::alias PrivateHeadersShort("p",
cl::desc("Alias for --private-headers"),
- cl::NotHidden, cl::Grouping,
+ cl::NotHidden,
cl::aliasopt(PrivateHeaders));
cl::opt<bool> llvm::FileHeaders(
@@ -239,16 +234,14 @@ cl::opt<bool> llvm::FileHeaders(
cl::desc("Display the contents of the overall file header"));
static cl::alias FileHeadersShort("f", cl::desc("Alias for --file-headers"),
- cl::NotHidden, cl::Grouping,
- cl::aliasopt(FileHeaders));
+ cl::NotHidden, cl::aliasopt(FileHeaders));
cl::opt<bool>
llvm::ArchiveHeaders("archive-headers",
cl::desc("Display archive header information"));
cl::alias ArchiveHeadersShort("a", cl::desc("Alias for --archive-headers"),
- cl::NotHidden, cl::Grouping,
- cl::aliasopt(ArchiveHeaders));
+ cl::NotHidden, cl::aliasopt(ArchiveHeaders));
cl::opt<bool>
llvm::PrintImmHex("print-imm-hex",
@@ -267,15 +260,14 @@ cl::opt<bool> PrintSource(
"Display source inlined with disassembly. Implies disassemble object"));
cl::alias PrintSourceShort("S", cl::desc("Alias for -source"), cl::NotHidden,
- cl::Grouping, cl::aliasopt(PrintSource));
+ cl::aliasopt(PrintSource));
cl::opt<bool> PrintLines("line-numbers",
cl::desc("Display source line numbers with "
"disassembly. Implies disassemble object"));
cl::alias PrintLinesShort("l", cl::desc("Alias for -line-numbers"),
- cl::NotHidden, cl::Grouping,
- cl::aliasopt(PrintLines));
+ cl::NotHidden, cl::aliasopt(PrintLines));
cl::opt<unsigned long long>
StartAddress("start-address", cl::desc("Disassemble beginning at address"),
@@ -290,7 +282,7 @@ cl::opt<bool> DisassembleZeroes(
cl::desc("Do not skip blocks of zeroes when disassembling"));
cl::alias DisassembleZeroesShort("z",
cl::desc("Alias for --disassemble-zeroes"),
- cl::NotHidden, cl::Grouping,
+ cl::NotHidden,
cl::aliasopt(DisassembleZeroes));
static StringRef ToolName;
More information about the llvm-commits
mailing list