[commit: ghc] ghc-8.0: Docs: -keep-llvm-file(s)/-ddump-llvm imply -fllvm (c980640)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/c980640302e38801bf3642addb7c9f7c6be34cc7/ghc

>---------------------------------------------------------------

commit c980640302e38801bf3642addb7c9f7c6be34cc7
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Mon Feb 22 14:31:40 2016 +0100

    Docs: -keep-llvm-file(s)/-ddump-llvm imply -fllvm
    
    This fixes #9917.
    
    (cherry picked from commit ed119096be6739b67d99acfa4c2d43627960f0e3)


>---------------------------------------------------------------

c980640302e38801bf3642addb7c9f7c6be34cc7
 docs/users_guide/debugging.rst                        | 2 ++
 docs/users_guide/separate_compilation.rst             | 5 +++++
 utils/mkUserGuidePart/Options/CompilerDebugging.hs    | 3 ++-
 utils/mkUserGuidePart/Options/KeepingIntermediates.hs | 9 +++++----
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/docs/users_guide/debugging.rst b/docs/users_guide/debugging.rst
index db36612..f49e84e 100644
--- a/docs/users_guide/debugging.rst
+++ b/docs/users_guide/debugging.rst
@@ -144,6 +144,8 @@ Dumping out compiler intermediate structures
 
     .. ghc-flag:: -ddump-llvm
 
+        :implies: :ghc-flag:`-fllvm`
+
         LLVM code from the :ref:`LLVM code generator <llvm-code-gen>`
 
     .. ghc-flag:: -ddump-bcos
diff --git a/docs/users_guide/separate_compilation.rst b/docs/users_guide/separate_compilation.rst
index afdde83..a2ce5eb 100644
--- a/docs/users_guide/separate_compilation.rst
+++ b/docs/users_guide/separate_compilation.rst
@@ -334,12 +334,16 @@ The following options are useful for keeping certain intermediate files
 around, when normally GHC would throw these away after compilation:
 
 .. ghc-flag:: -keep-hc-file
+              -keep-hc-files
 
     Keep intermediate ``.hc`` files when doing ``.hs``-to-``.o``
     compilations via :ref:`C <c-code-gen>` (Note: ``.hc`` files are only
     generated by :ref:`unregisterised <unreg>` compilers).
 
 .. ghc-flag:: -keep-llvm-file
+              -keep-llvm-files
+
+    :implies: :ghc-flag:`-fllvm`
 
     Keep intermediate ``.ll`` files when doing ``.hs``-to-``.o``
     compilations via :ref:`LLVM <llvm-code-gen>` (Note: ``.ll`` files
@@ -347,6 +351,7 @@ around, when normally GHC would throw these away after compilation:
     to use :ghc-flag:`-fllvm` to force them to be produced).
 
 .. ghc-flag:: -keep-s-file
+              -keep-s-files
 
     Keep intermediate ``.s`` files.
 
diff --git a/utils/mkUserGuidePart/Options/CompilerDebugging.hs b/utils/mkUserGuidePart/Options/CompilerDebugging.hs
index 320587b..ce84a2a 100644
--- a/utils/mkUserGuidePart/Options/CompilerDebugging.hs
+++ b/utils/mkUserGuidePart/Options/CompilerDebugging.hs
@@ -55,7 +55,8 @@ compilerDebuggingOptions =
          , flagType = DynamicFlag
          }
   , flag { flagName = "-ddump-llvm"
-         , flagDescription = "Dump LLVM intermediate code"
+         , flagDescription = "Dump LLVM intermediate code. "++
+           "Implies :ghc-flag:`-fllvm`."
          , flagType = DynamicFlag
          }
   , flag { flagName = "-ddump-occur-anal"
diff --git a/utils/mkUserGuidePart/Options/KeepingIntermediates.hs b/utils/mkUserGuidePart/Options/KeepingIntermediates.hs
index 9c93aed..dd68de4 100644
--- a/utils/mkUserGuidePart/Options/KeepingIntermediates.hs
+++ b/utils/mkUserGuidePart/Options/KeepingIntermediates.hs
@@ -5,19 +5,20 @@ import Types
 keepingIntermediatesOptions :: [Flag]
 keepingIntermediatesOptions =
   [ flag { flagName = "-keep-hc-file, -keep-hc-files"
-         , flagDescription = "retain intermediate ``.hc`` files"
+         , flagDescription = "Retain intermediate ``.hc`` files."
          , flagType = DynamicFlag
          }
   , flag { flagName = "-keep-llvm-file, -keep-llvm-files"
-         , flagDescription = "retain intermediate LLVM ``.ll`` files"
+         , flagDescription = "Retain intermediate LLVM ``.ll`` files. "++
+           "Implies :ghc-flag:`-fllvm`."
          , flagType = DynamicFlag
          }
   , flag { flagName = "-keep-s-file, -keep-s-files"
-         , flagDescription = "retain intermediate ``.s`` files"
+         , flagDescription = "Retain intermediate ``.s`` files."
          , flagType = DynamicFlag
          }
   , flag { flagName = "-keep-tmp-files"
-         , flagDescription = "retain all intermediate temporary files"
+         , flagDescription = "Retain all intermediate temporary files."
          , flagType = DynamicFlag
          }
   ]