From 7e7ae5ad692760aa8d97477f061a05b10948cf57 Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Thu, 18 Feb 2010 14:08:13 +0000 Subject: [PATCH] Refer to -help instead of --help since this is what tools themselves say. Also, have tools output -help-hidden rather than refer to --help-hidden, for consistency, and likewise adjust documentation. This doesn't change every mention of --help, only those which seemed clearly safe. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96578 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/CommandGuide/FileCheck.pod | 2 +- docs/CommandGuide/bugpoint.pod | 6 +-- docs/CommandGuide/index.html | 2 +- docs/CommandGuide/llc.pod | 4 +- docs/CommandGuide/lli.pod | 2 +- docs/CommandGuide/llvm-as.pod | 2 +- docs/CommandGuide/llvm-bcanalyzer.pod | 2 +- docs/CommandGuide/llvm-config.pod | 2 +- docs/CommandGuide/llvm-dis.pod | 2 +- docs/CommandGuide/llvm-extract.pod | 2 +- docs/CommandGuide/llvm-link.pod | 2 +- docs/CommandGuide/llvm-nm.pod | 2 +- docs/CommandGuide/llvm-prof.pod | 2 +- docs/CommandGuide/llvm-ranlib.pod | 4 +- docs/CommandGuide/llvmc.pod | 4 +- docs/CommandGuide/tblgen.pod | 2 +- docs/CommandLine.html | 68 +++++++++++++-------------- docs/CompilerDriver.html | 8 ++-- docs/GettingStarted.html | 4 +- docs/WritingAnLLVMPass.html | 12 ++--- include/llvm/CompilerDriver/Main.inc | 2 +- include/llvm/Support/CommandLine.h | 16 +++---- lib/Support/CommandLine.cpp | 14 +++--- 23 files changed, 83 insertions(+), 83 deletions(-) diff --git a/docs/CommandGuide/FileCheck.pod b/docs/CommandGuide/FileCheck.pod index 32516ad87b3..433979a8719 100644 --- a/docs/CommandGuide/FileCheck.pod +++ b/docs/CommandGuide/FileCheck.pod @@ -25,7 +25,7 @@ match. The file to verify is always read from standard input. =over -=item B<--help> +=item B<-help> Print a summary of command line options. diff --git a/docs/CommandGuide/bugpoint.pod b/docs/CommandGuide/bugpoint.pod index 204ea4d3d39..7afeea1aba5 100644 --- a/docs/CommandGuide/bugpoint.pod +++ b/docs/CommandGuide/bugpoint.pod @@ -85,7 +85,7 @@ mis-management. Continually randomize the specified passes and run them on the test program until a bug is found or the user kills B. -=item B<--help> +=item B<-help> Print a summary of command line options. @@ -99,9 +99,9 @@ it runs, to come from that file. Load the dynamic object F into B itself. This object should register new optimization passes. Once loaded, the object will add new command line options to enable various optimizations. To see the new complete list of -optimizations, use the B<--help> and B<--load> options together; for example: +optimizations, use the B<-help> and B<--load> options together; for example: - bugpoint --load myNewPass.so --help + bugpoint --load myNewPass.so -help =item B<--mlimit> F diff --git a/docs/CommandGuide/index.html b/docs/CommandGuide/index.html index 9516d075b3c..72cd2cf5f96 100644 --- a/docs/CommandGuide/index.html +++ b/docs/CommandGuide/index.html @@ -17,7 +17,7 @@ for all of the LLVM tools. These pages describe how to use the LLVM commands and what their options are. Note that these pages do not describe all of the options available for all tools. To get a complete listing, pass the ---help (general options) or --help-hidden (general+debugging +-help (general options) or -help-hidden (general+debugging options) arguments to the tool you are interested in.

