[CommandLine] --help: print "-o <xxx>" instead of "-o=<xxx>"

Accepting -o= is a quirk of CommandLine. For --help, we should print the
conventional "-o <xxx>".

clang-tools-extra/docs/clang-doc.rst

@@ -90,7 +90,7 @@ Options
       =html                     -   Documentation in HTML format.
     --ignore-map-errors         - Continue if files are not mapped correctly.
     --output=<string>           - Directory for outputting generated files.
-    -p=<string>                 - Build path
+    -p <string>                 - Build path
     --project-name=<string>     - Name of project.
     --public                    - Document only public declarations.
     --repository=<string>       -

clang-tools-extra/docs/clang-rename.rst

@@ -131,7 +131,7 @@ That way you can avoid spelling out all the names as command line arguments:
     -input=<string>            - YAML file to load oldname-newname pairs from.
     -new-name=<string>         - The new name to change the symbol to.
     -offset=<uint>             - Locates the symbol by offset as opposed to <line>:<column>.
-    -p=<string>                - Build path
+    -p <string>                - Build path
     -pl                        - Print the locations affected by renaming to stderr.
     -pn                        - Print the found symbol's name prior to renaming to stderr.
     -qualified-name=<string>   - The fully qualified name of the symbol.

clang-tools-extra/docs/clang-tidy/index.rst

@@ -226,7 +226,7 @@ An overview of all the command-line options:
                                      complete list of passes, use the
                                      :option:`--list-checks` and
                                      :option:`-load` options together.
-    -p=<string>                    - Build path
+    -p <string>                    - Build path
     --quiet                        -
                                      Run clang-tidy in quiet mode. This suppresses
                                      printing statistics about ignored warnings and

clang/docs/ClangOffloadPackager.rst

@@ -168,7 +168,7 @@ and ``arch`` arguments are considered mandatory to make a valid image.
   
     --image=<<key>=<value>,...> - List of key and value arguments. Required
                                   keywords are 'file' and 'triple'.
-    -o=<file>                   - Write output to <file>.
+    -o <file>                   - Write output to <file>.
 
 Example
 =======

clang/docs/ClangOffloadWrapper.rst

@@ -34,7 +34,7 @@ This tool can be used as follows:
     --help-list                        - Display list of available options (--help-list-hidden for more)
     --version                          - Display the version of this program
   clang-offload-wrapper options:
-    -o=<filename>                      - Output filename
+    -o <filename>                      - Output filename
     --target=<triple>                  - Target triple for the output module
 
 Example

clang/test/Driver/clang-offload-wrapper.c

@@ -8,7 +8,7 @@
 // CHECK-HELP: {{.*}}target binaries as input and produces bitcode file containing target binaries packaged
 // CHECK-HELP: {{.*}}as data and initialization code which registers target binaries in offload runtime.
 // CHECK-HELP: {{.*}}USAGE: clang-offload-wrapper [options] <input files>
-// CHECK-HELP: {{.*}}  -o=<filename>               - Output filename
+// CHECK-HELP: {{.*}}  -o <filename>               - Output filename
 // CHECK-HELP: {{.*}}  --target=<triple>           - Target triple for the output module
 
 //

llvm/docs/CommandGuide/llvm-cov.rst

@@ -128,7 +128,7 @@ OPTIONS
  Do not output any ``.gcov`` files. Summary information is still
  displayed.
 
-.. option:: -o=<DIR|FILE>, --object-directory=<DIR>, --object-file=<FILE>
+.. option:: -o <DIR|FILE>, --object-directory=<DIR>, --object-file=<FILE>
 
  Find objects in DIR or based on FILE's path. If you specify a particular
  object file, the coverage data files are expected to have the same base name
@@ -150,7 +150,7 @@ OPTIONS
  Only dump files with relative paths or absolute paths with the prefix specified
  by ``-s``.
 
-.. option:: -s=<string>
+.. option:: -s <string>
 
  Source prefix to elide.
 

llvm/lib/Support/CommandLine.cpp

@@ -1862,8 +1862,10 @@ void basic_parser_impl::printOptionInfo(const Option &O,
       outs() << " <" << getValueStr(O, ValName) << ">...";
     } else if (O.getValueExpectedFlag() == ValueOptional)
       outs() << "[=<" << getValueStr(O, ValName) << ">]";
-    else
-      outs() << "=<" << getValueStr(O, ValName) << '>';
+    else {
+      outs() << (O.ArgStr.size() == 1 ? " <" : "=<") << getValueStr(O, ValName)
+             << '>';
+    }
   }
 
   Option::printHelpStr(O.HelpStr, GlobalWidth, getOptionWidth(O));

llvm/test/tools/llvm-dwarfdump/cmdline.test

@@ -50,7 +50,7 @@ HELP: --ignore-case
 HELP: --lookup=<address>
 HELP: -n
 HELP: --name=<pattern>
-HELP: -o=<filename>
+HELP: -o <filename>
 HELP: -p
 HELP: --parent-recurse-depth=<N>
 HELP: --quiet