[llvm-branch-commits] [flang] 6338655 - [flang] Add -h as a synonym for help

[Hans Wennborg via llvm-branch-commits]

Author: Richard Barton
Date: 2020-08-18T11:58:47+02:00
New Revision: 633865571bfdd104d84eadfd7ed9dedbdf6027ee

URL: https://github.com/llvm/llvm-project/commit/633865571bfdd104d84eadfd7ed9dedbdf6027ee
DIFF: https://github.com/llvm/llvm-project/commit/633865571bfdd104d84eadfd7ed9dedbdf6027ee.diff

LOG: [flang] Add -h as a synonym for help

As expected by user in http://lists.llvm.org/pipermail/flang-dev/2020-June/000404.html

Depends on D84856

Differential Revision: https://reviews.llvm.org/D84857

(cherry picked from commit 30e45f339eb0841dc7fe27fad119cc5db0c052f3)

Added: 
    

Modified: 
    flang/test/Driver/help.f90
    flang/tools/f18/f18.cpp

Removed: 
    


################################################################################
diff  --git a/flang/test/Driver/help.f90 b/flang/test/Driver/help.f90
index 66dd14aa5a86..d6162954a872 100644
--- a/flang/test/Driver/help.f90
+++ b/flang/test/Driver/help.f90
@@ -1,3 +1,4 @@
+! RUN: %f18 -h 2>&1 | FileCheck %s
 ! RUN: %f18 -help 2>&1 | FileCheck %s
 ! RUN: %f18 --help 2>&1 | FileCheck %s
 ! RUN: %f18 -? 2>&1 | FileCheck %s

diff  --git a/flang/tools/f18/f18.cpp b/flang/tools/f18/f18.cpp
index 9189f6a46aff..03c0f7afe810 100644
--- a/flang/tools/f18/f18.cpp
+++ b/flang/tools/f18/f18.cpp
@@ -600,7 +600,7 @@ int main(int argc, char *const argv[]) {
       driver.getDefinitionArgs = {arguments[0], arguments[1], arguments[2]};
     } else if (arg == "-fget-symbols-sources") {
       driver.getSymbolsSources = true;
-    } else if (arg == "-help" || arg == "--help" || arg == "-?") {
+    } else if (arg == "-h" || arg == "-help" || arg == "--help" || arg == "-?") {
       llvm::errs()
           << "f18: LLVM Fortran compiler\n"
           << "\n"