diff --git a/docs/CommandGuide/llc.pod b/docs/CommandGuide/llc.pod index 8adfb682be0..ac24aab4ff6 100644 --- a/docs/CommandGuide/llc.pod +++ b/docs/CommandGuide/llc.pod @@ -38,7 +38,7 @@ Other B options are as follows: =over -=item B<--help> +=item B<-help> Print a summary of command line options. @@ -56,7 +56,7 @@ string. =item B<-march>=I Specify the architecture for which to generate assembly, overriding the target -encoded in the input file. See the output of B for a list of +encoded in the input file. See the output of B for a list of valid architectures. By default this is inferred from the target triple or autodetected to the current architecture. diff --git a/docs/CommandGuide/lli.pod b/docs/CommandGuide/lli.pod index e9fdf74fe53..3d5da3d465a 100644 --- a/docs/CommandGuide/lli.pod +++ b/docs/CommandGuide/lli.pod @@ -73,7 +73,7 @@ architecture which is not compatible with the current system. =item B<-march>=I Specify the architecture for which to generate assembly, overriding the target -encoded in the bitcode file. See the output of B for a list of +encoded in the bitcode file. See the output of B for a list of valid architectures. By default this is inferred from the target triple or autodetected to the current architecture. diff --git a/docs/CommandGuide/llvm-as.pod b/docs/CommandGuide/llvm-as.pod index 045a9245b60..185c009698f 100644 --- a/docs/CommandGuide/llvm-as.pod +++ b/docs/CommandGuide/llvm-as.pod @@ -50,7 +50,7 @@ Enable binary output on terminals. Normally, B will refuse to write raw bitcode output if the output stream is a terminal. With this option, B will write raw bitcode regardless of the output device. -=item B<--help> +=item B<-help> Print a summary of command line options. diff --git a/docs/CommandGuide/llvm-bcanalyzer.pod b/docs/CommandGuide/llvm-bcanalyzer.pod index f60b5138221..b0bc0cddba8 100644 --- a/docs/CommandGuide/llvm-bcanalyzer.pod +++ b/docs/CommandGuide/llvm-bcanalyzer.pod @@ -43,7 +43,7 @@ Causes B to verify the module produced by reading the bitcode. This ensures that the statistics generated are based on a consistent module. -=item B<--help> +=item B<-help> Print a summary of command line options. diff --git a/docs/CommandGuide/llvm-config.pod b/docs/CommandGuide/llvm-config.pod index 06f10de2216..4e38dae3df6 100644 --- a/docs/CommandGuide/llvm-config.pod +++ b/docs/CommandGuide/llvm-config.pod @@ -30,7 +30,7 @@ To link against the JIT: Print the version number of LLVM. -=item B<--help> +=item B<-help> Print a summary of B arguments. diff --git a/docs/CommandGuide/llvm-dis.pod b/docs/CommandGuide/llvm-dis.pod index 2b83290c9b2..5b2f4ef4e92 100644 --- a/docs/CommandGuide/llvm-dis.pod +++ b/docs/CommandGuide/llvm-dis.pod @@ -33,7 +33,7 @@ Enable binary output on terminals. Normally, B will refuse to write raw bitcode output if the output stream is a terminal. With this option, B will write raw bitcode regardless of the output device. -=item B<--help> +=item B<-help> Print a summary of command line options. diff --git a/docs/CommandGuide/llvm-extract.pod b/docs/CommandGuide/llvm-extract.pod index 02f38adf554..d4baab73991 100644 --- a/docs/CommandGuide/llvm-extract.pod +++ b/docs/CommandGuide/llvm-extract.pod @@ -42,7 +42,7 @@ specified multiple times to extract multiple functions at once. Extract the global variable named I from the LLVM bitcode. May be specified multiple times to extract multiple global variables at once. -=item B<--help> +=item B<-help> Print a summary of command line options. diff --git a/docs/CommandGuide/llvm-link.pod b/docs/CommandGuide/llvm-link.pod index e1a1267c52e..8d06cc9d9d9 100644 --- a/docs/CommandGuide/llvm-link.pod +++ b/docs/CommandGuide/llvm-link.pod @@ -51,7 +51,7 @@ Write output in LLVM intermediate language (instead of bitcode). If specified, B prints a human-readable version of the output bitcode file to standard error. -=item B<--help> +=item B<-help> Print a summary of command line options. diff --git a/docs/CommandGuide/llvm-nm.pod b/docs/CommandGuide/llvm-nm.pod index 995ac08139a..a580d3f5ca7 100644 --- a/docs/CommandGuide/llvm-nm.pod +++ b/docs/CommandGuide/llvm-nm.pod @@ -77,7 +77,7 @@ Use POSIX.2 output format. Alias for B<--format=posix>. Use BSD output format. Alias for B<--format=bsd>. -=item B<--help> +=item B<-help> Print a summary of command-line options and their meanings. diff --git a/docs/CommandGuide/llvm-prof.pod b/docs/CommandGuide/llvm-prof.pod index 381387d7dbe..9541b05dcaf 100644 --- a/docs/CommandGuide/llvm-prof.pod +++ b/docs/CommandGuide/llvm-prof.pod @@ -18,7 +18,7 @@ where the program hotspots are. This program is often used in conjunction with the F script. This script automatically instruments a program, runs it with the JIT, then runs B to format a report. To get more information about -F, execute it with the B<--help> option. +F, execute it with the B<-help> option. =head1 OPTIONS diff --git a/docs/CommandGuide/llvm-ranlib.pod b/docs/CommandGuide/llvm-ranlib.pod index 130edb07715..53cd34bbb5c 100644 --- a/docs/CommandGuide/llvm-ranlib.pod +++ b/docs/CommandGuide/llvm-ranlib.pod @@ -6,7 +6,7 @@ llvm-ranlib - Generate index for LLVM archive =head1 SYNOPSIS -B [--version] [--help] +B [--version] [-help] =head1 DESCRIPTION @@ -30,7 +30,7 @@ Specifies the archive-file to which the symbol table is added or updated. Print the version of B and exit without building a symbol table. -=item F<--help> +=item F<-help> Print usage help for B and exit without building a symbol table. diff --git a/docs/CommandGuide/llvmc.pod b/docs/CommandGuide/llvmc.pod index e5e06511613..d237ca4c14f 100644 --- a/docs/CommandGuide/llvmc.pod +++ b/docs/CommandGuide/llvmc.pod @@ -77,11 +77,11 @@ Store temporary files in the given directory. This directory is deleted on exit unless I<--save-temps> is specified. If I<--save-temps=obj> is also specified, I<--temp-dir> is given the precedence. -=item B<--help> +=item B<-help> Print a summary of command-line options and exit. -=item B<--help-hidden> +=item B<-help-hidden> Print a summary of command-line options and exit. Print help even for options intended for developers. diff --git a/docs/CommandGuide/tblgen.pod b/docs/CommandGuide/tblgen.pod index c8244af5cea..d127492a91b 100644 --- a/docs/CommandGuide/tblgen.pod +++ b/docs/CommandGuide/tblgen.pod @@ -26,7 +26,7 @@ to read as input. =over -=item B<--help> +=item B<-help> Print a summary of command line options. diff --git a/docs/CommandLine.html b/docs/CommandLine.html index cefb6f882e3..f5732267aad 100644 --- a/docs/CommandLine.html +++ b/docs/CommandLine.html @@ -44,7 +44,7 @@
  • Option Modifiers
      -
    • Hiding an option from --help +
    • Hiding an option from -help output
    • Controlling the number of occurrences required and allowed
      • @@ -161,7 +161,7 @@ you declare it. Custom parsers are no problem.
    • Labor Saving: The CommandLine library cuts down on the amount of grunt work that you, the user, have to do. For example, it automatically provides a ---help option that shows the available command line options for your +-help option that shows the available command line options for your tool. Additionally, it does most of the basic correctness checking for you.
      • @@ -239,14 +239,14 @@ href="#list">"cl::list template), and tell the CommandLine library that the data type that we are parsing is a string.

      The second and third parameters (which are optional) are used to specify what -to output for the "--help" option. In this case, we get a line that +to output for the "-help" option. In this case, we get a line that looks like this:

       USAGE: compiler [options]
 
 OPTIONS:
