diff --git a/llvm/test/tools/llvm-dwarfdump/cmdline.test b/llvm/test/tools/llvm-dwarfdump/cmdline.test
--- a/llvm/test/tools/llvm-dwarfdump/cmdline.test
+++ b/llvm/test/tools/llvm-dwarfdump/cmdline.test
@@ -2,29 +2,29 @@
 RUN: llvm-dwarfdump --help 2>&1 | FileCheck --check-prefix=HELP %s --implicit-check-not=out-file
 HELP: USAGE: llvm-dwarfdump{{[^ ]*}} [options] <input object files or .dSYM bundles>
 HELP: Color Options
-HELP: -color
+HELP: --color
 HELP: Generic Options
-HELP: -help
-HELP: -help-list
-HELP: -version
+HELP: --help
+HELP: --help-list
+HELP: --version
 HELP: Section-specific Dump Options
-HELP: -debug-info            - Dump the .debug_info section
-HELP: -eh-frame
+HELP: --debug-info            - Dump the .debug_info section
+HELP: --eh-frame
 HELP: Specific Options
-HELP: -diff
-HELP: -find
-HELP: -ignore-case
-HELP: -lookup
-HELP: -name
+HELP: --diff
+HELP: --find
+HELP: --ignore-case
+HELP: --lookup
+HELP: --name
 HELP: -o=<filename>
-HELP: -parent-recurse-depth=<N>
-HELP: -recurse-depth=<N>
-HELP: -regex
-HELP: -show-children
-HELP: -show-form
-HELP: -show-parents
-HELP: -statistics
-HELP: -summarize-types
+HELP: --parent-recurse-depth=<N>
+HELP: --recurse-depth=<N>
+HELP: --regex
+HELP: --show-children
+HELP: --show-form
+HELP: --show-parents
+HELP: --statistics
+HELP: --summarize-types
 HELP: @FILE
 
 RUN: llvm-dwarfdump --version 2>&1 | FileCheck --check-prefix=VERSION %s
diff --git a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
--- a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
+++ b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
@@ -72,10 +72,7 @@
     return ValueOptional;
   }
 
-  void printOptionInfo(const Option &O, size_t GlobalWidth) const {
-    outs() << "  -" << O.ArgStr;
-    Option::printHelpStr(O.HelpStr, GlobalWidth, getOptionWidth(O));
-  }
+  StringRef getValueName() const override { return StringRef(); }
 
   void printOptionDiff(const Option &O, OffsetOption V, OptVal Default,
                        size_t GlobalWidth) const {