[commit: ghc] master: Fix comment (old file names) in mk/ and utils/ (bd818a7)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/bd818a7ce0b872fc0b03375c65d55932ada1940d/ghc

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

commit bd818a7ce0b872fc0b03375c65d55932ada1940d
Author: Takenobu Tani <takenobu.hs at gmail.com>
Date:   Sat Feb 4 15:16:10 2017 -0500

    Fix comment (old file names) in mk/ and utils/
    
    There ware some old file names (.lhs, ...) at comments.
    
    * mk/config.mk.in
      - compiler/hsSyn/HsExpr.lhs -> HsExpr.hs
    
    * utils/ghc-pkg/Main.hs
      - compiler/main/Packages.lhs -> Packages.hs
    
    * utils/genapply/Main.hs
      - CgRetConv.lhs -> * REMOVE THIS COMMENT (OLDER FILE THAN GHC6) *
      - Constants.lhs -> Constants.hs
      - compiler/codeGen/CgCallConv.lhs -> compiler/codeGen/StgCmmLayout.hs
      - Apply.hc -> Apply.cmm
      - HeapStackCheck.hc -> HeapStackCheck.cmm
    
    Reviewers: mpickering, austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D3077


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

bd818a7ce0b872fc0b03375c65d55932ada1940d
 mk/config.mk.in        |  4 ++--
 utils/genapply/Main.hs | 12 ++++++------
 utils/ghc-pkg/Main.hs  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 35ff04c..b90aca3 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -71,9 +71,9 @@ GhcStage2HcOpts=-O2
 GhcStage3HcOpts=-O2
 
 # Disable -O2 optimization. Otherwise amount of generated C code
-# makes things very slow to compile (~5 minutes on core-i7 for 'compiler/hsSyn/HsExpr.lhs')
+# makes things very slow to compile (~5 minutes on core-i7 for 'compiler/hsSyn/HsExpr.hs')
 # and sometimes not compile at all (powerpc64 overflows something
-# on 'compiler/hsSyn/HsExpr.lhs').
+# on 'compiler/hsSyn/HsExpr.hs').
 ifeq "$(GhcUnregisterised)" "YES"
 GhcStage1HcOpts=
 GhcStage2HcOpts=
diff --git a/utils/genapply/Main.hs b/utils/genapply/Main.hs
index c5752fe..f9d6ea1 100644
--- a/utils/genapply/Main.hs
+++ b/utils/genapply/Main.hs
@@ -106,7 +106,6 @@ loadRegOffs = vcat . map (uncurry assign_stk_to_reg)
 saveRegOffs :: [(Reg,Int)] -> Doc
 saveRegOffs = vcat . map (uncurry assign_reg_to_stk)
 
--- a bit like assignRegs in CgRetConv.lhs
 assignRegs
         :: RegStatus            -- are we registerised?
         -> Int                  -- Sp of first arg
@@ -332,7 +331,7 @@ genMkPAP regstatus macro jump live ticker disamb
 
                 -- for a PAP, we have to arrange that the stack contains a
                 -- return address in the event that stg_PAP_entry fails its
-                -- heap check.  See stg_PAP_entry in Apply.hc for details.
+                -- heap check.  See stg_PAP_entry in Apply.cmm for details.
              if is_pap
                 then text "R2 = " <> mkApplyInfoName this_call_args <> semi
 
@@ -524,7 +523,7 @@ enterFastPath regstatus no_load_regs args_in_regs args
     = enterFastPathHelper tag regstatus no_load_regs args_in_regs args
 enterFastPath _ _ _ _ = empty
 
--- Copied from Constants.lhs & CgUtils.hs, i'd rather have this imported:
+-- Copied from Constants.hs & CgUtils.hs, i'd rather have this imported:
 -- (arity,tag)
 tAG_BITS = (TAG_BITS :: Int)
 tAG_BITS_MAX = ((1 `shiftL` tAG_BITS) :: Int)
@@ -903,7 +902,7 @@ genStackApply regstatus args =
 -- These code fragments are used to save registers on the stack at a heap
 -- check failure in the entry code for a function.  We also have to save R1
 -- and the return address (stg_gc_fun_info) on the stack.  See stg_gc_fun_gen
--- in HeapStackCheck.hc for more details.
+-- in HeapStackCheck.cmm for more details.
 
 mkStackSaveEntryLabel :: [ArgRep] -> Doc
 mkStackSaveEntryLabel args = text "stg_stk_save_" <> text (concatMap showArg args)
@@ -925,7 +924,8 @@ genStackSave regstatus args =
                 ]
 
    std_frame_size = 3 -- the std bits of the frame. See StgRetFun in Closures.h,
-                      -- and the comment on stg_fun_gc_gen in HeapStackCheck.hc.
+                      -- and the comment on stg_fun_gc_gen
+                      -- in HeapStackCheck.cmm.
    (reg_locs, leftovers, sp_offset) = assignRegs regstatus std_frame_size args
 
    -- number of words of arguments on the stack.
@@ -994,7 +994,7 @@ applyTypes = [
 --
 --  NOTE: other places to change if you change stackApplyTypes:
 --       - includes/rts/storage/FunTypes.h
---       - compiler/codeGen/CgCallConv.lhs: stdPattern
+--       - compiler/codeGen/StgCmmLayout.hs: stdPattern
 stackApplyTypes = [
         [],
         [N],
diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs
index 53f5f9d..1383f8f 100644
--- a/utils/ghc-pkg/Main.hs
+++ b/utils/ghc-pkg/Main.hs
@@ -806,7 +806,7 @@ mungePackageDBPaths top_dir db at PackageDB { packages = pkgs } =
     -- files and "package.conf.d" dirs) the pkgroot is the parent directory
     -- ${pkgroot}/package.conf  or  ${pkgroot}/package.conf.d/
 
--- TODO: This code is duplicated in compiler/main/Packages.lhs
+-- TODO: This code is duplicated in compiler/main/Packages.hs
 mungePackagePaths :: FilePath -> FilePath
                   -> InstalledPackageInfo -> InstalledPackageInfo
 -- Perform path/URL variable substitution as per the Cabal ${pkgroot} spec