-  -help             - display available options (--help-hidden for more)
+  -help             - display available options (-help-hidden for more)
   -o <filename>     - Specify output filename
      @@ -308,14 +308,14 @@ the CommandLine library will automatically issue an error if the argument is not specified, which shifts all of the command line option verification code out of your application into the library. This is just one example of how using flags can alter the default behaviour of the library, on a per-option basis. By -adding one of the declarations above, the --help option synopsis is now +adding one of the declarations above, the -help option synopsis is now extended to:

       USAGE: compiler [options] <input file>
 
 OPTIONS:
-  -help             - display available options (--help-hidden for more)
+  -help             - display available options (-help-hidden for more)
   -o <filename>     - Specify output filename
      @@ -346,8 +346,8 @@ declaring options of boolean type like this:

      ("Force", "Quiet", and "Quiet2") to recognize these options. Note that the "-q" option is specified with the "cl::Hidden" flag. This modifier prevents it -from being shown by the standard "--help" output (note that it is still -shown in the "--help-hidden" output).

      +from being shown by the standard "-help" output (note that it is still +shown in the "-help-hidden" output).

      The CommandLine library uses a different parser for different data types. For example, in the string case, the argument passed @@ -372,7 +372,7 @@ href="#doubleparser">double, and int parsers work like you would expect, using the 'strtol' and 'strtod' C library calls to parse the string value into the specified data type.

      -

      With the declarations above, "compiler --help" emits this:

      +

      With the declarations above, "compiler -help" emits this:

       USAGE: compiler [options] <input file>
