Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/e8723129a6c48438e81f95a73271014ffa96eaa3 >--------------------------------------------------------------- commit e8723129a6c48438e81f95a73271014ffa96eaa3 Author: Ian Lynagh <[email protected]> Date: Fri Dec 2 21:35:18 2011 +0000 Move includes/DerivedConstants.h and includes/GHCConstants.h into dist dirs When they existed, they were getting included in the includes_H_FILES variable (as it uses wildcard to find all header files). But the .depends files for the programs that generate the headers depend on $(includes_H_FILES), so the .depends files looked out-of-date once the headers had been created. This caused unnecessary make reinvocations. So now we put them in dist* directories, where they ought to be anyway. >--------------------------------------------------------------- compiler/codeGen/CgProf.hs | 2 +- compiler/codeGen/CgTicky.hs | 2 +- compiler/codeGen/StgCmmProf.hs | 2 +- compiler/codeGen/StgCmmTicky.hs | 2 +- includes/HaskellConstants.hs | 4 ++-- includes/ghc.mk | 13 ++++++++----- rts/package.conf.in | 2 +- 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/compiler/codeGen/CgProf.hs b/compiler/codeGen/CgProf.hs index 3e247ff..cac33ee 100644 --- a/compiler/codeGen/CgProf.hs +++ b/compiler/codeGen/CgProf.hs @@ -35,7 +35,7 @@ module CgProf ( #include "../includes/rts/Constants.h" -- For LDV_CREATE_MASK, LDV_STATE_USE -- which are StgWords -#include "../includes/DerivedConstants.h" +#include "../includes/dist-derivedconstants/header/DerivedConstants.h" -- For REP_xxx constants, which are MachReps import ClosureInfo diff --git a/compiler/codeGen/CgTicky.hs b/compiler/codeGen/CgTicky.hs index 04f38ac..0ff440e 100644 --- a/compiler/codeGen/CgTicky.hs +++ b/compiler/codeGen/CgTicky.hs @@ -43,7 +43,7 @@ module CgTicky ( staticTickyHdr, ) where -#include "../includes/DerivedConstants.h" +#include "../includes/dist-derivedconstants/header/DerivedConstants.h" -- For REP_xxx constants, which are MachReps import ClosureInfo diff --git a/compiler/codeGen/StgCmmProf.hs b/compiler/codeGen/StgCmmProf.hs index d9b3583..115ef1f 100644 --- a/compiler/codeGen/StgCmmProf.hs +++ b/compiler/codeGen/StgCmmProf.hs @@ -36,7 +36,7 @@ module StgCmmProf ( #include "../includes/rts/Constants.h" -- For LDV_CREATE_MASK, LDV_STATE_USE -- which are StgWords -#include "../includes/DerivedConstants.h" +#include "../includes/dist-derivedconstants/header/DerivedConstants.h" -- For REP_xxx constants, which are MachReps import StgCmmClosure diff --git a/compiler/codeGen/StgCmmTicky.hs b/compiler/codeGen/StgCmmTicky.hs index 8b8ab34..a6c592c 100644 --- a/compiler/codeGen/StgCmmTicky.hs +++ b/compiler/codeGen/StgCmmTicky.hs @@ -46,7 +46,7 @@ module StgCmmTicky ( ) where #include "HsVersions.h" -#include "../includes/DerivedConstants.h" +#include "../includes/dist-derivedconstants/header/DerivedConstants.h" -- For REP_xxx constants, which are MachReps import StgCmmClosure diff --git a/includes/HaskellConstants.hs b/includes/HaskellConstants.hs index f133f6a..e38e896 100644 --- a/includes/HaskellConstants.hs +++ b/includes/HaskellConstants.hs @@ -19,7 +19,7 @@ settings for the target plat instead). #include "stg/MachRegs.h" #include "rts/Constants.h" #include "MachDeps.h" -#include "DerivedConstants.h" +#include "../includes/dist-derivedconstants/header/DerivedConstants.h" -- import Util @@ -196,5 +196,5 @@ bITMAP_BITS_SHIFT = BITMAP_BITS_SHIFT -- Constants derived from headers in ghc/includes, generated by the program -- ../includes/mkDerivedConstants.c. -#include "GHCConstants.h" +#include "../includes/dist-ghcconstants/header/GHCConstants.h" diff --git a/includes/ghc.mk b/includes/ghc.mk index 7c2aac5..0ef2f54 100644 --- a/includes/ghc.mk +++ b/includes/ghc.mk @@ -41,7 +41,10 @@ ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO" includes_CC_OPTS += -DTABLES_NEXT_TO_CODE endif -includes_CC_OPTS += -Iincludes -Irts +includes_CC_OPTS += -Iincludes +includes_CC_OPTS += -Iincludes/dist-derivedconstants/header +includes_CC_OPTS += -Iincludes/dist-ghcconstants/header +includes_CC_OPTS += -Irts ifneq "$(GhcWithSMP)" "YES" includes_CC_OPTS += -DNOSMP @@ -126,7 +129,7 @@ endif # --------------------------------------------------------------------------- # Make DerivedConstants.h for the compiler -includes_DERIVEDCONSTANTS = includes/DerivedConstants.h +includes_DERIVEDCONSTANTS = includes/dist-derivedconstants/header/DerivedConstants.h ifeq "$(PORTING_HOST)" "YES" @@ -145,7 +148,7 @@ $(includes_dist-derivedconstants_depfile_c_asm) : $(includes_H_CONFIG) $(include includes/dist-derivedconstants/build/mkDerivedConstants.o : $(includes_H_CONFIG) $(includes_H_PLATFORM) ifneq "$(BINDIST)" "YES" -$(includes_DERIVEDCONSTANTS) : $(INPLACE_BIN)/mkDerivedConstants$(exeext) +$(includes_DERIVEDCONSTANTS) : $(INPLACE_BIN)/mkDerivedConstants$(exeext) | $$(dir $$@)/. ./$< >$@ endif @@ -154,7 +157,7 @@ endif # ----------------------------------------------------------------------------- # -includes_GHCCONSTANTS = includes/GHCConstants.h +includes_GHCCONSTANTS = includes/dist-ghcconstants/header/GHCConstants.h ifeq "$(PORTING_HOST)" "YES" @@ -175,7 +178,7 @@ $(includes_dist-ghcconstants_depfile_c_asm) : $(includes_H_CONFIG) $(includes_H_ includes/dist-ghcconstants/build/mkDerivedConstants.o : $(includes_H_CONFIG) $(includes_H_PLATFORM) -$(includes_GHCCONSTANTS) : $(INPLACE_BIN)/mkGHCConstants$(exeext) +$(includes_GHCCONSTANTS) : $(INPLACE_BIN)/mkGHCConstants$(exeext) | $$(dir $$@)/. ./$< >$@ endif diff --git a/rts/package.conf.in b/rts/package.conf.in index a1161ea..477c59f 100644 --- a/rts/package.conf.in +++ b/rts/package.conf.in @@ -51,7 +51,7 @@ extra-libraries: #ifdef INSTALLING include-dirs: INCLUDE_DIR PAPI_INCLUDE_DIR #else /* !INSTALLING */ -include-dirs: TOP"/includes" +include-dirs: TOP"/includes" TOP"/includes/dist-ghcconstants/header" TOP"/includes/dist-derivedconstants/header" #endif includes: Stg.h _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