@@ -381,10 +381,10 @@ OPTIONS:
   -f     - Enable binary output on terminals
   -o     - Override output filename
   -quiet - Don't print informational messages
-  -help  - display available options (--help-hidden for more)
+  -help  - display available options (-help-hidden for more)
      -

      and "compiler --help-hidden" prints this:

      +

      and "compiler -help-hidden" prints this:

       USAGE: compiler [options] <input file>
@@ -394,7 +394,7 @@ OPTIONS:
   -o     - Override output filename
   -q     - Don't print informational messages
   -quiet - Don't print informational messages
-  -help  - display available options (--help-hidden for more)
+  -help  - display available options (-help-hidden for more)

      This brief example has shown you how to use the 'cl::aliasopt modifier) whenever it is specified. Because aliases do not hold state, the only thing the program has to query is the Quiet variable now. Another nice feature of aliases is that they automatically hide themselves from the -help output -(although, again, they are still visible in the --help-hidden +(although, again, they are still visible in the -help-hidden output).

      Now the application code can simply use:

      @@ -531,7 +531,7 @@ OPTIONS: -O2 - Enable default optimizations -O3 - Enable expensive optimizations -f - Enable binary output on terminals - -help - display available options (--help-hidden for more) + -help - display available options (-help-hidden for more) -o <filename> - Specify output filename -quiet - Don't print informational messages @@ -599,7 +599,7 @@ enum DebugLev {

      This definition defines an enumerated command line variable of type "enum DebugLev", which works exactly the same way as before. The difference here is just the interface exposed to the user of your program and the help output by -the "--help" option:

      +the "-help" option:

       USAGE: compiler [options] <input file>
@@ -615,7 +615,7 @@ OPTIONS:
     =quick      - enable quick debug information
     =detailed   - enable detailed debug information
   -f            - Enable binary output on terminals
-  -help         - display available options (--help-hidden for more)
+  -help         - display available options (-help-hidden for more)
   -o <filename> - Specify output filename
   -quiet        - Don't print informational messages
      @@ -794,7 +794,7 @@ USAGE: compiler [options] <input file> OPTIONS: ... - -help - display available options (--help-hidden for more) + -help - display available options (-help-hidden for more) -o <filename> - Specify output filename @@ -835,14 +835,14 @@ Using the CommandLine library, this would be specified as:

      cl::opt<string> Filename(cl::Positional, cl::desc("<input file>"), cl::init("-")); -

      Given these two option declarations, the --help output for our grep +

      Given these two option declarations, the -help output for our grep replacement would look like this:

       USAGE: spiffygrep [options] <regular expression> <input file>
 
 OPTIONS:
-  -help - display available options (--help-hidden for more)
+  -help - display available options (-help-hidden for more)

      ... and the resultant program could be used just like the standard @@ -872,7 +872,7 @@ Note that the system grep has the same problem:

         $ spiffygrep '-foo' test.txt
-  Unknown command line argument '-foo'.  Try: spiffygrep --help'
+  Unknown command line argument '-foo'.  Try: spiffygrep -help'
 
   $ grep '-foo' test.txt
   grep: illegal option -- f
@@ -986,7 +986,7 @@ shell itself.  Using the CommandLine library, we would specify this as:
      
 USAGE: spiffysh [options] <input script> <program arguments>...
 
 OPTIONS:
-  -help - display available options (--help-hidden for more)
+  -help - display available options (-help-hidden for more)
   -x    - Enable trace output
      @@ -1098,11 +1098,11 @@ This option is specified in simple double quotes:
    • The cl::desc attribute specifies a -description for the option to be shown in the --help output for the +description for the option to be shown in the -help output for the program.
    • The cl::value_desc attribute -specifies a string that can be used to fine tune the --help output for +specifies a string that can be used to fine tune the -help output for a command line option. Look here for an example.
      • @@ -1130,7 +1130,7 @@ the string-to-value mapping to be used by the generic parser. It takes a clEnumValEnd terminated list of (option, value, description) triplets that specify the option name, the value mapped to, and the description shown in the ---help for the tool. Because the generic parser is used most +-help for the tool. Because the generic parser is used most frequently with enum values, two macros are often useful:
        @@ -1175,13 +1175,13 @@ obviously).

        Option modifiers are the flags and expressions that you pass into the constructors for cl::opt and cl::list. These modifiers give you the ability to -tweak how options are parsed and how --help output is generated to fit +tweak how options are parsed and how -help output is generated to fit your application well.

        These options fall into five main categories:

          -
        1. Hiding an option from --help output
          2. +
        2. Hiding an option from -help output
        3. Controlling the number of occurrences required and allowed
        4. Controlling whether or not a value must be @@ -1200,14 +1200,14 @@ usually shouldn't have to worry about these.

          - Hiding an option from --help output + Hiding an option from -help output

          The cl::NotHidden, cl::Hidden, and cl::ReallyHidden modifiers are used to control whether or not an option -appears in the --help and --help-hidden output for the +appears in the -help and -help-hidden output for the compiled program:

            @@ -1219,8 +1219,8 @@ in both help listings.
          • The cl::Hidden modifier (which is the default for cl::alias options) indicates that -the option should not appear in the --help output, but should appear in -the --help-hidden output.
            • +the option should not appear in the -help output, but should appear in +the -help-hidden output.
          • The cl::ReallyHidden modifier indicates that the option should not appear in any help output.
            • @@ -1508,7 +1508,7 @@ available.

            The cl::ParseCommandLineOptions function requires two parameters (argc and argv), but may also take an optional third parameter which holds additional extra text to emit when the ---help option is invoked, and a fourth boolean parameter that enables +-help option is invoked, and a fourth boolean parameter that enables response files.

          @@ -1535,7 +1535,7 @@ does.

          not be available, it can't just look in argv[0]), the name of the environment variable to examine, the optional additional extra text to emit when the ---help option is invoked, and the boolean +-help option is invoked, and the boolean switch that controls whether response files should be read.

          @@ -1689,7 +1689,7 @@ the conversion from string to data.

          The cl::extrahelp class is a nontemplated class that allows extra -help text to be printed out for the --help option.

          +help text to be printed out for the -help option.

           namespace cl {
@@ -1906,7 +1906,7 @@ MFS("max-file-size", cl::desc("Maximum file si
 
 
           OPTIONS:
-  -help                 - display available options (--help-hidden for more)
+  -help                 - display available options (-help-hidden for more)
   ...
   -max-file-size=<size> - Maximum file size to accept
 
          
diff --git a/docs/CompilerDriver.html b/docs/CompilerDriver.html
index 5f5788c1edf..3c82e2b0769 100644
--- a/docs/CompilerDriver.html
+++ b/docs/CompilerDriver.html
@@ -132,7 +132,7 @@ directory with the compilation graph description in Graphviz format (identical
 to the file used by the --view-graph option). The -o option can be
 used to set the output file name. Hidden option, useful for debugging LLVMC
 plugins.
          5. -
        5. --help, --help-hidden, --version - These options have +
        6. -help, -help-hidden, --version - These options have their standard meaning.
    @@ -325,7 +325,7 @@ aliased option name. Usage example: Possible option properties:

      -
    • help - help string associated with this option. Used for --help +
    • help - help string associated with this option. Used for -help output.
    • required - this option must be specified exactly once (or, in case of the list options without the multi_val property, at least @@ -338,7 +338,7 @@ it is synonymous with requiredmulti_val. Incompatible with required and one_or_more.
    • hidden - the description of this option will not appear in -the --help output (but will appear in the --help-hidden +the -help output (but will appear in the -help-hidden output).
    • really_hidden - the option will not be mentioned in any help output.
      • @@ -748,7 +748,7 @@ the Base plugin behav Mikhail Glushenkov
      LLVM Compiler Infrastructure
      -Last modified: $Date: 2008-12-11 11:34:48 -0600 (Thu, 11 Dec 2008) $ +Last modified: $Date$ diff --git a/docs/GettingStarted.html b/docs/GettingStarted.html index ce1efd59564..8bb1ac41e4f 100644 --- a/docs/GettingStarted.html +++ b/docs/GettingStarted.html @@ -1369,7 +1369,7 @@ end to compile.

      The tools directory contains the executables built out of the libraries above, which form the main part of the user interface. You can -always get help for a tool by typing tool_name --help. The +always get help for a tool by typing tool_name -help. The following is a brief introduction to the most important tools. More detailed information is in the Command Guide.

      @@ -1440,7 +1440,7 @@ information is in the Command Guide.

      opt
      opt reads LLVM bitcode, applies a series of LLVM to LLVM transformations (which are specified on the command line), and then outputs - the resultant bitcode. The 'opt --help' command is a good way to + the resultant bitcode. The 'opt -help' command is a good way to get a list of the program transformations available in LLVM.
      opt can also be used to run a specific analysis on an input LLVM bitcode file and print out the results. It is primarily useful for diff --git a/docs/WritingAnLLVMPass.html b/docs/WritingAnLLVMPass.html index f531a74a687..83de4f9b9de 100644 --- a/docs/WritingAnLLVMPass.html +++ b/docs/WritingAnLLVMPass.html @@ -377,10 +377,10 @@ interesting way, we just throw away the result of opt (sending it to /dev/null).

      To see what happened to the other string you registered, try running -opt with the --help option:

      +opt with the -help option:

      -$ opt -load ../../../Debug/lib/Hello.so --help
+$ opt -load ../../../Debug/lib/Hello.so -help
 OVERVIEW: llvm .bc -> .bc modular optimizer
 
 USAGE: opt [options] <input bitcode>
@@ -970,7 +970,7 @@ template, which requires you to pass at least two
 parameters.  The first parameter is the name of the pass that is to be used on
 the command line to specify that the pass should be added to a program (for
 example, with opt or bugpoint).  The second argument is the
-name of the pass, which is to be used for the --help output of
+name of the pass, which is to be used for the -help output of
 programs, as
 well as for debug output generated by the --debug-pass option.
      
 
@@ -1410,7 +1410,7 @@ allowing any analysis results to live across the execution of your pass.
      
 options that is useful for debugging pass execution, seeing how things work, and
 diagnosing when you should be preserving more analyses than you currently are
 (To get information about all of the variants of the --debug-pass
-option, just type 'opt --help-hidden').
      
+option, just type 'opt -help-hidden').
      
 
 
      By using the --debug-pass=Structure option, for example, we can see
 how our Hello World pass interacts with other passes.
@@ -1625,10 +1625,10 @@ form;

      Note the two spaces prior to the help string produces a tidy result on the ---help query.

      +-help query.

      -$ llc --help
+$ llc -help
   ...
   -regalloc                    - Register allocator to use: (default = linearscan)
     =linearscan                -   linear scan register allocator
diff --git a/include/llvm/CompilerDriver/Main.inc b/include/llvm/CompilerDriver/Main.inc
index fc8b5035e0c..71bb8cb3bf7 100644
--- a/include/llvm/CompilerDriver/Main.inc
+++ b/include/llvm/CompilerDriver/Main.inc
@@ -10,7 +10,7 @@
 //  This tool provides a single point of access to the LLVM
 //  compilation tools.  It has many options. To discover the options
 //  supported please refer to the tools' manual page or run the tool
-//  with the --help option.
+//  with the -help option.
 //
 //  This file provides the default entry point for the driver executable.
 //
diff --git a/include/llvm/Support/CommandLine.h b/include/llvm/Support/CommandLine.h
index 3ee2313b9a3..61c3256d384 100644
--- a/include/llvm/Support/CommandLine.h
+++ b/include/llvm/Support/CommandLine.h
@@ -93,9 +93,9 @@ enum ValueExpected {           // Is a value required for the option?
 };
 
 enum OptionHidden {            // Control whether -help shows this option
-  NotHidden       = 0x20,      // Option included in --help & --help-hidden
-  Hidden          = 0x40,      // -help doesn't, but --help-hidden does
-  ReallyHidden    = 0x60,      // Neither --help nor --help-hidden show this arg
+  NotHidden       = 0x20,      // Option included in -help & -help-hidden
+  Hidden          = 0x40,      // -help doesn't, but -help-hidden does
+  ReallyHidden    = 0x60,      // Neither -help nor -help-hidden show this arg
   HiddenMask      = 0x60
 };
 
@@ -159,7 +159,7 @@ class Option {
   Option *NextRegistered; // Singly linked list of registered options.
 public:
   const char *ArgStr;     // The argument string itself (ex: "help", "o")
-  const char *HelpStr;    // The descriptive text message for --help
+  const char *HelpStr;    // The descriptive text message for -help
   const char *ValueStr;   // String describing what the value of this option is
 
   inline enum NumOccurrencesFlag getNumOccurrencesFlag() const {
@@ -251,14 +251,14 @@ public:
 // command line option parsers...
 //
 
-// desc - Modifier to set the description shown in the --help output...
+// desc - Modifier to set the description shown in the -help output...
 struct desc {
   const char *Desc;
   desc(const char *Str) : Desc(Str) {}
   void apply(Option &O) const { O.setDescription(Desc); }
 };
 
-// value_desc - Modifier to set the value description shown in the --help
+// value_desc - Modifier to set the value description shown in the -help
 // output...
 struct value_desc {
   const char *Desc;
@@ -437,7 +437,7 @@ protected:
 // Default parser implementation - This implementation depends on having a
 // mapping of recognized options to values of some sort.  In addition to this,
 // each entry in the mapping also tracks a help message that is printed with the
-// command line option for --help.  Because this is a simple mapping parser, the
+// command line option for -help.  Because this is a simple mapping parser, the
 // data type can be any unsupported type.
 //
 template 
@@ -1373,7 +1373,7 @@ struct extrahelp {
 
 void PrintVersionMessage();
 // This function just prints the help message, exactly the same way as if the
-// --help option had been given on the command line.
+// -help option had been given on the command line.
 // NOTE: THIS FUNCTION TERMINATES THE PROGRAM!
 void PrintHelpMessage();
 
diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp
index 961dc1fef92..2ab4103de2e 100644
--- a/lib/Support/CommandLine.cpp
+++ b/lib/Support/CommandLine.cpp
@@ -650,7 +650,7 @@ void cl::ParseCommandLineOptions(int argc, char **argv,
     if (Handler == 0) {
       if (SinkOpts.empty()) {
         errs() << ProgramName << ": Unknown command line argument '"
-             << argv[i] << "'.  Try: '" << argv[0] << " --help'\n";
+             << argv[i] << "'.  Try: '" << argv[0] << " -help'\n";
         ErrorParsing = true;
       } else {
         for (SmallVectorImpl::iterator I = SinkOpts.begin(),
@@ -673,7 +673,7 @@ void cl::ParseCommandLineOptions(int argc, char **argv,
     errs() << ProgramName
          << ": Not enough positional command line arguments specified!\n"
          << "Must specify at least " << NumPositionalRequired
-         << " positional arguments: See: " << argv[0] << " --help\n";
+         << " positional arguments: See: " << argv[0] << " -help\n";
 
     ErrorParsing = true;
   } else if (!HasUnlimitedPositionals
@@ -681,7 +681,7 @@ void cl::ParseCommandLineOptions(int argc, char **argv,
     errs() << ProgramName
          << ": Too many positional arguments specified!\n"
          << "Can specify at most " << PositionalOpts.size()
-         << " positional arguments: See: " << argv[0] << " --help\n";
+         << " positional arguments: See: " << argv[0] << " -help\n";
     ErrorParsing = true;
 
   } else if (ConsumeAfterOpt == 0) {
@@ -1029,7 +1029,7 @@ void generic_parser_base::printOptionInfo(const Option &O,
 
 
 //===----------------------------------------------------------------------===//
-// --help and --help-hidden option implementation
+// -help and -help-hidden option implementation
 //
 
 static int OptNameCompare(const void *LHS, const void *RHS) {
@@ -1134,7 +1134,7 @@ static HelpPrinter NormalPrinter(false);
 static HelpPrinter HiddenPrinter(true);
 
 static cl::opt >
-HOp("help", cl::desc("Display available options (--help-hidden for more)"),
+HOp("help", cl::desc("Display available options (-help-hidden for more)"),
     cl::location(NormalPrinter), cl::ValueDisallowed);
 
 static cl::opt >
@@ -1222,8 +1222,8 @@ void cl::PrintHelpMessage() {
   // NormalPrinter variable is a HelpPrinter and the help gets printed when
   // its operator= is invoked. That's because the "normal" usages of the
   // help printer is to be assigned true/false depending on whether the
-  // --help option was given or not. Since we're circumventing that we have
-  // to make it look like --help was given, so we assign true.
+  // -help option was given or not. Since we're circumventing that we have
+  // to make it look like -help was given, so we assign true.
   NormalPrinter = true;
 }